From bac5ce62fed63670dd73ad7e6d902bb4c5eacecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@schuermann.eu>
Date: Wed, 18 Apr 2018 15:37:14 +0200
Subject: [PATCH] Update from transifex

---
 .../src/main/res/raw-ar/help_changelog.md     |   5 +
 .../src/main/res/raw-br/help_changelog.md     |   5 +
 .../src/main/res/raw-ca/help_changelog.md     |   5 +
 .../src/main/res/raw-cs/help_changelog.md     |   5 +
 .../src/main/res/raw-da/help_changelog.md     |   5 +
 .../src/main/res/raw-de/help_changelog.md     |  31 ++--
 .../src/main/res/raw-el/help_changelog.md     |   5 +
 .../src/main/res/raw-eo/help_changelog.md     |   5 +
 .../src/main/res/raw-es-rMX/help_changelog.md |   5 +
 .../src/main/res/raw-es/help_changelog.md     |   5 +
 .../src/main/res/raw-eu/help_changelog.md     |   5 +
 .../src/main/res/raw-fa/help_changelog.md     |   5 +
 .../src/main/res/raw-fi/help_changelog.md     |   5 +
 .../src/main/res/raw-fr/help_changelog.md     |   5 +
 .../src/main/res/raw-gl/help_changelog.md     |   5 +
 .../src/main/res/raw-hi/help_changelog.md     |   5 +
 .../src/main/res/raw-hu/help_changelog.md     |   5 +
 .../src/main/res/raw-id/help_changelog.md     |   5 +
 .../src/main/res/raw-it/help_changelog.md     |   5 +
 .../src/main/res/raw-ja/help_changelog.md     |   5 +
 .../src/main/res/raw-kn/help_changelog.md     |   5 +
 .../src/main/res/raw-ko/help_changelog.md     |   5 +
 .../src/main/res/raw-la/help_changelog.md     |   5 +
 .../src/main/res/raw-nb/help_changelog.md     |   5 +
 .../src/main/res/raw-nl/help_changelog.md     |   5 +
 .../src/main/res/raw-pl/help_changelog.md     |   5 +
 .../src/main/res/raw-pt-rBR/help_changelog.md |   5 +
 .../src/main/res/raw-ro/help_changelog.md     |   5 +
 .../src/main/res/raw-ru/help_changelog.md     |   5 +
 .../src/main/res/raw-sl/help_changelog.md     |   5 +
 .../src/main/res/raw-sr/help_changelog.md     |   5 +
 .../src/main/res/raw-sv/help_changelog.md     |  21 +--
 .../src/main/res/raw-th/help_changelog.md     |   5 +
 .../src/main/res/raw-tr/help_changelog.md     |   5 +
 .../src/main/res/raw-uk/help_changelog.md     |   5 +
 .../src/main/res/raw-vi/help_changelog.md     |   5 +
 .../src/main/res/raw-zh-rTW/help_changelog.md |   5 +
 .../src/main/res/raw-zh/help_changelog.md     |   5 +
 .../src/main/res/values-ar/strings.xml        |  71 ++++++++-
 .../src/main/res/values-ca/strings.xml        |  14 ++
 .../src/main/res/values-cs/strings.xml        |   4 -
 .../src/main/res/values-de/strings.xml        | 136 +++++++++++++++++-
 .../src/main/res/values-es-rMX/strings.xml    |   3 -
 .../src/main/res/values-es/strings.xml        |   7 +-
 .../src/main/res/values-eu/strings.xml        |   4 -
 .../src/main/res/values-fa/strings.xml        |   1 -
 .../src/main/res/values-fi/strings.xml        |   1 -
 .../src/main/res/values-fr/strings.xml        |  12 +-
 .../src/main/res/values-gl/strings.xml        |   7 +-
 .../src/main/res/values-hi/strings.xml        |   1 +
 .../src/main/res/values-it/strings.xml        |   4 -
 .../src/main/res/values-ja/strings.xml        |   4 -
 .../src/main/res/values-ko/strings.xml        |   4 -
 .../src/main/res/values-nb/strings.xml        |   4 -
 .../src/main/res/values-nl/strings.xml        |  12 +-
 .../src/main/res/values-pl/strings.xml        |   8 +-
 .../src/main/res/values-pt-rBR/strings.xml    |   4 -
 .../src/main/res/values-ro/strings.xml        |   4 +-
 .../src/main/res/values-ru/strings.xml        |  12 +-
 .../src/main/res/values-sl/strings.xml        |   1 -
 .../src/main/res/values-sr/strings.xml        |   4 -
 .../src/main/res/values-sv/strings.xml        |  10 +-
 .../src/main/res/values-th/strings.xml        |   8 ++
 .../src/main/res/values-tr/strings.xml        |   1 -
 .../src/main/res/values-uk/strings.xml        |   5 +-
 .../src/main/res/values-vi/strings.xml        |   3 -
 .../src/main/res/values-zh-rTW/strings.xml    |   2 -
 .../src/main/res/values-zh/strings.xml        | 108 ++++++++++----
 68 files changed, 553 insertions(+), 138 deletions(-)

