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 1197869b5..e414324d0 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
@@ -8,7 +8,7 @@
 <li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
 <li>querying keyservers directly from the import screen</li>
 <li>fix layout and dialog style on Android 2.2-3.0</li>
-<li>fix crash on keys with empty user ids</li>
+<li>Absturz bei leeren Nutzer IDs behoben </li>
 <li>fix crash and empty lists when coming back from signing screen</li>
 <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
 <li>fix upload of key from signing screen</li>
@@ -38,15 +38,15 @@
 <h2>2.0</h2>
 <ul>
 <li>Komlett neu designd</li>
-<li>share public keys via qr codes, nfc beam</li>
+<li>Öffentliche Schlüssel teilen via QR Code, NFC Beam</li>
 <li>Schlüssel signieren</li>
 <li>Schlüssel auf den Server hochladen</li>
-<li>fixes import issues</li>
+<li>Importprobleme behoben</li>
 <li>new AIDL API</li>
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic keyserver support</li>
+<li>Grundlegende Schlüsselserverunterstützung</li>
 <li>app2sd</li>
 <li>mehr Auswahlmöglichkeiten für den Passwortcache: 1, 2, 4, 8, Stunden</li>
 <li>Übersetzungen: norwegisch (Danke, Sander Danielsen), chinesisch (danke, Zhang Fredrick)</li>
@@ -98,8 +98,8 @@
 <h2>1.0.0</h2>
 <ul>
 <li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
-<li>support of more file managers (including ASTRO)</li>
-<li>Slovenian translation</li>
+<li>Unterstützung von mehr Filemanagern (einschließlich ASTRO)</li>
+<li>Slowenische Übersetzung</li>
 <li>Neue Datenbank, viel schneller, weniger Speicherbedarf</li>
 <li>defined Intents and content provider for other apps</li>
 <li>Fehlerbehebungen</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
index d2735f739..a7949dd64 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
@@ -1,7 +1,7 @@
 <html>
 <head></head>
 <body>
-<h2>Getting started</h2>
+<h2>Los gehts</h2>
 <p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
 <p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
@@ -9,7 +9,7 @@
 <h2>Ich habe einen Fehler in OpenKeychain gefunden!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
 
-<h2>Contribute</h2>
+<h2>Unterstützen</h2>
 <p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
 
 <h2>Übersetzungen</h2>
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html
index 863aeee58..23b904995 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html
@@ -3,14 +3,14 @@
 <body>
 <p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p>
 <p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p>
-<p>License: GPLv3+</p>
+<p>授權：GPLv3+</p>
 
 <h2>Developers OpenKeychain</h2>
 <ul>
 <li>Dominik Schürmann (Lead developer)</li>
 <li>Ash Hughes (crypto patches)</li>
 <li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov (UI)</li>
+<li>Bahtiar 'kalkin' Gadimov (介面)</li>
 
 </ul>
 <h2>Developers APG 1.x</h2>
@@ -20,7 +20,7 @@
 <li>Oliver Runge</li>
 <li>Markus Doits</li>
 </ul>
-<h2>Libraries</h2>
+<h2>函式庫</h2>
 <ul>
 <li>
 <a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html
index 88492731c..7a90a794b 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html
@@ -1,12 +1,12 @@
 <html>
 <head></head>
 <body>
-<h2>How to receive keys</h2>
+<h2>如何接收金要</h2>
 <ol>
-<li>Go to your partners contacts and open the contact you want to share.</li>
-<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
-<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
-<li>Tap the card and the content will then load on the your device.</li>
+<li>前往你夥伴裝置上的聯絡人清單，並點選你要分享的聯絡人。</li>
+<li>將兩部裝置背對背貼近(幾乎接觸)，你會感覺到一股震動。</li>
+<li>震動之後你會看見你夥伴的畫面變成卡片狀，並且背景帶有如 Star Trek 般的特效。</li>
+<li>輕觸卡片，內容隨即顯示在你的裝置上。</li>
 </ol>
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
index 3a6443a2f..104bdd545 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
@@ -1,18 +1,18 @@
 <html>
 <head></head>
 <body>
-<h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<h2>快速上手</h2>
+<p>首先你需要屬於你個人的金鑰對，從〝我的金鑰〞選單中建立一個或是使用〝匯入金鑰〞匯入現有的金鑰對。在這之後，你可以下載你朋友的公鑰或者是透過二維條碼或NFC和他交換公鑰。</p>
 
 <p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
-<h2>I found a bug in OpenKeychain!</h2>
-<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+<h2>我在OpenKeychain發現問題！</h2>
+<p>請利用 <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain 項目回報系統</a>回報問題。</p>
 
-<h2>Contribute</h2>
+<h2>發布</h2>
 <p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
 
-<h2>Translations</h2>
+<h2>翻譯</h2>
 <p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
 
 </body>
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html
index 083e055c7..99ffe4c12 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html
@@ -2,10 +2,10 @@
 <head></head>
 <body>
 <ol>
-<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
-<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
-<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
-<li>Tap the card and the content will then load on the other person’s device.</li>
+<li>確定在 "設定" &gt; "更多內容…" &gt; "NFC" 裡面已經開啟 NFC 和 Android Beam。</li>
+<li>將兩部裝置背對背貼近(幾乎接觸)，你會感覺到一股震動。</li>
+<li>震動之後你會看見你夥伴的畫面變成卡片狀，並且背景帶有如 Star Trek 般的特效。</li>
+<li>輕觸卡片，內容隨即顯示在你的裝置上。</li>
 </ol>
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
index 1e0fda3bc..493b81314 100644
--- a/OpenPGP-Keychain/src/main/res/values-de/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
@@ -13,8 +13,10 @@
   <string name="title_preferences">Einstellungen</string>
   <string name="title_api_registered_apps">Registrierte Anwendungen</string>
   <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_send_email">E-Mail senden...</string>
+  <string name="title_send_file">Datei senden</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>
@@ -62,6 +64,8 @@
   <string name="btn_clipboard">Zwischenablage</string>
   <string name="btn_share">Teilen mit…</string>
   <string name="btn_lookup_key">Schlüssel nachschlagen</string>
+  <string name="btn_encryption_advanced_settings_show">Erweiterte Einstellungen anzeigen</string>
+  <string name="btn_encryption_advanced_settings_hide">Erweiterte Einstellungen verbergen</string>
   <!--menu-->
   <string name="menu_preferences">Einstellungen</string>
   <string name="menu_help">Hilfe</string>
@@ -70,15 +74,17 @@
   <string name="menu_import">Importieren</string>
   <string name="menu_import_from_nfc">NFC</string>
   <string name="menu_export_keys">Alle Schlüssel exportieren</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>
   <string name="menu_create_key_expert">Schlüssel erstellen (Experte)</string>
   <string name="menu_search">Suchen</string>
-  <string name="menu_key_server">Schlüsselserver</string>
+  <string name="menu_import_from_key_server">Schlüsselserver</string>
+  <string name="menu_key_server">Schlüsselserver…</string>
   <string name="menu_update_key">Von einem Schlüsselserver aktualisieren</string>
   <string name="menu_export_key_to_server">Auf Schlüsselserver hochladen</string>
-  <string name="menu_share">Teilen</string>
+  <string name="menu_share">Teilen…</string>
   <string name="menu_share_title_fingerprint">Teile Fingerabdruck…</string>
   <string name="menu_share_title">Teile gesamten Schlüssel…</string>
   <string name="menu_share_default_fingerprint">mit…</string>
