diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
index dbf7afe76..58199a9c8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
index 0b3db3a30..4ad69fc20 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>corregido descifrado de mensajes/ficheros con pgp simétrico</li>
 <li>rediseñada la pantalla de edición de claves (gracias a Ash Hughes)</li>
-<li>API OpenPGP versión 3 (multiples cuentas api, correcciones internas)</li>
 <li>diseño más moderno para las pantallas de cifrado/descifrado</li>
+<li>OpenPGP API versión 3 (múltiples cuentas API, reparaciones internas, comprobación de claves)</li>
 </ul>
 <h2>2.4</h2>
 <p>¡Gracias a todos los solicitantes de  Google Summer of Code 2014, por hacer esta aplicación productiva y libre de errores!
diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html
index 08a84c5fb..7a22eafbb 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html
@@ -3,10 +3,10 @@
 <body>
 <h2>2.5</h2>
 <ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
-<li>new modern design for encrypt/decrypt screens</li>
+<li>corrige le déchiffrement des messages/fichiers pgp symétriques</li>
+<li>écran réusiné de modification des clefs (merci à Ash Hughes)</li>
+<li>nouveau style moderne des écrans de chiffrement/déchiffrement</li>
+<li>API OpenPGP version 3 (comptes multiples d'api, correctifs internes, recherche de clefs)</li>
 </ul>
 <h2>2.4</h2>
 <p>Merci à tous les participants  de « Google Summer of Code 2014 » qui ont rendu cette version riche en fonctions et sans bogue !
diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
index abe268523..46604991c 100644
--- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
@@ -3,14 +3,14 @@
 <body>
 <h2>2.5</h2>
 <ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
-<li>new modern design for encrypt/decrypt screens</li>
+<li>Corretta la decodifica di messaggi PGP / file simmetrici</li>
+<li>Refactoring della schermata di modifica chiave (grazie a Ash Hughes)</li>
+<li>nuovo design moderno per le schermate di codifica / decodifica</li>
+<li>OpenPGP API versione 3 (api account multipli, correzioni interne, ricerca chiavi)</li>
 </ul>
 <h2>2.4</h2>
 <p>Grazie a tutti i partecipanti di Google Summer of Code 2014 che hanno reso questo rilascio ricco di caratteristiche e privo di bug!
-Oltre a numerose piccole correzioni, un notevole numero di patch sono fatte dalle seguenti persone (in ordine alfabetico):
+Oltre a numerose piccole correzioni, un notevole numero di patch sono state fatte dalle seguenti persone (in ordine alfabetico):
 Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paolo Sarbinowski, Sreeram Boyapati, Vincent Breitmoser. </p>
 <ul>
 <li>nuova lista chiave unificata</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html
index f99656c1d..6a8aba073 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html
@@ -3,10 +3,10 @@
 <body>
 <h2>2.5</h2>
 <ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
-<li>new modern design for encrypt/decrypt screens</li>
+<li>対称暗号化PGPメッセージ/ファイルの復号化を修正</li>
+<li>鍵編集画面のリファクタ (thanks to Ash Hughes)</li>
+<li>暗号化/復号化画面を新しいモダンなデザインに</li>
+<li>OpenPGP API バージョン 3 (複数APIアカウント, 内部修正,鍵検索)</li>
 </ul>
 <h2>2.4</h2>
 <p>このリリースにおいて適用したリッチでバグのない機能を作ってくれたGoogle Summer of Code 2014の参加者たちに感謝を!
diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html
index 9d77a3e05..33207f8db 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html
@@ -3,10 +3,10 @@
 <body>
 <h2>2.5</h2>
 <ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
-<li>new modern design for encrypt/decrypt screens</li>
+<li>naprawiono deszyfrowanie symetrycznych wiadomości/plików PGP</li>
+<li>przerobiono ekran edytowania klucza (podziękowania dla Ash Hughes)</li>
+<li>nowy nowoczesny design dla ekranów szyfrowania/deszyfrowania</li>
+<li>OpenPGP API wersja 3 (wiele kont API, wewnętrzne poprawki, wyszukiwanie kluczy)</li>
 </ul>
 <h2>2.4</h2>
 <p>Podziękowania dla wszystkich kandydatów do Google Summer of Code 2014 którzy uczynili to wydanie bogatym w nowe funkcje i pozbawione błedów!
diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
index 0646e7dda..8b1580c3a 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
@@ -3,10 +3,10 @@
 <body>
 <h2>2.5</h2>
 <ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
-<li>new modern design for encrypt/decrypt screens</li>
+<li>исправлено симметричное шифрование сообщений/файлов</li>
+<li>переработано окно изменения ключа (благодаря Ash Hughes)</li>
+<li>новый дизайн для окон шифрования/расшифровки</li>
+<li>OpenPGP API версии 3 (множественные аккаунты, внутренние исправления, поиск ключей)</li>
 </ul>
 <h2>2.4</h2>
 <p>Спасибо всем участникам Google Summer of Code 2014, которые помогли сделать этот выпуск, добавив функции и исправив ошибки!
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html
index 77e39d434..f3dd5d5b6 100644
--- a/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>виправлено опис симетричних повідомлень/файлів pgp</li>
 <li>перероблено екран редагування ключа (завдяки Ash Hughes)</li>
-<li>OpenPGP API версія 3 (підтримка кількох профілів, внутрішні зміни)</li>
 <li>новий сучасний дизайн для екранів шифрування/розшифрування</li>
+<li>OpenPGP API версія 3 (підтримка кількох профілів, внутрішні зміни, пошук ключа)</li>
 </ul>
 <h2>2.4</h2>
 <p>Дякуємо усім заявникам Google Summer of Code 2014, які зробили цю версію багатшу на функції та вільну від помилок!
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
index db65b65f6..694c7b046 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
@@ -5,8 +5,8 @@
 <ul>
 <li>fix decryption of symmetric pgp messages/files</li>
 <li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li>
 <li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
 <p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
diff --git a/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml b/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml
index a2108f652..586785a62 100644
--- a/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml
@@ -47,4 +47,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
index c0ff7345e..567b40f01 100644
--- a/OpenPGP-Keychain/src/main/res/values-de/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
@@ -55,6 +55,8 @@
   <string name="btn_delete">Löschen</string>
   <string name="btn_no_date">Keine</string>
   <string name="btn_okay">Okay</string>
+  <string name="btn_change_passphrase">Passwort ändern</string>
+  <string name="btn_set_passphrase">Neues Passwort setzen</string>
   <string name="btn_search">Suchen</string>
   <string name="btn_export_to_server">Auf Schlüsselserver hochladen</string>
   <string name="btn_next">Weiter</string>
@@ -71,7 +73,6 @@
   <string name="menu_import_from_qr_code">QR-Code</string>
   <string name="menu_import">Importieren</string>
   <string name="menu_import_from_nfc">NFC</string>
-  <string name="menu_export_secret_keys">Alle geheimen Schlüssel exportieren</string>
   <string name="menu_export_key">In Datei exportieren</string>
   <string name="menu_delete_key">Schlüssel löschen</string>
   <string name="menu_create_key">Schlüssel erstellen</string>
@@ -95,6 +96,8 @@
   <string name="menu_key_edit_cancel">Abbrechen</string>
   <string name="menu_encrypt_to">Verschlüsseln nach…</string>
   <string name="menu_select_all">Alles auswählen</string>
+  <string name="menu_add_keys">Schlüssel hinzufügen</string>
+  <string name="menu_export_all_keys">Alle Schlüssel exportieren</string>
   <!--label-->
   <string name="label_sign">Signieren</string>
   <string name="label_message">Nachricht</string>
@@ -110,8 +113,8 @@
   <string name="label_share_after_encryption">Nach dem Verschlüsseln teilen</string>
   <string name="label_encryption_algorithm">Verschlüsselungsalgorithmus</string>
   <string name="label_hash_algorithm">Hash-Algorithmus</string>
-  <string name="label_asymmetric">Öffentlicher Schlüssel</string>
-  <string name="label_symmetric">Passwort</string>
+  <string name="label_asymmetric">mit Öffentlichem Schlüssel</string>
+  <string name="label_symmetric">mit Passwort</string>
   <string name="label_passphrase_cache_ttl">Passwort-Cache</string>
   <string name="label_message_compression">Nachrichten-Komprimierung</string>
   <string name="label_file_compression">Datei-Komprimierung</string>
@@ -176,6 +179,10 @@
   <string name="error">Fehler</string>
   <string name="error_message">Fehler: %s</string>
   <!--key flags-->
+  <string name="flag_certify">Beglaubigen</string>
+  <string name="flag_sign">Signieren</string>
+  <string name="flag_encrypt">Verschlüsseln</string>
+  <string name="flag_authenticate">Authentifizieren</string>
   <!--sentences-->
   <string name="wrong_passphrase">Falsches Passwort.</string>
   <string name="using_clipboard_content">Verwende Inhalt der Zwischenablage.</string>
@@ -197,6 +204,7 @@
   <string name="key_deletion_confirmation">Soll der Schlüssel \'%s\' wirklich gelöscht werden?\nDies kann nicht rückgängig gemacht werden! </string>
   <string name="key_deletion_confirmation_multi">Möchtest du wirklich alle ausgewählten Schlüssel löschen?\nDies kann nicht rückgängig gemacht werden!</string>
   <string name="secret_key_deletion_confirmation">Soll der PRIVATE Schlüssel \'%s\' wirklich gelöscht werden?\nDies kann nicht rückgängig gemacht werden!</string>
+  <string name="public_key_deletetion_confirmation">Soll der öffentliche Schlüssel \'%s\' wirklich gelöscht werden?\nDies kann nicht rückgängig gemacht werden! </string>
   <string name="also_export_secret_keys">Private Schlüssel auch exportieren</string>
   <plurals name="keys_added_and_updated_1">
     <item quantity="one">%d Schlüssel erfolgreich hinzugefügt</item>
@@ -353,7 +361,7 @@
   <string name="import_qr_code_start_with_one">Bitte fange mit QR-Code der ID 1 an</string>
   <string name="import_qr_code_wrong">Falsch formatierter QR-Code! Bitte erneut versuchen!</string>
   <string name="import_qr_code_finished">QR-Code wurde erfolgreich eingescannt!</string>
-  <string name="import_qr_code_too_short_fingerprint">Der Fingerabdruck in diesem QR-Code ist zu kurz (&lt; 16 Zeichen)</string>
+  <string name="import_qr_code_too_short_fingerprint">Der Fingerabdruck ist zu kurz (&lt; 16 Zeichen)</string>
   <string name="import_qr_scan_button">Qr-Code mittels \'Barcode Scanner\' einscannen</string>
   <string name="import_nfc_text">Um Schlüssel über NFC zu erhalten muss das Gerät entsperrt sein.</string>
   <string name="import_nfc_help_button">Hilfe</string>
@@ -365,6 +373,8 @@
   <string name="intent_send_decrypt">Mit OpenKeychain entschlüsseln</string>
   <!--Remote API-->
   <string name="api_no_apps">Keine registrierten Anwendungen vorhanden!\n\nAnwendungen von Dritten können Zugriff auf OpenKeychain erbitten. Nachdem Zugriff gewährt wurde, werden diese hier aufgelistet.</string>
+  <string name="api_settings_show_info">Erweiterte Informationen anzeigen</string>
+  <string name="api_settings_hide_info">Erweiterte Informationen ausblenden</string>
   <string name="api_settings_show_advanced">Erweiterte Einstellungen anzeigen</string>
   <string name="api_settings_hide_advanced">Erweiterte Einstellungen ausblenden</string>
   <string name="api_settings_no_key">Kein Schlüssel ausgewählt</string>
@@ -374,6 +384,7 @@
   <string name="api_settings_revoke">Zugriff widerufen</string>
   <string name="api_settings_package_name">Paketname</string>
   <string name="api_settings_package_signature">SHA-256 der Paketsignatur</string>
+  <string name="api_settings_accounts">Konten</string>
   <string name="api_register_text">Folgende Anwendung beantragt Zugriff zur API von OpenKeychain.\nZugriff erlauben?\n\nVORSICHT: Sollten Sie nicht wissen, warum dieses Fenster erscheint, sollten Sie den Zugriff nicht gewähren! Sie können Zugriffe später über das Menü \'Registrierte Anwendungen\' widerrufen.</string>
   <string name="api_register_allow">Zugriff erlauben</string>
   <string name="api_register_disallow">Zugriff verbieten</string>
@@ -405,6 +416,9 @@
   <string name="key_view_tab_main">Info</string>
   <string name="key_view_tab_certs">Zertifikationen</string>
   <!--Navigation Drawer-->
+  <string name="nav_contacts">Schlüssel</string>
+  <string name="nav_encrypt">Signieren und Verschlüsseln</string>
+  <string name="nav_decrypt">Entschlüsseln und Verifizieren</string>
   <string name="nav_import">Schlüssel Importieren</string>
   <string name="nav_secret_keys">Meine Schlüssel</string>
   <string name="nav_apps">Registrierte Anwendungen</string>
@@ -415,7 +429,8 @@
   <string name="label_secret_key">Geheime Schlüssel</string>
   <string name="secret_key_yes">verfügbar</string>
   <string name="secret_key_no">nicht verfügbar</string>
+  <!--hints-->
+  <!--unsorted-->
   <string name="section_uids_to_sign">Benutzer-IDs, die beglaubigt werden sollen</string>
   <string name="progress_re_adding_certs">Wiederhinzufügen der Zertifikate</string>
-  <!--hints-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-el/strings.xml b/OpenPGP-Keychain/src/main/res/values-el/strings.xml
index 824399722..73a736766 100644
--- a/OpenPGP-Keychain/src/main/res/values-el/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-el/strings.xml
@@ -26,8 +26,6 @@
   <string name="label_passphrase_again">Ξανά</string>
   <string name="label_algorithm">Αλγόριθμος</string>
   <string name="label_encryption_algorithm">Αλγόριθμος κρυπτογράφησης</string>
-  <string name="label_asymmetric">Δημόσιο κλειδί</string>
-  <string name="label_symmetric">Κωδικός</string>
   <string name="label_key_size">Μέγεθος κλειδιού</string>
   <string name="label_email">Ηλεκτρονικό ταχυδρομίο</string>
   <string name="unknown_status"></string>
@@ -50,4 +48,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
index 11d84cdee..0def5eba7 100644
--- a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
@@ -63,8 +63,6 @@
   <string name="label_delete_after_decryption">Borrar después de descifrar</string>
   <string name="label_encryption_algorithm">Algoritmo de cifrado</string>
   <string name="label_hash_algorithm">Algoritmo de Hash</string>
-  <string name="label_asymmetric">Clave pública</string>
-  <string name="label_symmetric">Contraseña</string>
   <string name="label_message_compression">Compresión de mensaje</string>
   <string name="label_file_compression">Compresión de archivo</string>
   <string name="label_key_id">ID de clave</string>
@@ -96,4 +94,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
index 55136642c..a3394f23a 100644
--- a/OpenPGP-Keychain/src/main/res/values-es/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
@@ -74,8 +74,6 @@
   <string name="menu_import_from_qr_code">Importar desde código QR</string>
   <string name="menu_import">Importar</string>
   <string name="menu_import_from_nfc">Importar desde NFC</string>
-  <string name="menu_export_public_keys">Exportar todas las claves públicas</string>
-  <string name="menu_export_secret_keys">Exportar todas las claves secretas</string>
   <string name="menu_export_key">Exportar hacia archivo</string>
   <string name="menu_delete_key">Borrar clave</string>
   <string name="menu_create_key">Crear clave</string>
@@ -100,7 +98,6 @@
   <string name="menu_encrypt_to">Cifrar hacia...</string>
   <string name="menu_select_all">Seleccionar todo</string>
   <string name="menu_add_keys">Añadir claves</string>
-  <string name="menu_export_keys">Exportar claves</string>
   <!--label-->
   <string name="label_sign">Firmar</string>
   <string name="label_message">Mensaje</string>
@@ -116,8 +113,8 @@
   <string name="label_share_after_encryption">Compartir después del cifrado</string>
   <string name="label_encryption_algorithm">Algoritmo de cifrado</string>
   <string name="label_hash_algorithm">Algoritmo de Hash</string>
-  <string name="label_asymmetric">Clave pública</string>
-  <string name="label_symmetric">Frase de contraseña</string>
+  <string name="label_asymmetric">con clave pública</string>
+  <string name="label_symmetric">con frase contraseña</string>
   <string name="label_passphrase_cache_ttl">Caché de frase de contraseña</string>
   <string name="label_message_compression">Compresión de mensaje</string>
   <string name="label_file_compression">Compresión de archivo</string>
@@ -373,7 +370,7 @@
   <string name="import_qr_code_start_with_one">Por favor, comienza con el código QR de ID 1</string>
   <string name="import_qr_code_wrong">¡El código QR está deformado! ¡Por favor, prueba de nuevo!</string>
   <string name="import_qr_code_finished">¡El escaneo del código QR ha finalizado!</string>
-  <string name="import_qr_code_too_short_fingerprint">La huella digital contenida en este código QR es demasiado corta (&lt; 16 caracteres)</string>
+  <string name="import_qr_code_too_short_fingerprint">La huella de validación (fingerprint) de clave es demasiado corta (&lt; 16 caracteres)</string>
   <string name="import_qr_scan_button">Escanea el código QR con \'Barcode Scanner\'</string>
   <string name="import_nfc_text">Para recibir las claves a través de NFC, el dispositivo tiene que estar desbloqueado.</string>
   <string name="import_nfc_help_button">Ayuda</string>
@@ -445,9 +442,10 @@
   <string name="label_secret_key">Claves secretas</string>
   <string name="secret_key_yes">disponible</string>
   <string name="secret_key_no">no disponible</string>
-  <string name="section_uids_to_sign">IDs de usuario para firmar</string>
-  <string name="progress_re_adding_certs">Nueva aplicación de certificados</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Escribe aquí el mensaje que quieras cifrar y/o firmar...</string>
   <string name="decrypt_content_edit_text_hint">Introduce aquí el texto cifrado para descifrarlo y/o verificarlo...</string>
+  <!--unsorted-->
+  <string name="section_uids_to_sign">IDs de usuario para firmar</string>
+  <string name="progress_re_adding_certs">Nueva aplicación de certificados</string>
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-et/strings.xml b/OpenPGP-Keychain/src/main/res/values-et/strings.xml
index 62741da09..e1e725234 100644
--- a/OpenPGP-Keychain/src/main/res/values-et/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-et/strings.xml
@@ -60,8 +60,6 @@
   <string name="label_select_public_keys">Saajad</string>
   <string name="label_delete_after_encryption">Kustuta peale šifreerimist</string>
   <string name="label_hash_algorithm">Räsialgoritm</string>
-  <string name="label_asymmetric">Avalik võti</string>
-  <string name="label_symmetric">Salasõne</string>
   <string name="label_passphrase_cache_ttl">Salasõne puhverdus</string>
   <string name="label_key_servers">Võtmeserverid</string>
   <string name="label_creation">Loodud</string>
@@ -116,4 +114,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml b/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml
index 7b71d3ecf..fc802092c 100644
--- a/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml
@@ -25,4 +25,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
index e7d8b0b7f..5d4c63432 100644
--- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
@@ -74,8 +74,6 @@
   <string name="menu_import_from_qr_code">Importer depuis un code QR</string>
   <string name="menu_import">Importer</string>
   <string name="menu_import_from_nfc">Importer avec NFC</string>
-  <string name="menu_export_public_keys">Exporter toutes les clefs publiques</string>
-  <string name="menu_export_secret_keys">Exporter toutes les clefs secrètes</string>
   <string name="menu_export_key">Exporter vers un fichier</string>
   <string name="menu_delete_key">Supprimer la clef</string>
   <string name="menu_create_key">Créer une clef</string>
@@ -100,7 +98,6 @@
   <string name="menu_encrypt_to">Chiffrer vers...</string>
   <string name="menu_select_all">Tout sélectionner</string>
   <string name="menu_add_keys">Ajouter des clefs</string>
-  <string name="menu_export_keys">Exporter des clefs</string>
   <!--label-->
   <string name="label_sign">Signer</string>
   <string name="label_message">Message</string>
@@ -116,8 +113,8 @@
   <string name="label_share_after_encryption">Partager après chiffrement</string>
   <string name="label_encryption_algorithm">Algorithme de chiffrement</string>
   <string name="label_hash_algorithm">Algorithme de hachage</string>
-  <string name="label_asymmetric">Clef publique</string>
-  <string name="label_symmetric">Phrase de passe</string>
+  <string name="label_asymmetric">avec une clef publique</string>
+  <string name="label_symmetric">avec une phrase de passe</string>
   <string name="label_passphrase_cache_ttl">Cache de la phrase de passe</string>
   <string name="label_message_compression">Compression des messages</string>
   <string name="label_file_compression">Compression des fichiers</string>
@@ -373,7 +370,7 @@
   <string name="import_qr_code_start_with_one">Veuillez commencer par le code QR avec l\'ID 1</string>
   <string name="import_qr_code_wrong">Code QR incorrecte ! Veuillez réessayer !</string>
   <string name="import_qr_code_finished">Balayage de code QR terminé !</string>
-  <string name="import_qr_code_too_short_fingerprint">L\'empreinte contenue dans ce code QR est trop courte (&lt; 16 caractères)</string>
+  <string name="import_qr_code_too_short_fingerprint">L\'empreinte est trop courte (&lt; 16 caractères)</string>
   <string name="import_qr_scan_button">Numériser le code QR avec le lecteur de code-barres</string>
   <string name="import_nfc_text">Pour recevoir des clefs par NFC, les appareils doivent être déverrouillés.</string>
   <string name="import_nfc_help_button">Aide</string>
@@ -445,9 +442,10 @@
   <string name="label_secret_key">Clef secrète</string>
   <string name="secret_key_yes">disponible</string>
   <string name="secret_key_no">non disponible</string>
-  <string name="section_uids_to_sign">ID utilisateur pour signer</string>
-  <string name="progress_re_adding_certs">Nouvel application des certificats</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Écrire ici le message à chiffrer et/ou signer...</string>
   <string name="decrypt_content_edit_text_hint">Saisir le cryptogramme à déchiffrer et/ou à vérifier ici...</string>
+  <!--unsorted-->
+  <string name="section_uids_to_sign">ID utilisateur pour signer</string>
+  <string name="progress_re_adding_certs">Nouvel application des certificats</string>
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
index ff46c9606..4f2f67d33 100644
--- a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
@@ -55,7 +55,7 @@
   <string name="btn_do_not_save">Annulla</string>
   <string name="btn_delete">Elimina</string>
   <string name="btn_no_date">Nessuno</string>
-  <string name="btn_okay">Okay</string>
+  <string name="btn_okay">OK</string>
   <string name="btn_change_passphrase">Cambia Nuova Frase di Accesso</string>
   <string name="btn_set_passphrase">Imposta Nuova Frase di Accesso</string>
   <string name="btn_search">Cerca</string>
@@ -63,7 +63,7 @@
   <string name="btn_next">Prossimo</string>
   <string name="btn_back">Precedente</string>
   <string name="btn_clipboard">Appunti</string>
-  <string name="btn_share">Condividi con...</string>
+  <string name="btn_share">Condividi...</string>
   <string name="btn_lookup_key">Chiave di ricerca</string>
   <string name="btn_encryption_advanced_settings_show">Mostra impostazioni avanzate</string>
   <string name="btn_encryption_advanced_settings_hide">Nascondi impostazioni avanzate</string>
@@ -74,7 +74,6 @@
   <string name="menu_import_from_qr_code">Importa da Codice QR</string>
   <string name="menu_import">Importa</string>
   <string name="menu_import_from_nfc">Importa tramite NFC</string>
-  <string name="menu_export_secret_keys">Esporta tutte le chiavi segrete</string>
   <string name="menu_export_key">Esporta su un file</string>
   <string name="menu_delete_key">Cancella chiave</string>
   <string name="menu_create_key">Crea chiave</string>
@@ -98,6 +97,7 @@
   <string name="menu_key_edit_cancel">Annulla</string>
   <string name="menu_encrypt_to">Codifica su...</string>
   <string name="menu_select_all">Seleziona tutto</string>
+  <string name="menu_add_keys">Aggiungi chiavi</string>
   <!--label-->
   <string name="label_sign">Firma</string>
   <string name="label_message">Messaggio</string>
@@ -113,8 +113,8 @@
   <string name="label_share_after_encryption">Condividi Dopo la Codifica</string>
   <string name="label_encryption_algorithm">Algoritmo di Codifica</string>
   <string name="label_hash_algorithm">Algoritmo di Hash</string>
-  <string name="label_asymmetric">Chiave Pubblica</string>
-  <string name="label_symmetric">Frase di Accesso</string>
+  <string name="label_asymmetric">con Chiave Pubblica</string>
+  <string name="label_symmetric">con Frase di Accesso</string>
   <string name="label_passphrase_cache_ttl">Cache Frase di Accesso</string>
   <string name="label_message_compression">Compressione Messaggio</string>
   <string name="label_file_compression">Compressione File</string>
@@ -142,7 +142,7 @@
   <string name="no_key">&lt;nessuna chiave&gt;</string>
   <string name="no_email">&lt;Nessuna Email&gt;</string>
   <string name="unknown_status"></string>
-  <string name="can_encrypt">puo\'; codificare</string>
+  <string name="can_encrypt">puo\' codificare</string>
   <string name="can_sign">puo\' firmare</string>
   <string name="expired">scaduto</string>
   <string name="revoked">revocato</string>
@@ -189,11 +189,15 @@
   <string name="set_a_passphrase">Imposta prima una frase di accesso.</string>
   <string name="no_filemanager_installed">Nessun gestore file compatibile installato.</string>
   <string name="passphrases_do_not_match">Le frasi di accesso non corrispondono.</string>
+  <string name="passphrase_must_not_be_empty">Si prega di inserire una frase di accesso.</string>
   <string name="passphrase_for_symmetric_encryption">Codifica Simmetrica.</string>
   <string name="passphrase_for">Inserisci la frase di accesso per \'%s\'</string>
   <string name="file_delete_confirmation">Sei sicuro di voler cancellare\n%s?</string>
   <string name="file_delete_successful">Eliminato correttamente.</string>
   <string name="no_file_selected">Seleziona un file prima.</string>
+  <string name="decryption_successful">Decodifica e/o verifica eseguita con successo.</string>
+  <string name="encryption_successful">Firmato e/o codificato con successo.</string>
+  <string name="encryption_to_clipboard_successful">Firmato e/o codificato con successo negli appunti.</string>
   <string name="enter_passphrase_twice">Inserisci la frase di accesso due volte.</string>
   <string name="select_encryption_key">Seleziona almeno una chiave di codifica.</string>
   <string name="select_encryption_or_signature_key">Seleziona almeno una chiave di codifica o di firma.</string>
@@ -205,6 +209,7 @@
   <string name="key_deletion_confirmation_multi">Vuoi veramente eliminare le chiavi selezionate?\nNon potrai annullare!</string>
   <string name="secret_key_deletion_confirmation">Vuoi veramente eliminare la chiave PRIVATA \'%s\'?\nNon potrai annullare!</string>
   <string name="ask_save_changed_key">Hai apportato modifiche al tuo portachiavi, vuoi salvarlo?</string>
+  <string name="ask_empty_id_ok">È stato aggiunto un ID utente vuoto, sei sicuro di voler continuare?</string>
   <string name="public_key_deletetion_confirmation">Vuoi veramente eliminare la chiave PUBBLICA \'%s\'?\nNon potrai annullare!</string>
   <string name="secret_key_delete_text">Eliminare le Chiavi Segrete?</string>
   <string name="also_export_secret_keys">Esportare anche le chiavi segrete?</string>
@@ -298,6 +303,7 @@
     <item quantity="one">parte del file caricato e\' un oggetto OpenPGP valido, ma non una chave OpenPGP</item>
     <item quantity="other">parti del file caricato sono oggetti OpenPGP validi, ma non chavi OpenPGP</item>
   </plurals>
+  <string name="error_change_something_first">È necessario apportare modifiche al portachiavi prima prima che sia possibile salvarlo</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Fatto.</string>
   <string name="progress_cancel">Annulla</string>
@@ -364,7 +370,7 @@
   <string name="import_qr_code_start_with_one">Perfavore inizia col Codice QR con ID 1</string>
   <string name="import_qr_code_wrong">Codica QR deformato! Prova di nuovo!</string>
   <string name="import_qr_code_finished">Scansione codice QR completata!</string>
-  <string name="import_qr_code_too_short_fingerprint">Impronta contenuta nel Codice QR troppo corta (&lt; 16 caratteri)</string>
+  <string name="import_qr_code_too_short_fingerprint">Impronta troppo corta (&lt; 16 caratteri)</string>
   <string name="import_qr_scan_button">Scansiona il Codice QR con \'Barcode Scanner\'</string>
   <string name="import_nfc_text">Per ricevere le chiavi via NFC, il dispositivo deve essere sbloccato.</string>
   <string name="import_nfc_help_button">Aiuto</string>
@@ -423,6 +429,9 @@
   <string name="key_view_tab_main">Info</string>
   <string name="key_view_tab_certs">Certificazioni</string>
   <!--Navigation Drawer-->
+  <string name="nav_contacts">Chiavi</string>
+  <string name="nav_encrypt">Firma e Codifica</string>
+  <string name="nav_decrypt">Decodifica e Verifica</string>
   <string name="nav_import">Importa Chiavi</string>
   <string name="nav_secret_keys">Le Mie Chiavi</string>
   <string name="nav_apps">App Registrate</string>
@@ -433,7 +442,10 @@
   <string name="label_secret_key">Chiave Segreta</string>
   <string name="secret_key_yes">disponibile</string>
   <string name="secret_key_no">non disponibile</string>
+  <!--hints-->
+  <string name="encrypt_content_edit_text_hint">Scrivi qui il messaggio da codificare e/o firmare...</string>
+  <string name="decrypt_content_edit_text_hint">Inserisci il testo cifrato qui per la decodifica e/o verifica...</string>
+  <!--unsorted-->
   <string name="section_uids_to_sign">ID Utente da firmare</string>
   <string name="progress_re_adding_certs">Riapplicazione certificati</string>
-  <!--hints-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
index eceefb8a3..2cd0630a8 100644
--- a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
@@ -74,8 +74,6 @@
   <string name="menu_import_from_qr_code">QRコードからインポート</string>
   <string name="menu_import">インポート</string>
   <string name="menu_import_from_nfc">NFCからインポート</string>
-  <string name="menu_export_public_keys">すべての公開鍵のエクスポート</string>
-  <string name="menu_export_secret_keys">すべての秘密鍵のエクスポート</string>
   <string name="menu_export_key">ファイルへのエクスポート</string>
   <string name="menu_delete_key">鍵の削除</string>
   <string name="menu_create_key">鍵の生成</string>
@@ -100,7 +98,6 @@
   <string name="menu_encrypt_to">暗号化...</string>
   <string name="menu_select_all">すべて選択</string>
   <string name="menu_add_keys">鍵の追加</string>
-  <string name="menu_export_keys">複数鍵のエクスポート</string>
   <!--label-->
   <string name="label_sign">署名</string>
   <string name="label_message">メッセージ</string>
@@ -116,8 +113,8 @@
   <string name="label_share_after_encryption">暗号化して共有</string>
   <string name="label_encryption_algorithm">暗号化アルゴリズム</string>
   <string name="label_hash_algorithm">ハッシュアルゴリズム</string>
-  <string name="label_asymmetric">公開鍵</string>
-  <string name="label_symmetric">パスフレーズ</string>
+  <string name="label_asymmetric">公開鍵で</string>
+  <string name="label_symmetric">パスフレーズで</string>
   <string name="label_passphrase_cache_ttl">パスフレーズキャッシュ</string>
   <string name="label_message_compression">メッセージの圧縮</string>
   <string name="label_file_compression">ファイルの圧縮</string>
@@ -359,7 +356,7 @@
   <string name="import_qr_code_start_with_one">QRコードをID 1で始めてください</string>
   <string name="import_qr_code_wrong">不適QRコード! もう一度!</string>
   <string name="import_qr_code_finished">QRコードの読み取り完了!</string>
-  <string name="import_qr_code_too_short_fingerprint">QRコードに含まれる指紋が短かすぎます (&lt; 16 文字)</string>
+  <string name="import_qr_code_too_short_fingerprint">指紋が短かすぎます (&lt; 16 文字)</string>
   <string name="import_qr_scan_button">\'バーコードスキャナー\'でQRコードをスキャンする</string>
   <string name="import_nfc_text">NFCで鍵を受信しました、デバイスのロックを解除する必要があります。</string>
   <string name="import_nfc_help_button">ヘルプ</string>
@@ -430,9 +427,10 @@
   <string name="label_secret_key">秘密鍵</string>
   <string name="secret_key_yes">存在する</string>
   <string name="secret_key_no">存在しない</string>
-  <string name="section_uids_to_sign">署名に使うユーザーID</string>
-  <string name="progress_re_adding_certs">検証を再適用する</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">ここに書いたメッセージを暗号化/署名..</string>
   <string name="decrypt_content_edit_text_hint">ここに入力された暗号化テキストを復号化/検証...</string>
+  <!--unsorted-->
+  <string name="section_uids_to_sign">署名に使うユーザーID</string>
+  <string name="progress_re_adding_certs">検証を再適用する</string>
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
index 9cb9a4756..b1354393c 100644
--- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
@@ -64,8 +64,6 @@
   <string name="label_delete_after_decryption">Verwijderen na ontsleuteling</string>
   <string name="label_encryption_algorithm">Versleutelingsalgoritme</string>
   <string name="label_hash_algorithm">Verificatie-algoritme</string>
-  <string name="label_asymmetric">Publieke sleutel</string>
-  <string name="label_symmetric">Wachtwoord</string>
   <string name="label_passphrase_cache_ttl">Wachtwoordcache</string>
   <string name="label_message_compression">Berichtcompressie</string>
   <string name="label_file_compression">Bestandscompressie</string>
@@ -227,4 +225,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-pl/strings.xml b/OpenPGP-Keychain/src/main/res/values-pl/strings.xml
index 336f0bff7..efdd61e3c 100644
--- a/OpenPGP-Keychain/src/main/res/values-pl/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-pl/strings.xml
@@ -74,8 +74,6 @@
   <string name="menu_import_from_qr_code">Zaimportuj z kodu QR</string>
   <string name="menu_import">Import</string>
   <string name="menu_import_from_nfc">Zaimportuj przy użyciu NFC</string>
-  <string name="menu_export_public_keys">Eksportuj wszystkie klucze publiczne</string>
-  <string name="menu_export_secret_keys">Eksportuj wszystkie prywatne klucze</string>
   <string name="menu_export_key">Eksportuj do pliku</string>
   <string name="menu_delete_key">Usuń klucz</string>
   <string name="menu_create_key">Stwórz klucz</string>
@@ -100,7 +98,6 @@
   <string name="menu_encrypt_to">Zaszyfruj do...</string>
   <string name="menu_select_all">Wybierz wszystko</string>
   <string name="menu_add_keys">Dodaj klucze</string>
-  <string name="menu_export_keys">Eksportuj klucze</string>
   <!--label-->
   <string name="label_sign">Podpis</string>
   <string name="label_message">Wiadomość</string>
@@ -116,8 +113,8 @@
   <string name="label_share_after_encryption">Udostępnij po zaszyfrowaniu</string>
   <string name="label_encryption_algorithm">Algorytm szyfrujący</string>
   <string name="label_hash_algorithm">Algorytm funkcji skrótu</string>
-  <string name="label_asymmetric">Klucz publiczny</string>
-  <string name="label_symmetric">Hasło</string>
+  <string name="label_asymmetric">za pomocą klucza publicznego</string>
+  <string name="label_symmetric">za pomocą hasła</string>
   <string name="label_passphrase_cache_ttl">Bufor haseł</string>
   <string name="label_message_compression">Kompresja wiadomości</string>
   <string name="label_file_compression">Kompresja plików</string>
@@ -387,7 +384,7 @@
   <string name="import_qr_code_start_with_one">Zacznij od kodu QR o identyfikatorze 1</string>
   <string name="import_qr_code_wrong">Kod QR zniekształcony! Spróbuj jeszcze raz!</string>
   <string name="import_qr_code_finished">Skanowanie kodu QR zakończone!</string>
-  <string name="import_qr_code_too_short_fingerprint">Odcisk klucza zawarty w tym kodzie QR jest za krótki (&lt; 16 znaków)</string>
+  <string name="import_qr_code_too_short_fingerprint">Odcisk klucza jest za krótki (&lt; 16 znaków)</string>
   <string name="import_qr_scan_button">Odczytaj kod QR przy pomocy \'Barcode Scanner\'</string>
   <string name="import_nfc_text">Aby odbierać klucze przez NFC, urządzenie musi być odblokowane.</string>
   <string name="import_nfc_help_button">Pomoc</string>
@@ -460,9 +457,10 @@
   <string name="label_secret_key">Klucz prywatny</string>
   <string name="secret_key_yes">dostępny</string>
   <string name="secret_key_no">niedostepny</string>
-  <string name="section_uids_to_sign">Identyfikator użytkownika do podpisu</string>
-  <string name="progress_re_adding_certs">Ponowne stosowanie certyfikatów</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Wpisz tutaj wiadomość do zaszyfrowania i/lub podpisania...</string>
   <string name="decrypt_content_edit_text_hint">Wpisz tutaj tekst do zaszyfrowania i/lub zweryfikowania...</string>
+  <!--unsorted-->
+  <string name="section_uids_to_sign">Identyfikator użytkownika do podpisu</string>
+  <string name="progress_re_adding_certs">Ponowne stosowanie certyfikatów</string>
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml b/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
index 7b71d3ecf..fc802092c 100644
--- a/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
@@ -25,4 +25,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
index 8ee6d95ca..5fe4dd587 100644
--- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
@@ -74,8 +74,6 @@
   <string name="menu_import_from_qr_code">Импорт из QR кода</string>
   <string name="menu_import">Импорт</string>
   <string name="menu_import_from_nfc">Импорт из NFC</string>
-  <string name="menu_export_public_keys">Экспорт всех открытых ключей</string>
-  <string name="menu_export_secret_keys">Экспорт всех секретных ключей</string>
   <string name="menu_export_key">Экспорт в файл</string>
   <string name="menu_delete_key">Удалить ключ</string>
   <string name="menu_create_key">Создать ключ</string>
@@ -100,7 +98,6 @@
   <string name="menu_encrypt_to">Зашифровать....</string>
   <string name="menu_select_all">Выбрать все</string>
   <string name="menu_add_keys">Добавить ключи</string>
-  <string name="menu_export_keys">Экспорт ключей</string>
   <!--label-->
   <string name="label_sign">Подписать</string>
   <string name="label_message">Сообщение</string>
@@ -116,8 +113,6 @@
   <string name="label_share_after_encryption">Отправить после шифрования</string>
   <string name="label_encryption_algorithm">Алгоритм шифрования</string>
   <string name="label_hash_algorithm">Hash-алгоритм</string>
-  <string name="label_asymmetric">Публичный ключ</string>
-  <string name="label_symmetric">Пароль</string>
   <string name="label_passphrase_cache_ttl">Помнить пароль</string>
   <string name="label_message_compression">Сжатие сообщения</string>
   <string name="label_file_compression">Сжатие файла</string>
@@ -382,7 +377,6 @@
   <string name="import_qr_code_start_with_one">Пожалуйста, начните с QR кода с id 1</string>
   <string name="import_qr_code_wrong">Некорректный QR код. Попробуйте снова!</string>
   <string name="import_qr_code_finished">Сканирование QR завершено!</string>
-  <string name="import_qr_code_too_short_fingerprint">QR код содержит слишком короткий отпечаток (&lt; 16 символов)</string>
   <string name="import_qr_scan_button">Сканировать QR код с \'Barcode Scanner\'</string>
   <string name="import_nfc_text">Разблокируйте устройство, что бы получить ключ через NFC.</string>
   <string name="import_nfc_help_button">Помощь</string>
@@ -400,11 +394,16 @@
   <string name="api_settings_hide_advanced">Скрыть расширенные настройки</string>
   <string name="api_settings_no_key">Ключ не выбран</string>
   <string name="api_settings_select_key">Выбрать ключ</string>
+  <string name="api_settings_create_key">Создать новый ключ для этого аккаунта</string>
   <string name="api_settings_save">Сохранить</string>
   <string name="api_settings_cancel">Отмена</string>
   <string name="api_settings_revoke">Отозвать доступ</string>
+  <string name="api_settings_delete_account">Удалить аккаунт</string>
   <string name="api_settings_package_name">Наименование пакета</string>
   <string name="api_settings_package_signature">SHA-256 подписи пакета</string>
+  <string name="api_settings_accounts">Аккаунты</string>
+  <string name="api_settings_accounts_empty">Нет аккаунтов, связанных с этим приложением.</string>
+  <string name="api_create_account_text">Приложение запрашивает создание нового аккаунта. Выберите секретный ключ или создайте новый.\nПриложения ограничены в доступе только к выбраным здесь ключам!</string>
   <string name="api_register_text">Данное приложение запрашивает доступ к OpenKeychain.\nРазрешить доступ?\n\nВНИМАНИЕ: Если вы не знаете почему возник этот запрос, откажите в доступе!\nПозже вы можете отозвать право доступа в разделе \"Зарегистрированные программы\".</string>
   <string name="api_register_allow">Разрешить доступ</string>
   <string name="api_register_disallow">Запретить доступ</string>
@@ -450,7 +449,8 @@
   <string name="label_secret_key">Секретный ключ</string>
   <string name="secret_key_yes">доступен</string>
   <string name="secret_key_no">не доступен</string>
-  <string name="section_uids_to_sign">Подписываемые ID пользователя</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Напишите сообщение здесь, что бы зашифровать и/или подписать...</string>
+  <!--unsorted-->
+  <string name="section_uids_to_sign">Подписываемые ID пользователя</string>
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml b/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
index 7b71d3ecf..fc802092c 100644
--- a/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
@@ -25,4 +25,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
index db1d438dd..d7e4afd7c 100644
--- a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
@@ -52,7 +52,6 @@
   <string name="label_file">Dosya</string>
   <string name="label_passphrase_again">Tekrar</string>
   <string name="label_algorithm">Algoritma</string>
-  <string name="label_asymmetric">Açık Anahtar</string>
   <string name="label_creation">Oluşturma</string>
   <string name="label_usage">Kullanım</string>
   <string name="label_key_size">Anahtar Boyutu</string>
@@ -135,4 +134,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
index da9509822..01551fcd9 100644
--- a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
@@ -74,8 +74,6 @@
   <string name="menu_import_from_qr_code">Імпорт з штрих-коду</string>
   <string name="menu_import">Імпорт</string>
   <string name="menu_import_from_nfc">Імпорт з NFC</string>
-  <string name="menu_export_public_keys">Експортувати усі публічні ключі</string>
-  <string name="menu_export_secret_keys">Експортувати усі секретні ключі</string>
   <string name="menu_export_key">Експорт до файлу</string>
   <string name="menu_delete_key">Вилучити ключ</string>
   <string name="menu_create_key">Створити ключ</string>
@@ -100,7 +98,7 @@
   <string name="menu_encrypt_to">Зашифрувати…</string>
   <string name="menu_select_all">Вибрати усе</string>
   <string name="menu_add_keys">Додати ключі</string>
-  <string name="menu_export_keys">Експортувати ключі</string>
+  <string name="menu_export_all_keys">Експортувати усі ключі</string>
   <!--label-->
   <string name="label_sign">Підпис</string>
   <string name="label_message">Повідомлення</string>
@@ -116,8 +114,8 @@
   <string name="label_share_after_encryption">Поширити після шифрування</string>
   <string name="label_encryption_algorithm">Алгоритм шифрування</string>
   <string name="label_hash_algorithm">Хеш алгоритм</string>
-  <string name="label_asymmetric">Публічний ключ</string>
-  <string name="label_symmetric">Парольна фраза</string>
+  <string name="label_asymmetric">з публічним ключем</string>
+  <string name="label_symmetric">з парольною фразою</string>
   <string name="label_passphrase_cache_ttl">Кеш парольної фрази</string>
   <string name="label_message_compression">Стиснення повідомлення</string>
   <string name="label_file_compression">Стиснення файлу</string>
@@ -387,7 +385,7 @@
   <string name="import_qr_code_start_with_one">Будь ласка, почніть з QR коду із ІД 1</string>
   <string name="import_qr_code_wrong">Невірний штрих-код! Спробуйте знову!</string>
   <string name="import_qr_code_finished">Сканування штрих-коду завершено!</string>
-  <string name="import_qr_code_too_short_fingerprint">Штрих-код містить надто короткий відбиток (&lt; 16 символів)</string>
+  <string name="import_qr_code_too_short_fingerprint">Відбиток надто короткий (&lt; 16 символів)</string>
   <string name="import_qr_scan_button">Сканувати QR код з \'Barcode Scanner\'</string>
   <string name="import_nfc_text">Розблокуйте пристрій, щоб отримати ключ через NFC.</string>
   <string name="import_nfc_help_button">Довідка</string>
@@ -460,9 +458,10 @@
   <string name="label_secret_key">Секретний ключ</string>
   <string name="secret_key_yes">доступний</string>
   <string name="secret_key_no">недоступний</string>
-  <string name="section_uids_to_sign">ІД користувача для реєстрації</string>
-  <string name="progress_re_adding_certs">Перезастосування сертифікатів</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Напишіть повідомлення для шифрування та/або підпису…</string>
   <string name="decrypt_content_edit_text_hint">Уведіть зашифрований текст тут для його розшифрування та/або перевірки…</string>
+  <!--unsorted-->
+  <string name="section_uids_to_sign">ІД користувача для реєстрації</string>
+  <string name="progress_re_adding_certs">Перезастосування сертифікатів</string>
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml
index 7b71d3ecf..fc802092c 100644
--- a/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml
@@ -25,4 +25,5 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
+  <!--unsorted-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
index d569050fa..fa21e211b 100644
--- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
@@ -67,8 +67,6 @@
   <string name="label_delete_after_decryption">解密后删除</string>
   <string name="label_encryption_algorithm">加密算法</string>
   <string name="label_hash_algorithm">哈希算法</string>
-  <string name="label_asymmetric">公共密钥</string>
-  <string name="label_symmetric">密语</string>
   <string name="label_passphrase_cache_ttl">密语缓存</string>
   <string name="label_comment">注解</string>
   <string name="label_email">电子邮件</string>
@@ -179,4 +177,5 @@
   <string name="nav_import">导入密钥</string>
   <string name="nav_secret_keys">我的密钥</string>
   <!--hints-->
+  <!--unsorted-->
 </resources>