diff --git a/OpenKeychain/src/main/res/raw-ar/help_changelog.md b/OpenKeychain/src/main/res/raw-ar/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-ar/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ar/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-br/help_changelog.md b/OpenKeychain/src/main/res/raw-br/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-br/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-br/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-ca/help_changelog.md b/OpenKeychain/src/main/res/raw-ca/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-ca/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ca/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.md b/OpenKeychain/src/main/res/raw-cs/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-da/help_changelog.md b/OpenKeychain/src/main/res/raw-da/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-da/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-da/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.md b/OpenKeychain/src/main/res/raw-de/help_changelog.md
index 0f1aaca13..baacc5a28 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.md
@@ -1,47 +1,52 @@
 [//]: # (Beachte: Bitte schreibe jeden Satz in eine eigene Zeile, Transifex wird jede Zeile in ein eigenes Übesetzungsfeld setzen!)
 
+## 4.9
+
+  Curve25519 Support
+  Verbesserter Support für Security-Tokens
+
 ## 4.8
 
   * Unterstützung für USB-Tokens verbessert: Gnuk, Nitrokey Modelle, YubiKey 4 Modelle
-  * Feature to find the position of the device's NFC reader
+  Feature zum Finden des NFC Lesers des Geräts
 
 ## 4.7
 
   * Die Möglichkeit, aus der Zwischenablage zu Importieren wurde verbessert
   * Neuer Schlüsselgenerierungsassistent für Security-Tokens
-  * Removed password cache "time to live" setting
+  Passwortcache-Einstellung "time to live" entfernt
 
 
 ## 4.6
 
-  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+  Importieren Sie Ihre Schlüssel mit unserem neuen Secure Wi-Fi Transfer Mechanismus
 
 
 ## 4.5
 
-  * Detailed description of security problems
-  * Display keyserver status per key
+  Detaillierte Beschreibung von Sicherheitsproblemen
+  Status des Keyservers je Schlüssel anzeigen
   * Unterstützung von EdDSA
-  * Fix pgp.mit.edu (new certificate)
+  Fix pgp.mit.edu (neues Zertifikat)
 
 
 ## 4.4
 
-  * New key status displays detailed information why a key is considered insecure or defective
+  Neuer Schlüsselstatus zeigt detaillierte Informationen dazu an, warum ein Schlüssel als unsicher oder beschädigt angesehen wird
 
 
 ## 4.3
 
   * Bessere Unterstützung von längeren Schlüsseln
-  * Fix import of Gpg4win files with broken encodings
+  Fix zum Importieren von Gpg4win-Dateien mit beschädigter Kodierung
 
 
 ## 4.2
 
-  * Experimental support for Elliptic Curve Encryption with Security Tokens
-  * Redesigned key import screen
-  * Design improvements to key lists
-  * Support for keyserver onion addresses
+  Experimenteller Support für Elliptic Curve Verschlüsselung mit Security-Tokens
+  Anzeige zum Import von Schlüsseln neu gestaltet
+  Verbesserungen im Design der Schlüssellisten
+  Support für Keyserver-Onion-Adressen
 
 
 ## 4.1
@@ -163,7 +168,7 @@
   * Viele Fehler beim Schlüsselimport behoben, auch bei gekürzten Schlüsseln
   * Schlüsselauthentifikations-Attribute berücksichtigen und anzeigen
   * Benutzeroberfläche zum Erzeugen benutzerdefinierter Schlüssel
-  * Fixing user ID revocation certificates
+  Fix für User ID Revocation Certificates
   * Neue Cloud-Suche (sucht über traditionelle Schlüsselserver und über keybase.io)
   * Unterstützung für das Kürzen von Schlüsseln innerhalb von OpenKeychain
   * Experimentelle YubiKey-Unterstützung: Unterstützung für Signaturerzeugung und Entschlüsselung
diff --git a/OpenKeychain/src/main/res/raw-el/help_changelog.md b/OpenKeychain/src/main/res/raw-el/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-el/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-el/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-eo/help_changelog.md b/OpenKeychain/src/main/res/raw-eo/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-eo/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-eo/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md b/OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md
index 518645d6d..f26c84b23 100644
--- a/OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (Observe: ¡Por favor ingrese cada enunciado en su propia línea, Transifex coloca cada línea en su propio campo de traducción!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.md b/OpenKeychain/src/main/res/raw-es/help_changelog.md
index 546309beb..48f1a0421 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!)
 
+## 4.9
+
+  * Soporte para Curve25519
+  * Soporte mejorado para tokens de seguridad
+
 ## 4.8
 
   * Soporte mejorado para tokens USB: Gnuk, modelos de Nitrokey, 4 modelos de Yubikey
diff --git a/OpenKeychain/src/main/res/raw-eu/help_changelog.md b/OpenKeychain/src/main/res/raw-eu/help_changelog.md
index 26acf5884..56aaa7b29 100644
--- a/OpenKeychain/src/main/res/raw-eu/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-eu/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (OHARRA: Meseez jarri esaldi bakoitza bere lerroan, Transifex-ek lerroak bere itzulpen eremuan jartzen ditu!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Hobetuta USB lekukoen sostengua: Gnuk, Nitrokey modeloak, YubiKey 4 modeloak
diff --git a/OpenKeychain/src/main/res/raw-fa/help_changelog.md b/OpenKeychain/src/main/res/raw-fa/help_changelog.md
index e6a62eef5..1185c1848 100644
--- a/OpenKeychain/src/main/res/raw-fa/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fa/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (تذکر: هر جمله در همان خط!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.md b/OpenKeychain/src/main/res/raw-fi/help_changelog.md
index 70d7ca0cd..d97d1fc5a 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.md b/OpenKeychain/src/main/res/raw-fr/help_changelog.md
index 2df352ca9..08916c260 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE : veuillez mettre chaque phrase sur sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)
 
+## 4.9
+
+  * Prise en charge de Curve25519
+  * Prise en charge améliorée des jetons de sécurité
+
 ## 4.8
 
   * Prise en charge améliorée des jetons USB : Gnuk, modèles Nitrokey, modèles YubiKey 4
diff --git a/OpenKeychain/src/main/res/raw-gl/help_changelog.md b/OpenKeychain/src/main/res/raw-gl/help_changelog.md
index 91037d841..99637e67e 100644
--- a/OpenKeychain/src/main/res/raw-gl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-gl/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTA: Por avor escriba cada frase na súa propia liña, Transifex pon cada liña no seu propio campo da tradución!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-hi/help_changelog.md b/OpenKeychain/src/main/res/raw-hi/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-hi/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-hi/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-hu/help_changelog.md b/OpenKeychain/src/main/res/raw-hu/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-hu/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-hu/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-id/help_changelog.md b/OpenKeychain/src/main/res/raw-id/help_changelog.md
index bb26e33b4..6b6a9f462 100644
--- a/OpenKeychain/src/main/res/raw-id/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-id/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.md b/OpenKeychain/src/main/res/raw-it/help_changelog.md
index 146d1ba1b..6fd6607a8 100644
--- a/OpenKeychain/src/main/res/raw-it/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-it/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTA: Si prega di mettere ogni frase in una propria linea, Transifex mette ogni riga nel proprio campo di traduzione!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.md b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
index 354897d2e..e57f092cc 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-kn/help_changelog.md b/OpenKeychain/src/main/res/raw-kn/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-kn/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-kn/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-ko/help_changelog.md b/OpenKeychain/src/main/res/raw-ko/help_changelog.md
index 9360e2536..622bec78c 100644
--- a/OpenKeychain/src/main/res/raw-ko/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ko/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * USB 토큰 지원 개선: Gnuk, Nitrokey 모델, YubiKey 4 모델
diff --git a/OpenKeychain/src/main/res/raw-la/help_changelog.md b/OpenKeychain/src/main/res/raw-la/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-la/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-la/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-nb/help_changelog.md b/OpenKeychain/src/main/res/raw-nb/help_changelog.md
index 6cdd5155b..c68685b42 100644
--- a/OpenKeychain/src/main/res/raw-nb/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-nb/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.md b/OpenKeychain/src/main/res/raw-nl/help_changelog.md
index 409db18d5..8d0f725dc 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (Ter info: Zet iedere zin op een eigen regel, Transifex zet iedere regel in zijn eigen vertalingsveld!)
 
+## 4.9
+
+  * Curve25519-ondersteuning
+  * Verbeterde ondersteuning voor Security Tokens
+
 ## 4.8
 
   * Verbeterde ondersteuning voor USB-tokens: Gnuk, Nitrokey-modellen, YubiKey 4-modellen
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.md b/OpenKeychain/src/main/res/raw-pl/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md b/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md
index 389a84e47..6f5b419b6 100644
--- a/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTA: coloque cada frase em sua própria linha, o Transifex coloca cada linha em seu próprio campo de tradução!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-ro/help_changelog.md b/OpenKeychain/src/main/res/raw-ro/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-ro/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ro/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.md b/OpenKeychain/src/main/res/raw-ru/help_changelog.md
index 3994c725e..bdb04b00c 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Поддержка Curve25519
+  * Улучшена поддержка токенов безопасности
+
 ## 4.8
 
   * Улучшена поддержка USB-токенов: модели Gnuk, Nitrokey, YubiKey 4
diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.md b/OpenKeychain/src/main/res/raw-sl/help_changelog.md
index 530a60bd9..2f3cb51e8 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-sr/help_changelog.md b/OpenKeychain/src/main/res/raw-sr/help_changelog.md
index d5986e1f8..3158fcc33 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sr/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: #
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-sv/help_changelog.md b/OpenKeychain/src/main/res/raw-sv/help_changelog.md
index 1652beb81..ff4ae9385 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sv/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTERING: Var vänlig och sätt varje mening på sin egen rad, Transifex sätter varje rad i sitt eget fält för översättningar!)
 
+## 4.9
+
+  * Curve25519 stöd
+  * Improved support for security tokens
+
 ## 4.8
 
   * Förbättrat stöd för USB-tokens: Gnuk, Nitrokey-modeller, YubiKey 4-modeller
@@ -7,7 +12,7 @@
 
 ## 4.7
 
-  * Improved import from clipboard
+  * Förbättrad import från urklipp
   * New key creation wizard for Security Tokens
   * Removed password cache "time to live" setting
 
@@ -19,10 +24,10 @@
 
 ## 4.5
 
-  * Detailed description of security problems
-  * Display keyserver status per key
+  * Detaljerad beskrivning av säkerhetsproblem
+  * Visa keyserverstatus per nyckel
   * Stöd för EdDSA
-  * Fix pgp.mit.edu (new certificate)
+  * Åtgärda pgp.mit.edu (nytt certifikat)
 
 
 ## 4.4
@@ -116,7 +121,7 @@
   * Materialkonstruktion
   * Integrering av skanning av QR-kod (Nya behörigheter krävs)
   * Förbättrade guiden för skapande av nyckel
-  * Fixa kontakter som saknas efter synkronisering
+  * Åtgärda kontakter som saknas efter synkronisering
   * Kräver Android 4
   * Redesigned key screen
   * Simplify crypto preferences, better selection of secure ciphers
@@ -135,12 +140,12 @@
 ## 3.1.1
 
   * Fix key export to files (they were written partially)
-  * Fixa krasch i Android 2.3
+  * Åtgärda krasch i Android 2.3
 
 
 ## 3.1
 
-  * Fixa krasch i Android 5
+  * Åtgärda krasch i Android 5
   Ny certifieringsskärm
   * Secure Exchange directly from key list (SafeSlinger library)
   * New QR Code program flow
@@ -171,7 +176,7 @@
 
 ## 2.9.2
 
-  Fixa trasiga nycklar i 2.9.1
+  Åtgärda trasiga nycklar i 2.9.1
   * Experimental YubiKey support: Decryption now working via API
 
 
diff --git a/OpenKeychain/src/main/res/raw-th/help_changelog.md b/OpenKeychain/src/main/res/raw-th/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-th/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-th/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.md b/OpenKeychain/src/main/res/raw-tr/help_changelog.md
index 28a235e43..600e027f9 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.md b/OpenKeychain/src/main/res/raw-uk/help_changelog.md
index e451e4ff0..f0c1ae1dc 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (Увага: Будь ласка розміщуйте кожне речення у окремому рядку, Transifex розмістить кожен рядок у відповідному полі для перекладу!)
 
+## 4.9
+
+  * Підтримка Curve25519
+  * Покращена підтримка для маркерів безпеки
+
 ## 4.8
 
   * Покращена підтримка для маркерів USB: Gnuk, моделі Nitrokey, моделі YubiKey 4
diff --git a/OpenKeychain/src/main/res/raw-vi/help_changelog.md b/OpenKeychain/src/main/res/raw-vi/help_changelog.md
index cae26ad54..c59e67fb3 100644
--- a/OpenKeychain/src/main/res/raw-vi/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-vi/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (CHÚ Ý: Xin hãy để mỗi câu văn bản trên một dòng, Transifex sẽ chuyển từng dòng vào cho từng trường đã được dịch sang các ngôn ngữ!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
index 271e2ab7a..27f8653b3 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.md b/OpenKeychain/src/main/res/raw-zh/help_changelog.md
index 8e63678e5..cd1b896b5 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.md
@@ -1,5 +1,10 @@
 [//]: # (注意：请把每个句子放在单独一行中， Transifex 将把每一行放置在独立的翻译表单内！)
 
+## 4.9
+
+  * Curve25519 support
+  * Improved support for security tokens
+
 ## 4.8
 
   * Improved support for USB tokens: Gnuk, Nitrokey models, YubiKey 4 models
diff --git a/OpenKeychain/src/main/res/values-ar/strings.xml b/OpenKeychain/src/main/res/values-ar/strings.xml
index 934032cdb..9e7d2d859 100644
--- a/OpenKeychain/src/main/res/values-ar/strings.xml
+++ b/OpenKeychain/src/main/res/values-ar/strings.xml
@@ -35,6 +35,7 @@
   <!--section-->
   <string name="section_user_ids">الهويات</string>
   <string name="section_security_token">شارة الأمان</string>
+  <string name="section_keybase_proofs">دلائل Keybase.io</string>
   <string name="section_should_you_trust">هل تود الثقة في هذا المفتاح ؟</string>
   <string name="section_proof_details">دليل التحقق</string>
   <string name="section_keys">المفاتيح التابعة</string>
@@ -51,6 +52,7 @@
   <string name="section_key_server">خادم المفاتيح</string>
   <string name="section_fingerprint">البصمة</string>
   <string name="section_encrypt">تشفير</string>
+  <string name="section_decrypt">فك التعمية/التحقق</string>
   <string name="section_current_expiry">التاريخ الحالي لنهاية الصلاحية</string>
   <string name="section_new_expiry">المدة الجديدة لنهاية الصلاحية</string>
   <!--button-->
@@ -67,7 +69,9 @@
   <string name="btn_next">التالي</string>
   <string name="btn_back">السابق</string>
   <string name="btn_no">ﻻ</string>
+  <string name="btn_match">البصمات متطابقة</string>
   <string name="btn_share_encrypted_signed">تشفير أو توقيع و مشاركة نص</string>
+  <string name="btn_copy_encrypted_signed">تعمية/توقيع ثم نسخ النص</string>
   <string name="btn_view_cert_key">الإطلاع على شهادة المفتاح</string>
   <string name="btn_create_key">إنشاء مفتاح</string>
   <string name="btn_share_decrypted_text">شارك</string>
@@ -81,6 +85,7 @@
   <string name="btn_unlock">إلغاء القفل</string>
   <string name="btn_add_keyserver">إضافة</string>
   <string name="btn_save_default">حفظ كافتراضي</string>
+  <string name="btn_saved">تم الإحتفاظ به</string>
   <string name="btn_not_matching">غير متطابقة</string>
   <!--Content Description-->
   <string name="cd_encrypt_files">تعمية الملفات</string>
@@ -110,6 +115,7 @@
   <!--label-->
   <string name="label_message">نص</string>
   <string name="label_file">ملف</string>
+  <string name="label_files">الملف(الملفات)</string>
   <string name="label_file_colon">ملف :</string>
   <string name="label_no_passphrase">دون كلمة السر</string>
   <string name="label_passphrase">كلمة السر</string>
@@ -119,6 +125,7 @@
   <string name="label_show_passphrase">عرض كلمة السر</string>
   <string name="label_algorithm">الخوارزمية</string>
   <string name="label_algorithm_colon">الخوارزمية :</string>
+  <string name="label_write_version_header">أخبر الآخرين أنك تستخدِم أوبن كي تشاين</string>
   <string name="label_asymmetric_from">التوقيع بـ :</string>
   <string name="label_to">تعمية إلى</string>
   <string name="label_delete_after_encryption">حذف الملفات بعد التعمية</string>
@@ -140,13 +147,13 @@
   <string name="label_main_user_id">الهوية الرئيسية</string>
   <string name="label_name">الاسم</string>
   <string name="label_email">البريد الإلكتروني</string>
-  <string name="label_send_key">زامن مع الإنترنت</string>
   <string name="label_fingerprint">البصمة</string>
   <string name="expiry_date_dialog_title">تعيين تاريخ نهاية الصلاحية</string>
   <string name="label_keyservers_title">خوادم المفاتيح</string>
   <string name="label_selected_keyserver_title">خادوم المفاتيح المختار</string>
   <string name="label_preferred">تم تفضيل</string>
   <string name="label_enable_compression">تفعيل الضغط</string>
+  <string name="label_enable_self_encrypt">تشفير إلى المُوَقِّع</string>
   <string name="label_encrypt_filenames">تعمية أسماء الملفات</string>
   <string name="label_hidden_recipients">إخفاء المستلمين</string>
   <string name="label_verify_keyserver_connection">التحقق من الربط</string>
@@ -175,6 +182,7 @@
   <string name="pref_proxy_normal_title">تمكين وكيل بروكسي آخَر</string>
   <string name="pref_proxy_host_title">عنوان البروكسي</string>
   <string name="pref_proxy_port_title">منفذ البروكسي</string>
+  <string name="pref_proxy_port_err_invalid">تم إدخال رقم منفذ خاطئ</string>
   <string name="pref_proxy_type_title">نوع البروكسي</string>
   <!--proxy type choices and values-->
   <string name="pref_proxy_type_choice_http">HTTP</string>
@@ -192,6 +200,8 @@
   <string name="orbot_start_dialog_start">بدء تشغيل Orbot</string>
   <string name="orbot_start_dialog_cancel">إلغاء</string>
   <string name="orbot_start_dialog_ignore_tor">لا تستعن بشبكة تور</string>
+  <string name="user_id_no_name"><![CDATA[<no name>]]></string>
+  <string name="none"><![CDATA[<none>]]></string>
   <string name="secret_key">المفتاح السري :</string>
   <!--choice-->
   <string name="choice_none">لا شيء</string>
@@ -207,6 +217,7 @@
   <string name="choice_4hours">4 ساعات</string>
   <string name="choice_8hours">8 ساعات</string>
   <string name="choice_forever">إلى الأبد</string>
+  <string name="choice_select_cert">إختر مفتاحًا</string>
   <string name="filemanager_title_open">إفتح …</string>
   <string name="rsa_2048">RSA 2048</string>
   <string name="rsa_3072">RSA 3072</string>
@@ -234,6 +245,11 @@
   <string name="no_file_selected">لم يتم تحديد أي ملف.</string>
   <string name="select_encryption_key">قم بتحديد مفتاح التشفير على الأقل.</string>
   <string name="error_no_encryption_or_signature_key">على الأقل قم باختيار مفتاح للتعمية أو للتوقيع.</string>
+  <string name="key_deletion_confirmation_multi">هل تريد حقًا حذف كافة المفاتيح التي اخترتَها ؟</string>
+  <string name="public_key_deletetion_confirmation">هل تريد حذف المفتاح \'%s\' ؟</string>
+  <string name="also_export_secret_keys">مع تصدير المفاتيح السرية أيضا</string>
+  <string name="key_exported">تم تصدير مفتاح واحد بنجاح.</string>
+  <string name="no_keys_exported">لم يتم تصدير أي مفتاح.</string>
   <string name="list_empty">هذه القائمة فارغة !</string>
   <string name="key_copied_to_clipboard">تم نسخ المفتاح إلى الحافظة !</string>
   <string name="fingerprint_copied_to_clipboard">تم نسخ البصمة إلى الحافظة !</string>
@@ -243,9 +259,12 @@
          they will be put after "error_message", e.g. "Error: file not found"-->
   <string name="error_file_not_found">الملف غير موجود</string>
   <string name="error_bad_data">بيانات غير صالحة !</string>
+  <string name="error_user_id_no_email">لم يتم العثور على أي عنوان بريد إلكتروني</string>
+  <string name="error_invalid_data">لم يُعثَر على أية بيانات صحيحة مُعمّاة أو مُوقعة بأوبن بي جي بي !</string>
   <string name="error_wrong_passphrase">كلمة السر خاطئة</string>
   <!--errors without preceding Error:-->
   <string name="error_nfc_needed">يجب تشغيل الـ NFC !</string>
+  <string name="error_nothing">ليس هناك ما نعرضُه حاليًا.</string>
   <string name="error_nothing_import">لم يتم العثور على أي مفتاح !</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">غير مُوقَّع</string>
@@ -268,11 +287,21 @@
   <string name="progress_exporting">تصدير ...</string>
   <string name="progress_uploading">عملية الرفع جارية ...</string>
   <string name="progress_building_key">إنشاء المفتاح ...</string>
+  <string name="progress_generating_rsa">عملية توليد مفتاح RSA جديد جارية …</string>
+  <string name="progress_generating_ecdsa">عملية توليد مفتاح ECDSA جديد جارية …</string>
+  <string name="progress_generating_eddsa">عملية توليد مفتاح EdDSA جديد جارية …</string>
   <string name="progress_modify_subkeychange">تعديل المفاتيح الفرعية ...</string>
   <string name="progress_modify_subkeyadd">إضافة المفاتيح الفرعية ...</string>
+  <string name="progress_modify_passphrase">جارٍ تعديل كلمة السر …</string>
   <string name="progress_encrypting">عملية تعمية البيانات جارية …</string>
   <string name="progress_prepare_decryption">جارٍ فك التعمية …</string>
+  <string name="progress_preparing_signature">جارٍ تهيئة التوقيع …</string>
+  <string name="progress_processing_signature">مُعالَجة التوقيع جارية …</string>
+  <string name="progress_generating_signature">عملية توليد التوقيع جارية …</string>
+  <string name="progress_verifying_signature">جارٍ التحقق مِن التوقيع …</string>
   <string name="progress_signing">لتوقيع …</string>
+  <string name="progress_reading_data">قراءة البيانات …</string>
+  <string name="progress_starting_orbot">جارٍ تشغيل أوربوت …</string>
   <!--action strings-->
   <!--key bit length selections-->
   <string name="key_size_2048">2048</string>
@@ -293,7 +322,7 @@
   <string name="compression_very_slow">بطيء جدا</string>
   <!--Help-->
   <string name="help_tab_start">إبدأ</string>
-  <string name="help_tab_faq">أسئلة متكررة</string>
+  <string name="help_tab_faq">الأسئلة الشائعة</string>
   <string name="help_tab_wot">إثبات المفتاح</string>
   <string name="help_tab_changelog">سجل التغيير </string>
   <string name="help_tab_license">الرخص</string>
@@ -327,6 +356,7 @@
   <string name="api_settings_show_info">إظهار المعلومات المتقدمة</string>
   <string name="api_settings_hide_info">إخفاء المعلومات المتقدمة</string>
   <string name="api_settings_no_key">لم يتم تعيين أي مفتاح</string>
+  <string name="api_settings_select_key">إختر مفتاحًا</string>
   <string name="api_settings_create_key">إنشاء مفتاح جديد</string>
   <string name="api_settings_save">حفظ</string>
   <string name="api_settings_cancel">إلغاء</string>
@@ -363,7 +393,6 @@
   <string name="key_view_action_update">التحديث مِن خادوم المفاتيح</string>
   <string name="key_view_action_share_with">شارك بواسطة ...</string>
   <string name="key_view_action_share_ssh_with">شارك كمفتاح SSH عمومي بواسطة ...</string>
-  <string name="key_view_action_upload">التحميل على خادم المفاتيح</string>
   <string name="key_view_tab_main">المعلومات الرئيسية</string>
   <string name="key_view_tab_start">إبدأ</string>
   <string name="key_view_tab_share">شارك</string>
@@ -391,14 +420,17 @@
   <string name="edit_key_error_add_identity">قم بإضافة هوية واحدة على الأقل !</string>
   <string name="edit_key_error_add_subkey">أضف مفتاحا فرعيا على الأقل !</string>
   <!--Create key-->
-  <string name="create_key_upload">زامن مع الإنترنت</string>
   <string name="create_key_empty">هذا الحقل إلزامي</string>
   <string name="create_key_passphrases_not_equal">كلمات السر غير متطابقة</string>
   <string name="create_key_final_text">لقد قمت بإدخال الهوية التالية :</string>
   <string name="create_key_rsa">(3 مفاتيح فرعية, RSA, 4096 bit)</string>
+  <string name="create_key_name_text">قم باختيار الإسم الذي تريد إشراكه مع هذا المفتاح. يمكن للإسم أن يكون كاملا، مثال \'جون دوي\' أو إسمًا مُستعارًا كـ \'جوني\'.</string>
+  <string name="create_key_email_text">أدخِل عنوان بريدك الإلكتروني الذي تستخدِمُه في التواصل الآمِن.</string>
   <string name="create_key_hint_full_name">الإسم الكامل أو الإسم المستعار</string>
   <string name="create_key_edit">تعديل إعدادات المفتاح</string>
   <string name="create_key_add_email">إضافة عنوان بريد إلكتروني</string>
+  <string name="create_key_email_already_exists_text">لقد تم إضافة عنوان البريد الإلكتروني مِن قبلُ</string>
+  <string name="create_key_email_empty_email">لا يمكن لعنوان البريد الإلكتروني أن يُترَك فارغًا</string>
   <string name="create_key_yubi_key_pin">رمز PIN</string>
   <string name="create_key_yubi_key_admin_pin">رمز PIN الخاص بالمدير</string>
   <string name="create_key_yubi_key_algorithm_text">الرجاء إختيار خوارزمية لكل مفتاح.</string>
@@ -426,17 +458,26 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">قم بتحرير نص</string>
   <!--certs-->
+  <string name="cert_default">الإفتراضية</string>
   <string name="cert_none">ﻻشيئ</string>
+  <string name="cert_positive">إيجابية</string>
   <string name="cert_verify_ok">موافق</string>
+  <string name="cert_verify_error">خطأ !</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <string name="msg_cancelled">لقد أُلغيَت العملية.</string>
   <!--Import Public log entries-->
+  <string name="msg_ip_uid_cert_error">خطأ أثناء معالَجة الشهادة !</string>
+  <string name="msg_ip_uat_cert_error">خطأ أثناء معالَجة الشهادة !</string>
   <!--Import Secret log entries-->
   <string name="msg_is_db_exception">خطأ في قاعدة البيانات !</string>
+  <string name="msg_is_importing_subkeys">معالَجة المفاتيح الفرعية السرية</string>
   <!--Keyring Canonicalization log entries-->
+  <string name="msg_kc_master">معالَجة المفتاح الرئيسي</string>
   <!--Keyring merging log entries-->
   <!--createSecretKeyRing-->
   <string name="msg_cr_error_keysize_2048">يتوجب أن يكون حجم المفتاح أكبر أو يساوي 2048 !</string>
   <!--modifySecretKeyRing-->
+  <string name="msg_mf_require_passphrase">كلمة السر مطلوبة للقيام بالإجراءات</string>
   <!--Edit Key (higher level than modify)-->
   <string name="msg_ed_error_key_not_found">مفتاح غير موجود!</string>
   <!--Promote key-->
@@ -448,6 +489,7 @@
   <string name="msg_dc_clear_meta_size">حجم الملف : %s</string>
   <string name="msg_dc_clear_meta_size_unknown">حجم الملف : مجهول</string>
   <string name="msg_dc_clear_meta_time">تاريخ التعديل : %s</string>
+  <string name="msg_dc_clear">معالجة البيانات النصية المُجرّدة</string>
   <!--Messages for VerifySignedLiteralData operation-->
   <string name="msg_vl_clear_meta_file">إسم الملف : %s</string>
   <string name="msg_vl_clear_meta_time">تاريخ التعديل : %s</string>
@@ -455,6 +497,7 @@
   <string name="msg_vl_ok">موافق</string>
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_compressing">طتهيئة الضغط</string>
   <string name="msg_pse_error_bad_passphrase">كلمة السر غير سليمة !</string>
   <!--Messages for Authentication operation-->
   <string name="msg_auth_error_bad_passphrase">كلمة السر غير سليمة !</string>
@@ -468,6 +511,9 @@
   <string name="msg_upload_error_not_found">مفتاح غير موجود!</string>
   <string name="msg_upload_success">نجحت عملية الرفع إلى خادم المفاتيح</string>
   <!--Linked Identity verification-->
+  <string name="msg_data_detached_raw">معالجَة البيانات المُوقّعَة</string>
+  <string name="msg_data_ok">تمت معالجة البيانات بنجاح</string>
+  <string name="msg_get_no_valid_keys">لم يُعثَر على أي مفتاح صحيح سواءا في الملف أو على الحافظة !</string>
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_specific">نسبة %s</string>
   <!--Messages for Mime parsing operation-->
@@ -478,18 +524,25 @@
   <!--First Time-->
   <string name="first_time_create_key">أنشئ مفتاحي</string>
   <string name="first_time_import_key">استيراد مفتاح من ملف</string>
+  <string name="first_time_skip">تخطي الإعداد</string>
+  <string name="backup_all">كافة المفاتيح + مفاتيحك</string>
   <string name="backup_public_keys">كل المفاتيح</string>
   <string name="backup_section">النسخ الاحتياطي</string>
   <string name="restore_section">إستعادة</string>
   <!--unsorted-->
+  <string name="section_cert">تفاصيل الشهادة </string>
   <string name="label_user_id">الهوية</string>
+  <string name="section_uids_to_certify">هويات</string>
   <string name="label_cert_type">النوع</string>
   <string name="error_key_not_found">مفتاح غير موجود!</string>
+  <string name="error_key_processing">خطأ أثناء عملية معالجة المفتاح !</string>
   <string name="key_no_passphrase">دون كلمة السر</string>
   <string name="key_unavailable">غير متواجد</string>
+  <string name="title_view_cert">الإطلاع على تفاصيل الشهادة</string>
   <string name="unknown">غير معروف</string>
   <string name="error_empty_text">قم بكتابة نص تود تعميتة !</string>
   <string name="btn_start_exchange">بداية التبادل</string>
+  <string name="user_id_none"><![CDATA[<none>]]></string>
   <!--Android Account-->
   <string name="account_privacy_title">الخصوصية</string>
   <!--Passphrase wizard-->
@@ -507,6 +560,7 @@
   <string name="btn_reset">إعادة الضبط</string>
   <string name="security_token_error">خطأ : %s</string>
   <string name="btn_delete_original">حذف الملف الأصلي</string>
+  <string name="progress_processing">المُعالَجة جارية …</string>
   <string name="file_delete_ok">تمت عملية حذف الملف الأصلي.</string>
   <string name="error_clipboard_empty">الحافظة فارغة !</string>
   <string name="error_clipboard_copy">طرأ خطأ أثناء نسخ البيانات إلى الحافظة !</string>
@@ -523,6 +577,8 @@
   <string name="linked_button_confirm">تأكيد </string>
   <string name="linked_button_view">مراجعة</string>
   <string name="linked_text_error">خطأ</string>
+  <string name="title_linked_id_create">إنشاء هوية مَوْصولة</string>
+  <string name="backup_code_explanation">سوف يتم تأمين النسخة الإحتياطية برمز أمان. يُرجى كتابة هذا الرمز في مكان آخَر قبل مُواصلة هذه الخطوة !</string>
   <string name="btn_code_wrotedown">حسنا، لقد قمت بكتابته !</string>
   <string name="btn_backup_back">العودة للتحقق ثانية</string>
   <string name="share_log_dialog_title">هل تود مشاركة السجل ؟</string>
@@ -541,8 +597,13 @@
   <string name="redirect_import_key_no">إغلاق</string>
   <string name="button_cancel">إلغاء</string>
   <string name="title_key_status">حالة المفتاح</string>
+  <string name="cap_title_confirm">تأكيد مفاتيح أخرى</string>
+  <string name="cap_cert_ok">يمكن لهذا المفتاح تأكيد مفاتيح أخرى.</string>
   <string name="cap_title_sign">توقيع الرسائل</string>
   <string name="cap_sign_ok">بإمكان هذا المفتاح توقيع / إرسال الرسائل.</string>
+  <string name="cap_title_decrypt">فك تعمية الرسائل</string>
+  <string name="cap_decrypt_ok">يُمكن للمفتاح فك تعمية و استقبال الرسائل.</string>
+  <string name="key_health_ok_title">سليم</string>
   <string name="key_health_ok_subtitle">المفتاح خال من الأخطاء.</string>
   <string name="key_health_divert_subtitle">المفتاح خال من الأخطاء.</string>
   <string name="key_health_divert_partial_subtitle">إضغط لمعرفة التفاصيل</string>
@@ -551,6 +612,7 @@
   <string name="key_health_insecure_title">غير آمن</string>
   <string name="key_health_insecure_subtitle">هذا المفتاح غير آمن !</string>
   <string name="key_health_broken_subtitle">إضغط لمعرفة التفاصيل</string>
+  <string name="key_health_sign_only_title">سليم (مفتاحُ توقيع)</string>
   <string name="key_health_sign_only_subtitle">إضغط لمعرفة التفاصيل</string>
   <string name="key_health_stripped_subtitle">إضغط لمعرفة التفاصيل</string>
   <string name="key_health_partial_stripped_subtitle">إضغط لمعرفة التفاصيل</string>
@@ -565,6 +627,7 @@
   <string name="usage_authentication">للمصادقة</string>
   <string name="button_scan">مسح</string>
   <string name="button_more_info">المزيد من المعلومات</string>
+  <string name="transfer_scan_only_wifi">لا يُمكن استخدام هذه الميزة إلّا على الواي فاي.</string>
   <string name="button_import">إستيراد</string>
   <string name="transfer_status_connected">متصل</string>
   <string name="transfer_status_disconnected">غير متصل!</string>
diff --git a/OpenKeychain/src/main/res/values-ca/strings.xml b/OpenKeychain/src/main/res/values-ca/strings.xml
index fc80d46c5..c070fa9ef 100644
--- a/OpenKeychain/src/main/res/values-ca/strings.xml
+++ b/OpenKeychain/src/main/res/values-ca/strings.xml
@@ -4,7 +4,9 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <!--title-->
   <!--section-->
+  <string name="section_certify">Confirma</string>
   <!--button-->
+  <string name="btn_do_not_save">Cancel·la</string>
   <!--Content Description-->
   <!--menu-->
   <!--label-->
@@ -13,8 +15,11 @@
   <!--proxy type choices and values-->
   <!--OrbotHelper strings-->
   <!--InstallDialogFragment strings-->
+  <string name="orbot_install_dialog_cancel">Cancel·la</string>
   <!--StartOrbotDialogFragment strings-->
+  <string name="orbot_start_dialog_cancel">Cancel·la</string>
   <!--choice-->
+  <string name="error">Error</string>
   <!--sentences-->
   <!--errors
          no punctuation, all lowercase,
@@ -23,6 +28,7 @@
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->
+  <string name="progress_cancel">Cancel·la</string>
   <!--action strings-->
   <!--key bit length selections-->
   <!--elliptic curve names-->
@@ -40,6 +46,7 @@
   <!--Certify result toast-->
   <!--Intent labels-->
   <!--Remote API-->
+  <string name="api_settings_cancel">Cancel·la</string>
   <!--Share-->
   <!--retry upload dialog-->
   <!--Delete or revoke private key dialog-->
@@ -84,4 +91,11 @@
   <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
   <!--Other Linked Identity strings-->
+  <string name="linked_button_confirm">Confirma</string>
+  <string name="linked_text_error">Error</string>
+  <string name="share_log_dialog_cancel_button">Cancel·la</string>
+  <string name="prompt_fidesmo_pgp_install_button_negative">Cancel·la</string>
+  <string name="prompt_fidesmo_app_install_button_negative">Cancel·la</string>
+  <string name="button_cancel">Cancel·la</string>
+  <string name="transfer_confirm_cancel">Cancel·la</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 350831e44..e91beac1d 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -147,7 +147,6 @@
   <string name="label_message_compression">Komprimovat text</string>
   <string name="label_file_compression">Komprimovat soubor</string>
   <string name="label_key_id">ID klíče</string>
-  <string name="label_key_created">Klíč vytvořen %s</string>
   <string name="label_key_type">Typ</string>
   <string name="label_creation">Vytvořeno</string>
   <string name="label_expiry">Expirace</string>
@@ -157,7 +156,6 @@
   <string name="label_main_user_id">Hlavní identita</string>
   <string name="label_name">Jméno</string>
   <string name="label_email">Email</string>
-  <string name="label_send_key">Synchronizovat s Internetem</string>
   <string name="label_fingerprint">Otisk</string>
   <string name="expiry_date_dialog_title">Nastavit datum expirace</string>
   <string name="label_keyservers_title">Keyservery</string>
@@ -542,7 +540,6 @@
   <string name="key_view_action_update">Aktualizuji z keyserveru</string>
   <string name="key_view_action_share_with">Sdílet pomocí...</string>
   <string name="key_view_action_share_nfc">Sdílet přes NFC</string>
-  <string name="key_view_action_upload">Nahrát na keyserver</string>
   <string name="key_view_tab_main">Hlavní info</string>
   <string name="key_view_tab_start">Začít</string>
   <string name="key_view_tab_share">Sdílet</string>
@@ -614,7 +611,6 @@
   <string name="edit_key_error_add_subkey">Přidejte alespoň jeden podklíč!</string>
   <string name="edit_key_error_bad_security_token_algo">Algoritmus nepodporován bezpečnostním tokenem!</string>
   <!--Create key-->
-  <string name="create_key_upload">Synchronizovat s Internetem</string>
   <string name="create_key_empty">Toto pole je vyžadováno</string>
   <string name="create_key_passphrases_not_equal">Hesla se neschodují.</string>
   <string name="create_key_final_text">Zadali jste následující identitu:</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 7d531baf9..c8b962235 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -156,7 +156,6 @@
   <string name="label_keyservers">OpenPGP-Schlüsselserver verwalten</string>
   <string name="label_key_id">Schlüssel-ID</string>
   <string name="label_key_id_colon">Schlüssel-ID:</string>
-  <string name="label_key_created">Schlüssel wurde erzeugt %s</string>
   <string name="label_key_type">Typ</string>
   <string name="label_creation">Erzeugungsdatum</string>
   <string name="label_creation_colon">Erstellung:</string>
@@ -167,7 +166,6 @@
   <string name="label_main_user_id">Hauptidentität</string>
   <string name="label_name">Name</string>
   <string name="label_email">E-Mail</string>
-  <string name="label_send_key">Mit dem Internet synchronisieren</string>
   <string name="label_fingerprint">Fingerabdruck</string>
   <string name="expiry_date_dialog_title">Ablaufdatum festlegen</string>
   <string name="label_keyservers_title">Schlüsselserver</string>
@@ -176,9 +174,11 @@
   <string name="label_selected_smartpgp_authority_title">Ausgewählte Zertifizierungsstelle</string>
   <string name="label_preferred">bevorzugt</string>
   <string name="label_enable_compression">Komprimierung aktivieren</string>
+  <string name="label_enable_self_encrypt">Für Unterschreibenden verschlüsseln</string>
   <string name="label_encrypt_filenames">Dateinamen verschlüsseln</string>
   <string name="label_hidden_recipients">Empfänger verbergen</string>
   <string name="label_smartpgp_verify">SmartPGP: Verifiziere Zertifikate</string>
+  <string name="label_smartpgp_verify_summary">Verifiziere Zertifikate auf SmartPGP Security Tokens gegenüber einer Menge von vertrauenswürdigen Autoritäten</string>
   <string name="label_smartpgp_roots">SmartPGP: Vertraute Zertifizierungsstellen</string>
   <string name="label_verify_keyserver_connection">Verbindung testen</string>
   <string name="label_only_trusted_keyserver">Erlaube nur vertrauenswürdige Schlüsselserver</string>
@@ -590,6 +590,7 @@
   <string name="api_settings_allowed_keys">Erlaubte Schlüssel</string>
   <string name="api_settings_settings">Einstellungen</string>
   <string name="api_register_title">Zugriff auf OpenKeyChain erlauben?</string>
+  <string name="api_register_text">%smöchte OpenKeychain also Krypto-Provider verwenden. Sie werden weiterhin um Erlaubnis gefragt bevor die App einen Ihrer Schlüssel zur Entschlüsselung verwendet.\n\nSie können diesen Zugriff später im \'Apps\' Menü in OpenKeychain 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>
@@ -628,6 +629,7 @@
   <string name="key_list_fab_search">Schlüsselsuche</string>
   <string name="key_list_fab_import">Aus Datei importieren</string>
   <string name="key_list_dummy_title">Du hast noch keine Schlüssel!</string>
+  <string name="key_list_dummy_subtitle">Hier klicken, um einen zu erstellen oder importieren.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Bearbeiten</string>
   <string name="key_view_action_encrypt">Text verschlüsseln</string>
@@ -637,7 +639,6 @@
   <string name="key_view_action_share_with">Teilen über...</string>
   <string name="key_view_action_share_ssh_with">Teile als öffentlicher SSH-Schlüssel mit...</string>
   <string name="key_view_action_share_nfc">Über NFC teilen</string>
-  <string name="key_view_action_upload">Auf Schlüsselserver hochladen</string>
   <string name="key_view_tab_main">Informationen</string>
   <string name="key_view_tab_start">Start</string>
   <string name="key_view_tab_share">Teilen</string>
@@ -713,7 +714,6 @@
   <string name="edit_key_error_bad_security_token_curve">Kurve vom Security-Token nicht unterstützt!</string>
   <string name="edit_key_error_bad_security_token_stripped">Der Schlüssel kann nicht auf den Security-Token verschoben werden (Entweder abgeschnitten oder schon im Security-Token)!</string>
   <!--Create key-->
-  <string name="create_key_upload">Mit dem Internet synchronisieren</string>
   <string name="create_key_empty">Dieses Feld darf nicht leer sein</string>
   <string name="create_key_passphrases_not_equal">Passwörter stimmen nicht überein</string>
   <string name="create_key_final_text">Du hast folgende Identität eingegeben:</string>
@@ -995,6 +995,7 @@
   <string name="msg_cr_error_flags_dsa">Falsche Schlüsselattribute ausgewählt, DSA kann nicht zum Verschlüsseln verwendet werden!</string>
   <string name="msg_cr_error_flags_elgamal">Falsche Schlüsselattribute ausgewählt, ElGamal kann nicht zum Signieren verwendet werden!</string>
   <string name="msg_cr_error_flags_ecdsa">Falsche Schlüsselattribute ausgewählt, ECDSA kann nicht zum Verschlüsseln verwendet werden!</string>
+  <string name="msg_cr_error_flags_eddsa">Ungültige Key Flags ausgewählt, EdDSA kann nicht zur Verschlüsselung verwendet werden!</string>
   <string name="msg_cr_error_flags_ecdh">Falsche Schlüsselattribute ausgewählt, ECDH kann nicht zum Signieren verwendet werden!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Schlüsselbund %s wird verändert</string>
@@ -1127,6 +1128,7 @@
   <string name="msg_vl_error_no_siglist">Keine Signaturliste in signierten Literaldaten!</string>
   <string name="msg_vl_error_wrong_key">Nachricht wurde nicht mit dem erwarteten Schlüssel signiert!</string>
   <string name="msg_vl_error_no_signature">Signaturdaten fehlen!</string>
+  <string name="msg_vl_error_missing_literal">Keine Daten im signierten Datenpaket</string>
   <string name="msg_vl_clear_meta_file">Dateiname: %s</string>
   <string name="msg_vl_clear_meta_mime">MIME-Typ: %s</string>
   <string name="msg_vl_clear_meta_time">Änderungszeit: %s</string>
@@ -1469,6 +1471,7 @@
   <string name="security_token_error_header">Der Security-Token meldete ungültige %s Byte.</string>
   <string name="security_token_error_tag_lost">Security-Token wurde zu früh abgenommen. Halte den Security-Token an die Rückseite, bis der Vorgang beendet ist.</string>
   <string name="security_token_error_iso_dep_not_supported">Security-Token unterstützt den geforderten Kommunikationsstandard (ISO-DEP, ISO 14443-4) nicht</string>
+  <string name="security_token_error_generic">Fehler bei der Kommunikation. Wahrscheinlich wurde das Security Token zu früh entfernt.</string>
   <string name="security_token_error_try_again">Erneut versuchen</string>
   <string name="security_token_not_supported">Dieser Security-Token wird aktuell von OpenKeychain nicht unterstützt</string>
   <string name="btn_delete_original">Originaldatei löschen</string>
@@ -1478,6 +1481,8 @@
   <string name="snack_armor_off">Ausgabe wurde als Binärdatei kodiert.</string>
   <string name="snack_compression_on">Komprimierung ist <b>aktiviert</b>.</string>
   <string name="snack_compression_off">Komprimierung ist <b>deaktiviert</b>.</string>
+  <string name="snack_self_encrypt_on">Verschlüsseln für Signierenden <b> aktiviert </b></string>
+  <string name="snack_self_encrypt_off">Verschlüsseln für Signierenden <b> deaktiviert </b></string>
   <string name="error_loading_keys">Fehler beim Laden der Schlüssel!</string>
   <string name="error_empty_log">(Fehler, Protokoll leer)</string>
   <string name="error_reading_text">Konnte Eingabe zur Entschlüsselung nicht lesen!</string>
@@ -1623,82 +1628,205 @@
     <item>100 Euro</item>
   </string-array>
   <string name="redirect_import_key_title">Scannen mit OpenKeychain!</string>
+  <string name="redirect_import_key_message">Sie haben einen OpenPGP QR-Code mit einer anderen App gescannt. Bitte scannen Sie direkt mit OpenKeychain um die Sicherheit zu gewährleisten.</string>
   <string name="redirect_import_key_yes">Erneut scannen</string>
   <string name="redirect_import_key_no">Schließen</string>
+  <string name="request_permission_title">Zugriff auf Ihren Schlüssel erlauben?</string>
+  <string name="request_permission_msg">%1$s fordert Zugriff auf einen Ihrer Schlüssel, was ihm erlaubt Nachrichten, die zu diesem Schlüssel gesendet wurden, zu entschlüsseln. Sie können den Zugriff später über OpenKeychain widerrufen.</string>
+  <string name="requested_key_unavailable_warning">Dieser Schlüssel ist nicht verfügbar. Um ihn zu verwenden, importieren Sie ihn als eigenen Schlüssel!</string>
   <string name="button_allow">Erlauben</string>
   <string name="button_cancel">Abbrechen</string>
   <string name="requested_key_label">Angeforderter Schlüssel:</string>
+  <string name="error_preselect_sign_key">Fehler beim Auswählen von Schlüssel %s zum Signieren!</string>
+  <string name="error_preselect_encrypt_key">Fehler beim Auswählen von Schlüssel %s zum Verschlüsseln!</string>
   <string name="title_key_status">Key Status</string>
+  <string name="caption_secret_status">Dieser Schlüssel gehört Ihnen. Sie können ihn zu folgenden Zwecken verwenden:</string>
   <string name="cap_title_confirm">Andere Schlüssel bestätigen</string>
   <string name="cap_cert_ok">Dieser Schlüssel kann andere Schlüssel bestätigen.</string>
+  <string name="cap_cert_divert">Dieser Schlüssel kann andere Schlüssel mit einem Security-Token bestätigen.</string>
+  <string name="cap_cert_stripped">Dieser Schlüssel ist stripped und kann daher KEINE anderen Schlüssel bestätigen.</string>
+  <string name="cap_cert_unavailable">Dieser Schlüssel ist nicht zum Bestätigen anderer Schlüssel konfiguriert!</string>
   <string name="cap_title_sign">Nachrichten signieren</string>
+  <string name="cap_sign_ok">Dieser Schlüssel kann Nachrichten signieren/senden.</string>
+  <string name="cap_sign_divert">Dieser Schlüssel kann mit einem Security-Token Nachrichten signieren/senden.</string>
+  <string name="cap_sign_expired">Dieser Schlüssel kann keine Nachrichten signieren/senden, da er abgelaufen ist.</string>
+  <string name="cap_sign_revoked">Dieser Schlüssel kann keine Nachrichten signieren/senden, da er widerrufen wurde.</string>
+  <string name="cap_sign_stripped">Dieser Schlüssel kann keinen Nachrichten auf diesem Gerät signieren/senden!</string>
+  <string name="cap_sign_unavailable">Dieser Schlüsel ist nicht zum Signieren/Senden von Nachrichten konfiguriert!</string>
+  <string name="cap_sign_insecure">Dieser Schlüssel kann Nachrichten signieren/senden, ist aber nicht sicher!</string>
   <string name="cap_title_decrypt">Nachrichten entschlüsseln</string>
+  <string name="cap_decrypt_ok">Dieser Schlüssel kann Nachrichten entschlüsseln/empfangen.</string>
+  <string name="cap_decrypt_divert">Dieser Schlüssel kann Nachrichten mit einem Security-Token entschlüsseln/empfangen.</string>
+  <string name="cap_decrypt_expired">Dieser Schlüssel kann Nachrichten entschlüsseln/empfangen, ist aber abgelaufen.</string>
+  <string name="cap_decrypt_revoked">Dieser Schlüssel kann Nachrichten entschlüsseln/empfangen, ist aber widerrufen worden.</string>
+  <string name="cap_decrypt_stripped">Dieser Schlüssel kann auf diesem Gerät keine Nachrichten entschlüsseln/empfangen.</string>
+  <string name="cap_decrypt_unavailable">Dieser Schlüssel ist nicht zum Entschlüsseln/Empfangen von Nachrichten konfiguriert!</string>
+  <string name="cap_decrypt_insecure">Dieser Schlüssel kann Nachrichten entschlüsseln/empfangen, ist aber nicht sicher!</string>
   <string name="key_health_ok_title">Gesund</string>
+  <string name="key_health_ok_subtitle">Keine Probleme mit dem Schlüssel gefunden.</string>
+  <string name="key_health_divert_title">Intakt (Security-Token)</string>
+  <string name="key_health_divert_subtitle">Keine Probleme mit dem Schlüssel gefunden.</string>
+  <string name="key_health_divert_partial_title">Einwandfrei (Partial Token)</string>
   <string name="key_health_divert_partial_subtitle">Für Details anklicken</string>
   <string name="key_health_expired_title">Abgelaufen</string>
+  <string name="key_health_expired_subtitle">Dieser Schlüssel sollte nicht mehr verwendet werden.</string>
   <string name="key_health_revoked_title">Widerrufen</string>
+  <string name="key_health_revoked_subtitle">Dieser Schlüssel kann nicht mehr verwendet werden.</string>
   <string name="key_health_insecure_title">Unsicher</string>
   <string name="key_health_insecure_subtitle">Dieser Schlüssel ist nicht sicher!</string>
   <string name="key_health_broken_title">Defekt</string>
   <string name="key_health_broken_subtitle">Für Details anklicken</string>
+  <string name="key_health_sign_only_title">Einwandfrei (Schlüssel zum Signieren)</string>
   <string name="key_health_sign_only_subtitle">Für Details anklicken</string>
+  <string name="key_health_stripped_title">Einwandfrei (Stripped)</string>
   <string name="key_health_stripped_subtitle">Für Details anklicken</string>
+  <string name="key_health_partial_stripped_title">Einwandfrei (Partially Stripped)</string>
   <string name="key_health_partial_stripped_subtitle">Für Details anklicken</string>
   <string name="keyserver_title_published">Veröffentlicht</string>
   <string name="keyserver_title_not_published">Nicht veröffentlicht</string>
   <string name="keyserver_title_unknown">Schlüsselserver Status: unbekannt</string>
   <string name="keyserver_last_updated">Zuletzt geprüft: %s</string>
   <string name="keyserver_last_updated_never">Zuletzt geprüft: Nie</string>
+  <string name="key_insecure_bitstrength_2048_problem">Dieser Schlüssel verwendet den <b>%1$s </b> Algorithmus mit einer Stärke von <b> %2$s </b> Bits. 
+Ein sicherer Schlüssel sollte eine Stärke von 2048 Bits besitzen.</string>
+  <string name="key_insecure_bitstrength_2048_solution">Dieser Schlüssel kann nicht geupgraded werden. Zur sicheren Kommunikation muss der Besitzer einen neuen Schlüssel erzeugen.</string>
+  <string name="key_insecure_unknown_curve_problem">Dieser Schlüssel verwendet den <b>%1$s</b> Algorithmus, der nicht auf der Whitelist steht.</string>
+  <string name="key_insecure_unknown_curve_solution">Dieser Schlüssel kann nicht geupgraded werden. Zur sicheren Kommunikation muss der Besitzer einen neuen Schlüssel erzeugen.</string>
+  <string name="key_insecure_unidentified_problem">Es liegt ein nicht identifizierbares Problem mit diesem Schlüssel vor.</string>
+  <string name="key_insecure_unidentified_solution">Bitte erstellen Sie einen Bug-Report.</string>
+  <string name="key_expiry_text">Dieser Schlüssel ist am <b>%1$s</b> abgelaufen.</string>
   <string name="dialog_insecure_title">Sicherheitswarnung</string>
+  <string name="dialog_insecure_recommend_title">Empfohlene Aktion</string>
+  <string name="insecure_encrypt_bitstrength">Der von Ihnen verwendete Schlüssel zum Empfangen (Entschlüsseln) dieser Nachricht ist veraltet!\n\nDer Algorithmus (%s) wird mit einer Schlüssellänge von 1024 Bits oder weniger konfiguriert was seit 2006 als zu unsicher für die allgemeine Verwendung angesehen wird.</string>
+  <string name="insecure_encrypt_bitstrength_suggestion">Der verwendete Schlüssel ist unsicher und kann nicht geupgraded werden. Um sicher zu kommunizieren, müssen SIe einen neuen Schlüssel erzeugen!</string>
+  <string name="insecure_sign_bitstrength">Der Schlüssel, der diese Nachricht gesendet (signiert) hat, ist veraltet!\n\nDer Algorithmus (%s) ist mit einer Schlüssellänge von 1024 Bits oder weniger konfiguriert. Dies gilt seit 2006 als unsicher für den allgemeinen Gebrauch.</string>
+  <string name="insecure_sign_bitstrength_suggestion">Der verwendete Schlüssel ist unsicher und kann nicht geupgraded werden. Zur sicheren Kommunikation müss der Sender einen neuen Schlüssel erzeugen!</string>
+  <string name="insecure_encrypt_not_whitelisted_curve">Der Schlüssel, der diese Nachricht empfangen (entschlüsselt) hat, verwendet eine elliptische Kurve mit OID %1$s; diese steht nicht auf der Whitelist!</string>
+  <string name="insecure_sign_not_whitelisted_curve">Der Schlüssel, der diese Nachricht gesendet (signiert) hat, verwendet eine elliptische Kurve mit OID %1$s ; diese steht nicht auf der W</string>
+  <string name="insecure_encrypt_unidentified">Es liegt ein nicht identifizierbares Sicherheitsproblem mit dem zum Empfangen (Entschlüsseln) der Nachricht verwendeten Schlüssel vor!</string>
+  <string name="insecure_sign_unidentified">Es liegt ein unbekanntes Sicherheitsproblem bei den Schlüssel vor, der diese Nachricht gesendet (signiert) hat!</string>
+  <string name="insecure_report_suggestion">Es liegt möglicherweise ein Problem in OpenKeychain vor; bitte melden Sie es in unserem Issue Tracker!</string>
+  <string name="insecure_mdc">Die Nachricht wurde nicht signiert und enthält auch keinen Modification Detection Code (MDC). Sie könnte von einem Angreifer verändert worden sein!</string>
+  <string name="insecure_mdc_suggestion">Ein fehlendes MDC deutet auf ein Problem in der sendenden Software oder einen Angriff hin. Für sichere Ende-zu-Ende-Verschlüsselung sollten Nachrichten durch den Sender auch signiert werden!</string>
+  <string name="insecure_symmetric_algo">Diese Nachricht wurde mit dem %sAlgorithmus verschlüsselt. Dies gilt als unsicher oder zumindest exotisch!</string>
+  <string name="insecure_hash_algo">Diese Nachricht wurde mit dem %sHash-Algorithmus signiert. Dies gilt als unsicher oder zumindest exotisch!</string>
+  <string name="dialog_insecure_override">Wenn Sie zu diesem speziellen Sicherheitsproblem zukünfitg keine Warnung mehr erhalten wollen, können Sie die Warnung unterdrücken.</string>
+  <string name="dialog_insecure_override_title">Diese Warnung unterdrücken</string>
+  <string name="dialog_insecure_override_ok_title">Warnung unterdrückt</string>
+  <string name="dialog_insecure_override_ok">Die Sicherheitswarnung (für diesen Schlüssel/diese Nachricht) wird in Zukunft nicht wieder angezeigt.</string>
+  <string name="dialog_insecure_button_override">Unterdrücken</string>
+  <string name="dialog_insecure_button_override_confirm">(%d) unterdrücken</string>
+  <string name="dialog_insecure_button_undo">Nicht mehr unterdrücken</string>
   <string name="dialog_insecure_button_view_key">Schlüssel ansehen</string>
   <string name="dialog_insecure_button_ok">Okay, verstanden.</string>
   <string name="usage_authentication">Authentifizierung</string>
   <string name="identity_context_forget">Vergessen</string>
   <string name="button_scan">Einlesen</string>
   <string name="button_more_info">Weitere Informationen</string>
+  <string name="transfer_scan_explanation">Um Ihr Schlüssel-Setup zu teilen oder zu importieren, erstellen Sie eine sichere Verbindung durch Scannen mit beiden Geräten.</string>
+  <string name="transfer_scan_warning">Nur mit ihren eigenen Geräten verwenden!</string>
   <string name="connection_status">Verbindungsstatus:</string>
+  <string name="section_transfer_keys">Für Transfer verfügbare Schlüssel</string>
   <string name="section_received_keys">Erhaltene Schlüssel</string>
+  <string name="transfer_scan_only_wifi">Dieses Feature kann nur mit Wifi verwendet werden.</string>
   <string name="button_import">Import</string>
   <string name="transfer_status_connected">Verbunden</string>
   <string name="transfer_status_disconnected">Getrennt!</string>
+  <string name="transfer_error_read_incoming">Fehler beim Lesen des eingehenden Schlüssels!</string>
   <string name="transfer_error_connect">Verbindung fehlgeschlagen!</string>
+  <string name="transfer_error_listen">Fehler beim Warten auf eine Verbindung!</string>
+  <string name="transfer_error_generic">Unbekannter Fehler bei der Kommunikation!</string>
   <string name="transfer_error_generic_msg">Kommunikationsfehler: %s</string>
+  <string name="transfer_not_available">Entschuldigen Sie, aber dieses Feature kann nur unter Android 5 oder neuer verwendet werden :(</string>
+  <string name="transfer_list_empty">Es befinden sich keine Schlüssel zum Senden auf diesem Gerät. Warte auf eingehende Schlüssel...</string>
   <string name="transfer_connecting">Verbindung wird aufgebaut …</string>
   <string name="first_time_secure_wifi_transfer">Sichere WiFi Übertragung</string>
   <string name="menu_secure_wifi_transfer">Sichere WiFi Übertragung</string>
   <string name="transfer_confirm_cancel">Abbrechen</string>
   <string name="transfer_confirm_ok">Absenden</string>
+  <string name="transfer_confirm_title">Ihren Schlüssel senden?</string>
+  <string name="transfer_confirm_text">Dies überträgt den vollen Zugriff auf Ihren Schlüssel an das angeschlossene Gerät. Sie sollten niemals Ihre eigenen Schlüssel an Geräte senden, die Ihnen nicht gehören!</string>
+  <string name="button_scan_again">Nochmals scannen</string>
   <string name="transfer_error_wifi_text">Verbindung fehlgeschlagen!</string>
+  <string name="transfer_error_wifi_text_instructions">Stellen Sie sicher, dass Sie sich im gleichen Netzwerk befinden und scannen Sie dann erneut.</string>
+  <string name="transfer_error_wifi_text_instructions_ssid">Stellen Sie sicher, dass Sie sich im Netzwerk \"%s\" befinden und scannen Sie dann erneut.</string>
+  <string name="status_check_key">Überprüfe Schlüsselstatus...</string>
+  <string name="status_search_local">Suche in der Schlüsselliste...</string>
+  <string name="status_search_uri">Suche am Token URL...</string>
+  <string name="status_search_keyserver">Suche auf Keyservern...</string>
   <string name="status_import">Schlüssel wird importiert…</string>
+  <string name="status_token_promote">Richte Schlüssel ein...</string>
+  <string name="status_token_check">Überprüfe Schlüsselsetup...</string>
   <string name="status_content_uri">Datei wird gelesen…</string>
+  <string name="token_reset_confirm_title">Security Token zurücksetzen?</string>
+  <string name="token_reset_confirm_message">Dies wird den auf diesem Securitytoken gespeicherten Schlüssel unwiderruflich löschen. Sie werden den Schlüssel nicht weiter zur Entschlüsselung verwenden können! Sind Sie sicher?</string>
   <string name="token_reset_confirm_ok">Zurücksetzen</string>
+  <string name="token_status_title">Sammle Informationen für Security Token...</string>
   <string name="token_result_not_found">Schlüssel nicht gefunden!</string>
   <string name="token_result_key_found">Schlüssel gefunden!</string>
+  <string name="token_result_token_ok">Bereit zur Verwendung!</string>
   <string name="token_result_empty">Token ist leer</string>
+  <string name="token_put_key_unsupported">Bitte konfigurieren Sie dieses Security Token mit GnuPG. OpenKeychain unterstützt aktuell nur signieren/entschlüsseln mit diesem Security Token.</string>
+  <string name="token_action_retry">Suche wiederholen</string>
   <string name="token_action_load_from_file">Aus Datei laden</string>
   <string name="token_action_reset">Security-Token zurücksetzen</string>
   <string name="token_action_import">Import</string>
   <string name="token_action_view_key">Schlüssel ansehen</string>
+  <string name="token_action_setup">Mit neuem Schlüssel konfigurieren</string>
+  <string name="token_action_unlock">Mit Admin PIN entsperren</string>
+  <string name="token_unlock_attempts_none">Keine Entsperrversuche übrig</string>
+  <string name="token_error_locked_indefinitely">Zu viele Rücksetzversuche. Token kann nicht entsperrt werden!</string>
+  <string name="token_error_cannot_reset_gnuk_old">Der Gnuk Token/Nitrokey Start unterstützt einen Reset erst ab Version 1.2.5</string>
+  <string name="token_error_cannot_reset">Dieses Security Token unterstützt keinen Reset</string>
   <string name="token_menu_change_pin">PIN ändern</string>
   <string name="token_menu_view_log">Log ansehen</string>
   <string name="token_unlock_ok">Entsperren</string>
   <string name="token_hint_admin_pin">Admin-PIN</string>
   <string name="token_hint_new_pin">Neue PIN</string>
+  <string name="token_hint_new_pin_repeat">Neue PIN (wiederholen)</string>
+  <string name="token_error_admin_min8">Die Admin PIN muss aus mindestens 8 Zeichen bestehen!</string>
+  <string name="token_error_pin_min6">Die neue PIN muss aus mindestens 6 Zeichen bestehen!</string>
   <string name="token_error_pin_repeat">PINs stimmen nicht überein!</string>
+  <string name="msg_ret_curi_error_io">Fehler beim Lesen der Daten!</string>
   <string name="msg_ret_curi_error_no_match">Kein passender Schlüssel gefunden</string>
+  <string name="msg_ret_curi_error_not_found">Konnte Datei nicht öffnen!</string>
+  <string name="msg_ret_curi_found">Schlüssel gefunden: %s</string>
+  <string name="msg_ret_curi_mismatch">Schlüssel stimmt nicht überein</string>
   <string name="msg_ret_curi_ok">Schlüssel gefunden</string>
+  <string name="msg_ret_curi_open">Öffne URL: %s</string>
+  <string name="msg_ret_curi_start">Lade Schlüssel aus Datei oder Dokument...</string>
+  <string name="msg_ret_ks_error">Unbekannter Fehler beim Suchen nach dem Schlüssel!</string>
   <string name="msg_ret_ks_error_not_found">Schlüssel nicht gefunden</string>
+  <string name="msg_ret_ks_fp_match">Fingerprint des gefundenen Schlüssels ist passend</string>
+  <string name="msg_ret_ks_fp_mismatch">Fingerprint des gefundenen Schlüssels ist nicht passend!</string>
   <string name="msg_ret_ks_ok">Schlüssel gefunden</string>
+  <string name="msg_ret_ks_start">Suche Schlüssel auf Keyservern...</string>
+  <string name="msg_ret_local_search">Suche nach Schlüssel: %s</string>
+  <string name="msg_ret_local_fp_match">Fingerprint des lokalen Schlüssels ist passend</string>
+  <string name="msg_ret_local_fp_mismatch">Fingerprint des lokalen Schlüssels ist nicht passend!</string>
   <string name="msg_ret_local_not_found">Schlüssel nicht gefunden</string>
   <string name="msg_ret_local_none_found">Kein passender Schlüssel gefunden</string>
   <string name="msg_ret_local_ok">Schlüssel gefunden</string>
+  <string name="msg_ret_local_secret">Der lokale Schlüssel enthält Teile des geheimen Schlüssels</string>
+  <string name="msg_ret_local_start">Suche Schlüssel in lokaler Schlüsselliste...</string>
+  <string name="msg_ret_uri_error_fetch">Unbekannter Fehler beim Holen der URL!</string>
+  <string name="msg_ret_uri_error_parse">Token URL ist falsch formatiert!</string>
   <string name="msg_ret_uri_error_no_match">Kein passender Schlüssel gefunden unter URL</string>
+  <string name="msg_ret_uri_fetching">Hole URL: %s</string>
   <string name="msg_ret_uri_ok">Schlüssel gefunden</string>
+  <string name="msg_ret_uri_start">Suche nach Schlüssel an der Token URL...</string>
+  <string name="msg_ret_uri_null">Keine URL auf Security Token gespeichert</string>
+  <string name="msg_ret_uri_test">Überprüfe, ob der gefundene Key zu %s passt</string>
+  <string name="msg_trust">Aktualisiere Vertrauensinformationen...</string>
+  <string name="msg_trust_ok">Aktualisierung erfolgreich!</string>
+  <string name="msg_trust_initialize">Initialisiere den Schlüsselsignatur-Cache</string>
+  <string name="msg_trust_key">Aktualisiere Schlüssel, die von %s signiert wurden</string>
   <string name="msg_trust_count_none">Keine Schlüssel zu aktualisieren</string>
   <plurals name="msg_trust_count">
     <item quantity="one">Ein Schlüssel wird aktualisiert</item>
     <item quantity="other">%d Schlüssel werden aktualisiert</item>
   </plurals>
   <string name="button_locate_nfc">Wo ist mein NFC-Leser?</string>
+  <string name="label_usb_untested_summary">Falls aktiviert können USB Smartcard Reader verwendet werden, die nicht umfassend getestet wurden.</string>
   <string name="label_usb_untested">Ungetestetes USB-Gerät erlauben</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-es-rMX/strings.xml b/OpenKeychain/src/main/res/values-es-rMX/strings.xml
index 2148d91a1..a34f30bca 100644
--- a/OpenKeychain/src/main/res/values-es-rMX/strings.xml
+++ b/OpenKeychain/src/main/res/values-es-rMX/strings.xml
@@ -127,7 +127,6 @@
   <string name="label_message_compression">Compresión de texto</string>
   <string name="label_file_compression">Compresión de archivo</string>
   <string name="label_key_id">Identificador de clave</string>
-  <string name="label_key_created">Clave creada el %s</string>
   <string name="label_creation">Creación</string>
   <string name="label_expiry">Expiración</string>
   <string name="label_usage">Uso</string>
@@ -136,7 +135,6 @@
   <string name="label_main_user_id">Identidad principal</string>
   <string name="label_name">Nombre</string>
   <string name="label_email">Correo electrónico</string>
-  <string name="label_send_key">Sincronizar con Internet</string>
   <string name="label_fingerprint">Huella digital</string>
   <string name="expiry_date_dialog_title">Asignar fecha de expiración</string>
   <string name="label_keyservers_title">Servidor de claves</string>
@@ -273,7 +271,6 @@
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Cambiar contraseña</string>
   <!--Create key-->
-  <string name="create_key_upload">Sincronizar con Internet</string>
   <string name="create_key_yubi_key_pin">NIP</string>
   <!--View key-->
   <!--Add/Edit keyserver-->
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 02570da07..9891a80bd 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -156,7 +156,6 @@
   <string name="label_keyservers">Administrar servidores de claves OpenPGP</string>
   <string name="label_key_id">ID de clave</string>
   <string name="label_key_id_colon">Identificación de clave:</string>
-  <string name="label_key_created">Clave creada el %s</string>
   <string name="label_key_type">Tipo</string>
   <string name="label_creation">Creación</string>
   <string name="label_creation_colon">Creación</string>
@@ -167,7 +166,6 @@
   <string name="label_main_user_id">Identidad principal</string>
   <string name="label_name">Nombre</string>
   <string name="label_email">Email</string>
-  <string name="label_send_key">Sincronizar con Internet</string>
   <string name="label_fingerprint">Huella digital</string>
   <string name="expiry_date_dialog_title">Establer la fecha de vencimiento</string>
   <string name="label_keyservers_title">Servidores de claves</string>
@@ -176,6 +174,7 @@
   <string name="label_selected_smartpgp_authority_title">Autoridad seleccionada</string>
   <string name="label_preferred">preferido</string>
   <string name="label_enable_compression">Habilitar compresión</string>
+  <string name="label_enable_self_encrypt">Ciifrar para el firmante</string>
   <string name="label_encrypt_filenames">Cifrar nombres de ficheros</string>
   <string name="label_hidden_recipients">Ocultar destinatarios</string>
   <string name="label_smartpgp_verify">SmartPGP: Verificar certificados</string>
@@ -640,7 +639,6 @@
   <string name="key_view_action_share_with">Compartir con...</string>
   <string name="key_view_action_share_ssh_with">Compartir como clave pública SSH con...</string>
   <string name="key_view_action_share_nfc">Compartir por NFC</string>
-  <string name="key_view_action_upload">Subir al servidor de claves</string>
   <string name="key_view_tab_main">Información principal</string>
   <string name="key_view_tab_start">Inicio</string>
   <string name="key_view_tab_share">Compartir</string>
@@ -716,7 +714,6 @@
   <string name="edit_key_error_bad_security_token_curve">¡El algoritmo de curva elíptica no está soportado por el token de seguridad!</string>
   <string name="edit_key_error_bad_security_token_stripped">¡No se puede mover la clave al token de seguridad (tanto si es una clave desnuda como si ya está en el token de seguridad)!</string>
   <!--Create key-->
-  <string name="create_key_upload">Sincronizar con Internet</string>
   <string name="create_key_empty">Este campo es obligatorio</string>
   <string name="create_key_passphrases_not_equal">Las contraseñas no coinciden</string>
   <string name="create_key_final_text">Ha introducido la siguiente identidad :</string>
@@ -1484,6 +1481,8 @@
   <string name="snack_armor_off">Salida codificada como Binario.</string>
   <string name="snack_compression_on">Compresión <b>habilitada</b>.</string>
   <string name="snack_compression_off">Compresión <b>deshabilitada</b>.</string>
+  <string name="snack_self_encrypt_on">Cifrar para el firmante <b>habilitado</b>.</string>
+  <string name="snack_self_encrypt_off">Cifrar para el firmane <b>deshabilitado</b>.</string>
   <string name="error_loading_keys">¡Error al cargar claves!</string>
   <string name="error_empty_log">(error, registro (log) vacío)</string>
   <string name="error_reading_text">¡No se pudo leer entrada a descifrar!</string>
diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml
index c21a0b1f8..3662ae952 100644
--- a/OpenKeychain/src/main/res/values-eu/strings.xml
+++ b/OpenKeychain/src/main/res/values-eu/strings.xml
@@ -154,7 +154,6 @@
   <string name="label_keyservers">Kudeatu OpenPGP giltza-zerbitzariak</string>
   <string name="label_key_id">Giltza ID-a</string>
   <string name="label_key_id_colon">Giltza ID-a:</string>
-  <string name="label_key_created">Giltza sortuta %s</string>
   <string name="label_key_type">Mota</string>
   <string name="label_creation">Sortzea</string>
   <string name="label_creation_colon">Sortzea:</string>
@@ -165,7 +164,6 @@
   <string name="label_main_user_id">Lehen nortasuna</string>
   <string name="label_name">Izena</string>
   <string name="label_email">Post@</string>
-  <string name="label_send_key">Aldiberetu Internet-ekin</string>
   <string name="label_fingerprint">Hatz-aztarna</string>
   <string name="expiry_date_dialog_title">Ezarri epemuga eguna</string>
   <string name="label_keyservers_title">Giltza-zerbitzariak</string>
@@ -616,7 +614,6 @@
   <string name="key_view_action_share_with">Elkarbanatu honekin...</string>
   <string name="key_view_action_share_ssh_with">Elkarbanatu SSH giltza publiko bezala honekin...</string>
   <string name="key_view_action_share_nfc">Elkarbanatu NFC gain</string>
-  <string name="key_view_action_upload">Igo giltza-zerbitzarira</string>
   <string name="key_view_tab_main">Argibide Nagusiak</string>
   <string name="key_view_tab_start">Hasi</string>
   <string name="key_view_tab_share">Elkarbanatu</string>
@@ -682,7 +679,6 @@
   <string name="edit_key_error_add_subkey">Gehitu azpigiltza bat gutxienez!</string>
   <string name="edit_key_error_bad_security_token_algo">Algoritmoa ez dago Segurtasun Lekukoak sostengatua!</string>
   <!--Create key-->
-  <string name="create_key_upload">Aldiberetu Internetekin</string>
   <string name="create_key_empty">Eremu hau beharrezkoa da</string>
   <string name="create_key_passphrases_not_equal">Sarhitzak ez datoz bat</string>
   <string name="create_key_final_text">Hurrengo nortasuna sartu duzu:</string>
diff --git a/OpenKeychain/src/main/res/values-fa/strings.xml b/OpenKeychain/src/main/res/values-fa/strings.xml
index 9620a743c..d54cc3290 100644
--- a/OpenKeychain/src/main/res/values-fa/strings.xml
+++ b/OpenKeychain/src/main/res/values-fa/strings.xml
@@ -122,7 +122,6 @@
   <string name="label_file_compression">فشرده‌کردن فایل</string>
   <string name="label_key_id">هویت کلید</string>
   <string name="label_key_id_colon">ID اصلی : </string>
-  <string name="label_key_created">کلید ساخته شد %s</string>
   <string name="label_key_type"> نوع</string>
   <string name="label_creation">ساخت</string>
   <string name="label_expiry">انقضأ</string>
diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml
index 627378077..d5d74a7fb 100644
--- a/OpenKeychain/src/main/res/values-fi/strings.xml
+++ b/OpenKeychain/src/main/res/values-fi/strings.xml
@@ -122,7 +122,6 @@
   <string name="label_hash_algorithm">Tiivistealgoritmi</string>
   <string name="label_file_compression">Tiedoston pakkaus</string>
   <string name="label_key_id">Avaimen ID</string>
-  <string name="label_key_created">Avain luotu %s</string>
   <string name="label_key_type">Tyyppi</string>
   <string name="label_creation">Luontiaika</string>
   <string name="label_expiry">Umpeutumisaika</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index cece131f1..c6120f3a2 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -156,7 +156,8 @@
   <string name="label_keyservers">Gérer les serveurs de clés OpenPGP</string>
   <string name="label_key_id">ID de clé</string>
   <string name="label_key_id_colon">ID de la clé :</string>
-  <string name="label_key_created">clé créée %s</string>
+  <string name="label_key_created">Créée le %s</string>
+  <string name="label_key_created_just_now">Vient d’être créée</string>
   <string name="label_key_type">Type</string>
   <string name="label_creation">Création</string>
   <string name="label_creation_colon">Création :</string>
@@ -167,7 +168,7 @@
   <string name="label_main_user_id">Identité principale</string>
   <string name="label_name">Nom</string>
   <string name="label_email">Courriel</string>
-  <string name="label_send_key">Synchroniser avec Internet</string>
+  <string name="label_send_key">Publier la certification sur les serveurs de clés</string>
   <string name="label_fingerprint">Empreinte</string>
   <string name="expiry_date_dialog_title">Définir une date d’expiration</string>
   <string name="label_keyservers_title">Serveurs de clés </string>
@@ -176,6 +177,7 @@
   <string name="label_selected_smartpgp_authority_title">Autorité sélectionnée</string>
   <string name="label_preferred">préféré </string>
   <string name="label_enable_compression">Activer la compression</string>
+  <string name="label_enable_self_encrypt">Chiffrer avec la clé du signataire</string>
   <string name="label_encrypt_filenames">Chiffrer les nom de fichier</string>
   <string name="label_hidden_recipients">Cacher les destinataires</string>
   <string name="label_smartpgp_verify">SmartPGP : vérifier les certificats</string>
@@ -640,7 +642,7 @@
   <string name="key_view_action_share_with">Partager avec…</string>
   <string name="key_view_action_share_ssh_with">Partager comme clé publique SSH avec…</string>
   <string name="key_view_action_share_nfc">Partager par CCP</string>
-  <string name="key_view_action_upload">Téléverser vers le serveur de clés</string>
+  <string name="key_view_action_upload">Publier sur le serveur de clés</string>
   <string name="key_view_tab_main">Infos principales</string>
   <string name="key_view_tab_start">Début</string>
   <string name="key_view_tab_share">Partager</string>
@@ -716,7 +718,7 @@
   <string name="edit_key_error_bad_security_token_curve">La courbe n’est pas prise en charge par le jeton de sécurité !</string>
   <string name="edit_key_error_bad_security_token_stripped">Impossible de déplacer la clé vers le jeton de sécurité (elle est soit dépouillée, soit déjà un jeton de sécurité) !</string>
   <!--Create key-->
-  <string name="create_key_upload">Synchroniser avec Internet</string>
+  <string name="create_key_upload">Publier sur les serveur de clés</string>
   <string name="create_key_empty">Ce champ est exigé</string>
   <string name="create_key_passphrases_not_equal">Les mots de passe ne correspondent pas</string>
   <string name="create_key_final_text">Vous avez saisie l’identité suivante :</string>
@@ -1484,6 +1486,8 @@
   <string name="snack_armor_off">Sortie encodée comme exécutable.</string>
   <string name="snack_compression_on">Compression <b>activée</b>.</string>
   <string name="snack_compression_off">Compression <b>désactivée</b>.</string>
+  <string name="snack_self_encrypt_on">Chiffrer avec la clé du signataire est <b>activé</b>.</string>
+  <string name="snack_self_encrypt_off">Chiffrer avec la clé du signataire est<b>désactivé</b>.</string>
   <string name="error_loading_keys">Erreur de chargement des clés !</string>
   <string name="error_empty_log">(erreur, journal vide)</string>
   <string name="error_reading_text">Impossible de lire l’entrée à déchiffrer !</string>
diff --git a/OpenKeychain/src/main/res/values-gl/strings.xml b/OpenKeychain/src/main/res/values-gl/strings.xml
index 5e3e4b0e9..25e250b9f 100644
--- a/OpenKeychain/src/main/res/values-gl/strings.xml
+++ b/OpenKeychain/src/main/res/values-gl/strings.xml
@@ -154,7 +154,6 @@
   <string name="label_keyservers">Xestionar servidores de chaves OpenPGP</string>
   <string name="label_key_id">ID da chave</string>
   <string name="label_key_id_colon">ID da chave:</string>
-  <string name="label_key_created">Chave creada %s</string>
   <string name="label_key_type">Tipo</string>
   <string name="label_creation">Creada</string>
   <string name="label_creation_colon">Creada:</string>
@@ -165,7 +164,6 @@
   <string name="label_main_user_id">Identidade primaria</string>
   <string name="label_name">Nome</string>
   <string name="label_email">Email</string>
-  <string name="label_send_key">Sincronizar coa internet</string>
   <string name="label_fingerprint">Pegada</string>
   <string name="expiry_date_dialog_title">Establecer data de caducidade</string>
   <string name="label_keyservers_title">Servidores de chaves</string>
@@ -637,7 +635,6 @@
   <string name="key_view_action_share_with">Compartir con...</string>
   <string name="key_view_action_share_ssh_with">Compartir como chave pública SSH con...</string>
   <string name="key_view_action_share_nfc">Compartir a través de NFC</string>
-  <string name="key_view_action_upload">Subir ao servidor de chaves</string>
   <string name="key_view_tab_main">Info principal</string>
   <string name="key_view_tab_start">Iniciar</string>
   <string name="key_view_tab_share">Compartir</string>
@@ -711,7 +708,6 @@
   <string name="edit_key_error_bad_security_token_curve">Curva non soportada por Testemuño de Seguridade!</string>
   <string name="edit_key_error_bad_security_token_stripped">Non pode mover a chave a Testemuño de Seguridade (ou ben eliminada ou xa no Testemuño de Seguridade)!</string>
   <!--Create key-->
-  <string name="create_key_upload">Sincronizar coa internet</string>
   <string name="create_key_empty">Este campo é requerido</string>
   <string name="create_key_passphrases_not_equal">Non coinciden os contrasinais</string>
   <string name="create_key_final_text">Escribeu a seguinte identidade:</string>
@@ -762,6 +758,8 @@
   <string name="nav_keys">Chaves</string>
   <string name="nav_encrypt_decrypt">Cifrar/Descifrar</string>
   <string name="nav_apps">Apps</string>
+  <string name="drawer_open">Abrir cadro de navegación</string>
+  <string name="drawer_close">Pechar cadro de navegación</string>
   <string name="my_keys">As miñas chaves</string>
   <string name="nav_backup">Respaldar/Restaurar</string>
   <string name="nav_transfer">Transferencia segura sobre WiFi</string>
@@ -940,6 +938,7 @@
   <!--Other Linked Identity strings-->
   <string name="section_linked_identities">Identidades ligadas</string>
   <string name="linked_button_verify">Verificar</string>
+  <string name="linked_button_retry">Intentar de novo</string>
   <string name="linked_button_confirm">Confirmar</string>
   <string name="linked_text_error">Fallo</string>
   <string name="share_log_dialog_share_button">Compartir</string>
diff --git a/OpenKeychain/src/main/res/values-hi/strings.xml b/OpenKeychain/src/main/res/values-hi/strings.xml
index 052ac4822..d718337ae 100644
--- a/OpenKeychain/src/main/res/values-hi/strings.xml
+++ b/OpenKeychain/src/main/res/values-hi/strings.xml
@@ -173,6 +173,7 @@
   <string name="snack_security_token_import">आयात</string>
   <string name="btn_reset">रीसेट करें</string>
   <string name="security_token_error_unknown">अज्ञात त्रुटि</string>
+  <string name="security_token_error_try_again">पुनः प्रयास करें</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">समाप्त</string>
   <string name="linked_title_github">गीथहब</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 98851ab4d..5863138e8 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -151,7 +151,6 @@
   <string name="label_keyservers">Gestisci i keyserver OpenPGP</string>
   <string name="label_key_id">ID Chiave</string>
   <string name="label_key_id_colon">ID chiave:</string>
-  <string name="label_key_created">Chiave creata %s</string>
   <string name="label_key_type">Tipo</string>
   <string name="label_creation">Creazione</string>
   <string name="label_expiry">Scadenza</string>
@@ -161,7 +160,6 @@
   <string name="label_main_user_id">Identità Primaria</string>
   <string name="label_name">Nome</string>
   <string name="label_email">Email</string>
-  <string name="label_send_key">Sincronizza con Internet</string>
   <string name="label_fingerprint">Impronta</string>
   <string name="expiry_date_dialog_title">Impostare la data di scadenza</string>
   <string name="label_keyservers_title">Server chiavi</string>
@@ -607,7 +605,6 @@
   <string name="key_view_action_share_with">Condividi con...</string>
   <string name="key_view_action_share_ssh_with">Condividi come chiave pubblica SSH con...</string>
   <string name="key_view_action_share_nfc">Condividi tramite NFC</string>
-  <string name="key_view_action_upload">Carica sul Server delle Chiavi</string>
   <string name="key_view_tab_main">Info Principale</string>
   <string name="key_view_tab_start">Inizia</string>
   <string name="key_view_tab_share">Condividi</string>
@@ -679,7 +676,6 @@
   <string name="edit_key_error_add_subkey">Aggiungi almeno una sottochiave!</string>
   <string name="edit_key_error_bad_security_token_algo">Algoritmo non supportato dal Token di Sicurezza!</string>
   <!--Create key-->
-  <string name="create_key_upload">Sincronizza con internet</string>
   <string name="create_key_empty">Questo campo è necessario</string>
   <string name="create_key_passphrases_not_equal">Le password non sono identiche</string>
   <string name="create_key_final_text">Hai inserito la seguente identità:</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 77f1e7965..9c002715d 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -155,7 +155,6 @@
   <string name="label_keyservers">OpenPGP鍵サーバの管理</string>
   <string name="label_key_id">鍵ID</string>
   <string name="label_key_id_colon">鍵 ID:</string>
-  <string name="label_key_created">%s で鍵を生成</string>
   <string name="label_key_type">種別</string>
   <string name="label_creation">生成</string>
   <string name="label_creation_colon">生成:</string>
@@ -166,7 +165,6 @@
   <string name="label_main_user_id">主ユーザID</string>
   <string name="label_name">名前</string>
   <string name="label_email">Eメールアドレス</string>
-  <string name="label_send_key">インターネットでの同期</string>
   <string name="label_fingerprint">指紋</string>
   <string name="expiry_date_dialog_title">期限日時を設定</string>
   <string name="label_keyservers_title">鍵サーバ</string>
@@ -619,7 +617,6 @@
   <string name="key_view_action_update">鍵サーバからの更新</string>
   <string name="key_view_action_share_with">...で共有</string>
   <string name="key_view_action_share_nfc">NFC越しに共有</string>
-  <string name="key_view_action_upload">鍵サーバへアップロード</string>
   <string name="key_view_tab_main">情報</string>
   <string name="key_view_tab_start">開始</string>
   <string name="key_view_tab_share">共有</string>
@@ -695,7 +692,6 @@
   <string name="edit_key_error_bad_security_token_curve">セキュリティトークンで曲線はサポートされていません!</string>
   <string name="edit_key_error_bad_security_token_stripped">セキュリティトークンに鍵を移動できません (ストリップしているか、すでにセキュリティトークン上です)!</string>
   <!--Create key-->
-  <string name="create_key_upload">インターネットでの同期</string>
   <string name="create_key_empty">このフィールドは必須です</string>
   <string name="create_key_passphrases_not_equal">パスワードが一致しない</string>
   <string name="create_key_final_text">あたなが入力したIDは以下です:</string>
diff --git a/OpenKeychain/src/main/res/values-ko/strings.xml b/OpenKeychain/src/main/res/values-ko/strings.xml
index 44cb038ca..07bb820f9 100644
--- a/OpenKeychain/src/main/res/values-ko/strings.xml
+++ b/OpenKeychain/src/main/res/values-ko/strings.xml
@@ -154,7 +154,6 @@
   <string name="label_keyservers">OpenPGP 키서버 관리</string>
   <string name="label_key_id">키 ID</string>
   <string name="label_key_id_colon">키 ID:</string>
-  <string name="label_key_created">키가 %s 에 만들어짐</string>
   <string name="label_key_type">종류</string>
   <string name="label_creation">생성</string>
   <string name="label_creation_colon">생성 시점:</string>
@@ -165,7 +164,6 @@
   <string name="label_main_user_id">기본 신원</string>
   <string name="label_name">이름</string>
   <string name="label_email">이메일</string>
-  <string name="label_send_key">인터넷과 동기화</string>
   <string name="label_fingerprint">지문</string>
   <string name="expiry_date_dialog_title">만료일자 설정</string>
   <string name="label_keyservers_title">키서버</string>
@@ -601,7 +599,6 @@
   <string name="key_view_action_update">키서버로 부터 갱신</string>
   <string name="key_view_action_share_with">다음으로 공유...</string>
   <string name="key_view_action_share_ssh_with">다음을 SSH 공개키로 공유...</string>
-  <string name="key_view_action_upload">키서버로 올리기</string>
   <string name="key_view_tab_main">주요 정보</string>
   <string name="key_view_tab_start">시작</string>
   <string name="key_view_tab_share">공유</string>
@@ -647,7 +644,6 @@
   <string name="edit_key_error_bad_security_token_algo">보안 토큰이 알고리즘을 지원하지 않습니다!</string>
   <string name="edit_key_error_bad_security_token_size">2048 비트보다 낮은 RSA 키는 OpenPGP 카드 스펙 3.x 이후 보안 토큰에서 지원되지 않습니다!</string>
   <!--Create key-->
-  <string name="create_key_upload">인터넷과 동기화</string>
   <string name="create_key_empty">해당 필드는 필수입니다</string>
   <string name="create_key_passphrases_not_equal">패스워드가 일치하지 않습니다</string>
   <string name="create_key_rsa">(3 하위키, RSA, 4096 bit)</string>
diff --git a/OpenKeychain/src/main/res/values-nb/strings.xml b/OpenKeychain/src/main/res/values-nb/strings.xml
index 2529c6b0c..515bfb139 100644
--- a/OpenKeychain/src/main/res/values-nb/strings.xml
+++ b/OpenKeychain/src/main/res/values-nb/strings.xml
@@ -148,7 +148,6 @@
   <string name="label_file_compression">Filkomprimering</string>
   <string name="label_key_id">Nøkkel-ID</string>
   <string name="label_key_id_colon">Nøkkel-ID:</string>
-  <string name="label_key_created">Nøkkel opprettet %s</string>
   <string name="label_key_type">Type</string>
   <string name="label_creation">Opprettet</string>
   <string name="label_creation_colon">Opprettet:</string>
@@ -159,7 +158,6 @@
   <string name="label_main_user_id">Hovedidentitet</string>
   <string name="label_name">Navn</string>
   <string name="label_email">E-post</string>
-  <string name="label_send_key">Synkroniser med Internett</string>
   <string name="label_fingerprint">Fingeravtrykk</string>
   <string name="expiry_date_dialog_title">Sett utløpsdato</string>
   <string name="label_keyservers_title">Nøkkeltjenere</string>
@@ -485,7 +483,6 @@
   <string name="key_view_action_update">Oppdater fra nøkkeltjener</string>
   <string name="key_view_action_share_with">Del med…</string>
   <string name="key_view_action_share_nfc">Del over NFC</string>
-  <string name="key_view_action_upload">Lost opp til nøkkeltjener</string>
   <string name="key_view_tab_main">Hovedinfo</string>
   <string name="key_view_tab_start">Start</string>
   <string name="key_view_tab_share">Del</string>
@@ -510,7 +507,6 @@
   <string name="edit_key_edit_user_id_title">Velg en handling!</string>
   <string name="edit_key_edit_subkey_title">Velg en handling!</string>
   <!--Create key-->
-  <string name="create_key_upload">Synkroniser med Internett</string>
   <string name="create_key_empty">Dette feltet er påkrevd</string>
   <string name="create_key_passphrases_not_equal">Passordene samsvarer ikke</string>
   <string name="create_key_final_text">Du har endret følgende identitet:</string>
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index e39e607aa..4a63a4c4b 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -156,7 +156,8 @@
   <string name="label_keyservers">Beheer OpenPGP-sleutelservers</string>
   <string name="label_key_id">Sleutel-id</string>
   <string name="label_key_id_colon">Sleutel-ID:</string>
-  <string name="label_key_created">Sleutel aangemaakt %s</string>
+  <string name="label_key_created">Aangemaakt op %s</string>
+  <string name="label_key_created_just_now">Zonet aangemaakt</string>
   <string name="label_key_type">Soort</string>
   <string name="label_creation">Aanmaak</string>
   <string name="label_creation_colon">Aangemaakt:</string>
@@ -167,7 +168,7 @@
   <string name="label_main_user_id">Primaire identiteit</string>
   <string name="label_name">Naam</string>
   <string name="label_email">E-mailadres</string>
-  <string name="label_send_key">Synchroniseren met het internet</string>
+  <string name="label_send_key">Certificaat publiceren op sleutelservers</string>
   <string name="label_fingerprint">Vingerafdruk</string>
   <string name="expiry_date_dialog_title">Bepaal verloopdatum</string>
   <string name="label_keyservers_title">Sleutelservers</string>
@@ -176,6 +177,7 @@
   <string name="label_selected_smartpgp_authority_title">Geselecteerde autoriteit</string>
   <string name="label_preferred">voorkeur</string>
   <string name="label_enable_compression">Compressie aanzetten</string>
+  <string name="label_enable_self_encrypt">Versleutelen naar ondertekenaar</string>
   <string name="label_encrypt_filenames">Versleutel bestandsnamen</string>
   <string name="label_hidden_recipients">Verberg ontvangers</string>
   <string name="label_smartpgp_verify">SmartPGP: verifieer certificaten</string>
@@ -640,7 +642,7 @@
   <string name="key_view_action_share_with">Delen met…</string>
   <string name="key_view_action_share_ssh_with">Delen als SSH-publieke sleutel met…</string>
   <string name="key_view_action_share_nfc">Delen over NFC</string>
-  <string name="key_view_action_upload">Uploaden naar sleutelserver</string>
+  <string name="key_view_action_upload">Publiceren op sleutelserver</string>
   <string name="key_view_tab_main">Hoofdinfo</string>
   <string name="key_view_tab_start">Start</string>
   <string name="key_view_tab_share">Delen</string>
@@ -716,7 +718,7 @@
   <string name="edit_key_error_bad_security_token_curve">Curve niet ondersteund door Security Token!</string>
   <string name="edit_key_error_bad_security_token_stripped">Kan sleutel niet verplaatsen naar Security Token (ofwel gestript ofwel reeds aanwezig op Security Token)!</string>
   <!--Create key-->
-  <string name="create_key_upload">Synchroniseren met internet</string>
+  <string name="create_key_upload">Publiceren op sleutelservers</string>
   <string name="create_key_empty">Dit veld moet ingevuld worden</string>
   <string name="create_key_passphrases_not_equal">Wachtwoorden komen niet overeen</string>
   <string name="create_key_final_text">Je hebt volgende identiteit ingevoerd:</string>
@@ -1484,6 +1486,8 @@
   <string name="snack_armor_off">Uitvoer geëncodeerd als binair.</string>
   <string name="snack_compression_on">Compressie <b>ingeschakeld</b>.</string>
   <string name="snack_compression_off">Compressie <b>uitgeschakeld</b>.</string>
+  <string name="snack_self_encrypt_on">Versleutelen naar ondertekenaar <b>ingeschakeld</b>.</string>
+  <string name="snack_self_encrypt_off">Versleutelen naar ondertekenaar <b>uitgeschakeld</b>.</string>
   <string name="error_loading_keys">Fout bij laden van sleutels!</string>
   <string name="error_empty_log">(fout, leeg log)</string>
   <string name="error_reading_text">Kon invoer niet lezen om te ontsleutelen!</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 777f4f632..afd7b9e3d 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -452,7 +452,6 @@
   <string name="key_view_action_update">Aktualizuj z serwera kluczy</string>
   <string name="key_view_action_share_with">Podziel się z...</string>
   <string name="key_view_action_share_nfc">Udostępnij używając NFC</string>
-  <string name="key_view_action_upload">Wyślij do serwera kluczy</string>
   <string name="key_view_tab_main">Główne Informacje</string>
   <string name="key_view_tab_start">Start</string>
   <string name="key_view_tab_share">Udostępnij</string>
@@ -702,8 +701,15 @@
   <string name="prompt_fidesmo_app_install_button_negative">Zamknij</string>
   <string name="redirect_import_key_no">Close</string>
   <string name="button_cancel">Zamknij</string>
+  <string name="title_key_status">Stan klucza</string>
+  <string name="key_health_ok_title">Prawidłowy</string>
+  <string name="key_health_divert_title">Prawidłowy (token bezpieczeństwa)</string>
+  <string name="key_health_divert_partial_title">Prawidłowy (częściowy token)</string>
   <string name="key_health_expired_title">Wygasło</string>
   <string name="key_health_revoked_title">Unieważnione</string>
+  <string name="key_health_sign_only_title">Prawidłowy (klucz podpisujący)</string>
+  <string name="key_health_stripped_title">Prawidłowy (zredukowany)</string>
+  <string name="key_health_partial_stripped_title">Prawidłowy (częściowo zredukowany)</string>
   <string name="keyserver_title_published">Opublikowane</string>
   <string name="dialog_insecure_title">Ostrzeżenie Bezpieczeństwa</string>
   <string name="dialog_insecure_button_ok">Mam to</string>
diff --git a/OpenKeychain/src/main/res/values-pt-rBR/strings.xml b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
index 14050de11..aecdeb162 100644
--- a/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
+++ b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
@@ -150,7 +150,6 @@
   <string name="label_file_compression">Compressão de arquivo</string>
   <string name="label_key_id">ID da chave</string>
   <string name="label_key_id_colon"> Identificação da Chave:</string>
-  <string name="label_key_created">Chave criada %s</string>
   <string name="label_key_type">Tipo</string>
   <string name="label_creation">Criação</string>
   <string name="label_expiry">Data de expiração</string>
@@ -160,7 +159,6 @@
   <string name="label_main_user_id">Identidade primária</string>
   <string name="label_name">Nome</string>
   <string name="label_email">Email</string>
-  <string name="label_send_key">Sincronizar com a Internet</string>
   <string name="label_fingerprint">Impressão Digital</string>
   <string name="expiry_date_dialog_title">Definir data de validade</string>
   <string name="label_keyservers_title">Servidor de chaves</string>
@@ -594,7 +592,6 @@
   <string name="key_view_action_update">Atualizar do servidor de chaves</string>
   <string name="key_view_action_share_with">Compartilhar com...</string>
   <string name="key_view_action_share_nfc">Compartilhar via NFC</string>
-  <string name="key_view_action_upload">Enviar pro servidor de chaves</string>
   <string name="key_view_tab_main">Informações Principais</string>
   <string name="key_view_tab_start">Iniciar</string>
   <string name="key_view_tab_share">Compartilhar</string>
@@ -662,7 +659,6 @@
   <string name="edit_key_error_add_subkey">Adicione ao menos uma sub-chave!</string>
   <string name="edit_key_error_bad_security_token_algo">O algoritmo não é suportado pelo Token de Segurança!</string>
   <!--Create key-->
-  <string name="create_key_upload">Sincronizar com a Internet</string>
   <string name="create_key_empty">Este campo é requerido</string>
   <string name="create_key_passphrases_not_equal">As senhas não conferem</string>
   <string name="create_key_final_text">Você inseriu a seguinte identidade:</string>
diff --git a/OpenKeychain/src/main/res/values-ro/strings.xml b/OpenKeychain/src/main/res/values-ro/strings.xml
index fba90f3f0..82d3491e0 100644
--- a/OpenKeychain/src/main/res/values-ro/strings.xml
+++ b/OpenKeychain/src/main/res/values-ro/strings.xml
@@ -92,7 +92,6 @@
   <string name="label_asymmetric_from">Semnează cu:</string>
   <string name="label_symmetric">Criptează cu parolă</string>
   <string name="label_key_id">ID cheie</string>
-  <string name="label_key_created">Cheie creată %s</string>
   <string name="label_key_type">Tip</string>
   <string name="label_expiry">Expirare</string>
   <string name="label_usage">Utilizare</string>
@@ -100,7 +99,6 @@
   <string name="label_ecc_curve">Curbă eliptică</string>
   <string name="label_name">Nume</string>
   <string name="label_email">Email</string>
-  <string name="label_send_key">Sincronizează pe Internet</string>
   <string name="label_fingerprint">Amprentă</string>
   <string name="label_hidden_recipients">Ascunde recipientele</string>
   <string name="label_enter_keyserver_url">URL</string>
@@ -267,7 +265,6 @@
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Schimbă parola</string>
   <!--Create key-->
-  <string name="create_key_upload">Sincronizează pe Internet</string>
   <string name="create_key_empty">Acest câmp este necesar</string>
   <string name="create_key_passphrases_not_equal">Parolele nu se potrivesc</string>
   <string name="create_key_final_text">Ai introdus următoarea identitate:</string>
@@ -409,6 +406,7 @@
     <item>100 EURO</item>
   </string-array>
   <string name="redirect_import_key_no">Închide</string>
+  <string name="button_allow">Permite</string>
   <string name="button_cancel">Anulare</string>
   <string name="key_health_expired_title">Expirată</string>
   <string name="key_health_revoked_title">Revocat</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 7601b14d9..fd5b30b94 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -156,7 +156,8 @@
   <string name="label_keyservers">Управление серверами ключей OpenPGP</string>
   <string name="label_key_id">ID ключа</string>
   <string name="label_key_id_colon">ID ключа:</string>
-  <string name="label_key_created">Создан ключ %s</string>
+  <string name="label_key_created">Создан %s</string>
+  <string name="label_key_created_just_now">Создан прямо сейчас</string>
   <string name="label_key_type">Тип</string>
   <string name="label_creation">Создан</string>
   <string name="label_creation_colon">Создан:</string>
@@ -167,7 +168,7 @@
   <string name="label_main_user_id">Основной идентификатор</string>
   <string name="label_name">Имя</string>
   <string name="label_email">Email</string>
-  <string name="label_send_key">Синхронизация с интернетом</string>
+  <string name="label_send_key">Публикация сертификации на серверах ключей</string>
   <string name="label_fingerprint">Отпечаток</string>
   <string name="expiry_date_dialog_title">Срок годности</string>
   <string name="label_keyservers_title">Серверы ключей</string>
@@ -176,6 +177,7 @@
   <string name="label_selected_smartpgp_authority_title">Выбранный центр</string>
   <string name="label_preferred">предпочитаемый</string>
   <string name="label_enable_compression">Использовать сжатие</string>
+  <string name="label_enable_self_encrypt">Шифровать для подписывающего лица</string>
   <string name="label_encrypt_filenames">Шифровать имена файлов</string>
   <string name="label_hidden_recipients">Скрыть получателей</string>
   <string name="label_smartpgp_verify">Сертификат проверки SmartPGP</string>
@@ -679,7 +681,7 @@
   <string name="key_view_action_share_with">Отправить...</string>
   <string name="key_view_action_share_ssh_with">Отправить публичный ключ SSH в…</string>
   <string name="key_view_action_share_nfc">Отправить через NFC</string>
-  <string name="key_view_action_upload">Загрузить на сервер ключей</string>
+  <string name="key_view_action_upload">Опубликовать на сервере ключей</string>
   <string name="key_view_tab_main">Основные данные</string>
   <string name="key_view_tab_start">Начать</string>
   <string name="key_view_tab_share">Отправить...</string>
@@ -755,7 +757,7 @@
   <string name="edit_key_error_bad_security_token_curve">Кривая не поддерживается токеном безопасности!</string>
   <string name="edit_key_error_bad_security_token_stripped">Невозможно переместить ключ в токен безопасности (он или отделён, или уже в токене)!</string>
   <!--Create key-->
-  <string name="create_key_upload">Синхронизация с интернетом</string>
+  <string name="create_key_upload">Опубликовать на серверах ключей</string>
   <string name="create_key_empty">Это обязательне поле</string>
   <string name="create_key_passphrases_not_equal">Пароли не совпадают</string>
   <string name="create_key_final_text">Вы указали следующие данные:</string>
@@ -1551,6 +1553,8 @@
   <string name="snack_armor_off">Результат кодируется как двоичный.</string>
   <string name="snack_compression_on">Сжатие <b>включено</b>.</string>
   <string name="snack_compression_off">Сжатие <b>отключено</b>.</string>
+  <string name="snack_self_encrypt_on">Шифрование для подписывающего лица <b>включено</b>.</string>
+  <string name="snack_self_encrypt_off">Шифрование для подписывающего лица <b>отключено</b>.</string>
   <string name="error_loading_keys">Ошибка загрузки ключей!</string>
   <string name="error_empty_log">(ошибка, пустой журнал)</string>
   <string name="error_reading_text">Не удалось прочитать ввод для расшифровки!</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index dbed369f2..e4054ec7c 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -428,7 +428,6 @@
   <string name="key_view_action_update">Posodobi s strežnika</string>
   <string name="key_view_action_share_with">Deli z...</string>
   <string name="key_view_action_share_nfc">Deli preko NFC</string>
-  <string name="key_view_action_upload">Naloži na strežnik</string>
   <string name="key_view_tab_main">Glavne informacije</string>
   <string name="key_view_tab_start">Start</string>
   <string name="key_view_tab_share">Deli</string>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index 6aca5fb33..ba5988ddc 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -148,7 +148,6 @@
   <string name="label_message_compression">Компресија текста</string>
   <string name="label_file_compression">Компресија фајла</string>
   <string name="label_key_id">ИД кључа</string>
-  <string name="label_key_created">Кључ направљен %s</string>
   <string name="label_key_type">Тип</string>
   <string name="label_creation">Створен</string>
   <string name="label_expiry">Истиче</string>
@@ -158,7 +157,6 @@
   <string name="label_main_user_id">Примарни идентитет</string>
   <string name="label_name">Име</string>
   <string name="label_email">Е-адреса</string>
-  <string name="label_send_key">Синхронизуј са интернетом</string>
   <string name="label_fingerprint">Отисак</string>
   <string name="expiry_date_dialog_title">Датум истицања</string>
   <string name="label_keyservers_title">Сервери кључева</string>
@@ -597,7 +595,6 @@
   <string name="key_view_action_update">Ажурирај са сервера кључева</string>
   <string name="key_view_action_share_with">Дели помоћу…</string>
   <string name="key_view_action_share_nfc">Дели преко НФЦ</string>
-  <string name="key_view_action_upload">Отпреми на сервер кључева</string>
   <string name="key_view_tab_main">Главни подаци</string>
   <string name="key_view_tab_start">Почетак</string>
   <string name="key_view_tab_share">Дељење</string>
@@ -669,7 +666,6 @@
   <string name="edit_key_error_add_identity">Додајте бар један идентитет!</string>
   <string name="edit_key_error_add_subkey">Додајте бар један поткључ!</string>
   <!--Create key-->
-  <string name="create_key_upload">Синхронизуј са интернетом</string>
   <string name="create_key_empty">Ово поље је обавезно</string>
   <string name="create_key_passphrases_not_equal">Лозинке се не поклапају</string>
   <string name="create_key_final_text">Унели сте следећи идентитет:</string>
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index 7b0222fa4..e2a6a3e30 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -52,7 +52,7 @@
   <string name="section_proxy_settings_summary">Tor, proxyinställningar</string>
   <string name="section_gui">Gränssnitt</string>
   <string name="section_sync_settings">Synkronisering</string>
-  <string name="section_sync_settings_summary">Automatiska nyckel uppdateringar, kontakt länkning</string>
+  <string name="section_sync_settings_summary">Automatiska nyckeluppdateringar, kontakt länkning</string>
   <string name="section_experimental_features">Experimentella funktioner</string>
   <string name="section_certify">Bekräfta</string>
   <string name="section_actions">Åtgärder</string>
@@ -155,7 +155,6 @@
   <string name="label_keyservers">Hantera OpenPGP-nyckelservrar</string>
   <string name="label_key_id">Nyckel-ID</string>
   <string name="label_key_id_colon">Nyckel-ID</string>
-  <string name="label_key_created">Nyckel skapad %s</string>
   <string name="label_key_type">Typ</string>
   <string name="label_creation">Skapande</string>
   <string name="label_creation_colon">Skapelse:</string>
@@ -166,7 +165,6 @@
   <string name="label_main_user_id">Primär identitet</string>
   <string name="label_name">Namn</string>
   <string name="label_email">E-post</string>
-  <string name="label_send_key">Synkronisera med Internet</string>
   <string name="label_fingerprint">Fingeravtryck</string>
   <string name="expiry_date_dialog_title">Ställ in utgångsdatum</string>
   <string name="label_keyservers_title">Nyckelservrar</string>
@@ -192,7 +190,7 @@
   <string name="pref_keybase_summary">Sök nycklar på keybase.io</string>
   <string name="pref_facebook">Facebook</string>
   <string name="pref_facebook_summary">Söknycklar på Facebook efter användarnamn</string>
-  <string name="label_sync_settings_keyserver_title">Automatiska nyckel uppdateringar</string>
+  <string name="label_sync_settings_keyserver_title">Automatiska nyckeluppdateringar</string>
   <string name="label_sync_settings_keyserver_summary_on">Var tredje dag, uppdateras nycklar från den föredragna nyckelserver </string>
   <string name="label_sync_settings_keyserver_summary_off">Nycklar uppdateras inte automatiskt</string>
   <string name="label_sync_settings_wifi_title">Synkronisera endast över Wi-Fi</string>
@@ -200,7 +198,7 @@
   <string name="label_sync_settings_contacts_summary_on">Länka nycklar till kontakter baserade på namn och e-postadresser. Detta sker helt offline på enheten.</string>
   <string name="label_sync_settings_contacts_summary_off">Nya nycklar kommer inte att kopplas till kontakter</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automatiska nyckel uppdateringar</string>
+  <string name="keyserver_sync_settings_title">Automatiska nyckeluppdateringar</string>
   <string name="label_experimental_settings_desc_title">Varning</string>
   <string name="label_experimental_settings_desc_summary">Dessa funktioner är ännu inte klar eller resultat användarupplevelse/säkerhetsforskning. Således, lita inte på deras säkerhet och vänligen rapporterar inte problem som du påträffar!</string>
   <string name="label_experimental_settings_linked_identities_title">Länkade identiteter</string>
@@ -584,7 +582,6 @@
   <string name="key_view_action_update">Uppdatera från nyckelserver</string>
   <string name="key_view_action_share_with">Dela med…</string>
   <string name="key_view_action_share_nfc">Dela via NFC</string>
-  <string name="key_view_action_upload">Ladda upp till nyckelserver</string>
   <string name="key_view_tab_main">Info</string>
   <string name="key_view_tab_start">Starta</string>
   <string name="key_view_tab_share">Dela</string>
@@ -636,7 +633,6 @@
   <string name="edit_key_error_add_identity">Lägg till åtminstone en identitet!</string>
   <string name="edit_key_error_add_subkey">Lägg till åtminstone en undernyckel!</string>
   <!--Create key-->
-  <string name="create_key_upload">Synkronisera med Internet</string>
   <string name="create_key_empty">Detta fält krävs</string>
   <string name="create_key_passphrases_not_equal">Lösenorden stämmer inte överens</string>
   <string name="create_key_final_text">Du angav följande identitet:</string>
diff --git a/OpenKeychain/src/main/res/values-th/strings.xml b/OpenKeychain/src/main/res/values-th/strings.xml
index e193590d8..e88cdd8c2 100644
--- a/OpenKeychain/src/main/res/values-th/strings.xml
+++ b/OpenKeychain/src/main/res/values-th/strings.xml
@@ -3,13 +3,18 @@
   <!--GENERAL: Please put all strings inside quotes as described in example 1 on
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <!--title-->
+  <string name="title_preferences">การตั้งค่า</string>
+  <string name="title_api_registered_apps">แอป</string>
   <string name="title_help">ช่วยเหลือ</string>
+  <string name="title_log_display">บันทึก</string>
   <!--section-->
   <!--button-->
   <!--Content Description-->
   <!--menu-->
+  <string name="menu_preferences">การตั้งค่า</string>
   <string name="menu_help">ช่วยเหลือ</string>
   <!--label-->
+  <string name="label_email">อีเมล</string>
   <!--label shown in Android settings under the OpenKeychain account-->
   <!--Proxy Preferences-->
   <!--proxy type choices and values-->
@@ -42,6 +47,7 @@
   <!--Certify result toast-->
   <!--Intent labels-->
   <!--Remote API-->
+  <string name="api_settings_settings">การตั้งค่า</string>
   <!--Share-->
   <!--retry upload dialog-->
   <!--Delete or revoke private key dialog-->
@@ -56,6 +62,7 @@
   <!--Add/Edit keyserver-->
   <!--Add/Edit SmartPGP authority-->
   <!--Navigation Drawer-->
+  <string name="nav_apps">แอป</string>
   <!--hints-->
   <!--certs-->
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
@@ -85,5 +92,6 @@
   <!--TODO: rename all the things!-->
   <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+  <string name="nfc_settings">การตั้งค่า</string>
   <!--Other Linked Identity strings-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 9587c2995..ed14fb2fa 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -338,7 +338,6 @@
   <string name="key_view_action_update">Anahtar sunucusundan güncelle</string>
   <string name="key_view_action_share_with">Şu şekilde paylaş...</string>
   <string name="key_view_action_share_nfc">NFC üzerinden Paylaş</string>
-  <string name="key_view_action_upload">Anahtar sunucusuna yükle</string>
   <string name="key_view_tab_main">Ana Bilgi</string>
   <string name="key_view_tab_start">Başlat</string>
   <string name="key_view_tab_share">Paylaş</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index cd7942e1c..da98ee220 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -156,7 +156,7 @@
   <string name="label_keyservers">Керувати серверами ключів OpenPGP</string>
   <string name="label_key_id">ІД ключа</string>
   <string name="label_key_id_colon">Ідентифікатор ключа:</string>
-  <string name="label_key_created">Ключ створено %s</string>
+  <string name="label_key_created">Створено %s</string>
   <string name="label_key_type">Тип</string>
   <string name="label_creation">Створення</string>
   <string name="label_creation_colon">Створення:</string>
@@ -167,7 +167,6 @@
   <string name="label_main_user_id">Первинна сутність</string>
   <string name="label_name">Назва</string>
   <string name="label_email">Ел. пошта</string>
-  <string name="label_send_key">Синхронізувати з інтернетом</string>
   <string name="label_fingerprint">Відбиток</string>
   <string name="expiry_date_dialog_title">Задати термін дії</string>
   <string name="label_keyservers_title">Сервери ключів</string>
@@ -662,7 +661,6 @@
   <string name="key_view_action_share_with">Поділитися із…</string>
   <string name="key_view_action_share_ssh_with">Поділитися відкритим ключем SSH із…</string>
   <string name="key_view_action_share_nfc">Поділитися через NFC</string>
-  <string name="key_view_action_upload">Вивантажити на сервер ключів</string>
   <string name="key_view_tab_main">Основна інформація</string>
   <string name="key_view_tab_start">Початок</string>
   <string name="key_view_tab_share">Поділитися</string>
@@ -738,7 +736,6 @@
   <string name="edit_key_error_bad_security_token_curve">Крива не підтримує маркер безпеки!</string>
   <string name="edit_key_error_bad_security_token_stripped">Не можу перемістити ключ до маркера безпеки (ключ вже відділено чи переміщено на маркер безпеки)</string>
   <!--Create key-->
-  <string name="create_key_upload">Синхронізувати з Internet</string>
   <string name="create_key_empty">Це поле - обов\'язкове</string>
   <string name="create_key_passphrases_not_equal">Паролі не збігаються</string>
   <string name="create_key_final_text">Ви ввели наступну сутність:</string>
diff --git a/OpenKeychain/src/main/res/values-vi/strings.xml b/OpenKeychain/src/main/res/values-vi/strings.xml
index 877c8ce6c..c9f46abe1 100644
--- a/OpenKeychain/src/main/res/values-vi/strings.xml
+++ b/OpenKeychain/src/main/res/values-vi/strings.xml
@@ -149,7 +149,6 @@
   <string name="label_message_compression">Nén văn bản</string>
   <string name="label_file_compression">Nén tệp tin</string>
   <string name="label_key_id">ID của khóa</string>
-  <string name="label_key_created">Khóa đã tạo %s</string>
   <string name="label_key_type">Kiểu</string>
   <string name="label_creation">Tạo</string>
   <string name="label_expiry">Hạn dùng</string>
@@ -159,7 +158,6 @@
   <string name="label_main_user_id">Định danh chính</string>
   <string name="label_name">Tên</string>
   <string name="label_email">Thư điện tử</string>
-  <string name="label_send_key">Đồng bộ với Internet</string>
   <string name="label_fingerprint">Mã nhận dạng</string>
   <string name="expiry_date_dialog_title">Thiết lập ngày hết hạn</string>
   <string name="label_keyservers_title">Máy chủ khóa</string>
@@ -277,7 +275,6 @@
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Đổi mật khẩu</string>
   <!--Create key-->
-  <string name="create_key_upload">Đồng bộ với Internet</string>
   <string name="create_key_yubi_key_pin">Mã PIN</string>
   <!--View key-->
   <!--Add/Edit keyserver-->
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index 9a8775b22..3d412a138 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -143,7 +143,6 @@
   <string name="label_message_compression">文字壓縮</string>
   <string name="label_file_compression">檔案壓縮</string>
   <string name="label_key_id">金鑰ID</string>
-  <string name="label_key_created">金鑰 %s 已建立</string>
   <string name="label_key_type">類型</string>
   <string name="label_creation">建立</string>
   <string name="label_expiry">有效期限</string>
@@ -513,7 +512,6 @@
   <string name="key_view_action_update">從金鑰伺服器更新</string>
   <string name="key_view_action_share_with">分享...</string>
   <string name="key_view_action_share_nfc">以NFC分享</string>
-  <string name="key_view_action_upload">上傳到金鑰伺服器</string>
   <string name="key_view_tab_main">摘要</string>
   <string name="key_view_tab_start">快速上手</string>
   <string name="key_view_tab_share">分享</string>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 12e92aa51..ca044f53c 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -39,8 +39,8 @@
   <!--section-->
   <string name="section_user_ids">用户标识</string>
   <string name="section_security_token">安全令牌</string>
-  <string name="section_linked_system_contact">关联系统联系人</string>
-  <string name="section_keybase_proofs">Keybase.io 证书</string>
+  <string name="section_linked_system_contact">关联的系统联系人</string>
+  <string name="section_keybase_proofs">Keybase.io 证明</string>
   <string name="section_should_you_trust">信任此密钥？</string>
   <string name="section_proof_details">验证</string>
   <string name="section_keys">子密钥</string>
@@ -89,7 +89,7 @@
   <string name="btn_open_with">打开为</string>
   <string name="btn_copy_decrypted_text">复制到剪贴板</string>
   <string name="btn_decrypt_clipboard">从剪贴板导入</string>
-  <string name="btn_decrypt_files">选择导入文件</string>
+  <string name="btn_decrypt_files">从文件导入</string>
   <string name="btn_encrypt_files">加密文件</string>
   <string name="btn_encrypt_text">加密文本</string>
   <string name="btn_add_email">添加额外的邮件地址</string>
@@ -120,7 +120,7 @@
   <string name="menu_export_all_keys">导出全部密钥</string>
   <string name="menu_update_all_keys">更新所有密钥</string>
   <string name="menu_certify_fingerprint">通过指纹确认</string>
-  <string name="menu_certify_fingerprint_phrases">通过短语认证</string>
+  <string name="menu_certify_fingerprint_phrases">通过短语确认</string>
   <string name="menu_share_log">分享记录</string>
   <string name="menu_change_password">更改密码</string>
   <string name="menu_advanced">更多密钥详情</string>
@@ -155,7 +155,6 @@
   <string name="label_keyservers">管理 OpenPGP 密钥服务器</string>
   <string name="label_key_id">密钥 ID</string>
   <string name="label_key_id_colon">密钥 ID：</string>
-  <string name="label_key_created">已创建密钥 %s</string>
   <string name="label_key_type">类型</string>
   <string name="label_creation">创建时间</string>
   <string name="label_creation_colon">创建时间：</string>
@@ -166,7 +165,6 @@
   <string name="label_main_user_id">主要标识</string>
   <string name="label_name">姓名</string>
   <string name="label_email">电子邮件</string>
-  <string name="label_send_key">网络同步</string>
   <string name="label_fingerprint">指纹</string>
   <string name="expiry_date_dialog_title">设置有效期</string>
   <string name="label_keyservers_title">密钥服务器</string>
@@ -179,6 +177,7 @@
   <string name="label_verify_keyserver_connection">连接测试</string>
   <string name="label_only_trusted_keyserver">只信任该密钥服务器</string>
   <string name="label_enter_keyserver_url">URL</string>
+  <string name="label_enter_keyserver_onion">可选的 Tor .onion URL</string>
   <string name="label_keyserver_dialog_delete">删除密钥服务器</string>
   <string name="label_theme">主题</string>
   <string name="label_enter_smartpgp_authority_name">名称</string>
@@ -193,7 +192,7 @@
   <string name="label_sync_settings_keyserver_summary_off">不自动更新密钥</string>
   <string name="label_sync_settings_wifi_title">仅在 Wi-Fi 环境下同步</string>
   <string name="label_sync_settings_contacts_title">与联系人关联密钥</string>
-  <string name="label_sync_settings_contacts_summary_on">根据名字和 email 地址将密钥关联到联系人。这是本地操作，不需要联网。</string>
+  <string name="label_sync_settings_contacts_summary_on">根据名字和邮件地址将密钥关联到联系人。这是本地操作，不需要联网。</string>
   <string name="label_sync_settings_contacts_summary_off">新密钥将不会与联系人相关联</string>
   <!--label shown in Android settings under the OpenKeychain account-->
   <string name="keyserver_sync_settings_title">自动更新密钥</string>
@@ -201,6 +200,7 @@
   <string name="label_experimental_settings_desc_summary">这些功能目前尚未完成或者缺少用户经验性/安全性的研究结果。所以，不保证他们是安全的，请不要对我们发牢骚！</string>
   <string name="label_experimental_settings_linked_identities_title">关联用户标识</string>
   <string name="label_experimental_settings_linked_identities_summary">将密钥与 Twitter, GitHub, 网站或者 DNS 关联 (类似 Keybase.io 但是去中心化的)</string>
+  <string name="label_experimental_settings_keybase_title">Keybase.io 证明</string>
   <string name="label_experimental_settings_keybase_summary">每次展示密钥时自动从keybase.io获取证明并显示它们</string>
   <string name="label_experimental_settings_theme_summary">（图标和某些界面还未根据深色主题进行调整）</string>
   <!--Proxy Preferences-->
@@ -288,7 +288,7 @@
   <string name="pin_for">输入 \'%s\' 的 PIN 码</string>
   <string name="security_token_pin_for">输入 PIN 码以访问 \'%s\' 的安全令牌</string>
   <string name="security_token_nfc_text">将安全令牌贴近设备背面的 NFC 标志.</string>
-  <string name="security_token_nfc_wait">请保持安全令牌贴在后面!</string>
+  <string name="security_token_nfc_wait">请保持安全令牌贴在设备背部！</string>
   <string name="security_token_nfc_finished">现在移开安全令牌.</string>
   <string name="security_token_nfc_try_again_text">移开安全令牌并点击 \'重试\'.</string>
   <string name="file_delete_confirmation_title">删除原始文件？</string>
@@ -337,7 +337,7 @@
   <string name="error_external_storage_not_ready">外置存储没有就绪</string>
   <string name="error_key_size_minimum512bit">密钥的大小必须至少 512 位!</string>
   <string name="error_unknown_algorithm_choice">未知的算法选项</string>
-  <string name="error_user_id_no_email">没有找到邮箱地址</string>
+  <string name="error_user_id_no_email">未找到邮件地址</string>
   <string name="error_key_needs_a_user_id">至少需要一个用户标识</string>
   <string name="error_no_signature_passphrase">没有给出密码</string>
   <string name="error_no_signature_key">没有提供签名密钥</string>
@@ -349,6 +349,7 @@
   <string name="error_jelly_bean_needed">只有 Android 4.1 及以上才支持 Android\'s NFC Beam 功能</string>
   <string name="error_nfc_needed">必须开启 NFC!</string>
   <string name="error_beam_needed">必须开启 Beam!</string>
+  <string name="error_nothing">无内容可显示。</string>
   <string name="error_nothing_import">未发现密钥！</string>
   <string name="error_contacts_key_id_missing">从联系人取回密钥 ID 失败！</string>
   <string name="error_generic_report_bug">发生错误，请建立一个新的错误反馈给 OpenKeychain。</string>
@@ -376,6 +377,7 @@
   <string name="progress_done">完成。</string>
   <string name="progress_cancel">取消</string>
   <string name="progress_cancelling">正在取消…</string>
+  <string name="progress_downloading">下载中…</string>
   <string name="progress_saving">保存中…</string>
   <string name="progress_importing">导入中…</string>
   <string name="progress_benchmarking">评测中…</string>
@@ -389,6 +391,7 @@
   <string name="progress_generating_dsa">产生新的DSA密钥中…</string>
   <string name="progress_generating_elgamal">产生新的ElGamal密钥中…</string>
   <string name="progress_generating_ecdsa">产生新的ECDSA密钥中…</string>
+  <string name="progress_generating_eddsa">生成新的 EdDSA 密钥中…</string>
   <string name="progress_generating_ecdh">产生新的ECDH密钥中…</string>
   <string name="progress_modify">变更密钥环中…</string>
   <string name="progress_modify_unlock">解锁密钥环中…</string>
@@ -426,7 +429,7 @@
   <string name="progress_verifying_keyserver_connection">验证网络连接中…</string>
   <string name="progress_starting_orbot">启动 Orbot 中…</string>
   <!--action strings-->
-  <string name="hint_cloud_search_hint">通过姓名、邮件查找…</string>
+  <string name="hint_cloud_search_hint">通过姓名、邮箱等查找</string>
   <!--key bit length selections-->
   <string name="key_size_2048">2048</string>
   <string name="key_size_3072">3072</string>
@@ -467,6 +470,8 @@
   <string name="import_qr_code_button">扫描二维码</string>
   <string name="import_qr_code_text">将您的镜头对准二维码！</string>
   <string name="btn_import">导入</string>
+  <string name="btn_refresh">刷新</string>
+  <string name="btn_go_to_key">转到密钥</string>
   <!--Generic result toast-->
   <string name="snackbar_details">细节</string>
   <string name="with_warnings">，包含警告</string>
@@ -541,7 +546,7 @@
   <string name="api_register_allow">允许访问</string>
   <string name="api_register_disallow">禁止访问</string>
   <string name="api_register_error_select_key">请选择一个密钥！</string>
-  <string name="api_select_pub_keys_missing_text">未找任何密钥与这些邮箱对应:</string>
+  <string name="api_select_pub_keys_missing_text">没有与这些邮件地址对应的密钥：</string>
   <string name="api_select_pub_keys_dublicates_text">多个密钥与这些邮箱对应:</string>
   <string name="api_select_pub_keys_text">请确认收件人列表！</string>
   <string name="api_select_pub_keys_text_no_user_ids">请选择接收人！</string>
@@ -570,7 +575,7 @@
   </plurals>
   <string name="key_list_empty_text1">未发现密钥！</string>
   <string name="key_list_filter_show_all">显示所有密钥</string>
-  <string name="key_list_filter_show_certified">仅显示验证过的密钥</string>
+  <string name="key_list_filter_show_certified">仅显示确认过的密钥</string>
   <string name="key_list_fab_qr_code">扫描二维码</string>
   <string name="key_list_fab_search">搜索密钥</string>
   <string name="key_list_fab_import">从文件导入</string>
@@ -581,8 +586,8 @@
   <string name="key_view_action_certify">确认密钥</string>
   <string name="key_view_action_update">从密钥服务器更新</string>
   <string name="key_view_action_share_with">分享到…</string>
+  <string name="key_view_action_share_ssh_with">将 SSH 公钥分享到...</string>
   <string name="key_view_action_share_nfc">通过NFC分享</string>
-  <string name="key_view_action_upload">上传至服务器</string>
   <string name="key_view_tab_main">主要信息</string>
   <string name="key_view_tab_start">开始</string>
   <string name="key_view_tab_share">分享</string>
@@ -604,7 +609,7 @@
   <!--keybase proof stuff-->
   <string name="keybase_narrative_twitter">能发送推文到 %s </string>
   <string name="keybase_narrative_github">在GitHub上的用户名是 %s</string>
-  <string name="keybase_narrative_dns">拥有的域名 %s</string>
+  <string name="keybase_narrative_dns">拥有域名 %s</string>
   <string name="keybase_narrative_web_site">能发送网页到 %s</string>
   <string name="keybase_narrative_reddit">以 %s 之名发送到 Reddit </string>
   <string name="keybase_narrative_coinbase">在Coinbase上的用户名是 %s</string>
@@ -655,7 +660,6 @@
   <string name="edit_key_error_add_subkey">至少要有一个子密钥！</string>
   <string name="edit_key_error_bad_security_token_algo">安全令牌不支持该算法！</string>
   <!--Create key-->
-  <string name="create_key_upload">网络同步</string>
   <string name="create_key_empty">该字段必填</string>
   <string name="create_key_passphrases_not_equal">密码不匹配</string>
   <string name="create_key_final_text">您输入了以下用户标识:</string>
@@ -663,13 +667,14 @@
   <string name="create_key_rsa">(3个子密钥，RSA，4096位)</string>
   <string name="create_key_custom">（自定义密钥配置）</string>
   <string name="create_key_name_text">选择一个关联到此密钥的名字，可以是全名，例如‘John Doe’，或者一个妮称‘Johnny’。</string>
-  <string name="create_key_email_text">输入你用来加密通信的主邮箱地址</string>
+  <string name="create_key_email_text">输入你用来加密通信的主邮件地址</string>
   <string name="create_key_passphrase_text">选择一个强壮密码.在你的设备丢失时它能保护你的密钥.</string>
   <string name="create_key_hint_full_name">全名或昵称</string>
   <string name="create_key_edit">更改密钥配置</string>
-  <string name="create_key_add_email">添加电子邮件地址</string>
+  <string name="create_key_add_email">添加邮件地址</string>
   <string name="create_key_add_email_text">其它能用此密钥通信的邮件地址</string>
-  <string name="create_key_email_already_exists_text">电子邮件地址已经被添加</string>
+  <string name="create_key_email_already_exists_text">邮件地址已经被添加</string>
+  <string name="create_key_email_empty_email">邮件地址不能为空</string>
   <string name="create_key_yubi_key_pin_text">请选择一个有6位数字的PIN.</string>
   <string name="create_key_yubi_key_admin_pin_text">请写下管理员密码并将其存放在安全的地方(如果你输错密码3次将需要管理员密码)。</string>
   <string name="create_key_yubi_key_pin">PIN</string>
@@ -679,8 +684,8 @@
   <string name="create_key_yubi_key_pin_too_short">PIN最少要求为6位数字!</string>
   <!--View key-->
   <string name="view_key_my_key">我的密钥</string>
-  <string name="view_key_verified">已验证的密钥</string>
-  <string name="view_key_unverified">未验证：扫描二维码以验证密钥！</string>
+  <string name="view_key_verified">已确认的密钥</string>
+  <string name="view_key_unverified">未确认：扫描二维码以确认密钥！</string>
   <string name="view_key_fragment_no_system_contact">&lt;无&gt;</string>
   <!--Add/Edit keyserver-->
   <string name="add_keyserver_dialog_title">添加密钥服务器</string>
@@ -701,6 +706,7 @@
   <string name="drawer_close">关闭抽屉</string>
   <string name="my_keys">我的密钥</string>
   <string name="nav_backup">备份/恢复</string>
+  <string name="nav_transfer">安全 Wifi 传输</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">此处输入要加密的内容</string>
   <!--certs-->
@@ -1333,7 +1339,7 @@
   <string name="security_token_status_bound">安全信息匹配并且已绑定到密钥</string>
   <string name="security_token_status_unbound">安全信息匹配并且可绑定到密钥</string>
   <string name="security_token_status_partly">安全信息匹配并且已部分绑定到密钥</string>
-  <string name="security_token_create">保持安全令牌在您的手机背部</string>
+  <string name="security_token_create">请将安全令牌贴在您设备的背部</string>
   <string name="btn_reset">重置</string>
   <string name="security_token_reset_warning">重置安全令牌将完全摧毁其内部的密钥。之后您将无法使用该密钥加解密消息或文件！</string>
   <string name="snack_security_token_other">安全令牌中存有不同的密钥！</string>
@@ -1348,7 +1354,7 @@
   <string name="security_token_error_unknown">未知错误</string>
   <string name="security_token_error_chaining_error">安全令牌在等待最后一个命令。</string>
   <string name="security_token_error_header">安全令牌报告了无效的 %s 字节。</string>
-  <string name="security_token_error_tag_lost">安全信息被过早移除了。保持安全令牌在背面直到操作完成。</string>
+  <string name="security_token_error_tag_lost">安全令牌被过早移除了。请将安全令牌贴在设备背部直到操作完成。</string>
   <string name="security_token_error_try_again">重试</string>
   <string name="btn_delete_original">删除源文件？</string>
   <string name="snack_encrypt_filenames_on">文件名<b>将会</b> 被加密。</string>
@@ -1463,7 +1469,7 @@
   <string name="snack_backup_saved_dir">已保存到 OpenKeychain 目录</string>
   <string name="btn_backup_back">后退并检查</string>
   <string name="snack_text_too_long">文本过长，无法完整显示！</string>
-  <string name="snack_shared_text_too_long">分享文本因过长而被截取！</string>
+  <string name="snack_shared_text_too_long">分享文本因过长而被截断！</string>
   <string name="share_log_dialog_title">分享日志?</string>
   <string name="share_log_dialog_message">日志对开发者查找 OpenKeychain 的错误非常有用，但其可能包含诸如更新密钥这样的敏感信息。请确认您愿意分享此类信息。</string>
   <string name="share_log_dialog_share_button">分享</string>
@@ -1497,37 +1503,79 @@
     <item>50 欧元</item>
     <item>100 欧元</item>
   </string-array>
+  <string name="redirect_import_key_title">使用 OpenKeychain  扫描！</string>
+  <string name="redirect_import_key_message">您使用第三方应用扫描了一个 OpenPGP 二维码。请直接使用 Openkeychain 扫描以确保安全。</string>
+  <string name="redirect_import_key_yes">重新扫描</string>
   <string name="redirect_import_key_no">关闭</string>
   <string name="button_cancel">取消</string>
+  <string name="title_key_status">密钥状态</string>
+  <string name="cap_title_confirm">确认其他密钥</string>
+  <string name="cap_cert_ok">此密钥可用于确认其他密钥。</string>
+  <string name="cap_cert_divert">此密钥可在安全令牌的配合下确认其他密钥。</string>
+  <string name="cap_title_sign">签名消息</string>
   <string name="cap_sign_ok">此密钥可用于签名/发送消息。</string>
-  <string name="cap_sign_divert">此密钥可用于签名/发送消息，使用安全令牌。</string>
-  <string name="cap_sign_expired">此密钥不能用于签名/发送消息，因为已过期。</string>
-  <string name="cap_sign_revoked">此密钥不能用于签名/发送消息，因为已吊销。</string>
+  <string name="cap_sign_divert">此密钥可在安全令牌的配合下签名/发送消息。</string>
+  <string name="cap_sign_expired">此密钥不能用于签名/发送消息，因为其已过期。</string>
+  <string name="cap_sign_revoked">此密钥不能用于签名/发送消息，因为其已被吊销。</string>
   <string name="cap_sign_stripped">此密钥不能在此设备上签名/发送消息！</string>
   <string name="cap_sign_unavailable">此密钥未配置为签名/发送消息用途！</string>
   <string name="cap_sign_insecure">此密钥可用于签名/发送消息，但不安全！</string>
+  <string name="cap_title_decrypt">解密消息</string>
   <string name="cap_decrypt_ok">此密钥可用于解密/接收消息。</string>
-  <string name="cap_decrypt_divert">此密钥可用于解密/接收消息，使用安全令牌。</string>
+  <string name="cap_decrypt_divert">此密钥可在安全令牌的配合下解密/接收消息。</string>
   <string name="cap_decrypt_expired">此密钥可用于解密/接收消息，但已过期。</string>
-  <string name="cap_decrypt_revoked">此密钥可用于解密/接收消息，但已吊销。</string>
+  <string name="cap_decrypt_revoked">此密钥可用于解密/接收消息，但已被吊销。</string>
   <string name="cap_decrypt_stripped">此密钥不能在此设备上解密/接收消息。</string>
   <string name="cap_decrypt_unavailable">此密钥未配置为解密/接收消息用途！</string>
   <string name="cap_decrypt_insecure">此密钥可用于解密/接收消息，但不安全！</string>
+  <string name="key_health_ok_title">正常</string>
+  <string name="key_health_ok_subtitle">未发现密钥有问题。</string>
+  <string name="key_health_divert_title">正常（安全令牌）</string>
+  <string name="key_health_divert_subtitle">未发现密钥有问题。</string>
+  <string name="key_health_divert_partial_subtitle">点击查看详情</string>
+  <string name="key_health_expired_title">已过期</string>
+  <string name="key_health_expired_subtitle">此密钥不应再被使用。</string>
   <string name="key_health_revoked_title">已吊销</string>
-  <string name="keyserver_title_published">Published</string>
-  <string name="keyserver_title_not_published">不公开</string>
+  <string name="key_health_revoked_subtitle">此密钥已无法再被使用。</string>
+  <string name="key_health_insecure_title">不安全</string>
+  <string name="key_health_insecure_subtitle">此密钥已不再安全！</string>
+  <string name="key_health_broken_subtitle">点击查看详情</string>
+  <string name="key_health_sign_only_title">正常（签名密钥）</string>
+  <string name="key_health_sign_only_subtitle">点击查看详情</string>
+  <string name="key_health_stripped_title">正常（已剥离）</string>
+  <string name="key_health_stripped_subtitle">点击查看详情</string>
+  <string name="key_health_partial_stripped_title">正常（部分剥离）</string>
+  <string name="key_health_partial_stripped_subtitle">点击查看详情</string>
+  <string name="keyserver_title_published">已公开</string>
+  <string name="keyserver_title_not_published">未公开</string>
+  <string name="keyserver_last_updated">上一次检查：%s</string>
+  <string name="keyserver_last_updated_never">上一次检查：无</string>
   <string name="dialog_insecure_title">安全警告</string>
+  <string name="dialog_insecure_override_title">忽略此警告</string>
+  <string name="dialog_insecure_override_ok_title">警告已忽略</string>
+  <string name="usage_authentication">认证</string>
+  <string name="button_scan">扫描</string>
+  <string name="transfer_scan_explanation">使用二者中任一设备扫描二维码，以建立安全连接来分享或导入密钥。</string>
   <string name="button_import">导入</string>
   <string name="transfer_status_connected">已连接</string>
   <string name="transfer_status_disconnected">已断开连接！</string>
+  <string name="transfer_error_connect">连接失败！</string>
   <string name="transfer_error_generic_msg">通讯错误:%s</string>
   <string name="transfer_connecting">连接中…</string>
+  <string name="first_time_secure_wifi_transfer">安全 Wifi 传输</string>
+  <string name="menu_secure_wifi_transfer">安全 Wifi 传输</string>
   <string name="transfer_confirm_cancel">取消</string>
   <string name="transfer_confirm_ok">发送</string>
+  <string name="button_scan_again">重新扫描</string>
+  <string name="transfer_error_wifi_text">连接失败！</string>
+  <string name="transfer_error_wifi_text_instructions">请确保两设备均在同一网络上，然后重新扫描。</string>
+  <string name="transfer_error_wifi_text_instructions_ssid">请确保两设备均在“%s”网络上，然后重新扫描。</string>
   <string name="token_reset_confirm_ok">重置</string>
   <string name="token_result_not_found">未找到密钥</string>
   <string name="token_action_reset">重置安全令牌</string>
   <string name="token_action_import">导入</string>
   <string name="token_unlock_ok">解锁</string>
   <string name="token_hint_admin_pin">Admin PIN</string>
+  <string name="label_usb_untested_summary">若启用，则可以使用未被测试过的 USB 读卡器。</string>
+  <string name="label_usb_untested">允许未经测试的 USB 设备</string>
 </resources>