@@ -91,6 +97,7 @@
   <string name="menu_beam_preferences">Beam-Einstellungen</string>
   <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>
   <!--label-->
   <string name="label_sign">Signieren</string>
   <string name="label_message">Nachricht</string>
@@ -103,6 +110,7 @@
   <string name="label_select_public_keys">Empfänger</string>
   <string name="label_delete_after_encryption">Nach Verschlüsselung löschen</string>
   <string name="label_delete_after_decryption">Nach Entschlüsselung löschen</string>
+  <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>
@@ -121,9 +129,12 @@
   <string name="label_name">Name</string>
   <string name="label_comment">Kommentar</string>
   <string name="label_email">E-Mail</string>
+  <string name="label_sign_user_id">Benutzer ID unterschreiben</string>
+  <string name="label_sign_email">Email unterschreiben</string>
   <string name="label_send_key">Schlüssel nach Beglaubigung auf ausgewählten Schlüsselserver hochladen</string>
   <string name="label_fingerprint">Fingerabdruck</string>
   <string name="select_keys_button_default">Auswählen</string>
+  <string name="expiry_date_dialog_title">Ablaufdatum festsetzen</string>
   <plurals name="select_keys_button">
     <item quantity="one">%d ausgewählt</item>
     <item quantity="other">%d ausgewählt</item>
@@ -131,11 +142,17 @@
   <string name="user_id_no_name">&lt;kein Name&gt;</string>
   <string name="none">&lt;keine&gt;</string>
   <string name="no_key">&lt;kein Schlüssel&gt;</string>
+  <string name="no_email">&lt;Keine E-Mail&gt;</string>
   <string name="unknown_status"></string>
   <string name="can_encrypt">kann verschlüsseln</string>
   <string name="can_sign">kann signieren</string>
   <string name="expired">abgelaufen</string>
   <string name="revoked">zurückgezogen</string>
+  <string name="user_id">Benutzer ID</string>
+  <plurals name="n_contacts">
+    <item quantity="one">1 Kontakt</item>
+    <item quantity="other">%d Kontakte</item>
+  </plurals>
   <plurals name="n_key_servers">
     <item quantity="one">%d Schlüsselserver</item>
     <item quantity="other">%d Schlüsselserver</item>
@@ -191,6 +208,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="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>
     <item quantity="other">%d Schlüssel erfolgreich hinzugefügt</item>
@@ -212,6 +230,7 @@
   <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. Für ElGamal wird die am nächsten liegende Schlüssellänge von 1536, 2048, 3072, 4096 oder 8192 verwendet.</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">
     <item quantity="one">%d Schlüssel gefunden.</item>
@@ -243,6 +262,7 @@
   <string name="error_master_key_must_not_be_el_gamal">Der Hauptschlüssel kann kein ElGamal Schlüssel sein</string>
   <string name="error_unknown_algorithm_choice">Unbekannte Auswahl für Algorithmus</string>
   <string name="error_user_id_needs_a_name">ein Name muss angegeben werden</string>
+  <string name="error_user_id_no_email">keine E-Mail gefunden</string>
   <string name="error_user_id_needs_an_email_address">eine E-Mail-Adresse muss angegeben werden</string>
   <string name="error_key_needs_a_user_id">Mindestens eine Benutzer-ID wird benötigt</string>
   <string name="error_main_user_id_must_not_be_empty">Hauptbenutzer-ID darf nicht leer sein</string>
@@ -265,48 +285,59 @@
   <string name="error_expiry_must_come_after_creation">Ablaufdatum muss später sein als das Erstellungsdatum</string>
   <string name="error_can_not_delete_contact">Sie können diesen Kontakt nicht löschen, denn es ist ihr eigener.</string>
   <string name="error_can_not_delete_contacts">Sie können folgende Kontakte nicht löschen, denn sie gehören Ihnen selbst:\n%s</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_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_can_not_delete_info">
     <item quantity="one">Bitte lösche ihn unter \'Meine Schlüssel\'!</item>
     <item quantity="other">Bitte lösche sie unter \'Meine Schlüssel\'!</item>
   </plurals>
+  <plurals name="error_import_non_pgp_part">
+    <item quantity="one">Ein Teil der geladenen Datei ist ein gültiges OpenPGP Objekt aber kein OpenPGP Schlüssel</item>
+    <item quantity="other">Teile der geladenen Dateien sind gültige OpenPGP Objekte aber keine OpenPGP Schlüssel</item>
+  </plurals>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">fertig.</string>
+  <string name="progress_done">Erledigt</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_generating">erstelle Schlüssel, dies kann bis zu 3 Minuten dauern...</string>
-  <string name="progress_building_key">erstelle Schlüssel...</string>
-  <string name="progress_preparing_master_key">Hauptschlüssel wird vorbereitet...</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_saving_key_ring">Schlüssel wird gespeichert...</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_preparing_master_key">Hauptschlüssel wird vorbereitet…</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_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>
-  <string name="progress_extracting_signature_key">extrahiere Signaturschlüssel...</string>
-  <string name="progress_extracting_key">extrahiere Schlüssel...</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>
-  <string name="progress_preparing_signature">Signatur wird vorbereitet...</string>
-  <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_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>
-  <string name="progress_verifying_integrity">Integrität wird überprüft...</string>
-  <string name="progress_deleting_securely">\'%s\' wird sicher gelöscht...</string>
-  <string name="progress_querying">Anfrage wird gestellt...</string>
+  <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>
+  </plurals>
+  <string name="progress_extracting_signature_key">extrahiere Signaturschlüssel…</string>
+  <string name="progress_extracting_key">extrahiere Schlüssel…</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>
+  <string name="progress_preparing_signature">Signatur wird vorbereitet…</string>
+  <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_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>
+  <string name="progress_verifying_integrity">Integrität wird überprüft…</string>
+  <string name="progress_deleting_securely">\'%s\' wird sicher gelöscht…</string>
+  <string name="progress_querying">Anfrage wird gestellt…</string>
   <!--action strings-->
   <string name="hint_public_keys">Öffentliche Schlüssel suchen</string>
   <string name="hint_secret_keys">Private Schlüssel suchen</string>
-  <string name="action_share_key_with">Teile Schlüssel über...</string>
+  <string name="action_share_key_with">Teile Schlüssel über…</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_1024">1024</string>
@@ -317,6 +348,7 @@
   <string name="compression_very_slow">sehr langsam</string>
   <!--Help-->
   <string name="help_tab_start">Start</string>
+  <string name="help_tab_faq">FAQ</string>
   <string name="help_tab_nfc_beam">NFC-Beam</string>
   <string name="help_tab_changelog">Changelog</string>
   <string name="help_tab_about">Über</string>
@@ -338,6 +370,10 @@
   <string name="import_nfc_help_button">Hilfe</string>
   <string name="import_clipboard_button">Füge den Schlüssel aus der Zwischenablage ein</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_settings_show_advanced">Erweiterte Einstellungen anzeigen</string>
@@ -356,7 +392,7 @@
   <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 ausschließen 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 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>
   <!--Share-->
   <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>
@@ -374,6 +410,7 @@
   <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">Für diesen Kontakt verschlüsseln</string>
   <string name="key_view_action_certify">Schlüssel dieses Kontakts beglaubigen</string>
   <string name="key_view_tab_main">Info</string>
@@ -387,4 +424,12 @@
   <string name="nav_apps">Registrierte Anwendungen</string>
   <string name="drawer_open">Menu öffnen</string>
   <string name="drawer_close">Menu 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="secret_key_yes">verfügbar</string>
