diff --git a/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
index e335b8535..36ec25bab 100644
--- a/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index 3692d05be..22821caca 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-el/help_changelog.html b/OpenKeychain/src/main/res/raw-el/help_changelog.html
index e335b8535..36ec25bab 100644
--- a/OpenKeychain/src/main/res/raw-el/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-el/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
index 41b9f1701..f710c3e53 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
index e335b8535..36ec25bab 100644
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
index e335b8535..36ec25bab 100644
--- a/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
index fdccca887..05e8ef3e3 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>certifications des clefs (merci à Vincent Breitmoser)</li>
-<li>prends en charge les clefs secrètes partielles de GnuPG (merci à Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>nouvelle conception de la vérification des signatures</li>
 <li>longueur de clef personnalisée (merci à Greg Witczak)</li>
 <li>correction de la fonctionnalité partagée avec d'autres applis</li>
diff --git a/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
index aaf94749f..19e17616b 100644
--- a/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
@@ -3,11 +3,11 @@
 <body>
 <h2>2.6</h2>
 <ul>
-<li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
-<li>new design for signature verification</li>
-<li>custom key length (thanks to Greg Witczak)</li>
-<li>fix share-functionality from other apps</li>
+<li>certificazioni chiave (grazie a Vincent Breitmoser)</li>
+<li>supporto per chiavi segrete parziali GnuPG (grazie a Vincent Breitmoser)</li>
+<li>nuovo design per la verifica della firma</li>
+<li>lunghezza chiave personalizzata (grazie a Greg Witczak)</li>
+<li>fix funzionalità di condivisione da altre app</li>
 </ul>
 <h2>2.5</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-it-rIT/help_start.html b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
index b3dbb5473..de6418e5d 100644
--- a/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Per iniziare</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>In primo luogo è necessaria una chiave segreta personale. Creane una tramite il menu opzioni sotto la voce "Chiavi" o importa chiavi segrete già esistenti. Successivamente, è possibile scaricare le chiavi dei vostri amici o scambiarle con i codici QR o NFC.</p>
 
 <p>Si raccomanda di installare <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> per una migliore selezione dei file e <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> per scansionare i codici QR. I collegamenti verranno aperti in Google Play Store o F-Droid per l'installazione.</p>
 
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index a4867835f..9effbd52d 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>鍵証明 (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>GnuPGの部分秘密鍵のサポート (thanks to Vincent Breitmoser)</li>
 <li>新しいデザインでの署名の検証</li>
 <li>カスタムの鍵長 (thanks to Greg Witczak)</li>
 <li>他のアプリからの共有ファンクションの修正</li>
diff --git a/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
index e335b8535..36ec25bab 100644
--- a/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
index baca16fc5..5abcabe5b 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index b19affb4d..2617aace9 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
index e335b8535..36ec25bab 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
index e7ac04d97..2c5a80a51 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>сертифікації ключів (завдяки Вінсенту Бреймозеру)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>новий дизайн для перевірки підпису</li>
 <li>власна довжина ключа (завдяки Ґреґу Вітчаку)</li>
 <li>виправлено функцію поширення з інших програм</li>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index e335b8535..36ec25bab 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -4,7 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
 <li>new design for signature verification</li>
 <li>custom key length (thanks to Greg Witczak)</li>
 <li>fix share-functionality from other apps</li>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 44e8c85f6..28074933c 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -13,6 +13,7 @@
   <string name="title_key_server_preference">Schlüsselserver</string>
   <string name="title_change_passphrase">Passphrase ändern</string>
   <string name="title_set_passphrase">Passwort setzen</string>
+  <string name="title_share_file">Datei teilen mit…</string>
   <string name="title_encrypt_to_file">In eine Datei verschlüsseln</string>
   <string name="title_decrypt_to_file">In eine Datei entschlüsseln</string>
   <string name="title_import_keys">Schlüssel importieren</string>
@@ -106,7 +107,7 @@
   <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>
-  <string name="label_force_v3_signature">Alte OpenPGPv3 Unterschriften erzwingen</string>
+  <string name="label_force_v3_signature">Erzwinge alte OpenPGPv3-Signaturen</string>
   <string name="label_key_id">Schlüssel-ID</string>
   <string name="label_creation">Erstellungsdatum</string>
   <string name="label_expiry">Ablaufdatum</string>
@@ -160,21 +161,24 @@
   <string name="flag_authenticate">Authentifizieren</string>
   <!--sentences-->
   <string name="wrong_passphrase">Falsches Passwort.</string>
-  <string name="set_a_passphrase">Zuerst ein Passwort setzen.</string>
+  <string name="set_a_passphrase">Zuerst muss ein Passwort gesetzt werden.</string>
   <string name="no_filemanager_installed">Kein passender Dateimanager installiert.</string>
   <string name="passphrases_do_not_match">Die Passwörter stimmten nicht überein.</string>
+  <string name="passphrase_must_not_be_empty">Bitte ein Passwort eingeben.</string>
   <string name="passphrase_for_symmetric_encryption">Symmetrische Verschlüsselung.</string>
   <string name="passphrase_for">Passwort für \'%s\' eingeben</string>
   <string name="file_delete_confirmation">%s\nwirklich löschen?</string>
   <string name="file_delete_successful">Erfolgreich gelöscht.</string>
   <string name="no_file_selected">Zuerst eine Datei auswählen.</string>
-  <string name="enter_passphrase_twice">Passwort zweimal eingeben.</string>
-  <string name="select_encryption_key">Mindestens einen Schlüssel zum verschlüsseln auswählen.</string>
+  <string name="enter_passphrase_twice">Das Passwort bitte zweimal eingeben.</string>
+  <string name="select_encryption_key">Mindestens einen Schlüssel zum Verschlüsseln auswählen.</string>
   <string name="select_encryption_or_signature_key">Mindestens einen Schlüssel zum Verschlüsseln oder einen zum Signieren auswählen.</string>
   <string name="specify_file_to_encrypt_to">Bitte angeben, in welche Datei verschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. </string>
   <string name="specify_file_to_decrypt_to">Bitte angeben, in welche Datei entschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. </string>
   <string name="specify_file_to_export_to">Bitte angeben, in welche Datei exportiert werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. </string>
+  <string name="key_deletion_confirmation_multi">Möchtest du wirklich alle ausgewählten öffentlichen 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>
@@ -196,6 +200,7 @@
   <string name="key_exported">1 Schlüssel erfolgreich exportiert.</string>
   <string name="keys_exported">%d Schlüssel erfolgreich exportiert.</string>
   <string name="no_keys_exported">Keine Schlüssel exportiert.</string>
+  <string name="key_creation_el_gamal_info">Beachte: Nur Unterschlüssel unterstützen ElGamal.</string>
   <string name="key_creation_weak_rsa_info">Beachte: RSA-Schlüssel mit einer Schlüssellänge von 1024-Bits oder weniger werden als unsicher angesehen und können daher nicht für neue Schlüssel erstellt werden.</string>
   <string name="key_not_found">Schlüssel %08X konnte nicht gefunden werden.</string>
   <plurals name="keys_found">
@@ -207,11 +212,8 @@
     <item quantity="other">%d schlechte private Schlüssel ignoriert. Evtl. wurden sie mit folgender Option exportiert:\n --export-secret-subkeys\nUnbedingt mit der Option \n --export-secret-keys\nexportieren.</item>
   </plurals>
   <string name="key_send_success">Schlüssel wurde erfolgreich hochgeladen.</string>
-  <string name="key_certify_success">Schlüssel erfolgreich signiert</string>
   <string name="list_empty">Diese Liste ist leer!</string>
-  <string name="nfc_successful">Schlüssel erfolgreich mit NFC Beam gesendet!</string>
   <string name="key_copied_to_clipboard">Schlüssel wurde in die Zwischenablage kopiert!</string>
-  <string name="key_has_already_been_certified">Dieser Schlüssel wurde schon signiert!</string>
   <string name="select_key_to_sign">Bitte wähle einen Signaturschlüssel!</string>
   <string name="key_too_big_for_sharing">Schlüssel ist zu groß um so geteilt zu werden!</string>
   <!--errors
@@ -237,13 +239,13 @@
   <string name="error_could_not_extract_private_key">Privater Schlüssel konnte nicht extrahiert werden</string>
   <string name="error_expiry_must_come_after_creation">Ablaufdatum muss später sein als das Erstellungsdatum</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Binäre Daten ohne Datei im Dateisystem werden nicht unterstützt. Dies wird nur durch ACTION_ENCRYPT_STREAM_AND_RETURN unterstützt.</string>
-  <string name="error_jelly_bean_needed">Android 4.1 alias Jelly Bean wird benötigt um Androids NFC-Beam nutzen zu können!</string>
+  <string name="error_only_files_are_supported">Binäre Daten ohne ohne Datei im Dateisystem werden nicht unterstützt.</string>
+  <string name="error_jelly_bean_needed">Android 4.1 wird benötigt um Androids NFC Beam nutzen zu können!</string>
   <string name="error_nfc_needed">NFC steht auf diesem Gerät nicht zur Verfügung!</string>
   <string name="error_nothing_import">Nichts zu importieren!</string>
   <string name="error_keyserver_insufficient_query">Unzureichende Serveranfrage</string>
-  <string name="error_keyserver_query">Keyserveranfrage fehlgeschlagen</string>
-  <string name="error_keyserver_too_many_responses">Zu viele Antworten</string>
+  <string name="error_keyserver_query">Anfrage fehlgeschlagen</string>
+  <string name="error_keyserver_too_many_responses">Zu viele mögliche Schlüssel. Verfeinere deine Suchanfrage!</string>
   <string name="error_import_file_no_content">Datei ist leer</string>
   <string name="error_generic_report_bug">Ein allgemeiner Fehler trat auf, bitte schreiben Sie einen neuen Bugreport für OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
@@ -252,26 +254,26 @@
   </plurals>
   <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">Erledigt</string>
+  <string name="progress_done">Fertig.</string>
   <string name="progress_cancel">Abbrechen</string>
-  <string name="progress_saving">speichern…</string>
-  <string name="progress_importing">importieren…</string>
-  <string name="progress_exporting">exportieren…</string>
-  <string name="progress_building_key">erstelle Schlüssel…</string>
+  <string name="progress_saving">wird gespeichert…</string>
+  <string name="progress_importing">wird importiert…</string>
+  <string name="progress_exporting">wird exportiert…</string>
+  <string name="progress_building_key">Schlüssel wird erstellt…</string>
   <string name="progress_certifying_master_key">Hauptschlüssel wird beglaubigt…</string>
-  <string name="progress_building_master_key">erstelle Hauptring…</string>
-  <string name="progress_adding_sub_keys">füge Unterschlüssel hinzu…</string>
+  <string name="progress_building_master_key">Hauptschlüssel wird erstellt…</string>
+  <string name="progress_adding_sub_keys">Unterschlüssel wird hinzugefügt…</string>
   <string name="progress_saving_key_ring">Schlüssel wird gespeichert…</string>
   <plurals name="progress_exporting_key">
     <item quantity="one">Schlüssel wird exportiert…</item>
     <item quantity="other">Schlüssel werden exportiert…</item>
   </plurals>
   <plurals name="progress_generating">
-    <item quantity="one">erstelle Schlüssel, das kann bis zu 3 Minuten dauern…</item>
-    <item quantity="other">erstelle Schlüssel, das kann bis zu 3 Minuten dauern…</item>
+    <item quantity="one">Schlüssel wird erstellt, das kann bis zu 3 Minuten dauern…</item>
+    <item quantity="other">Schlüssel wird erstellt, das kann bis zu 3 Minuten dauern…</item>
   </plurals>
-  <string name="progress_extracting_signature_key">extrahiere Signaturschlüssel…</string>
-  <string name="progress_extracting_key">extrahiere Schlüssel…</string>
+  <string name="progress_extracting_signature_key">Signaturschlüssel wird extrahiert…</string>
+  <string name="progress_extracting_key">Schlüssel wird extrahiert…</string>
   <string name="progress_preparing_streams">Datenstrom wird vorbereitet…</string>
   <string name="progress_encrypting">Daten werden verschlüsselt…</string>
   <string name="progress_decrypting">Daten werden entschlüsselt…</string>
@@ -279,7 +281,7 @@
   <string name="progress_generating_signature">Signatur wird erstellt…</string>
   <string name="progress_processing_signature">Signatur wird verarbeitet…</string>
   <string name="progress_verifying_signature">Signatur wird verifiziert…</string>
-  <string name="progress_signing">signiere…</string>
+  <string name="progress_signing">wird signiert…</string>
   <string name="progress_reading_data">Daten werden gelesen…</string>
   <string name="progress_finding_key">Schlüssel wird gesucht…</string>
   <string name="progress_decompressing_data">Daten werden entpackt…</string>
@@ -318,14 +320,14 @@
   <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>
-  <string name="import_clipboard_button">Füge den Schlüssel aus der Zwischenablage ein</string>
+  <string name="import_clipboard_button">Schlüssel aus der Zwischenablage einfügen</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Datei mit OpenKeychain entschlüsseln</string>
   <string name="intent_import_key">Schlüssel mit OpenKeychain importieren</string>
   <string name="intent_send_encrypt">Mit OpenKeychain verschlüsseln</string>
   <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_no_apps">Keine registrierten Anwendungen vorhanden!\n\nAnwendungen können Zugriff auf OpenKeychain anfordern. Nachdem Zugriff erlaubt 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>
@@ -338,16 +340,16 @@
   <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_text">Folgende Anwendung beantragt Zugriff auf OpenKeychains API.\nZugriff erlauben?\n\nVORSICHT: Sollten Sie nicht wissen, warum diese Anfrage erscheint, sollten Sie den Zugriff nicht erlauben! 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>
   <string name="api_register_error_select_key">Bitte einen Schlüssel auswählen!</string>
   <string name="api_select_pub_keys_missing_text">Für diese Benutzer-IDs wurden keine öffentlichen Schlüssel gefunden:</string>
   <string name="api_select_pub_keys_dublicates_text">Für diese Benutzer-IDs existieren mehrere öffentliche Schlüssel:</string>
   <string name="api_select_pub_keys_text">Bitte die Liste der Empfänger überprüfen!</string>
-  <string name="api_error_wrong_signature">Signaturüberprüfung fehlgeschlagen! Haben Sie diese App von einer anderen Quelle installiert? Wenn Sie eine Attacke ausschliessen können, sollten Sie die Registrierung der App in OpenKeychain widerrufen und die App erneut registrieren.</string>
+  <string name="api_error_wrong_signature">Signaturüberprüfung fehlgeschlagen! Haben Sie diese Anwendung aus einer anderen Quelle installiert? Wenn Sie eine Attacke ausschliessen können, sollten Sie die Registrierung der App in OpenKeychain widerrufen und die Anwendung erneut registrieren.</string>
   <!--Share-->
-  <string name="share_qr_code_dialog_title">Über QR Code teilen</string>
+  <string name="share_qr_code_dialog_title">Über QR-Code teilen</string>
   <string name="share_qr_code_dialog_start">Mit \'Weiter\' durch alle QR-Codes gehen und diese nacheinander scannen.</string>
   <string name="share_qr_code_dialog_fingerprint_text">Fingerabdruck:</string>
   <string name="share_qr_code_dialog_progress">QR-Code mit ID %1$d von %2$d</string>
@@ -358,24 +360,26 @@
     <item quantity="other">%d Schlüssel ausgewählt.</item>
   </plurals>
   <string name="key_list_empty_text1">Keine Schlüssel verfügbar…</string>
-  <string name="key_list_empty_text2">Du kannst anfangen OpenPGP Keychain zu benutzen indem du</string>
+  <string name="key_list_empty_text2">Du kannst anfangen OpenKeychain zu benutzen indem du</string>
   <string name="key_list_empty_text3">oder</string>
   <string name="key_list_empty_button_create">deinen eigenen Schlüssel erstellst</string>
   <string name="key_list_empty_button_import">existierende Schlüssel importierst.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Diesen Schlüssel bearbeiten</string>
+  <string name="key_view_action_encrypt">Mit diesem Schlüssel verschlüsseln</string>
+  <string name="key_view_action_certify">Diesen Schlüssel beglaubigen</string>
   <string name="key_view_tab_main">Info</string>
-  <string name="key_view_tab_certs">Zertifikationen</string>
+  <string name="key_view_tab_certs">Beglaubigungen</string>
   <!--Navigation Drawer-->
   <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_apps">Registrierte Anwendungen</string>
-  <string name="drawer_open">Menu öffnen</string>
-  <string name="drawer_close">Menu schließen</string>
+  <string name="drawer_open">Menü öffnen</string>
+  <string name="drawer_close">Menü schließen</string>
   <string name="edit">Bearbeiten</string>
   <string name="my_keys">Meine Schlüssel</string>
-  <string name="label_secret_key">Geheime Schlüssel</string>
+  <string name="label_secret_key">Private Schlüssel</string>
   <string name="secret_key_yes">verfügbar</string>
   <string name="secret_key_no">nicht verfügbar</string>
   <!--hints-->
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 1bf4686cb..e57b6091f 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -212,11 +212,8 @@
     <item quantity="other">%d malas claves secretas ignoradas. Quizás hayas exportado con la opción\n--export-secret-subkeys\nAsegúrate de que exportas con\n--export-secret-keys\nen su lugar.</item>
   </plurals>
   <string name="key_send_success">Clave cargada al servidor satisfactoriamente</string>
-  <string name="key_certify_success">Clave firmada satisfactoriamente</string>
   <string name="list_empty">¡Esta lista está vacía!</string>
-  <string name="nfc_successful">¡Clave enviada satisfactoriamente con NFC Beam!</string>
   <string name="key_copied_to_clipboard">¡La clave ha sido copiada al portapapeles!</string>
-  <string name="key_has_already_been_certified">¡La clave ya ha sido firmada!</string>
   <string name="select_key_to_sign">¡Por favor, selecciona la clave que se usará para firmar!</string>
   <string name="key_too_big_for_sharing">¡La clave es demasiado grande para ser compartida de esta forma!</string>
   <!--errors
@@ -242,13 +239,10 @@
   <string name="error_could_not_extract_private_key">no se puede extraer la clave privada</string>
   <string name="error_expiry_must_come_after_creation">la fecha de caducidad debe ser posterior a la fecha de creación</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Dirigir datos binarios sin un archivo real en el sistema de archivos es incompatible. Esto solo es compatible con ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">!Necesitas Android 4.1 alias Jelly Bean para poder usar la característica NFC Beam!</string>
   <string name="error_nfc_needed">¡NFC no está disponible en tu dispositivo!</string>
   <string name="error_nothing_import">¡Nada que importar!</string>
   <string name="error_keyserver_insufficient_query">Consulta al servidor insuficiente</string>
   <string name="error_keyserver_query">La consulta al servidor de claves ha fallado</string>
-  <string name="error_keyserver_too_many_responses">Demasiadas respuestas</string>
   <string name="error_import_file_no_content">El archivo está vacio</string>
   <string name="error_generic_report_bug">Ha ocurrido un error genérico, por favor, informa de este bug a OpenKeychain</string>
   <plurals name="error_import_non_pgp_part">
@@ -403,7 +397,6 @@
   <string name="section_signer_id">Firmante</string>
   <string name="section_cert">Detalles del certificado</string>
   <string name="label_user_id">Identificador del usuario</string>
-  <string name="unknown_uid"><![CDATA[<desconocido>]]></string>
   <string name="empty_certs">No hay certificados para esta clave</string>
   <string name="section_uids_to_sign">IDs de usuario para firmar</string>
   <string name="cert_default">predeterminado</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 0738586d5..1b9bd41b8 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -13,6 +13,8 @@
   <string name="title_key_server_preference">Préférences du serveur de clefs</string>
   <string name="title_change_passphrase">Modifier la phrase de passe</string>
   <string name="title_set_passphrase">Définir la phrase de passe</string>
+  <string name="title_share_with">Partager avec...</string>
+  <string name="title_share_file">Partager le fichier avec...</string>
   <string name="title_encrypt_to_file">Chiffrer vers un fichier</string>
   <string name="title_decrypt_to_file">Déchiffrer vers un fichier</string>
   <string name="title_import_keys">importer des clefs</string>
@@ -108,6 +110,7 @@
   <string name="label_message_compression">Compression des messages</string>
   <string name="label_file_compression">Compression des fichiers</string>
   <string name="label_force_v3_signature">Forcer les anciennes signatures OpenPGP v3</string>
+  <string name="label_keyservers">Serveurs de clefs</string>
   <string name="label_key_id">ID de le clef</string>
   <string name="label_creation">Création</string>
   <string name="label_expiry">Expiration</string>
@@ -132,6 +135,14 @@
   <string name="can_sign">peut signer</string>
   <string name="expired">expiré</string>
   <string name="revoked">révoquée</string>
+  <plurals name="n_keys">
+    <item quantity="one">1 clef</item>
+    <item quantity="other">%d clefs</item>
+  </plurals>
+  <plurals name="n_keyservers">
+    <item quantity="one">%d serveur de clefs</item>
+    <item quantity="other">%d serveur de clefs</item>
+  </plurals>
   <string name="secret_key">Clef secrète :</string>
   <!--choice-->
   <string name="choice_none">Aucune</string>
@@ -216,11 +227,8 @@
     <item quantity="other">%d mauvaises clefs ignorées. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item>
   </plurals>
   <string name="key_send_success">Clef téléversée vers le serveur avec succès</string>
-  <string name="key_certify_success">Clef signée avec succès</string>
   <string name="list_empty">Cette liste est vide !</string>
-  <string name="nfc_successful">Clef envoyée par NFC BEAM avec succès !</string>
   <string name="key_copied_to_clipboard">La clef a été copié vers le presse-papiers !</string>
-  <string name="key_has_already_been_certified">La clef a déjà été signée !</string>
   <string name="select_key_to_sign">Veuillez choisir une clef a utiliser pour la signature !</string>
   <string name="key_too_big_for_sharing">La clef est trop grosse pour être partagée ainsi !</string>
   <!--errors
@@ -246,13 +254,10 @@
   <string name="error_could_not_extract_private_key">impossible d\'extraire la clef privée</string>
   <string name="error_expiry_must_come_after_creation">la date d\'expiration doit venir après la date de création</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Les données binaires directes sans fichier dans le système de fichiers ne sont pas prises en charge. C\'est uniquement pris en charge par ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Vous devez avoir Android 4.1 Jelly Bean pour utiliser la fonction NFC Beam !</string>
   <string name="error_nfc_needed">La NFC n\'est pas disponible sur votre appareil !</string>
   <string name="error_nothing_import">Rien à importer !</string>
   <string name="error_keyserver_insufficient_query">Requête serveur insuffisante</string>
   <string name="error_keyserver_query">Échec lors de l\'interrogation du serveur de clefs</string>
-  <string name="error_keyserver_too_many_responses">Trop de réponses</string>
   <string name="error_import_file_no_content">Le fichier n\'a pas de contenu</string>
   <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
@@ -394,9 +399,12 @@
   <string name="key_list_empty_button_import">Importer des clefs.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Modifier cette clef</string>
+  <string name="key_view_action_encrypt">Chiffrer avec cette clef</string>
+  <string name="key_view_action_certify">Certifier cette clef</string>
   <string name="key_view_tab_main">Infos</string>
   <string name="key_view_tab_certs">Certifications</string>
   <!--Navigation Drawer-->
+  <string name="nav_keys">Clefs</string>
   <string name="nav_encrypt">Signer et chiffrer</string>
   <string name="nav_decrypt">Déchiffrer et vérifier</string>
   <string name="nav_import">Importer les clefs</string>
@@ -415,7 +423,6 @@
   <string name="section_signer_id">Signataire</string>
   <string name="section_cert">Détails du certificat</string>
   <string name="label_user_id">ID utilisateur</string>
-  <string name="unknown_uid"><![CDATA[<unknown>]]></string>
   <string name="empty_certs">Aucun certificat pour cette clef</string>
   <string name="section_uids_to_sign">ID utilisateur pour signer</string>
   <string name="cert_default">valeur par défaut</string>
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index df33c67c6..c744bdda7 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -13,6 +13,8 @@
   <string name="title_key_server_preference">Preferenze Server delle Chiavi</string>
   <string name="title_change_passphrase">Cambia Frase Di Accesso</string>
   <string name="title_set_passphrase">Imposta Frase di Accesso</string>
+  <string name="title_share_with">Condividi con...</string>
+  <string name="title_share_file">Condividi file con...</string>
   <string name="title_encrypt_to_file">Codifica File</string>
   <string name="title_decrypt_to_file">Decodifica File</string>
   <string name="title_import_keys">Importa Chiavi</string>
@@ -108,6 +110,7 @@
   <string name="label_message_compression">Compressione Messaggio</string>
   <string name="label_file_compression">Compressione File</string>
   <string name="label_force_v3_signature">Forza vecchie Firme OpenPGPv3</string>
+  <string name="label_keyservers">Server Chiavi</string>
   <string name="label_key_id">ID Chiave</string>
   <string name="label_creation">Creazione</string>
   <string name="label_expiry">Scadenza</string>
@@ -132,6 +135,14 @@
   <string name="can_sign">puo\' firmare</string>
   <string name="expired">scaduto</string>
   <string name="revoked">revocato</string>
+  <plurals name="n_keys">
+    <item quantity="one">1 chiave</item>
+    <item quantity="other">%d chiavi</item>
+  </plurals>
+  <plurals name="n_keyservers">
+    <item quantity="one">%d server delle chiavi</item>
+    <item quantity="other">%d server delle chiavi</item>
+  </plurals>
   <string name="secret_key">Chiave Privata:</string>
   <!--choice-->
   <string name="choice_none">Nessuno</string>
@@ -170,12 +181,15 @@
   <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="encrypt_sign_successful">Firmato e/o codificato con successo.</string>
+  <string name="encrypt_sign_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>
   <string name="specify_file_to_encrypt_to">Perfavore specifica quale file codificare.\nATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
   <string name="specify_file_to_decrypt_to">Perfavore specifica quale file decodificare.\nATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
   <string name="specify_file_to_export_to">Perfavore specifica su quale file esportare.\nATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
+  <string name="key_deletion_confirmation_multi">Vuoi veramente eliminare tutte le chiavi pubbliche 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>
@@ -213,11 +227,8 @@
     <item quantity="other">%d chiavi private non valide  ignorate. Forse hai esportato con opzione\n--export-secret-subkeys\nAssicurati di esportare con\n--export-secret-keys\ninvece.</item>
   </plurals>
   <string name="key_send_success">Chiave caricata con successo sul server</string>
-  <string name="key_certify_success">Chiave firmata correttamente</string>
   <string name="list_empty">Lista vuota!</string>
-  <string name="nfc_successful">Chiave inviata tramite NFC Beam!</string>
   <string name="key_copied_to_clipboard">Chiave copiata negli appunti!</string>
-  <string name="key_has_already_been_certified">La chiave e\' gia\' firmata!</string>
   <string name="select_key_to_sign">Per favore seleziona la chiave per la firma!</string>
   <string name="key_too_big_for_sharing">Chiave troppo grande per essere condivisa in questo modo!</string>
   <!--errors
@@ -243,13 +254,10 @@
   <string name="error_could_not_extract_private_key">impossibile estrarre la chiave privata</string>
   <string name="error_expiry_must_come_after_creation">La data di scadenza deve essere postuma quella di creazione</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Flusso di dati diretto senza file corrispettivo nel filesystem non e\' supportato. Supportato soltanto da ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Devi avere Android 4.1 alias Jelly Bean per usare Android NFC Beam!</string>
   <string name="error_nfc_needed">NFC non disponibile nel tuo dispositivo!</string>
   <string name="error_nothing_import">Niente da importare!</string>
   <string name="error_keyserver_insufficient_query">Query di server insufficiente</string>
   <string name="error_keyserver_query">Interrogazione del server delle chiavi fallita</string>
-  <string name="error_keyserver_too_many_responses">Troppi responsi</string>
   <string name="error_import_file_no_content">Il File non ha contenuti</string>
   <string name="error_generic_report_bug">Si è verificato un errore generico, si prega di creare una nuova segnalazione di errore per OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
@@ -258,6 +266,14 @@
   </plurals>
   <string name="error_change_something_first">È necessario apportare modifiche al portachiavi prima prima che sia possibile salvarlo</string>
   <!--results shown after decryption/verification-->
+  <string name="decrypt_result_invalid_signature">Firma non valida!</string>
+  <string name="decrypt_result_signature_unknown_pub_key">Chiave pubblica sconosciuta</string>
+  <string name="decrypt_result_signature_uncertified">Firma valida (non certificata)</string>
+  <string name="decrypt_result_signature_certified">Firma valida (certificata)</string>
+  <string name="decrypt_result_decrypted">Decodificato correttamente</string>
+  <string name="decrypt_result_decrypted_unknown_pub_key">Decodificata correttamente ma chiave pubblica sconosciuta</string>
+  <string name="decrypt_result_decrypted_and_signature_uncertified">Decodifcato correttamente e firma valida (non certificata)</string>
+  <string name="decrypt_result_decrypted_and_signature_certified">Decodifcato correttamente e firma valida (certificata)</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Fatto.</string>
   <string name="progress_cancel">Annulla</string>
@@ -383,9 +399,12 @@
   <string name="key_list_empty_button_import">importazione chiavi.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Modifica chiave</string>
+  <string name="key_view_action_encrypt">Codifica con questa chiave</string>
+  <string name="key_view_action_certify">Certifica questa chiave</string>
   <string name="key_view_tab_main">Info</string>
   <string name="key_view_tab_certs">Certificazioni</string>
   <!--Navigation Drawer-->
+  <string name="nav_keys">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>
@@ -404,7 +423,6 @@
   <string name="section_signer_id">Firmatario</string>
   <string name="section_cert">Dettagli Certificato</string>
   <string name="label_user_id">ID Utente</string>
-  <string name="unknown_uid"><![CDATA[<sconosciuto>]]></string>
   <string name="empty_certs">Nessun certificato per questa chiave</string>
   <string name="section_uids_to_sign">ID Utente da firmare</string>
   <string name="cert_default">predefiniti</string>
@@ -424,4 +442,8 @@
   <string name="can_certify_not">non può certificare</string>
   <string name="error_key_not_found">Chiave non trovata!</string>
   <string name="error_key_processing">Errore di elaborazione chiave!</string>
+  <string name="no_subkey">sottochiave non disponibile</string>
+  <string name="key_stripped">ripulito</string>
+  <string name="secret_cannot_multiple">Le chiavi segrete possono essere cancellate solo individualmente!</string>
+  <string name="title_view_cert">Visualizza Dettagli Certificati</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 1122e2c96..cad362fb1 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -13,6 +13,8 @@
   <string name="title_key_server_preference">鍵サーバ設定</string>
   <string name="title_change_passphrase">パスフレーズの変更</string>
   <string name="title_set_passphrase">パスフレーズの設定</string>
+  <string name="title_share_with">...で共有</string>
+  <string name="title_share_file">...でファイルの共有</string>
   <string name="title_encrypt_to_file">暗号化してファイルに</string>
   <string name="title_decrypt_to_file">復号化してファイルに</string>
   <string name="title_import_keys">鍵のインポート</string>
@@ -108,6 +110,7 @@
   <string name="label_message_compression">メッセージの圧縮</string>
   <string name="label_file_compression">ファイルの圧縮</string>
   <string name="label_force_v3_signature">強制的に古いOpenPGPV3形式の署名にする</string>
+  <string name="label_keyservers">鍵サーバ</string>
   <string name="label_key_id">鍵ID</string>
   <string name="label_creation">生成</string>
   <string name="label_expiry">満了</string>
@@ -131,6 +134,12 @@
   <string name="can_sign">署名可能</string>
   <string name="expired">期限切れ</string>
   <string name="revoked">破棄</string>
+  <plurals name="n_keys">
+    <item quantity="other">%d個の鍵</item>
+  </plurals>
+  <plurals name="n_keyservers">
+    <item quantity="other">%d の鍵サーバ</item>
+  </plurals>
   <string name="secret_key">秘密鍵:</string>
   <!--choice-->
   <string name="choice_none">無し</string>
@@ -177,6 +186,7 @@
   <string name="specify_file_to_encrypt_to">どのファイルを暗号化するか決めてください。\n注意: 既存のファイルがあると上書きされます。</string>
   <string name="specify_file_to_decrypt_to">どのファイルを復号化するか決めてください。\n注意: 既存のファイルがあると上書きされます。</string>
   <string name="specify_file_to_export_to">どのファイルをエクスポートするか決めてください。\n注意: 既存のファイルがあると上書きされます。</string>
+  <string name="key_deletion_confirmation_multi">選択したすべての公開鍵を削除して本当に良いのですか?\nこれは元に戻せません!</string>
   <string name="secret_key_deletion_confirmation">秘密鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
   <string name="ask_save_changed_key">あなたは鍵輪に変更を加えました、これを保存しますか?</string>
   <string name="ask_empty_id_ok">あなたは空のユーザーIDを追加しました、このまま続けますか?</string>
@@ -208,11 +218,8 @@
     <item quantity="other">%d の問題ある鍵を無視しました。 おそらく次のオプションでエクスポートしています\n --export-secret-subkeys\n代りに次のオプションでエクスポートしてください。\n --export-secret-keys</item>
   </plurals>
   <string name="key_send_success">鍵を鍵サーバにアップロードしました</string>
-  <string name="key_certify_success">鍵に署名しました。</string>
   <string name="list_empty">このリストは空です!</string>
-  <string name="nfc_successful">NFCビームで鍵を送信しました!</string>
   <string name="key_copied_to_clipboard">鍵はクリプボードにコピーされました!</string>
-  <string name="key_has_already_been_certified">鍵はすでに署名されています!</string>
   <string name="select_key_to_sign">署名に使う鍵を選択して下さい!</string>
   <string name="key_too_big_for_sharing">この共有方法では鍵が大きすぎます!</string>
   <!--errors
@@ -238,13 +245,10 @@
   <string name="error_could_not_extract_private_key">秘密鍵を取り出すことができません</string>
   <string name="error_expiry_must_come_after_creation">期限日時は生成日時より後である必要があります</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">ファイルシステムに存在するファイルではないバイナリデータはサポートされません。 ACTION_ENCRYPT_STREAM_AND_RETURN でのみサポートされます。</string>
-  <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1 (Jelly Bean) が必要です!</string>
   <string name="error_nfc_needed">あなたのデバイスにはNFCが存在しません!</string>
   <string name="error_nothing_import">インポートするものがありません!</string>
   <string name="error_keyserver_insufficient_query">サーバへのクエリーが不足しています</string>
   <string name="error_keyserver_query">鍵サーバへのクエリーが失敗</string>
-  <string name="error_keyserver_too_many_responses">レスポンスが多すぎます</string>
   <string name="error_import_file_no_content">ファイルに内容がありません</string>
   <string name="error_generic_report_bug">一般エラーが発生しました、この新しいバグの情報をOpenKeychainプロジェクトに送ってください</string>
   <plurals name="error_import_non_pgp_part">
@@ -381,9 +385,12 @@
   <string name="key_list_empty_button_import">鍵のインポート。</string>
   <!--Key view-->
   <string name="key_view_action_edit">この鍵の編集</string>
+  <string name="key_view_action_encrypt">この鍵で暗号化</string>
+  <string name="key_view_action_certify">この鍵で検証</string>
   <string name="key_view_tab_main">情報</string>
   <string name="key_view_tab_certs">証明</string>
   <!--Navigation Drawer-->
+  <string name="nav_keys">鍵</string>
   <string name="nav_encrypt">署名と暗号化</string>
   <string name="nav_decrypt">復号化と検証</string>
   <string name="nav_import">鍵のインポート</string>
@@ -402,7 +409,6 @@
   <string name="section_signer_id">署名者</string>
   <string name="section_cert">証明の詳細</string>
   <string name="label_user_id">ユーザーID</string>
-  <string name="unknown_uid"><![CDATA[<unknown>]]></string>
   <string name="empty_certs">この鍵に証明がない</string>
   <string name="section_uids_to_sign">署名に使うユーザーID</string>
   <string name="cert_default">デフォルト</string>
@@ -422,4 +428,8 @@
   <string name="can_certify_not">検証不能</string>
   <string name="error_key_not_found">鍵が見当りません!</string>
   <string name="error_key_processing">鍵処理のエラー!</string>
+  <string name="no_subkey">副鍵がありません</string>
+  <string name="key_stripped">スリム化</string>
+  <string name="secret_cannot_multiple">秘密鍵は個別にしか削除できません!</string>
+  <string name="title_view_cert">証明の詳細を見る</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
index a2faafb0c..ea4414b59 100644
--- a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
@@ -114,9 +114,7 @@
   <string name="key_exported">1 sleutel succesvol geëxporteerd.</string>
   <string name="no_keys_exported">Geen sleutels geëxporteerd.</string>
   <string name="key_not_found">Kan de sleutel %08X niet vinden.</string>
-  <string name="key_certify_success">Sleutel succesvol ondertekend</string>
   <string name="list_empty">Lijst is leeg</string>
-  <string name="nfc_successful">Sleutel succesvol verzonden met Beam</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
@@ -136,8 +134,6 @@
   <string name="error_wrong_passphrase">wachtwoord verekerd</string>
   <string name="error_could_not_extract_private_key">kan privésleutel niet uitpakken</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Ruwe invoer van binaire gegevens wordt niet ondersteund, alleen bij ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Android 4.1 Jelly Bean of hoger is vereist voor NFC Beam.</string>
   <string name="error_nfc_needed">Uw apparaat biedt geen ondersteuning voor NFC</string>
   <string name="error_nothing_import">Niets te importeren</string>
   <!--results shown after decryption/verification-->
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index a8627eaea..6cf4feb20 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -220,11 +220,8 @@
     <item quantity="other">zignorowano %d niepoprawnych kluczy prywatnych. Prawdopodobnie zostały wyeksportowane przy uzyciu opcji\n --export-secret-subkeys\nUpewnij się że eksportujesz je z opcją\n --export-secret-keys\nktóra jest poprawna.</item>
   </plurals>
   <string name="key_send_success">Pomyślnie wysłano klucz na serwer</string>
-  <string name="key_certify_success">Pomyślnie podpisano klucz</string>
   <string name="list_empty">Lista jest pusta!</string>
-  <string name="nfc_successful">Pomyślnie wysłano klucz przez NFC!</string>
   <string name="key_copied_to_clipboard">Klucz został skopiowany do schowka!</string>
-  <string name="key_has_already_been_certified">Klucz został już wcześniej podpisany!</string>
   <string name="select_key_to_sign">Wybierz klucz, który zostanie użyty do podpisania!</string>
   <string name="key_too_big_for_sharing">Klucz ma za duży rozmiar by być udostępniony w ten sposób!</string>
   <!--errors
@@ -250,13 +247,10 @@
   <string name="error_could_not_extract_private_key">nie można wyodrębnić klucza prywatnego</string>
   <string name="error_expiry_must_come_after_creation">data wygaśnięcia musi być późniejsza niż data stworzenia</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Dane binarne pozbawione pliku nie są obsługiwane. To jest wspierane tylko dla akcji ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Potrzebujesz Androida 4.1 Jelly Bean, aby korzystać z Android NFC Beam!</string>
   <string name="error_nfc_needed">NCF jest niedostępne na twoim urządzeniu</string>
   <string name="error_nothing_import">Nie ma nic do zaimportowania!</string>
   <string name="error_keyserver_insufficient_query">Niewystarczające zapytanie do serwera</string>
   <string name="error_keyserver_query">Odpytywanie serwera zakończone niepowodzeniem</string>
-  <string name="error_keyserver_too_many_responses">Za dużo odpowiedzi</string>
   <string name="error_import_file_no_content">Plik jest pusty</string>
   <string name="error_generic_report_bug">Wystąpił błąd ogólny, proszę zgłoś go autorom OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
@@ -416,7 +410,6 @@
   <string name="section_signer_id">Podpisujący</string>
   <string name="section_cert">Szczegóły certyfikatu</string>
   <string name="label_user_id">Identyfikator użytkownika</string>
-  <string name="unknown_uid"><![CDATA[<unknown>]]></string>
   <string name="empty_certs">Nie ma certyfikatów dla tego klucza</string>
   <string name="section_uids_to_sign">Identyfikator użytkownika do podpisu</string>
   <string name="cert_default">domyślny</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 4468b5fda..5a40a8d96 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -215,11 +215,8 @@
     <item quantity="other">%d плохих секретных ключей проигнорировано. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys\n</item>
   </plurals>
   <string name="key_send_success">Ключ успешно загружен на сервер</string>
-  <string name="key_certify_success">Ключ успешно подписан</string>
   <string name="list_empty">Список пуст!</string>
-  <string name="nfc_successful">Ключ успешно передан через NFC!</string>
   <string name="key_copied_to_clipboard">Ключ скопирован в буфер обмена!</string>
-  <string name="key_has_already_been_certified">Ключ уже был подписан ранее!</string>
   <string name="select_key_to_sign">Выберите ключ, используемый для подписи!</string>
   <string name="key_too_big_for_sharing">Ключ слишком большой для этого способа передачи!</string>
   <!--errors
@@ -245,13 +242,10 @@
   <string name="error_could_not_extract_private_key">не удалось извлечь личный ключ</string>
   <string name="error_expiry_must_come_after_creation">срок годности не может быть раньше даты создания</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Прямая передача данных без использования файла в памяти устройства не поддерживается. Это возможно только для ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Для использования NFC Beam требуется Android 4.1+ !</string>
   <string name="error_nfc_needed">Ваше устройство не поддерживает NFC!</string>
   <string name="error_nothing_import">Нет данных для импорта!</string>
   <string name="error_keyserver_insufficient_query">Ограничение запроса сервера</string>
   <string name="error_keyserver_query">Сбой запроса сервера ключей</string>
-  <string name="error_keyserver_too_many_responses">Слишком много ответов</string>
   <string name="error_import_file_no_content">Файл пуст</string>
   <string name="error_generic_report_bug">Выявлена ошибка. Пожалуйста, сообщите о ней разработчику.</string>
   <plurals name="error_import_non_pgp_part">
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index c2adaa8d4..11256f0ae 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -77,7 +77,6 @@
   <string name="file_delete_successful">Başarıyla silindi.</string>
   <string name="no_file_selected">Önce bir dosya seçin.</string>
   <string name="key_not_found">Anahtar %08X bulunamadı.</string>
-  <string name="key_certify_success">Anahtar başarıyla imzalandı</string>
   <string name="list_empty">Liste boş!</string>
   <!--errors
          no punctuation, all lowercase,
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index fe5c1b3c9..dd74826e3 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -223,11 +223,8 @@
     <item quantity="other">%d поганих секретних ключів проігноровано. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item>
   </plurals>
   <string name="key_send_success">Успішно завантажено ключ на сервер</string>
-  <string name="key_certify_success">Успішно підписаний ключ</string>
   <string name="list_empty">Цей список - порожній!</string>
-  <string name="nfc_successful">Успішно відправлений ключ з NFC променем!</string>
   <string name="key_copied_to_clipboard">Ключ вже скопійовано у буфер обміну!</string>
-  <string name="key_has_already_been_certified">Ключ уже був підписаний раніше!</string>
   <string name="select_key_to_sign">Будь ласка, виберіть ключ, використаний для підписування!</string>
   <string name="key_too_big_for_sharing">Ключ надто великий для цього способу поширення!</string>
   <!--errors
@@ -253,13 +250,10 @@
   <string name="error_could_not_extract_private_key">не можна витягти секретний ключ</string>
   <string name="error_expiry_must_come_after_creation">дата завершення дії має йти після дати створення</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Прямі двійкові дані без справжнього файлу у файловій системі не підтримуються. Підтримується лише  ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Вам потрібний Android 4.1 Jelly Bean для використання функції Androids NFC промінь!</string>
   <string name="error_nfc_needed">NFC недоступний на вашому пристрої!</string>
   <string name="error_nothing_import">Нема що імпортувати!</string>
   <string name="error_keyserver_insufficient_query">Запит обмеженого сервера</string>
   <string name="error_keyserver_query">Збій сервера ключа запиту</string>
-  <string name="error_keyserver_too_many_responses">Забагато відповідей</string>
   <string name="error_import_file_no_content">Файл не має вмісту</string>
   <string name="error_generic_report_bug">Трапилася загальна помилка, будь ласка, створіть новий звіт про помилку для OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
@@ -427,7 +421,6 @@
   <string name="section_signer_id">Підписувач</string>
   <string name="section_cert">Дані сертифікату</string>
   <string name="label_user_id">ІД користувача</string>
-  <string name="unknown_uid"><![CDATA[<unknown>]]></string>
   <string name="empty_certs">Немає сертифікатів для цього ключа</string>
   <string name="section_uids_to_sign">ІД користувача для реєстрації</string>
   <string name="cert_default">типово</string>