Rename folder structure from OpenPGP Keychain to OpenKeychain

author: Dominik Schürmann <dominik@dominikschuermann.de> 2014-04-06 12:57:42 +0200
committer: Dominik Schürmann <dominik@dominikschuermann.de> 2014-04-06 12:57:42 +0200
commit: 6d1137190529dc7add74926cea52c377883319be (patch)
tree: fd88b29a048f3aec1daa2a84bbaf22c0efa3663f
parent: 17997dd362fe62d72113a0536069d0fdb9c3211b (diff)
download: open-keychain-6d1137190529dc7add74926cea52c377883319be.tar.gz
open-keychain-6d1137190529dc7add74926cea52c377883319be.tar.bz2
open-keychain-6d1137190529dc7add74926cea52c377883319be.zip
532 files changed, 7 insertions, 7 deletions
diff --git a/OpenPGP-Keychain-API/.gitignore b/OpenKeychain-API/.gitignore
index aa8bb5760..aa8bb5760 100644
--- a/OpenPGP-Keychain-API/.gitignore
+++ b/OpenKeychain-API/.gitignore
diff --git a/OpenPGP-Keychain-API/build.gradle b/OpenKeychain-API/build.gradle
index 0ce5dc8c0..0ce5dc8c0 100644
--- a/OpenPGP-Keychain-API/build.gradle
+++ b/OpenKeychain-API/build.gradle
diff --git a/OpenPGP-Keychain-API/example-app/build.gradle b/OpenKeychain-API/example-app/build.gradle
index e7a25e689..e7a25e689 100644
--- a/OpenPGP-Keychain-API/example-app/build.gradle
+++ b/OpenKeychain-API/example-app/build.gradle
diff --git a/OpenPGP-Keychain-API/example-app/ic_launcher-web.png b/OpenKeychain-API/example-app/ic_launcher-web.png
index ae4cd0976..ae4cd0976 100644
--- a/OpenPGP-Keychain-API/example-app/ic_launcher-web.png
+++ b/OpenKeychain-API/example-app/ic_launcher-web.png
diff --git a/OpenPGP-Keychain-API/example-app/src/main/AndroidManifest.xml b/OpenKeychain-API/example-app/src/main/AndroidManifest.xml
index d62c26495..d62c26495 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/AndroidManifest.xml
+++ b/OpenKeychain-API/example-app/src/main/AndroidManifest.xml
diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/BaseActivity.java b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/BaseActivity.java
index dd642d879..dd642d879 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/BaseActivity.java
+++ b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/BaseActivity.java
diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/Constants.java b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/Constants.java
index acff12f47..acff12f47 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/Constants.java
+++ b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/Constants.java
diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java
index e8aa2a2e7..e8aa2a2e7 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java
+++ b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java
diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
index 345d63eef..345d63eef 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
+++ b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain-API/example-app/src/main/res/drawable-hdpi/ic_launcher.png
index cf114d7db..cf114d7db 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/OpenKeychain-API/example-app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain-API/example-app/src/main/res/drawable-mdpi/ic_launcher.png
index d55318843..d55318843 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/OpenKeychain-API/example-app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain-API/example-app/src/main/res/drawable-xhdpi/ic_launcher.png
index 13ed3d450..13ed3d450 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/OpenKeychain-API/example-app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain-API/example-app/src/main/res/drawable-xxhdpi/ic_launcher.png
index 831c993d4..831c993d4 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/OpenKeychain-API/example-app/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml b/OpenKeychain-API/example-app/src/main/res/layout/openpgp_provider.xml
index 2b8e8016a..2b8e8016a 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml
+++ b/OpenKeychain-API/example-app/src/main/res/layout/openpgp_provider.xml
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml b/OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml
index b38e07a36..b38e07a36 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
+++ b/OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/xml/intent_preference.xml b/OpenKeychain-API/example-app/src/main/res/xml/intent_preference.xml
index 801e4a78a..801e4a78a 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/xml/intent_preference.xml
+++ b/OpenKeychain-API/example-app/src/main/res/xml/intent_preference.xml
diff --git a/OpenPGP-Keychain-API/gradle/gradle/wrapper/gradle-wrapper.jar b/OpenKeychain-API/gradle/gradle/wrapper/gradle-wrapper.jar
index 583859812..583859812 100644
--- a/OpenPGP-Keychain-API/gradle/gradle/wrapper/gradle-wrapper.jar
+++ b/OpenKeychain-API/gradle/gradle/wrapper/gradle-wrapper.jar
diff --git a/OpenPGP-Keychain-API/gradle/gradle/wrapper/gradle-wrapper.properties b/OpenKeychain-API/gradle/gradle/wrapper/gradle-wrapper.properties
index 42c0fbd9d..42c0fbd9d 100644
--- a/OpenPGP-Keychain-API/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/OpenKeychain-API/gradle/gradle/wrapper/gradle-wrapper.properties
diff --git a/OpenPGP-Keychain-API/gradle/gradlew b/OpenKeychain-API/gradle/gradlew
index 91a7e269e..91a7e269e 100755
--- a/OpenPGP-Keychain-API/gradle/gradlew
+++ b/OpenKeychain-API/gradle/gradlew
diff --git a/OpenPGP-Keychain-API/gradle/gradlew.bat b/OpenKeychain-API/gradle/gradlew.bat
index aec99730b..aec99730b 100644
--- a/OpenPGP-Keychain-API/gradle/gradlew.bat
+++ b/OpenKeychain-API/gradle/gradlew.bat
diff --git a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar b/OpenKeychain-API/gradle/wrapper/gradle-wrapper.jar
index 583859812..583859812 100644
--- a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar
+++ b/OpenKeychain-API/gradle/wrapper/gradle-wrapper.jar
diff --git a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties b/OpenKeychain-API/gradle/wrapper/gradle-wrapper.properties
index d8e0b5b29..d8e0b5b29 100644
--- a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties
+++ b/OpenKeychain-API/gradle/wrapper/gradle-wrapper.properties
diff --git a/OpenPGP-Keychain-API/gradlew b/OpenKeychain-API/gradlew
index 91a7e269e..91a7e269e 100755
--- a/OpenPGP-Keychain-API/gradlew
+++ b/OpenKeychain-API/gradlew
diff --git a/OpenPGP-Keychain-API/gradlew.bat b/OpenKeychain-API/gradlew.bat
index aec99730b..aec99730b 100644
--- a/OpenPGP-Keychain-API/gradlew.bat
+++ b/OpenKeychain-API/gradlew.bat
diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/.gitignore b/OpenKeychain-API/libraries/openkeychain-api-library/.gitignore
index aa8bb5760..aa8bb5760 100644
--- a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/.gitignore
+++ b/OpenKeychain-API/libraries/openkeychain-api-library/.gitignore
diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/AndroidManifest.xml b/OpenKeychain-API/libraries/openkeychain-api-library/AndroidManifest.xml
index 768922c22..768922c22 100644
--- a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/AndroidManifest.xml
+++ b/OpenKeychain-API/libraries/openkeychain-api-library/AndroidManifest.xml
diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/LICENSE b/OpenKeychain-API/libraries/openkeychain-api-library/LICENSE
index d64569567..d64569567 100644
--- a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/LICENSE
+++ b/OpenKeychain-API/libraries/openkeychain-api-library/LICENSE
diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/build.gradle b/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle
index 98c9a3bd6..98c9a3bd6 100644
--- a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/build.gradle
+++ b/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle
diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/build.xml b/OpenKeychain-API/libraries/openkeychain-api-library/build.xml
index 48ebf198c..48ebf198c 100644
--- a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/build.xml
+++ b/OpenKeychain-API/libraries/openkeychain-api-library/build.xml
diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/proguard-project.txt b/OpenKeychain-API/libraries/openkeychain-api-library/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/proguard-project.txt
+++ b/OpenKeychain-API/libraries/openkeychain-api-library/proguard-project.txt
diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/project.properties b/OpenKeychain-API/libraries/openkeychain-api-library/project.properties
index 91d2b0246..91d2b0246 100644
--- a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/project.properties
+++ b/OpenKeychain-API/libraries/openkeychain-api-library/project.properties
diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java b/OpenKeychain-API/libraries/openkeychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java
index 15aceb534..15aceb534 100644
--- a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java
+++ b/OpenKeychain-API/libraries/openkeychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/.gitignore b/OpenKeychain-API/libraries/openpgp-api-library/.gitignore
index aa8bb5760..aa8bb5760 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/.gitignore
+++ b/OpenKeychain-API/libraries/openpgp-api-library/.gitignore
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/AndroidManifest.xml b/OpenKeychain-API/libraries/openpgp-api-library/AndroidManifest.xml
index 98cb89faa..98cb89faa 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/AndroidManifest.xml
+++ b/OpenKeychain-API/libraries/openpgp-api-library/AndroidManifest.xml
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/LICENSE b/OpenKeychain-API/libraries/openpgp-api-library/LICENSE
index d64569567..d64569567 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/LICENSE
+++ b/OpenKeychain-API/libraries/openpgp-api-library/LICENSE
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/build.gradle b/OpenKeychain-API/libraries/openpgp-api-library/build.gradle
index 98c9a3bd6..98c9a3bd6 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/build.gradle
+++ b/OpenKeychain-API/libraries/openpgp-api-library/build.gradle
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/build.xml b/OpenKeychain-API/libraries/openpgp-api-library/build.xml
index 48ebf198c..48ebf198c 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/build.xml
+++ b/OpenKeychain-API/libraries/openpgp-api-library/build.xml
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/proguard-project.txt b/OpenKeychain-API/libraries/openpgp-api-library/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/proguard-project.txt
+++ b/OpenKeychain-API/libraries/openpgp-api-library/proguard-project.txt
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/project.properties b/OpenKeychain-API/libraries/openpgp-api-library/project.properties
index 91d2b0246..91d2b0246 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/project.properties
+++ b/OpenKeychain-API/libraries/openpgp-api-library/project.properties
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png
index 71b9118dc..71b9118dc 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png
index 73b1d08f3..73b1d08f3 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png
index 270abf45f..270abf45f 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png
index d841821c8..d841821c8 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png
index 1e3571fa5..1e3571fa5 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png
index d505046b4..d505046b4 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
index 52044601e..52044601e 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png
index d6fb86bdd..d6fb86bdd 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/values/strings.xml b/OpenKeychain-API/libraries/openpgp-api-library/res/values/strings.xml
index 0119831cc..0119831cc 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/values/strings.xml
+++ b/OpenKeychain-API/libraries/openpgp-api-library/res/values/strings.xml
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl
index 7ee79d6ab..7ee79d6ab 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl
+++ b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java
index b894a4609..b894a4609 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java
+++ b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java
index 157dd1aad..157dd1aad 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java
+++ b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java
index 465a12002..465a12002 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java
+++ b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
index cf5864620..cf5864620 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
+++ b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java
index 0395a7bc5..0395a7bc5 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java
+++ b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java
index 67fe86291..67fe86291 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java
+++ b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java
diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java
index 58c62110d..58c62110d 100644
--- a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java
+++ b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java
diff --git a/OpenPGP-Keychain-API/settings.gradle b/OpenKeychain-API/settings.gradle
index a819a021b..a819a021b 100644
--- a/OpenPGP-Keychain-API/settings.gradle
+++ b/OpenKeychain-API/settings.gradle
diff --git a/OpenPGP-Keychain/.gitignore b/OpenKeychain/.gitignore
index aa8bb5760..aa8bb5760 100644
--- a/OpenPGP-Keychain/.gitignore
+++ b/OpenKeychain/.gitignore
diff --git a/OpenPGP-Keychain/build.gradle b/OpenKeychain/build.gradle
index ef9bcfda5..3fcdf790b 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -10,8 +10,8 @@ sourceSets {
 dependencies {
     compile 'com.android.support:support-v4:19.0.1'
     compile 'com.android.support:appcompat-v7:19.0.1'
-    compile project(':OpenPGP-Keychain-API:libraries:openpgp-api-library')
-    compile project(':OpenPGP-Keychain-API:libraries:openkeychain-api-library')
+    compile project(':OpenKeychain-API:libraries:openpgp-api-library')
+    compile project(':OpenKeychain-API:libraries:openkeychain-api-library')
     compile project(':libraries:HtmlTextView')
     compile project(':libraries:StickyListHeaders:library')
     compile project(':libraries:AndroidBootstrap')
@@ -29,8 +29,8 @@ dependencies {
     testLocalCompile 'com.google.android:android:4.1.1.4'
     testLocalCompile 'com.android.support:support-v4:19.0.1'
     testLocalCompile 'com.android.support:appcompat-v7:19.0.1'
-    testLocalCompile project(':OpenPGP-Keychain-API:libraries:openpgp-api-library')
-    testLocalCompile project(':OpenPGP-Keychain-API:libraries:openkeychain-api-library')
+    testLocalCompile project(':OpenKeychain-API:libraries:openpgp-api-library')
+    testLocalCompile project(':OpenKeychain-API:libraries:openkeychain-api-library')
     testLocalCompile project(':libraries:HtmlTextView')
     testLocalCompile project(':libraries:StickyListHeaders:library')
     testLocalCompile project(':libraries:AndroidBootstrap')
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index de17f9b20..de17f9b20 100644
--- a/OpenPGP-Keychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
diff --git a/OpenPGP-Keychain/src/main/assets/fontawesome-webfont.ttf b/OpenKeychain/src/main/assets/fontawesome-webfont.ttf
index 7ec2e1de8..7ec2e1de8 100644
--- a/OpenPGP-Keychain/src/main/assets/fontawesome-webfont.ttf
+++ b/OpenKeychain/src/main/assets/fontawesome-webfont.ttf
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index b3bfaa229..b3bfaa229 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Id.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Id.java
index 784ec340e..784ec340e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Id.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Id.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 9b80e76f3..9b80e76f3 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
index 1cac5762d..1cac5762d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
index 36f7fd23b..36f7fd23b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
index 1cb91c688..1cb91c688 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
index a26df556d..a26df556d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java
index f8ed21816..f8ed21816 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
index 810f22d8e..810f22d8e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java
index d24aeca52..d24aeca52 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java
index b31a889f0..b31a889f0 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
index ca5555fea..ca5555fea 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
index c6c62d649..c6c62d649 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
index 8a0bf99d7..8a0bf99d7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java
index ad240e834..ad240e834 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
index f884b1776..f884b1776 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index d03f3ccc2..d03f3ccc2 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
index 4c786f555..4c786f555 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 48b959738..48b959738 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index a864a165d..a864a165d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java
index 5bb1665b6..5bb1665b6 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
index 23c4bbbd9..23c4bbbd9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
index 418445367..418445367 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java
index caa7842db..caa7842db 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
index fc25faecd..fc25faecd 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index 8674ad94b..8674ad94b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 9b9e4991d..9b9e4991d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
index 701ffc6af..701ffc6af 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
index bc7de0b37..bc7de0b37 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
index aa30e845d..aa30e845d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 5e6d37237..5e6d37237 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java
index 832cbc752..832cbc752 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java
index a3f9f84c9..a3f9f84c9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index b38fea5a9..b38fea5a9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
index 16a800022..16a800022 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/WrongPackageSignatureException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/WrongPackageSignatureException.java
index 6f44a65e9..6f44a65e9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/WrongPackageSignatureException.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/WrongPackageSignatureException.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
index 123ed526f..123ed526f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
index 0a3ec3c3b..0a3ec3c3b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountsListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountsListFragment.java
index 4d99e1923..4d99e1923 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountsListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountsListFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
index 818c296c1..818c296c1 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
index a6db02708..a6db02708 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java
index f86d279f0..f86d279f0 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java
index 9d0e6d3ef..9d0e6d3ef 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
index ab95f2691..ab95f2691 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 1c6aa7971..1c6aa7971 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
index 92d012c80..92d012c80 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 962b304c7..962b304c7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
index 7c2dcf2c1..7c2dcf2c1 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
index 7027c114e..7027c114e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index 8533e9072..8533e9072 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
index 492c0cf29..492c0cf29 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
index 1c465f55c..1c465f55c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
index 2169bbd77..2169bbd77 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
index c875818e3..c875818e3 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 93d5688b9..93d5688b9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index a03c7d797..a03c7d797 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java
index 0786b3a16..0786b3a16 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
index 8400cf397..8400cf397 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
index 470c85715..470c85715 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
index ba11074fc..ba11074fc 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptSymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptSymmetricFragment.java
index 8efa07953..8efa07953 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptSymmetricFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptSymmetricFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java
index a484b57de..a484b57de 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
index 32f37a0a5..32f37a0a5 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java
index 6b3c51b08..6b3c51b08 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 6ea79473a..6ea79473a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
index 28e2091a9..28e2091a9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
index 31d5f3fd0..31d5f3fd0 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 077fa0cab..077fa0cab 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
index 110647284..110647284 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
index 8b553d273..8b553d273 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
index 3eb463dac..3eb463dac 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index 8db643583..8db643583 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 3e2c96464..3e2c96464 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
index 265bb2139..265bb2139 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
index 719378274..719378274 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
index 874703704..874703704 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
index 9bfe3eaa9..9bfe3eaa9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
index 0ff88d97c..0ff88d97c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
index 9987facbc..9987facbc 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
index 514951385..514951385 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index 0e231e6a8..0e231e6a8 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
index 294fadab2..294fadab2 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index cce34139c..cce34139c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
index 6dc0413bb..6dc0413bb 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
index b738970f1..b738970f1 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
index 6e96a338a..6e96a338a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java
index 5f2aec4fe..5f2aec4fe 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java
index a3ed08a4c..a3ed08a4c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index f322ea980..f322ea980 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
index 5631d40ea..5631d40ea 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
index c9983213c..c9983213c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
index 259e14319..259e14319 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
index 5b5d316b6..5b5d316b6 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java
index fd864eb09..fd864eb09 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
index fbbb9caa4..fbbb9caa4 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java
index 9ddfa90be..9ddfa90be 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
index 64b735bfa..64b735bfa 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
index 09137f745..09137f745 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java
index 20b70658c..20b70658c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java
index ad558a81e..ad558a81e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index b4c38184c..b4c38184c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index 72ea4c013..72ea4c013 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
index a4285c8e9..a4285c8e9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
index a3feab959..a3feab959 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
index 132a2ce86..132a2ce86 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
index ae61c1470..ae61c1470 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
index 741530b1d..741530b1d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
index b6ff139df..b6ff139df 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java
index 7b21c189d..7b21c189d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
index da29f808a..da29f808a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java
index 6b2f3bf06..6b2f3bf06 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
index 6e1e4c678..6e1e4c678 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
index c7bd1c987..c7bd1c987 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
index 171763672..171763672 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index fb59cd3b7..fb59cd3b7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
index 937a48e48..937a48e48 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
index 2253872d5..2253872d5 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
index d2f4cc003..d2f4cc003 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
index 1a6184d9c..1a6184d9c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
index 5efc732e4..5efc732e4 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java
index 28cfa11f2..28cfa11f2 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
index ae87deb31..ae87deb31 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java
index 3af674526..3af674526 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
index 7f70867a5..7f70867a5 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java
index b205bd556..b205bd556 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
index f58f1757a..f58f1757a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
index 2d8fbcd81..2d8fbcd81 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
index 5ec915810..5ec915810 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
index 4fcd3047f..4fcd3047f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
index 28a12bf37..28a12bf37 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
index 26c05ad0a..26c05ad0a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
index 23961c05f..23961c05f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
index af9034aa7..af9034aa7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
diff --git a/OpenPGP-Keychain/src/main/res/anim/push_left_in.xml b/OpenKeychain/src/main/res/anim/push_left_in.xml
index 45fb4875a..45fb4875a 100644
--- a/OpenPGP-Keychain/src/main/res/anim/push_left_in.xml
+++ b/OpenKeychain/src/main/res/anim/push_left_in.xml
diff --git a/OpenPGP-Keychain/src/main/res/anim/push_left_out.xml b/OpenKeychain/src/main/res/anim/push_left_out.xml
index 845679f16..845679f16 100644
--- a/OpenPGP-Keychain/src/main/res/anim/push_left_out.xml
+++ b/OpenKeychain/src/main/res/anim/push_left_out.xml
diff --git a/OpenPGP-Keychain/src/main/res/anim/push_right_in.xml b/OpenKeychain/src/main/res/anim/push_right_in.xml
index 09a244406..09a244406 100644
--- a/OpenPGP-Keychain/src/main/res/anim/push_right_in.xml
+++ b/OpenKeychain/src/main/res/anim/push_right_in.xml
diff --git a/OpenPGP-Keychain/src/main/res/anim/push_right_out.xml b/OpenKeychain/src/main/res/anim/push_right_out.xml
index e8893a69a..e8893a69a 100644
--- a/OpenPGP-Keychain/src/main/res/anim/push_right_out.xml
+++ b/OpenKeychain/src/main/res/anim/push_right_out.xml
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/certify_small.png b/OpenKeychain/src/main/res/drawable-hdpi/certify_small.png
index 9e54464ed..9e54464ed 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/certify_small.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/certify_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/drawer_shadow.9.png b/OpenKeychain/src/main/res/drawable-hdpi/drawer_shadow.9.png
index 236bff558..236bff558 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/drawer_shadow.9.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-hdpi/encrypted_small.png
index 3ff8e9b97..3ff8e9b97 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/encrypted_small.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png
index 5ebac9706..5ebac9706 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_add_person.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png
index cde36e1fa..cde36e1fa 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cancel.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png
index 3daa64131..3daa64131 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png
index 9c717dd32..9c717dd32 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_discard.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png
index 58bf97217..58bf97217 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_done.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png
index 742ba271c..742ba271c 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_import_export.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png
index 9fd81097b..9fd81097b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_person.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png
index c4b7783cc..c4b7783cc 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_save.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png
index f594b4e48..f594b4e48 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_search.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png
index 287ae2fb0..287ae2fb0 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_secure.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png
index fc0dd57b6..fc0dd57b6 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_select_all.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png
index 8a6cbfea2..8a6cbfea2 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_share.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png
index 1374a53e5..1374a53e5 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_drawer.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_drawer.png
index c59f601ca..c59f601ca 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_drawer.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_search.png
index 1cb61faf4..1cb61faf4 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search_list.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_search_list.png
index efee6dfd2..efee6dfd2 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search_list.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_next.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_next.png
index d71058055..d71058055 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_next.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_next.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_previous.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_previous.png
index d610e4667..d610e4667 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_previous.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_previous.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png b/OpenKeychain/src/main/res/drawable-hdpi/icon.png
index f5487599b..f5487599b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/icon.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/key_small.png b/OpenKeychain/src/main/res/drawable-hdpi/key_small.png
index 6966048a1..6966048a1 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/key_small.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_error.png b/OpenKeychain/src/main/res/drawable-hdpi/overlay_error.png
index e6d7e60ba..e6d7e60ba 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_error.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/overlay_error.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/overlay_ok.png
index 0672f869d..0672f869d 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_ok.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_center_bright.9.png b/OpenKeychain/src/main/res/drawable-hdpi/popup_center_bright.9.png
index c2a739c42..c2a739c42 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_center_bright.9.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/popup_center_bright.9.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_full_bright.9.png b/OpenKeychain/src/main/res/drawable-hdpi/popup_full_bright.9.png
index 6b8aa9d52..6b8aa9d52 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_full_bright.9.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/popup_full_bright.9.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/revoked_key_small.png b/OpenKeychain/src/main/res/drawable-hdpi/revoked_key_small.png
index 75f45eb54..75f45eb54 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/revoked_key_small.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/revoked_key_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_large.png b/OpenKeychain/src/main/res/drawable-hdpi/signed_large.png
index c209f4167..c209f4167 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_large.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/signed_large.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_small.png b/OpenKeychain/src/main/res/drawable-hdpi/signed_small.png
index 54c4906e8..54c4906e8 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_small.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/signed_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-ldpi/encrypted_small.png
index 5e7294a4b..5e7294a4b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/encrypted_small.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_next.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_next.png
index 474ed8faa..474ed8faa 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_next.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/ic_next.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_previous.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_previous.png
index 6fd885e6b..6fd885e6b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_previous.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/ic_previous.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png b/OpenKeychain/src/main/res/drawable-ldpi/icon.png
index 7cd482bff..7cd482bff 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/icon.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/key_small.png b/OpenKeychain/src/main/res/drawable-ldpi/key_small.png
index 073b95029..073b95029 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/key_small.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/key_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_error.png b/OpenKeychain/src/main/res/drawable-ldpi/overlay_error.png
index e5a88e18f..e5a88e18f 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_error.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/overlay_error.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_ok.png b/OpenKeychain/src/main/res/drawable-ldpi/overlay_ok.png
index 63374d47f..63374d47f 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_ok.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_large.png b/OpenKeychain/src/main/res/drawable-ldpi/signed_large.png
index d2917644c..d2917644c 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_large.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/signed_large.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_small.png b/OpenKeychain/src/main/res/drawable-ldpi/signed_small.png
index 19d45f8da..19d45f8da 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_small.png
+++ b/OpenKeychain/src/main/res/drawable-ldpi/signed_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/certify_small.png b/OpenKeychain/src/main/res/drawable-mdpi/certify_small.png
index 575b2d866..575b2d866 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/certify_small.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/certify_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/drawer_shadow.9.png b/OpenKeychain/src/main/res/drawable-mdpi/drawer_shadow.9.png
index ffe3a28d7..ffe3a28d7 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/drawer_shadow.9.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-mdpi/encrypted_small.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/encrypted_small.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png
index c43cf6553..c43cf6553 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_add_person.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png
index 9f4c3d6a2..9f4c3d6a2 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cancel.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png
index 266d4c21f..266d4c21f 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png
index 9dfb7cc2c..9dfb7cc2c 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_discard.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png
index cf5fab3ad..cf5fab3ad 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_done.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png
index 1d6522beb..1d6522beb 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_import_export.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png
index 359da1c12..359da1c12 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_person.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png
index 61304a68c..61304a68c 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_save.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png
index f6719d228..f6719d228 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_search.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png
index d49217234..d49217234 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_secure.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png
index da37d7a6e..da37d7a6e 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_select_all.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png
index bff81179a..bff81179a 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_share.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png
index 9e7f0bd5f..9e7f0bd5f 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_drawer.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_drawer.png
index 1ed2c56ee..1ed2c56ee 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_drawer.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_search.png
index 2369d03f3..2369d03f3 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search_list.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_search_list.png
index 9033f1ec2..9033f1ec2 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search_list.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_next.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_next.png
index 8271c1380..8271c1380 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_next.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_next.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_previous.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_previous.png
index ef90db972..ef90db972 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_previous.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_previous.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png b/OpenKeychain/src/main/res/drawable-mdpi/icon.png
index 34f1420ac..34f1420ac 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/icon.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/key_small.png b/OpenKeychain/src/main/res/drawable-mdpi/key_small.png
index c806b6041..c806b6041 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/key_small.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_error.png b/OpenKeychain/src/main/res/drawable-mdpi/overlay_error.png
index 5fe017433..5fe017433 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_error.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/overlay_error.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/overlay_ok.png
index b4f332260..b4f332260 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_ok.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_large.png b/OpenKeychain/src/main/res/drawable-mdpi/signed_large.png
index ab9495e7b..ab9495e7b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_large.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/signed_large.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_small.png b/OpenKeychain/src/main/res/drawable-mdpi/signed_small.png
index 4202c3f97..4202c3f97 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_small.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/signed_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png
index fabe9d965..fabe9d965 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
index 91434a47b..91434a47b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
index ca7d159fd..ca7d159fd 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
index 0769899fd..0769899fd 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_discard.png
index db69d6c25..db69d6c25 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_discard.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_done.png
index b8915716e..b8915716e 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_done.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
index 5e48a9c6b..5e48a9c6b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_person.png
index 03eeb8d6a..03eeb8d6a 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_person.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_person.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_save.png
index 29c5f4d3b..29c5f4d3b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_save.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_save.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search.png
index aad535e97..aad535e97 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_search.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_secure.png
index 2a0898381..2a0898381 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_secure.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_secure.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_select_all.png
index af37a3680..af37a3680 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_select_all.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_select_all.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_share.png
index 2f6dc413b..2f6dc413b 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_share.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png
index a99f0621c..a99f0621c 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_drawer.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_drawer.png
index a5fa74def..a5fa74def 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_drawer.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_search.png
index 578cb24eb..578cb24eb 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png
index de20fa0e7..de20fa0e7 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xhdpi/icon.png
index 32584f3ff..32584f3ff 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/icon.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
index b91e9d7f2..b91e9d7f2 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
index f18aa6144..f18aa6144 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png
index f97084dbe..f97084dbe 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
index b522daffe..b522daffe 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
index f054a68e6..f054a68e6 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_person.png
index fd1bcdd45..fd1bcdd45 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_person.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_person.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_save.png
index 744350049..744350049 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_save.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_save.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search.png
index 9c0ea3ca0..9c0ea3ca0 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_search.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_secure.png
index d8c094ed8..d8c094ed8 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_secure.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_secure.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png
index aa5937eab..aa5937eab 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_share.png
index 3e441000f..3e441000f 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_share.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png
index 24ec28c2e..24ec28c2e 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_drawer.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_drawer.png
index 9c4685d6e..9c4685d6e 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_drawer.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png
index b2922309f..b2922309f 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png
index 93ea6b0f5..93ea6b0f5 100644
--- a/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/certify_small.png b/OpenKeychain/src/main/res/drawable/certify_small.png
index 575b2d866..575b2d866 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/certify_small.png
+++ b/OpenKeychain/src/main/res/drawable/certify_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/encrypted_small.png b/OpenKeychain/src/main/res/drawable/encrypted_small.png
index 7f4ab803f..7f4ab803f 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/encrypted_small.png
+++ b/OpenKeychain/src/main/res/drawable/encrypted_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/ic_next.png b/OpenKeychain/src/main/res/drawable/ic_next.png
index 8271c1380..8271c1380 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/ic_next.png
+++ b/OpenKeychain/src/main/res/drawable/ic_next.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/ic_previous.png b/OpenKeychain/src/main/res/drawable/ic_previous.png
index ef90db972..ef90db972 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/ic_previous.png
+++ b/OpenKeychain/src/main/res/drawable/ic_previous.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/key_small.png b/OpenKeychain/src/main/res/drawable/key_small.png
index 121803508..121803508 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/key_small.png
+++ b/OpenKeychain/src/main/res/drawable/key_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/overlay_error.png b/OpenKeychain/src/main/res/drawable/overlay_error.png
index 2372de59e..2372de59e 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/overlay_error.png
+++ b/OpenKeychain/src/main/res/drawable/overlay_error.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/overlay_ok.png b/OpenKeychain/src/main/res/drawable/overlay_ok.png
index 2f0005898..2f0005898 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/overlay_ok.png
+++ b/OpenKeychain/src/main/res/drawable/overlay_ok.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/revoked_key_small.png b/OpenKeychain/src/main/res/drawable/revoked_key_small.png
index f9ed0596f..f9ed0596f 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/revoked_key_small.png
+++ b/OpenKeychain/src/main/res/drawable/revoked_key_small.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/section_header.xml b/OpenKeychain/src/main/res/drawable/section_header.xml
index a4468484e..a4468484e 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/section_header.xml
+++ b/OpenKeychain/src/main/res/drawable/section_header.xml
diff --git a/OpenPGP-Keychain/src/main/res/drawable/selector_transparent_button.xml b/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml
index a2cacf0ad..a2cacf0ad 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/selector_transparent_button.xml
+++ b/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml
diff --git a/OpenPGP-Keychain/src/main/res/drawable/signed_large.png b/OpenKeychain/src/main/res/drawable/signed_large.png
index 92e64dc51..92e64dc51 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/signed_large.png
+++ b/OpenKeychain/src/main/res/drawable/signed_large.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable/signed_small.png b/OpenKeychain/src/main/res/drawable/signed_small.png
index 590220281..590220281 100644
--- a/OpenPGP-Keychain/src/main/res/drawable/signed_small.png
+++ b/OpenKeychain/src/main/res/drawable/signed_small.png
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
index c0021261e..c0021261e 100644
--- a/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
index 26aed0831..26aed0831 100644
--- a/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
index 7d0d44074..7d0d44074 100644
--- a/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml b/OpenKeychain/src/main/res/layout-large/import_keys_activity.xml
index 2cb408441..2cb408441 100644
--- a/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/import_keys_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
index 6636f12ff..6636f12ff 100644
--- a/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
index 50134f4e7..50134f4e7 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml
+++ b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
index 1d0476361..1d0476361 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
+++ b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml
index 5fd36286b..5fd36286b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
+++ b/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml
index e51f63c80..e51f63c80 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
+++ b/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
index 3557c1f00..3557c1f00 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index 32843eb29..32843eb29 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
index d31ae52d7..d31ae52d7 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index 1377acf0e..1377acf0e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
index 96271d418..96271d418 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
index e70a79589..e70a79589 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
index 9f95e9f3b..9f95e9f3b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
index 9f9b99045..9f9b99045 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
index 3aee9094f..3aee9094f 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
index 48aa89d4f..48aa89d4f 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
index f85f3b8f7..f85f3b8f7 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
index a10592607..a10592607 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 3fa0468de..3fa0468de 100644
--- a/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml b/OpenKeychain/src/main/res/layout/create_key_dialog.xml
index 57a1b865f..57a1b865f 100644
--- a/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_dialog.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
index c4709a67e..c4709a67e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml
index a496d8b9d..a496d8b9d 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index 633c9c832..633c9c832 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
index dfe1bf64a..dfe1bf64a 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml b/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
index 3e0d35c9b..3e0d35c9b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml b/OpenKeychain/src/main/res/layout/drawer_list.xml
index ab00c0073..ab00c0073 100644
--- a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
+++ b/OpenKeychain/src/main/res/layout/drawer_list.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml b/OpenKeychain/src/main/res/layout/drawer_list_item.xml
index 72f4fec50..72f4fec50 100644
--- a/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/drawer_list_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index fc4422cf0..fc4422cf0 100644
--- a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
index 090115d62..090115d62 100644
--- a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_section.xml b/OpenKeychain/src/main/res/layout/edit_key_section.xml
index 9f10ff8c1..9f10ff8c1 100644
--- a/OpenPGP-Keychain/src/main/res/layout/edit_key_section.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_section.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
index a8d1dc674..a8d1dc674 100644
--- a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_activity.xml
index 6484c9b7b..6484c9b7b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index fa1b03889..fa1b03889 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml
index e719d07e1..e719d07e1 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
index ac990653a..ac990653a 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
index efc4b4641..efc4b4641 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
index 1fa338426..1fa338426 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
index 89381e499..89381e499 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml
index 83d697001..83d697001 100644
--- a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/file_dialog.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
index 2b863d52b..2b863d52b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml
+++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/help_about_fragment.xml b/OpenKeychain/src/main/res/layout/help_about_fragment.xml
index 71788e720..71788e720 100644
--- a/OpenPGP-Keychain/src/main/res/layout/help_about_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/help_about_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index 58e4919dc..58e4919dc 100644
--- a/OpenPGP-Keychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index c82607a33..c82607a33 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_clipboard_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_clipboard_fragment.xml
index 046768495..046768495 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_clipboard_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_clipboard_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml b/OpenKeychain/src/main/res/layout/import_keys_content.xml
index eb1333704..eb1333704 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_content.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
index 0a49571d1..0a49571d1 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
index f5a39f115..f5a39f115 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry_user_id.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml
index 9d3a4a1ab..9d3a4a1ab 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry_user_id.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_nfc_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml
index 2a8e74fc2..2a8e74fc2 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_nfc_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
index 472c05e65..472c05e65 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
index 2438dd785..2438dd785 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_server_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml
index fcb376fa8..fcb376fa8 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index e58e42961..e58e42961 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index f2430f213..f2430f213 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml b/OpenKeychain/src/main/res/layout/key_list_header.xml
index 09ac1c856..09ac1c856 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_header.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 84ad9f9b5..84ad9f9b5 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml b/OpenKeychain/src/main/res/layout/key_server_editor.xml
index 950978a0e..950978a0e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_editor.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml b/OpenKeychain/src/main/res/layout/key_server_export.xml
index 6031bf7c7..6031bf7c7 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_export.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml
index b8897a7b3..b8897a7b3 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index 4b331f0f2..4b331f0f2 100644
--- a/OpenPGP-Keychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
index ae523762c..ae523762c 100644
--- a/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml
index 08c161ec6..08c161ec6 100644
--- a/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/select_key_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
index a18ce46fc..a18ce46fc 100644
--- a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_activity.xml b/OpenKeychain/src/main/res/layout/select_secret_key_activity.xml
index c4cdd7576..c4cdd7576 100644
--- a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/select_secret_key_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
index 408c0c54e..408c0c54e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/share_qr_code_dialog.xml b/OpenKeychain/src/main/res/layout/share_qr_code_dialog.xml
index 0b58ae72f..0b58ae72f 100644
--- a/OpenPGP-Keychain/src/main/res/layout/share_qr_code_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/share_qr_code_dialog.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 95b8ffc8d..95b8ffc8d 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 58e4919dc..58e4919dc 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
index 33042c541..33042c541 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_header.xml b/OpenKeychain/src/main/res/layout/view_key_certs_header.xml
index 04e7b8097..04e7b8097 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_header.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_certs_header.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_item.xml b/OpenKeychain/src/main/res/layout/view_key_certs_item.xml
index de7570818..de7570818 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_certs_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml
index ef31f7690..ef31f7690 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml b/OpenKeychain/src/main/res/layout/view_key_keys_item.xml
index aecedc39b..aecedc39b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_keys_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index e3448c39f..e3448c39f 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
index e47f591cb..e47f591cb 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
diff --git a/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml b/OpenKeychain/src/main/res/menu/api_account_settings.xml
index d08fc7f42..d08fc7f42 100644
--- a/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_account_settings.xml
diff --git a/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml b/OpenKeychain/src/main/res/menu/api_app_settings.xml
index a21db6708..a21db6708 100644
--- a/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_app_settings.xml
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 3f80b616d..3f80b616d 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml
index 087521177..087521177 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
+++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 2f5697a0f..2f5697a0f 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
diff --git a/OpenPGP-Keychain/src/main/res/menu/view_cert.xml b/OpenKeychain/src/main/res/menu/view_cert.xml
index 8c8e455c7..8c8e455c7 100644
--- a/OpenPGP-Keychain/src/main/res/menu/view_cert.xml
+++ b/OpenKeychain/src/main/res/menu/view_cert.xml
diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_about.html
index 99977f75d..99977f75d 100644
--- a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_start.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_start.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html b/OpenKeychain/src/main/res/raw-de/help_about.html
index 7dc0ee7d9..7dc0ee7d9 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html
+++ b/OpenKeychain/src/main/res/raw-de/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index 58199a9c8..58199a9c8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html b/OpenKeychain/src/main/res/raw-de/help_start.html
index 7a652682e..7a652682e 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
+++ b/OpenKeychain/src/main/res/raw-de/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-de/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-de/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_about.html b/OpenKeychain/src/main/res/raw-el/help_about.html
index ae7e16aae..ae7e16aae 100644
--- a/OpenPGP-Keychain/src/main/res/raw-el/help_about.html
+++ b/OpenKeychain/src/main/res/raw-el/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html b/OpenKeychain/src/main/res/raw-el/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-el/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-el/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-el/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-el/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_start.html b/OpenKeychain/src/main/res/raw-el/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-el/help_start.html
+++ b/OpenKeychain/src/main/res/raw-el/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-el/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-el/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-el/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-el/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html b/OpenKeychain/src/main/res/raw-es-rCO/help_about.html
index ae7e16aae..ae7e16aae 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html
+++ b/OpenKeychain/src/main/res/raw-es-rCO/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html b/OpenKeychain/src/main/res/raw-es-rCO/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es-rCO/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-es-rCO/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-es-rCO/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html b/OpenKeychain/src/main/res/raw-es-rCO/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html
+++ b/OpenKeychain/src/main/res/raw-es-rCO/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-es-rCO/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-es-rCO/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html b/OpenKeychain/src/main/res/raw-es/help_about.html
index 7a4f61127..7a4f61127 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html
+++ b/OpenKeychain/src/main/res/raw-es/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
index 4ad69fc20..4ad69fc20 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html
index 4a95680b5..4a95680b5 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_start.html b/OpenKeychain/src/main/res/raw-es/help_start.html
index d56399ef0..d56399ef0 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_start.html
+++ b/OpenKeychain/src/main/res/raw-es/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-es/nfc_beam_share.html
index b6c2a2278..b6c2a2278 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-es/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_about.html b/OpenKeychain/src/main/res/raw-et/help_about.html
index ae7e16aae..ae7e16aae 100644
--- a/OpenPGP-Keychain/src/main/res/raw-et/help_about.html
+++ b/OpenKeychain/src/main/res/raw-et/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-et/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_start.html b/OpenKeychain/src/main/res/raw-et/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-et/help_start.html
+++ b/OpenKeychain/src/main/res/raw-et/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-et/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-et/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-et/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-et/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_about.html
index ae7e16aae..ae7e16aae 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_start.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html
index 93a305796..93a305796 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-fa-rIR/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html b/OpenKeychain/src/main/res/raw-fr/help_about.html
index 00370c77e..00370c77e 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
index 7a22eafbb..7a22eafbb 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html
index 673e5b224..673e5b224 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html b/OpenKeychain/src/main/res/raw-fr/help_start.html
index ddaac44b1..ddaac44b1 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-fr/nfc_beam_share.html
index b63c9ac84..b63c9ac84 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-fr/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html b/OpenKeychain/src/main/res/raw-it-rIT/help_about.html
index 8644d3fc6..8644d3fc6 100644
--- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
index 46604991c..46604991c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-it-rIT/help_nfc_beam.html
index 6ff56194e..6ff56194e 100644
--- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
index 0fd24178c..0fd24178c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-it-rIT/nfc_beam_share.html
index e75877efe..e75877efe 100644
--- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenKeychain/src/main/res/raw-ja/help_about.html
index e60add867..e60add867 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index 6a8aba073..6a8aba073 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html
index c19280fd1..c19280fd1 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html b/OpenKeychain/src/main/res/raw-ja/help_start.html
index 04ad31352..04ad31352 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-ja/nfc_beam_share.html
index 422423a5d..422423a5d 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-ja/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_about.html
index ae7e16aae..ae7e16aae 100644
--- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-nl-rNL/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html b/OpenKeychain/src/main/res/raw-pl/help_about.html
index a033c084a..a033c084a 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
index 33207f8db..33207f8db 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html
index 53db5e80c..53db5e80c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pl/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_start.html b/OpenKeychain/src/main/res/raw-pl/help_start.html
index e88a1ad6d..e88a1ad6d 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-pl/nfc_beam_share.html
index f17e44079..f17e44079 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pl/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-pl/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_about.html
index ae7e16aae..ae7e16aae 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html
+++ b/OpenKeychain/src/main/res/raw-pt-rBR/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html
+++ b/OpenKeychain/src/main/res/raw-pt-rBR/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html b/OpenKeychain/src/main/res/raw-ru/help_about.html
index 29cc1af83..29cc1af83 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index 8b1580c3a..8b1580c3a 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
index fcf55cdaf..fcf55cdaf 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ru/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html b/OpenKeychain/src/main/res/raw-ru/help_start.html
index 78db598ec..78db598ec 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-ru/nfc_beam_share.html
index 584353da4..584353da4 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ru/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-ru/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_about.html
index ae7e16aae..ae7e16aae 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html
+++ b/OpenKeychain/src/main/res/raw-sl-rSI/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-sl-rSI/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html
+++ b/OpenKeychain/src/main/res/raw-sl-rSI/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html b/OpenKeychain/src/main/res/raw-tr/help_about.html
index 7d2c24f9c..7d2c24f9c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html b/OpenKeychain/src/main/res/raw-tr/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-tr/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-tr/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html b/OpenKeychain/src/main/res/raw-uk/help_about.html
index b51b80617..b51b80617 100644
--- a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
index f3dd5d5b6..f3dd5d5b6 100644
--- a/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html
index dc34048d3..dc34048d3 100644
--- a/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html b/OpenKeychain/src/main/res/raw-uk/help_start.html
index 45a3edb6a..45a3edb6a 100644
--- a/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-uk/nfc_beam_share.html
index 4adff525f..4adff525f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-uk/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-uk/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
index ae7e16aae..ae7e16aae 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html
index 88492731c..88492731c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_start.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
index 0e60c17a7..0e60c17a7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-zh-rTW/nfc_beam_share.html
index 083e055c7..083e055c7 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html b/OpenKeychain/src/main/res/raw-zh/help_about.html
index 813676ea2..813676ea2 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index 694c7b046..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html
index 7a90a794b..7a90a794b 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html
index 22ac99882..22ac99882 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html
index 99ffe4c12..99ffe4c12 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_about.html b/OpenKeychain/src/main/res/raw/help_about.html
index 847168446..847168446 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_about.html
+++ b/OpenKeychain/src/main/res/raw/help_about.html
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
index 64a91e5f1..64a91e5f1 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw/help_changelog.html
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_faq.html b/OpenKeychain/src/main/res/raw/help_faq.html
index bfd43eafd..bfd43eafd 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_faq.html
+++ b/OpenKeychain/src/main/res/raw/help_faq.html
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html b/OpenKeychain/src/main/res/raw/help_nfc_beam.html
index f3bb9d16e..f3bb9d16e 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html
index 56c02b1fd..56c02b1fd 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_start.html
+++ b/OpenKeychain/src/main/res/raw/help_start.html
diff --git a/OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html b/OpenKeychain/src/main/res/raw/nfc_beam_share.html
index 873c71777..873c71777 100644
--- a/OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml b/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml
index 586785a62..586785a62 100644
--- a/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 567b40f01..567b40f01 100644
--- a/OpenPGP-Keychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-el/strings.xml b/OpenKeychain/src/main/res/values-el/strings.xml
index 73a736766..73a736766 100644
--- a/OpenPGP-Keychain/src/main/res/values-el/strings.xml
+++ b/OpenKeychain/src/main/res/values-el/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml b/OpenKeychain/src/main/res/values-es-rCO/strings.xml
index 0def5eba7..0def5eba7 100644
--- a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
+++ b/OpenKeychain/src/main/res/values-es-rCO/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index a3394f23a..a3394f23a 100644
--- a/OpenPGP-Keychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml
index e1e725234..e1e725234 100644
--- a/OpenPGP-Keychain/src/main/res/values-et/strings.xml
+++ b/OpenKeychain/src/main/res/values-et/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml b/OpenKeychain/src/main/res/values-fa-rIR/strings.xml
index fc802092c..fc802092c 100644
--- a/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml
+++ b/OpenKeychain/src/main/res/values-fa-rIR/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 5d4c63432..5d4c63432 100644
--- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index 4f2f67d33..4f2f67d33 100644
--- a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 2cd0630a8..2cd0630a8 100644
--- a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-large/dimens.xml b/OpenKeychain/src/main/res/values-large/dimens.xml
index 192a4bb99..192a4bb99 100644
--- a/OpenPGP-Keychain/src/main/res/values-large/dimens.xml
+++ b/OpenKeychain/src/main/res/values-large/dimens.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
index b1354393c..b1354393c 100644
--- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index efdd61e3c..efdd61e3c 100644
--- a/OpenPGP-Keychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
index fc802092c..fc802092c 100644
--- a/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
+++ b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 5fe4dd587..5fe4dd587 100644
--- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml b/OpenKeychain/src/main/res/values-sl-rSI/strings.xml
index fc802092c..fc802092c 100644
--- a/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl-rSI/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index d7e4afd7c..d7e4afd7c 100644
--- a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 01551fcd9..01551fcd9 100644
--- a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-v14/styles.xml b/OpenKeychain/src/main/res/values-v14/styles.xml
index 4f8c45117..4f8c45117 100644
--- a/OpenPGP-Keychain/src/main/res/values-v14/styles.xml
+++ b/OpenKeychain/src/main/res/values-v14/styles.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index fc802092c..fc802092c 100644
--- a/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index fa21e211b..fa21e211b 100644
--- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml
index c84c2648d..c84c2648d 100644
--- a/OpenPGP-Keychain/src/main/res/values/arrays.xml
+++ b/OpenKeychain/src/main/res/values/arrays.xml
diff --git a/OpenPGP-Keychain/src/main/res/values/attr.xml b/OpenKeychain/src/main/res/values/attr.xml
index 86622b3e0..86622b3e0 100644
--- a/OpenPGP-Keychain/src/main/res/values/attr.xml
+++ b/OpenKeychain/src/main/res/values/attr.xml
diff --git a/OpenPGP-Keychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index d1dc6c1f4..d1dc6c1f4 100644
--- a/OpenPGP-Keychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
diff --git a/OpenPGP-Keychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index e1a7749f0..e1a7749f0 100644
--- a/OpenPGP-Keychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
diff --git a/OpenPGP-Keychain/src/main/res/values/ids.xml b/OpenKeychain/src/main/res/values/ids.xml
index 2004c0397..2004c0397 100644
--- a/OpenPGP-Keychain/src/main/res/values/ids.xml
+++ b/OpenKeychain/src/main/res/values/ids.xml
diff --git a/OpenPGP-Keychain/src/main/res/values/static_strings.xml b/OpenKeychain/src/main/res/values/static_strings.xml
index faf1e687a..faf1e687a 100644
--- a/OpenPGP-Keychain/src/main/res/values/static_strings.xml
+++ b/OpenKeychain/src/main/res/values/static_strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6c6d05103..6c6d05103 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
diff --git a/OpenPGP-Keychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index f03d72605..f03d72605 100644
--- a/OpenPGP-Keychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
diff --git a/OpenPGP-Keychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
index 03f93b051..03f93b051 100644
--- a/OpenPGP-Keychain/src/main/res/xml/adv_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml
diff --git a/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml b/OpenKeychain/src/main/res/xml/gen_preferences.xml
index 9f1883df0..9f1883df0 100644
--- a/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/gen_preferences.xml
diff --git a/OpenPGP-Keychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index 3506ba322..3506ba322 100644
--- a/OpenPGP-Keychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
diff --git a/OpenPGP-Keychain/src/main/res/xml/preference_headers_legacy.xml b/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
index 141bf93e5..141bf93e5 100644
--- a/OpenPGP-Keychain/src/main/res/xml/preference_headers_legacy.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
diff --git a/OpenPGP-Keychain/src/main/res/xml/searchable_public_keys.xml b/OpenKeychain/src/main/res/xml/searchable_public_keys.xml
index f07a809a0..f07a809a0 100644
--- a/OpenPGP-Keychain/src/main/res/xml/searchable_public_keys.xml
+++ b/OpenKeychain/src/main/res/xml/searchable_public_keys.xml
diff --git a/OpenPGP-Keychain/src/main/res/xml/searchable_secret_keys.xml b/OpenKeychain/src/main/res/xml/searchable_secret_keys.xml
index 59b9841db..59b9841db 100644
--- a/OpenPGP-Keychain/src/main/res/xml/searchable_secret_keys.xml
+++ b/OpenKeychain/src/main/res/xml/searchable_secret_keys.xml
diff --git a/OpenPGP-Keychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java
index 72f29a1e3..72f29a1e3 100644
--- a/OpenPGP-Keychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java
diff --git a/OpenPGP-Keychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java
index b64ffde07..b64ffde07 100644
--- a/OpenPGP-Keychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java
diff --git a/settings.gradle b/settings.gradle
index f6ba5c517..164ddf4b0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
-include ':OpenPGP-Keychain'
-include ':OpenPGP-Keychain-API:libraries:openpgp-api-library'
-include ':OpenPGP-Keychain-API:libraries:openkeychain-api-library'
+include ':OpenKeychain'
+include ':OpenKeychain-API:libraries:openpgp-api-library'
+include ':OpenKeychain-API:libraries:openkeychain-api-library'
 include ':libraries:HtmlTextView'
 include ':libraries:StickyListHeaders:library'
 include ':libraries:AndroidBootstrap'
author	Dominik Schürmann <dominik@dominikschuermann.de>	2014-04-06 12:57:42 +0200
committer	Dominik Schürmann <dominik@dominikschuermann.de>	2014-04-06 12:57:42 +0200
commit	6d1137190529dc7add74926cea52c377883319be (patch)
tree	fd88b29a048f3aec1daa2a84bbaf22c0efa3663f
parent	17997dd362fe62d72113a0536069d0fdb9c3211b (diff)
download	open-keychain-6d1137190529dc7add74926cea52c377883319be.tar.gz open-keychain-6d1137190529dc7add74926cea52c377883319be.tar.bz2 open-keychain-6d1137190529dc7add74926cea52c377883319be.zip