+  <string name="secret_key_no">nicht verfügbar</string>
+  <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 84b39c221..094dfe28a 100644
--- a/OpenPGP-Keychain/src/main/res/values-el/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-el/strings.xml
@@ -50,4 +50,5 @@
   <!--Key list-->
   <!--Key view-->
   <!--Navigation Drawer-->
+  <!--hints-->
 </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 41dc629aa..ce365b776 100644
--- a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
@@ -97,4 +97,5 @@
   <!--Key list-->
   <!--Key view-->
   <!--Navigation Drawer-->
+  <!--hints-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
index c643a3cd8..85c77b0da 100644
--- a/OpenPGP-Keychain/src/main/res/values-es/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
@@ -16,6 +16,7 @@
   <string name="title_change_passphrase">Cambiar frase de contraseña</string>
   <string name="title_set_passphrase">Establecer frase de contraseña</string>
   <string name="title_send_email">Enviar email...</string>
+  <string name="title_send_file">Enviar archivo...</string>
   <string name="title_encrypt_to_file">Cifrar hacia archivo</string>
   <string name="title_decrypt_to_file">Descifrar hacia archivo</string>
   <string name="title_import_keys">Importar claves</string>
@@ -63,6 +64,8 @@
   <string name="btn_clipboard">Portapapeles</string>
   <string name="btn_share">Compartir con...</string>
   <string name="btn_lookup_key">Buscar clave</string>
+  <string name="btn_encryption_advanced_settings_show">Mostrar ajustes avanzados</string>
+  <string name="btn_encryption_advanced_settings_hide">Ocultar ajustes avanzados</string>
   <!--menu-->
   <string name="menu_preferences">Ajustes</string>
   <string name="menu_help">Ayuda</string>
@@ -71,15 +74,17 @@
   <string name="menu_import">Importar</string>
   <string name="menu_import_from_nfc">Importar desde NFC</string>
   <string name="menu_export_keys">Exportar todas las claves</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>
   <string name="menu_create_key_expert">Crear clave (experto)</string>
   <string name="menu_search">Buscar</string>
-  <string name="menu_key_server">Importar desde servidor de claves</string>
+  <string name="menu_import_from_key_server">Servidor de claves...</string>
+  <string name="menu_key_server">Servidor de claves...</string>
   <string name="menu_update_key">Actualizar desde servidor de claves</string>
   <string name="menu_export_key_to_server">Cargar al servidor de claves</string>
-  <string name="menu_share">Compartir</string>
+  <string name="menu_share">Compartir...</string>
   <string name="menu_share_title_fingerprint">Compartir la huella digital...</string>
   <string name="menu_share_title">Compartir la clave completa...</string>
   <string name="menu_share_default_fingerprint">con...</string>
@@ -105,6 +110,7 @@
   <string name="label_select_public_keys">Destinatarios</string>
   <string name="label_delete_after_encryption">Borrar después del cifrado</string>
   <string name="label_delete_after_decryption">Borrar después del descifrado</string>
+  <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>
@@ -123,6 +129,8 @@
   <string name="label_name">Nombre</string>
   <string name="label_comment">Comentario</string>
   <string name="label_email">Email</string>
+  <string name="label_sign_user_id">Firmar Id de usuario</string>
+  <string name="label_sign_email">Firmar correo</string>
   <string name="label_send_key">Cargar clave al servidor de claves seleccionado después de la certificación</string>
   <string name="label_fingerprint">Huella digital</string>
   <string name="select_keys_button_default">Seleccionar</string>
@@ -134,11 +142,17 @@
   <string name="user_id_no_name">&lt;sin nombre&gt;</string>
   <string name="none">&lt;ninguna&gt;</string>
   <string name="no_key">&lt;sin clave&gt;</string>
+  <string name="no_email">&lt;No hay un email&gt;</string>
   <string name="unknown_status"></string>
   <string name="can_encrypt">se puede cifrar</string>
   <string name="can_sign">se puede firmar</string>
   <string name="expired">caducado</string>
   <string name="revoked">revocado</string>
+  <string name="user_id">ID de usuario</string>
+  <plurals name="n_contacts">
+    <item quantity="one">1 contacto</item>
+    <item quantity="other">%d contactos</item>
+  </plurals>
   <plurals name="n_key_servers">
     <item quantity="one">%d servidor de claves</item>
     <item quantity="other">%d servidores de claves</item>
@@ -194,6 +208,7 @@
   <string name="key_deletion_confirmation">¿Quieres realmente borrar la clave \'%s\'?\n¡No podrás deshacerlo!</string>
   <string name="key_deletion_confirmation_multi">¿Quieres realmente borrar todas las claves seleccionadas?\n¡No podrás deshacerlo!</string>
   <string name="secret_key_deletion_confirmation">¿Quieres realmente borrar la clave SECRETA \'%s\'?\n¡No podrás deshacerlo!</string>
+  <string name="also_export_secret_keys">¿Exportar también las claves secretas?</string>
   <plurals name="keys_added_and_updated_1">
     <item quantity="one">%d clave añadida satisfactoriamente</item>
     <item quantity="other">%d claves añadidas satisfactoriamente</item>
@@ -215,6 +230,7 @@
   <string name="keys_exported">%d claves exportadas satisfactoriamente.</string>
   <string name="no_keys_exported">No se han exportado claves.</string>
   <string name="key_creation_el_gamal_info">Nota: solo las subclaves son compatibles con ElGamal, y para ElGamal debe usarse el tamaño de clave más próximo de 1536, 2048, 3072, 4096, o 8192.</string>
+  <string name="key_creation_weak_rsa_info">Nota: generar una clave RSA de longitud 1024-bit o menos está considerado inseguro y desactivado para generar nuevas claves.</string>
   <string name="key_not_found">No se puede encontrar la clave %08X.</string>
   <plurals name="keys_found">
     <item quantity="one">Se ha encontrado %d clave.</item>
@@ -246,6 +262,7 @@
   <string name="error_master_key_must_not_be_el_gamal">la clave maestra no puede ser una clave ElGamal</string>
   <string name="error_unknown_algorithm_choice">elegido algoritmo desconocido</string>
   <string name="error_user_id_needs_a_name">necesitas determinar un nombre</string>
+  <string name="error_user_id_no_email">no se ha encontrado un email</string>
   <string name="error_user_id_needs_an_email_address">tienes que determinar una dirección de email</string>
   <string name="error_key_needs_a_user_id">necesitas al menos una ID de usuario</string>
   <string name="error_main_user_id_must_not_be_empty">la ID del usuario principal no puede estar vacía</string>
@@ -271,17 +288,22 @@
   <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_can_not_delete_info">
     <item quantity="one">Por favor, bórralo desde la pantalla \'Mis claves\'!</item>
     <item quantity="other">Por favor, bórralos desde la pantalla \'Mis claves\'!</item>
   </plurals>
+  <plurals name="error_import_non_pgp_part">
+    <item quantity="one">parte del archivo cargado es un objeto OpenPGP válido pero no una clave OpenPGP</item>
+    <item quantity="other">partes del archivo cargado son objetos OpenPGP válidos pero no claves OpenPGP</item>
+  </plurals>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">hecho.</string>
-  <string name="progress_cancel">cancelar</string>
+  <string name="progress_done">Hecho.</string>
+  <string name="progress_cancel">Cancelar</string>
   <string name="progress_saving">guardando...</string>
   <string name="progress_importing">importando...</string>
   <string name="progress_exporting">exportando...</string>
-  <string name="progress_generating">generando la clave, esto puede tardar más de 3 minutos...</string>
   <string name="progress_building_key">construyendo la clave...</string>
   <string name="progress_preparing_master_key">preparando la clave maestra...</string>
   <string name="progress_certifying_master_key">certificando la clave maestra...</string>
@@ -292,6 +314,10 @@
     <item quantity="one">exportando clave...</item>
     <item quantity="other">exportando claves...</item>
   </plurals>
+  <plurals name="progress_generating">
+    <item quantity="one">generando clave, esto puede tardar más de 3 minutos...</item>
+    <item quantity="other">generando claves, esto puede tardar más de 3 minutos...</item>
+  </plurals>
   <string name="progress_extracting_signature_key">extrayendo la clave de firma...</string>
   <string name="progress_extracting_key">extrayendo la clave...</string>
   <string name="progress_preparing_streams">preparando las transmisiones...</string>
@@ -322,6 +348,7 @@
   <string name="compression_very_slow">muy lento</string>
   <!--Help-->
   <string name="help_tab_start">Comenzar</string>
+  <string name="help_tab_faq">FAQ</string>
   <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_changelog">Registro de cambios</string>
   <string name="help_tab_about">A cerca de</string>
@@ -383,6 +410,7 @@
   <string name="key_list_empty_button_create">crear tu propia clave</string>
   <string name="key_list_empty_button_import">importar claves</string>
   <!--Key view-->
+  <string name="key_view_action_edit">Editar esta clave</string>
   <string name="key_view_action_encrypt">Cifrar hacia este contacto</string>
   <string name="key_view_action_certify">Certificar la clave de este contacto</string>
   <string name="key_view_tab_main">Información</string>
@@ -396,4 +424,12 @@
   <string name="nav_apps">Aplicaciones registradas</string>
   <string name="drawer_open">Abrir el Navigation Drawer</string>
   <string name="drawer_close">Cerrar el Navigation Drawer</string>
+  <string name="edit">Editar</string>
+  <string name="my_keys">Mis claves</string>
+  <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-->
 </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 6bb115049..3d00a143f 100644
--- a/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml
@@ -23,4 +23,5 @@
   <!--Key list-->
   <!--Key view-->
   <!--Navigation Drawer-->
+  <!--hints-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
index d99bbcd7c..4f92f7855 100644
--- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
@@ -64,6 +64,8 @@
   <string name="btn_clipboard">Presse-papiers</string>
   <string name="btn_share">Partager avec...</string>
   <string name="btn_lookup_key">Rechercher la clef</string>
+  <string name="btn_encryption_advanced_settings_show">Afficher les paramètres avancés</string>
+  <string name="btn_encryption_advanced_settings_hide">Masquer les paramètres avancés</string>
   <!--menu-->
   <string name="menu_preferences">Paramètres</string>
   <string name="menu_help">Aide</string>
@@ -72,15 +74,17 @@
   <string name="menu_import">Importer</string>
   <string name="menu_import_from_nfc">Importer avec NFC</string>
   <string name="menu_export_keys">Exporter toutes les clefs</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>
   <string name="menu_create_key_expert">Créer une clef (expert)</string>
   <string name="menu_search">Rechercher</string>
-  <string name="menu_key_server">Importer depuis le serveur de clefs</string>
+  <string name="menu_import_from_key_server">Serveur de clefs</string>
+  <string name="menu_key_server">Serveur de clefs...</string>
   <string name="menu_update_key">Mettre à jour depuis le serveur de clefs</string>
   <string name="menu_export_key_to_server">Téléverser vers le serveur de clefs</string>
-  <string name="menu_share">Partager</string>
+  <string name="menu_share">Partager...</string>
   <string name="menu_share_title_fingerprint">Partager l\'empreinte...</string>
   <string name="menu_share_title">Partager la clef entière...</string>
   <string name="menu_share_default_fingerprint">avec...</string>
@@ -138,12 +142,17 @@
   <string name="user_id_no_name">&lt;aucun nom&gt;</string>
   <string name="none">&lt;aucune&gt;</string>
   <string name="no_key">&lt;pas de clef&gt;</string>
+  <string name="no_email">&lt;aucun courriel&gt;</string>
   <string name="unknown_status"></string>
   <string name="can_encrypt">peut chiffrer</string>
   <string name="can_sign">peut signer</string>
   <string name="expired">expiré</string>
   <string name="revoked">révoquée</string>
   <string name="user_id">ID utilisateur</string>
+  <plurals name="n_contacts">
+    <item quantity="one">1 contact</item>
+    <item quantity="other">%d contacts</item>
+  </plurals>
   <plurals name="n_key_servers">
     <item quantity="one">%d serveur de clefs</item>
     <item quantity="other">%d serveurs de clefs</item>
@@ -199,6 +208,7 @@
   <string name="key_deletion_confirmation">Voulez-vous vraiment supprimer la clef %s ?\nVous ne pourrez pas la restituer !</string>
   <string name="key_deletion_confirmation_multi">Voulez-vous vraiment supprimer toutes les clefs choisies ?\nCeci est irréversible !</string>
   <string name="secret_key_deletion_confirmation">Voulez-vous vraiment supprimer la clef SECRÈTE %s ?\nVous ne pourrez pas la restituer !</string>
+  <string name="also_export_secret_keys">Exporter aussi les clefs secrètes?</string>
   <plurals name="keys_added_and_updated_1">
     <item quantity="one">%d clef ajoutée avec succès</item>
     <item quantity="other">%d clefs ajoutées avec succès</item>
@@ -220,6 +230,7 @@
   <string name="keys_exported">%d clefs exportées avec succès.</string>
   <string name="no_keys_exported">Aucune clef exportée.</string>
   <string name="key_creation_el_gamal_info">Note : seules les sous-clefs prennent en charge ElGamal, et pour ElGamal la taille de clef la plus proche de 1 536, 2 048, 3 072, 4 096 ou  8 192 sera utilisée.</string>
+  <string name="key_creation_weak_rsa_info">Note : générer des clefs RSA d\'une longueur de 1024 bits ou moins est considéré non sécuritaire et est désactivé pour la génération de nouvelles clefs.</string>
   <string name="key_not_found">Clef %08X introuvable.</string>
   <plurals name="keys_found">
     <item quantity="one">%d clef trouvée.</item>
@@ -251,6 +262,7 @@
   <string name="error_master_key_must_not_be_el_gamal">la clef maîtresse ne peut être une clef ElGama</string>
   <string name="error_unknown_algorithm_choice">choix d\'algorhitme inconnu</string>
   <string name="error_user_id_needs_a_name">vous devez spécifier un nom</string>
+  <string name="error_user_id_no_email">aucun courriel trouvé</string>
   <string name="error_user_id_needs_an_email_address">vous devez spécifier une adresse courriel</string>
   <string name="error_key_needs_a_user_id">vous avez besoin d\'au moins un ID utilisateur</string>
   <string name="error_main_user_id_must_not_be_empty">l\'ID utilisateur principal ne doit pas être vide</string>
@@ -287,12 +299,11 @@
     <item quantity="other">certaines parties du fichier chargé sont des objets OpenPGP valides mais pas des clefs OpenPGP</item>
   </plurals>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">fait.</string>
-  <string name="progress_cancel">annuler</string>
+  <string name="progress_done">Terminé.</string>
+  <string name="progress_cancel">Annuler</string>
   <string name="progress_saving">sauvegarde...</string>
   <string name="progress_importing">importation...</string>
   <string name="progress_exporting">exportation...</string>
-  <string name="progress_generating">génération de la clef, ceci peut prendre jusqu\'à 3 minutes...</string>
   <string name="progress_building_key">assemblage de la clef...</string>
   <string name="progress_preparing_master_key">préparation de la clef maîtresse...</string>
   <string name="progress_certifying_master_key">certification de la clef maîtresse...</string>
@@ -303,6 +314,10 @@
     <item quantity="one">exportation de la clef...</item>
     <item quantity="other">exportation des clefs...</item>
   </plurals>
+  <plurals name="progress_generating">
+    <item quantity="one">génération de la clef, ceci peut prendre jusqu\'à 3 min...</item>
+    <item quantity="other">génération des clefs, ceci peut prendre jusqu\'à 3 min...</item>
+  </plurals>
   <string name="progress_extracting_signature_key">extraction de la clef de signature...</string>
   <string name="progress_extracting_key">extraction de la clef...</string>
   <string name="progress_preparing_streams">préparation des flux...</string>
@@ -333,6 +348,7 @@
   <string name="compression_very_slow">très lent</string>
   <!--Help-->
   <string name="help_tab_start">Commencer</string>
+  <string name="help_tab_faq">FAQ</string>
   <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_changelog">Journal des changements</string>
   <string name="help_tab_about">À propos de</string>
@@ -394,6 +410,7 @@
   <string name="key_list_empty_button_create">créer votre propre clef</string>
   <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 vers ce contact</string>
   <string name="key_view_action_certify">Certifier la clef de ce contact</string>
   <string name="key_view_tab_main">Infos</string>
@@ -407,4 +424,12 @@
   <string name="nav_apps">Applis enregistrées</string>
   <string name="drawer_open">Ouvrir le tiroir de navigation</string>
   <string name="drawer_close">Fermer le tiroir de navigation</string>
+  <string name="edit">Modifier</string>
+  <string name="my_keys">Mes clefs</string>
+  <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-->
 </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 f9e7074da..b125de448 100644
--- a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
@@ -64,6 +64,8 @@
   <string name="btn_clipboard">Appunti</string>
   <string name="btn_share">Condividi con...</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>
   <!--menu-->
   <string name="menu_preferences">Impostazioni</string>
   <string name="menu_help">Aiuto</string>
@@ -72,15 +74,17 @@
   <string name="menu_import">Importa</string>
   <string name="menu_import_from_nfc">Importa tramite NFC</string>
   <string name="menu_export_keys">Esporta tutte le chiavi</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>
   <string name="menu_create_key_expert">Crea chiave (esperto)</string>
   <string name="menu_search">Cerca</string>
-  <string name="menu_key_server">Importa dal server delle chiavi</string>
+  <string name="menu_import_from_key_server">Server delle Chiavi</string>
+  <string name="menu_key_server">Server delle Chiavi...</string>
   <string name="menu_update_key">Aggiorna dal server delle chiavi</string>
   <string name="menu_export_key_to_server">Carica chiave nel server</string>
-  <string name="menu_share">Condividi</string>
+  <string name="menu_share">Condividi...</string>
   <string name="menu_share_title_fingerprint">Condivi impronta...</string>
   <string name="menu_share_title">Condividi intera chiave...</string>
   <string name="menu_share_default_fingerprint">con..</string>
@@ -138,12 +142,17 @@
   <string name="user_id_no_name">&lt;nessun nome&gt;</string>
   <string name="none">&lt;nessuno&gt;</string>
   <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_sign">puo\' firmare</string>
   <string name="expired">scaduto</string>
   <string name="revoked">revocato</string>
   <string name="user_id">ID Utente</string>
+  <plurals name="n_contacts">
+    <item quantity="one">1 contatto</item>
+    <item quantity="other">%d contatti</item>
+  </plurals>
   <plurals name="n_key_servers">
     <item quantity="one">%d server delle chiavi</item>
     <item quantity="other">%d server delle chiavi</item>
@@ -199,6 +208,7 @@
   <string name="key_deletion_confirmation">Vuoi veramente eliminare la chiave \'%s\'?\nNon potrai annullare!</string>
   <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="also_export_secret_keys">Esportare anche le chiavi segrete?</string>
   <plurals name="keys_added_and_updated_1">
     <item quantity="one">%d chiave aggiunta correttamente</item>
     <item quantity="other">%d chiavi aggiunte correttamente</item>
@@ -220,6 +230,7 @@
   <string name="keys_exported">%d chiavi esportate correttamente.</string>
   <string name="no_keys_exported">Nessuna chiave esportata.</string>
   <string name="key_creation_el_gamal_info">Nota: solo le sottochiavi supportano ElGamal, e per ElGamal verra\' usata la grandezza chiave piu\' vicina a 1536, 2048, 3072, 4096 o 8192.</string>
+  <string name="key_creation_weak_rsa_info">Nota: la generazione di chiavi RSA con lunghezza pari a 1024 bit o inferiore è considerata non sicura ed è disabilitata per la generazione di nuove chiavi.</string>
   <string name="key_not_found">Impossibile trovare la chiave %08X.</string>
   <plurals name="keys_found">
     <item quantity="one">Trovata %d chiave.</item>
@@ -251,6 +262,7 @@
   <string name="error_master_key_must_not_be_el_gamal">La chiave principale non puo\' essere ElGamal</string>
   <string name="error_unknown_algorithm_choice">opzione algoritmo sconosciuta</string>
   <string name="error_user_id_needs_a_name">devi specificare un nome</string>
+  <string name="error_user_id_no_email">Nessuna email trovata</string>
   <string name="error_user_id_needs_an_email_address">devi specificare un indirizzo email</string>
   <string name="error_key_needs_a_user_id">necessario almeno un id utente</string>
   <string name="error_main_user_id_must_not_be_empty">id utente principale non puo\' essere vuoto</string>
@@ -287,12 +299,11 @@
     <item quantity="other">parti del file caricato sono oggetti OpenPGP validi, ma non chavi OpenPGP</item>
   </plurals>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">fatto.</string>
-  <string name="progress_cancel">cancella</string>
+  <string name="progress_done">Fatto.</string>
+  <string name="progress_cancel">Annulla</string>
   <string name="progress_saving">salvataggio...</string>
   <string name="progress_importing">importazione...</string>
   <string name="progress_exporting">esportazione...</string>
-  <string name="progress_generating">generazione chiave, richiede fino a 3 minuti...</string>
   <string name="progress_building_key">fabbricazione chiave...</string>
   <string name="progress_preparing_master_key">preparazione chiave principale...</string>
   <string name="progress_certifying_master_key">certificazione chiave principale...</string>
@@ -303,6 +314,10 @@
     <item quantity="one">esportazione chiave...</item>
     <item quantity="other">esportazione chiavi...</item>
   </plurals>
+  <plurals name="progress_generating">
+    <item quantity="one">generazione chiave, sono necessari fino a 3 minuti...</item>
+    <item quantity="other">generazione chiavi, sono necessari fino a 3 minuti...</item>
+  </plurals>
   <string name="progress_extracting_signature_key">estrazione chiavi di firma...</string>
   <string name="progress_extracting_key">estrazione chiave...</string>
   <string name="progress_preparing_streams">preparazione flussi...</string>
@@ -333,6 +348,7 @@
   <string name="compression_very_slow">molto lento</string>
   <!--Help-->
   <string name="help_tab_start">Inizia</string>
+  <string name="help_tab_faq">FAQ</string>
   <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_changelog">Novita\'</string>
   <string name="help_tab_about">Info</string>
@@ -394,6 +410,7 @@
   <string name="key_list_empty_button_create">creazione della tua chiave</string>
   <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 a questo contatto</string>
   <string name="key_view_action_certify">Certifica la chiave di questo contatto</string>
   <string name="key_view_tab_main">Info</string>
@@ -407,4 +424,12 @@
   <string name="nav_apps">App Registrate</string>
   <string name="drawer_open">Apri drawer di navigazione</string>
   <string name="drawer_close">Chiudi drawer di navigazione</string>
+  <string name="edit">Modifica</string>
+  <string name="my_keys">Le Mie Chiavi</string>
+  <string name="label_secret_key">Chiave Segreta</string>
+  <string name="secret_key_yes">disponibile</string>
+  <string name="secret_key_no">non disponibile</string>
+  <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 e5ee5ecc0..97f0c6eed 100644
--- a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
@@ -62,8 +62,10 @@
   <string name="btn_next">次</string>
   <string name="btn_back">戻る</string>
   <string name="btn_clipboard">クリップボード</string>
-  <string name="btn_share">共有...</string>
+  <string name="btn_share">...で共有</string>
   <string name="btn_lookup_key">鍵検出</string>
+  <string name="btn_encryption_advanced_settings_show">拡張設定を表示</string>
+  <string name="btn_encryption_advanced_settings_hide">拡張設定を隠す</string>
   <!--menu-->
   <string name="menu_preferences">設定</string>
   <string name="menu_help">ヘルプ</string>
@@ -72,15 +74,17 @@
   <string name="menu_import">インポート</string>
   <string name="menu_import_from_nfc">NFCからインポート</string>
   <string name="menu_export_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>
   <string name="menu_create_key_expert">鍵の生成(上級)</string>
   <string name="menu_search">検索</string>
-  <string name="menu_key_server">鍵サーバからのインポート</string>
+  <string name="menu_import_from_key_server">鍵サーバ</string>
+  <string name="menu_key_server">鍵サーバ...</string>
   <string name="menu_update_key">鍵サーバからの更新</string>
   <string name="menu_export_key_to_server">鍵サーバへのアップロード</string>
-  <string name="menu_share">共有</string>
+  <string name="menu_share">共有...</string>
   <string name="menu_share_title_fingerprint">指紋の共有...</string>
   <string name="menu_share_title">すべての鍵の共有...</string>
   <string name="menu_share_default_fingerprint">...(指紋)</string>
@@ -137,12 +141,16 @@
   <string name="user_id_no_name">&lt;名前なし&gt;</string>
   <string name="none">&lt;無し&gt;</string>
   <string name="no_key">&lt;鍵無し&gt;</string>
+  <string name="no_email">&lt;メールなし&gt;</string>
   <string name="unknown_status"></string>
   <string name="can_encrypt">暗号化可能</string>
   <string name="can_sign">署名可能</string>
   <string name="expired">期限切れ</string>
   <string name="revoked">破棄</string>
   <string name="user_id">ユーザーID</string>
+  <plurals name="n_contacts">
+    <item quantity="other">%d個の連絡先</item>
+  </plurals>
   <plurals name="n_key_servers">
     <item quantity="other">%d の鍵サーバ</item>
   </plurals>
@@ -197,6 +205,7 @@
   <string name="key_deletion_confirmation">鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
   <string name="key_deletion_confirmation_multi">選択したすべての鍵を本当に削除してよいですか?\nこれは元に戻せません。</string>
   <string name="secret_key_deletion_confirmation">秘密鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
+  <string name="also_export_secret_keys">秘密鍵もエクスポートしますか?</string>
   <plurals name="keys_added_and_updated_1">
     <item quantity="other">%d の鍵を追加しました</item>
   </plurals>
@@ -214,6 +223,7 @@
   <string name="keys_exported">%d の鍵をエクスポートしました。</string>
   <string name="no_keys_exported">鍵をエクスポートしていません。</string>
   <string name="key_creation_el_gamal_info">備考: 副鍵として ElGamalだけがサポートされ, ElGamal は鍵サイズとして1536, 2048, 3072, 4096, 8192 だけが使えます。</string>
+  <string name="key_creation_weak_rsa_info">付記: 長さ1024bitかそれ以下で生成されたRSA鍵は安全とはみなされず、新な鍵の生成は無効にされています。</string>
   <string name="key_not_found">鍵 %08X は見付かりませんでした。</string>
   <plurals name="keys_found">
     <item quantity="other">%d の鍵を発見。</item>
@@ -243,6 +253,7 @@
   <string name="error_master_key_must_not_be_el_gamal">主鍵を ElGamal にすることはできません</string>
   <string name="error_unknown_algorithm_choice">未知のアルゴリズムを選択しています</string>
   <string name="error_user_id_needs_a_name">名前を特定する必要があります</string>
+  <string name="error_user_id_no_email">メールが見付かりません</string>
   <string name="error_user_id_needs_an_email_address">Eメールアドレスを特定する必要があります</string>
   <string name="error_key_needs_a_user_id">最低でも1つのユーザIDが必要です</string>
   <string name="error_main_user_id_must_not_be_empty">主ユーザIDは空にすることはできません</string>
@@ -282,7 +293,6 @@
   <string name="progress_saving">保存...</string>
   <string name="progress_importing">インポート...</string>
   <string name="progress_exporting">エクスポート...</string>
-  <string name="progress_generating">鍵の生成、3分ほどかかります...</string>
   <string name="progress_building_key">鍵の構築中...</string>
   <string name="progress_preparing_master_key">主鍵の準備中...</string>
   <string name="progress_certifying_master_key">主鍵の検証中...</string>
@@ -292,6 +302,9 @@
   <plurals name="progress_exporting_key">
     <item quantity="other">鍵のエクスポート...</item>
   </plurals>
+  <plurals name="progress_generating">
+    <item quantity="other">鍵の生成中、最大3分ほどかかります...</item>
+  </plurals>
   <string name="progress_extracting_signature_key">署名鍵の取り出し中...</string>
   <string name="progress_extracting_key">鍵の取り出し中...</string>
   <string name="progress_preparing_streams">ストリームの準備中...</string>
@@ -311,7 +324,7 @@
   <!--action strings-->
   <string name="hint_public_keys">公開鍵の検索</string>
   <string name="hint_secret_keys">秘密鍵の検索</string>
-  <string name="action_share_key_with">鍵の共有...</string>
+  <string name="action_share_key_with">...で鍵の共有</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_1024">1024</string>
@@ -322,6 +335,7 @@
   <string name="compression_very_slow">とても遅い</string>
   <!--Help-->
   <string name="help_tab_start">開始</string>
+  <string name="help_tab_faq">FAQ</string>
   <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_changelog">Changelog</string>
   <string name="help_tab_about">これについて</string>
@@ -349,7 +363,7 @@
   <!--Remote API-->
   <string name="api_no_apps">登録されていないアプリケーション!\n\nサードパーティアプリケーションはOpenKeychainにアクセスを要求できます。アクセスを与えた後、それらはここにリストされます。</string>
   <string name="api_settings_show_advanced">拡張設定を表示</string>
-  <string name="api_settings_hide_advanced">拡張設定を非表示</string>
+  <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_save">保存</string>
@@ -381,6 +395,7 @@
   <string name="key_list_empty_button_create">あなた所有の鍵を作る</string>
   <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>
@@ -394,4 +409,12 @@
   <string name="nav_apps">登録済みのアプリ</string>
   <string name="drawer_open">ナビゲーションドロワーを開く</string>
   <string name="drawer_close">ナビゲーションドロワーを閉める</string>
+  <string name="edit">編集</string>
+  <string name="my_keys">自分の鍵</string>
+  <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-->
 </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 de6ba554d..a7f674ea0 100644
--- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
@@ -170,7 +170,6 @@
   <string name="error_nfc_needed">Uw apparaat biedt geen ondersteuning voor NFC</string>
   <string name="error_nothing_import">Niets te importeren</string>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">gereed.</string>
   <string name="progress_saving">opslaan...</string>
   <string name="progress_importing">importeren...</string>
   <string name="progress_exporting">exporteren...</string>
@@ -236,4 +235,5 @@
   <!--Key list-->
   <!--Key view-->
   <!--Navigation Drawer-->
+  <!--hints-->
 </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 6bb115049..3d00a143f 100644
--- a/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
@@ -23,4 +23,5 @@
   <!--Key list-->
   <!--Key view-->
   <!--Navigation Drawer-->
+  <!--hints-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
index 22f676ccb..55e778bee 100644
--- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
@@ -16,6 +16,7 @@
   <string name="title_change_passphrase">Изменить пароль</string>
   <string name="title_set_passphrase">Задать пароль</string>
   <string name="title_send_email">Отправить...</string>
+  <string name="title_send_file">Отправить файл</string>
   <string name="title_encrypt_to_file">Зашифровать в файл</string>
   <string name="title_decrypt_to_file">Расшифровать в файл</string>
   <string name="title_import_keys">Импорт ключей</string>
@@ -63,6 +64,8 @@
   <string name="btn_clipboard">Буфер обмена</string>
   <string name="btn_share">Поделиться...</string>
   <string name="btn_lookup_key">Найти ключ</string>
+  <string name="btn_encryption_advanced_settings_show">Показать расширенные настройки</string>
+  <string name="btn_encryption_advanced_settings_hide">Скрыть расширенные настройки</string>
   <!--menu-->
   <string name="menu_preferences">Настройки</string>
   <string name="menu_help">Помощь</string>
@@ -76,10 +79,8 @@
   <string name="menu_create_key">Создать ключ</string>
   <string name="menu_create_key_expert">Создать ключ (эксперт)</string>
   <string name="menu_search">Поиск</string>
-  <string name="menu_key_server">Импорт с сервера ключей</string>
   <string name="menu_update_key">Обновить с сервера ключей</string>
   <string name="menu_export_key_to_server">Загрузить на сервер ключей</string>
-  <string name="menu_share">Отправить...</string>
   <string name="menu_share_title_fingerprint">Отправить отпечаток...</string>
   <string name="menu_share_title">Отправить ключ...</string>
   <string name="menu_share_default_fingerprint">Отправить</string>
@@ -105,6 +106,7 @@
   <string name="label_select_public_keys">Получатели</string>
   <string name="label_delete_after_encryption">Удалить после шифрования</string>
   <string name="label_delete_after_decryption">Удалить после расшифровки</string>
+  <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>
@@ -135,6 +137,7 @@
   <string name="user_id_no_name">&lt;нет имени&gt;</string>
   <string name="none">&lt;нет&gt;</string>
   <string name="no_key">&lt;нет ключа&gt;</string>
+  <string name="no_email">&lt;нет email&gt;</string>
   <string name="unknown_status"></string>
   <string name="can_encrypt">шифрование</string>
   <string name="can_sign">подпись</string>
@@ -254,6 +257,7 @@
   <string name="error_master_key_must_not_be_el_gamal">ключ ElGamal не может быть основным</string>
   <string name="error_unknown_algorithm_choice">выбран неизвестный алгоритм</string>
   <string name="error_user_id_needs_a_name">необходимо указать имя</string>
+  <string name="error_user_id_no_email">email не найден</string>
   <string name="error_user_id_needs_an_email_address">необходимо указать email</string>
   <string name="error_key_needs_a_user_id">необходим хотя бы один id пользователя</string>
   <string name="error_main_user_id_must_not_be_empty">основная запись пользователя не может быть пустой</string>
@@ -279,18 +283,24 @@
   <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_can_not_delete_info">
     <item quantity="one">Пожалуйста, удалите его в разделе \'Мои ключи\'!</item>
     <item quantity="few">Пожалуйста, удалите их в разделе \'Мои ключи\'!</item>
     <item quantity="other">Пожалуйста, удалите их в разделе \'Мои ключи\'!</item>
   </plurals>
+  <plurals name="error_import_non_pgp_part">
+    <item quantity="one">часть загруженного файла содержит данные OpenPGP, но это не ключ</item>
+    <item quantity="few">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
+    <item quantity="other">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
+  </plurals>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">готово.</string>
-  <string name="progress_cancel">отмена</string>
+  <string name="progress_done">Готово.</string>
+  <string name="progress_cancel">Отмена</string>
   <string name="progress_saving">сохранение...</string>
   <string name="progress_importing">импорт...</string>
   <string name="progress_exporting">экспорт...</string>
-  <string name="progress_generating">создание ключа. это может занять до 3 минут...</string>
   <string name="progress_building_key">создание ключа...</string>
   <string name="progress_preparing_master_key">подготовка основного ключа...</string>
   <string name="progress_certifying_master_key">сертификация основного ключа...</string>
@@ -302,6 +312,11 @@
     <item quantity="few">экспорт ключей...</item>
     <item quantity="other">экспорт ключей...</item>
   </plurals>
+  <plurals name="progress_generating">
+    <item quantity="one">создание ключа. это может занять до 3 минут...</item>
+    <item quantity="few">создание ключей. это может занять до 3 минут...</item>
+    <item quantity="other">создание ключей. это может занять до 3 минут...</item>
+  </plurals>
   <string name="progress_extracting_signature_key">извлечение подписи ключа...</string>
   <string name="progress_extracting_key">извлечение ключа...</string>
   <string name="progress_preparing_streams">подготовка к передаче...</string>
@@ -408,4 +423,5 @@
   <string name="nav_apps">Связанные приложения</string>
   <string name="drawer_open">Открыть панель навигации</string>
   <string name="drawer_close">Закрыть панель навигации</string>
+  <!--hints-->
 </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 6bb115049..3d00a143f 100644
--- a/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
@@ -23,4 +23,5 @@
   <!--Key list-->
   <!--Key view-->
   <!--Navigation Drawer-->
+  <!--hints-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
index 5bb5225b5..174d8538f 100644
--- a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
@@ -95,7 +95,6 @@
   <string name="error_key_size_minimum512bit">anahtar uzunluğu en az 512bit olmalı</string>
   <string name="error_corrupt_data">bozuk veri</string>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">bitti.</string>
   <string name="progress_saving">kaydediliyor...</string>
   <string name="progress_importing">alıyor...</string>
   <string name="progress_exporting">veriyor...</string>
@@ -135,4 +134,5 @@
   <!--Key list-->
   <!--Key view-->
   <!--Navigation Drawer-->
+  <!--hints-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
index 7ccb661d3..58ac643af 100644
--- a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
@@ -64,6 +64,8 @@
   <string name="btn_clipboard">Буфер обміну</string>
   <string name="btn_share">Поділитися через…</string>
   <string name="btn_lookup_key">Шукати ключ</string>
+  <string name="btn_encryption_advanced_settings_show">Показати додаткові налаштування</string>
+  <string name="btn_encryption_advanced_settings_hide">Приховати додаткові налаштування</string>
   <!--menu-->
   <string name="menu_preferences">Параметри</string>
   <string name="menu_help">Довідка</string>
@@ -72,15 +74,17 @@
   <string name="menu_import">Імпорт</string>
   <string name="menu_import_from_nfc">Імпорт з NFC</string>
   <string name="menu_export_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>
   <string name="menu_create_key_expert">Створити ключ (експерт)</string>
   <string name="menu_search">Пошук</string>
-  <string name="menu_key_server">Імпорт з сервера ключів</string>
+  <string name="menu_import_from_key_server">Сервер ключів</string>
+  <string name="menu_key_server">Сервер ключів…</string>
   <string name="menu_update_key">Оновити з сервера ключів</string>
   <string name="menu_export_key_to_server">Завантажити на сервер ключів</string>
-  <string name="menu_share">Поділитися</string>
+  <string name="menu_share">Поділитися…</string>
   <string name="menu_share_title_fingerprint">Поділитися відбитком…</string>
   <string name="menu_share_title">Поділитися цілим ключем…</string>
   <string name="menu_share_default_fingerprint">з…</string>
@@ -139,12 +143,18 @@
   <string name="user_id_no_name">&lt;без імені&gt;</string>
   <string name="none">&lt;жоден&gt;</string>
   <string name="no_key">&lt;без ключа&gt;</string>
+  <string name="no_email">&lt;Немає ел. пошти&gt;</string>
   <string name="unknown_status"></string>
   <string name="can_encrypt">можна зашифрувати</string>
   <string name="can_sign">можна підписати</string>
   <string name="expired">закінчився</string>
   <string name="revoked">скасовано</string>
   <string name="user_id">ІД користувача</string>
+  <plurals name="n_contacts">
+    <item quantity="one">1 контакт</item>
+    <item quantity="few">%d контакти</item>
+    <item quantity="other">%d контактів</item>
+  </plurals>
   <plurals name="n_key_servers">
     <item quantity="one">%d сервер ключів</item>
     <item quantity="few">%d сервери ключів</item>
@@ -201,6 +211,7 @@
   <string name="key_deletion_confirmation">Ви справді хочете вилучити ключ \'%s\'?\nВи не зможете це відмінити!</string>
   <string name="key_deletion_confirmation_multi">Ви справді хочете вилучити усі вибрані ключі?\nВи не зможете це відмінити!</string>
   <string name="secret_key_deletion_confirmation">Ви справді хочете вилучити секретний ключ \'%s\'?\nВи не зможете це відмінити!</string>
+  <string name="also_export_secret_keys">Також експортувати секретні ключі?</string>
   <plurals name="keys_added_and_updated_1">
     <item quantity="one">Успішно додано %d ключ</item>
     <item quantity="few">Успішно додано %d ключі</item>
@@ -226,6 +237,7 @@
   <string name="keys_exported">Успішно експортовано %d ключів.</string>
   <string name="no_keys_exported">Жодного ключа не експортовано.</string>
   <string name="key_creation_el_gamal_info">Примітка: тільки підключі підтримують ElGamal, а для ElGamal буде використаний найближчий розмір ключа з 1536, 2048, 3072, 4096, або 8192.</string>
+  <string name="key_creation_weak_rsa_info">Примітка: генерація ключа RSA з довжиною 1024 біти і менше вважається небезпечною і вона вимкнена для генерації нових ключів.</string>
   <string name="key_not_found">Не можливо знайти ключ %08X.</string>
   <plurals name="keys_found">
     <item quantity="one">Знайдено %d ключ.</item>
@@ -259,6 +271,7 @@
   <string name="error_master_key_must_not_be_el_gamal">основний ключ не може бути ключем ElGamal</string>
   <string name="error_unknown_algorithm_choice">вибір невідомого алгоритму</string>
   <string name="error_user_id_needs_a_name">вам потрібно вказати назву</string>
+  <string name="error_user_id_no_email">жодного листа не знайдено</string>
   <string name="error_user_id_needs_an_email_address">вам потрібно вказати електронну адресу</string>
   <string name="error_key_needs_a_user_id">потрібний хоча б один ІД користувача</string>
   <string name="error_main_user_id_must_not_be_empty">ІД основного користувача не має бути порожнім</string>
@@ -297,12 +310,11 @@
     <item quantity="other">частин завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item>
   </plurals>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">готово.</string>
-  <string name="progress_cancel">cкасувати</string>
+  <string name="progress_done">Готово.</string>
+  <string name="progress_cancel">Скасувати</string>
   <string name="progress_saving">збереження…</string>
   <string name="progress_importing">імпортується…</string>
   <string name="progress_exporting">експортується…</string>
-  <string name="progress_generating">генерується ключ, вона може тривати до 3 хвилин…</string>
   <string name="progress_building_key">будується ключ…</string>
   <string name="progress_preparing_master_key">підготовка основного ключа…</string>
   <string name="progress_certifying_master_key">сертифікація основного ключа…</string>
@@ -314,6 +326,11 @@
     <item quantity="few">експортуються ключі…</item>
     <item quantity="other">експортуються ключі…</item>
   </plurals>
+  <plurals name="progress_generating">
+    <item quantity="one">генерується ключ, це може тривати до 3 хвилини</item>
+    <item quantity="few">генеруються ключі, це може тривати до 3 хвилини</item>
+    <item quantity="other">генеруються ключі, це може тривати до 3 хвилини</item>
+  </plurals>
   <string name="progress_extracting_signature_key">видобування ключа підпису…</string>
   <string name="progress_extracting_key">видобувається ключа…</string>
   <string name="progress_preparing_streams">підготовка потоків…</string>
@@ -344,6 +361,7 @@
   <string name="compression_very_slow">дуже повільне</string>
   <!--Help-->
   <string name="help_tab_start">Початок</string>
+  <string name="help_tab_faq">ЧАП</string>
   <string name="help_tab_nfc_beam">NFC промінь</string>
   <string name="help_tab_changelog">Журнал змін</string>
   <string name="help_tab_about">Про</string>
@@ -407,6 +425,7 @@
   <string name="key_list_empty_button_create">створюється ваш власний ключ</string>
   <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>
@@ -420,4 +439,12 @@
   <string name="nav_apps">Зареєстровані програми</string>
   <string name="drawer_open">Відкрити панель навігації</string>
   <string name="drawer_close">Закрити панель навігації</string>
+  <string name="edit">Редагувати</string>
+  <string name="my_keys">Мої ключі</string>
+  <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-->
 </resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
index 80413d589..244e7e57b 100644
--- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
+  <string name="title_manage_public_keys">聯絡人</string>
   <string name="title_select_recipients">选择公钥</string>
   <string name="title_select_secret_key">选择私钥</string>
   <string name="title_encrypt">加密</string>
@@ -50,7 +51,6 @@
   <string name="menu_create_key">创建密钥</string>
   <string name="menu_create_key_expert">创建密钥(专家)</string>
   <string name="menu_search">搜索</string>
-  <string name="menu_share">分享</string>
   <string name="menu_copy_to_clipboard">复制到剪贴板</string>
   <string name="menu_sign_key">签署密钥</string>
   <string name="menu_key_edit_cancel">取消</string>
@@ -135,7 +135,6 @@
   <string name="error_corrupt_data">损坏的数据</string>
   <string name="error_wrong_passphrase">错误的密语</string>
   <!--progress dialogs, usually ending in '…'-->
-  <string name="progress_done">完成。</string>
   <string name="progress_saving">保存...</string>
   <string name="progress_importing">导入中...</string>
   <string name="progress_exporting">导出中...</string>
@@ -187,4 +186,5 @@
   <string name="nav_decrypt">解密</string>
   <string name="nav_import">导入密钥</string>
   <string name="nav_secret_keys">我的密钥</string>
+  <!--hints-->
 </resources>
