Pull from transifex

OpenKeychain/src/main/res/raw-ar/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-cs/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-da/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-de/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (Beachte: Bitte schreibe jeden Satz in eine eigene Zeile, Transifex wird jede Zeile in ein eigenes Übesetzungsfeld setzen!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detaillierte Beschreibung von Sicherheits-Problemen
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Unterstützung von EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Bessere Unterstützung von längeren Schlüsseln
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (Observe: ¡Por favor ingrese cada enunciado en su propia línea, Transifex coloca cada línea en su propio campo de traducción!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * El estado de la nueva clave muestra información detallada del porque una clave está considerada insegura o defectuosa
 
 
 ## 4.3
+
   * Mejor soporte para claves grandes
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-es/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
-  * Display keyserver status per key
-  * Support for EdDSA
-  * Fix pgp.mit.edu (new certificate)
+
+  * Detailed description of security problems
+  * Muestra el estado del servidor de claves para cada clave
+  * Soporte para EdDSA
+  * Corrige pgp.mit.edu (nuevo certificado)
+
 
 ## 4.4
+
   * El nuevo estado de la clave muestra información detallada de por qué se considera una clave insegura o defectuosa.
 
 
 ## 4.3
+
   * Mejor soporte para claves grandes
   * Corrige la importación de ficheros de Gpg4win con codificaciones rotas
 

OpenKeychain/src/main/res/raw-eu/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (OHARRA: Meseez jarri esaldi bakoitza bere lerroan, Transifex-ek lerroak bere itzulpen eremuan jartzen ditu!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-fa/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (تذکر: هر جمله در همان خط!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   پشتیبانی بهتر برای کلیدهای بیشتر 
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-fi/help_about.md

@@ -12,7 +12,7 @@ Lisenssi: GPLv3+
   * Dominik Schürmann (Ylläpitäjä)
   * Vincent Breitmoser
 
-## Top Contributors
+## Suurimmat auttajat
   * Adithya Abraham Philip
   * Andrea Torlaschi
   * Arnaud Fontaine
@@ -61,7 +61,7 @@ Lisenssi: GPLv3+
 
 [//]: # (Huom.: Aakkosjärjestys)
 
-## Libraries
+## Kirjastot
   * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
   * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
   * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2)

OpenKeychain/src/main/res/raw-fi/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-fr/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE : veuillez mettre chaque phrase sur sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Description détaillée des problèmes de sécurité
+
+  * Detailed description of security problems
   * Affiche l'état du serveur de clés par clé
   * Prise en charge d'EdDSA
   * Correctif - pgp.mit.edu (nouveau certificat)
 
+
 ## 4.4
+
   *  Le nouvel état des clé affiche en détail pourquoi une clef est considérée comme non fiable ou défectueuse
 
 
 ## 4.3
+
   * Meilleure prise en charge des clé de grande taille
   * Correctif - Importation des fichiers Gpg4win avec des encodages brisés
 

OpenKeychain/src/main/res/raw-hi/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-hu/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-id/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-it/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTA: Si prega di mettere ogni frase in una propria linea, Transifex mette ogni riga nel proprio campo di traduzione!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-ja/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * セキュリティ問題の詳細な説明
+
+  * Detailed description of security problems
   * 鍵ごとに鍵サーバの状態を表示
   * EdDSA のサポート
   * pgp.mit.edu の修正 (新しい証明書)
 
+
 ## 4.4
+
   * 新しい鍵ステータスに、キーが安全でないとみなされる理由の詳細情報を表示
 
 
 ## 4.3
+
   * 巨大な鍵のサポートを改善
   * 破損したエンコーディングのGpg4winファイルのインポートを修正
 

OpenKeychain/src/main/res/raw-kn/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-ko/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-la/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-nb/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
-  * Display keyserver status per key
-  * Support for EdDSA
-  * Fix pgp.mit.edu (new certificate)
+
+  * Detailed description of security problems
+  * Vis nøkkelstatus per nøkkel
+  * Støtte for EdDSA
+  * Fiks for pgp.mit.edu (nytt sertifikat)
+
 
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Bedre støtte for store nøkler
   * Fix import of Gpg4win files with broken encodings
 
@@ -95,7 +108,7 @@
 ## 3.2
 
   * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,...
-  * Material design
+  * Materielt design
   * Integrasjon av QR-kodeskanning (Nye tilganger kreves)
   * Forbedret veiviser for nøkkelopprettelse
   * Fikser manglende kontakter etter synkronisering
@@ -123,11 +136,11 @@
 ## 3.1
 
   * Fikset kræsj på Android 5
-  * New certify screen
+  * Ny bekreftelsesskjerm
   * Secure Exchange directly from key list (SafeSlinger library)
   * New QR Code program flow
-  * Redesigned decrypt screen
-  * New icon usage and colors
+  * Nytt design for dekrypteringsoversikt
+  * Ny ikonbruk og farger
   * Fix import of secret keys from Symantec Encryption Desktop
   * Experimental YubiKey support: Subkey IDs are now checked correctly
 

OpenKeychain/src/main/res/raw-nl/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (Ter info: Zet iedere zin op een eigen regel, Transifex zet iedere regel in zijn eigen vertalingsveld!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Gedetailleerde beschrijving voor beveiligingsproblemen
+
+  * Detailed description of security problems
   * Weergeven van sleutelstatus per sleutel
   * Ondersteuning voor EdDSA
   * Oplossing voor pgp.mit.edu (nieuw certificaat)
 
+
 ## 4.4
+
   * Nieuw overzicht met gedetailleerde informatie over sleutelstatus, waarom een sleutel beschouwd wordt als onveilig of defect
 
 
 ## 4.3
+
   * Betere ondersteuning voor grote sleutels
   * Importeren van Gpg4win-bestanden met beschadigde coderingen hersteld
 

OpenKeychain/src/main/res/raw-pl/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTA: coloque cada frase em sua própria linha, o Transifex coloca cada linha em seu próprio campo de tradução!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   *Melhor suporte para chaves grandes
   * Corrigido importação de arquivos Gpg4win com quebra de codificação
 

OpenKeychain/src/main/res/raw-ro/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-ru/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Детальное описание проблем безопасности
+
+  * Detailed description of security problems
   * Отображение статуса сервера для каждого ключа
   * Поддержка EdDSA
   * Исправлен pgp.mit.edu (новый сертификат)
 
+
 ## 4.4
+
   * Новый статус ключа отображает подробную информацию о том, почему ключ признан небезопасным или дефектным
 
 
 ## 4.3
+
   * Улучшена поддержка больших ключей
   * Исправлен импорт файлов из программы Gpg4win с нарушенной кодировкой
 

OpenKeychain/src/main/res/raw-sl/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-sr/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: #
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-sv/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (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.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Stöd för EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-tr/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-uk/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (Увага: Будь ласка розміщуйте кожне речення у окремому рядку, Transifex розмістить кожен рядок у відповідному полі для перекладу!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Детальний опис для проблем безпеки
+
+  * Detailed description of security problems
   * Відображення стану сервера ключів за ключами
   * Підтримка для EdDSA
   * Виправлено pgp.mit.edu (новий сертифікат)
 
+
 ## 4.4
+
   * Новий статус ключа відображає інформацію, чому ключ вважається незахищеним чи дефектним
 
 
 ## 4.3
+
   * Краща підтримка великих ключів
   * Виправлено імпорт файлів Gpg4win із пошкодженим кодуванням
 

OpenKeychain/src/main/res/raw-vi/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/raw-zh/help_changelog.md

@@ -1,19 +1,32 @@
 [//]: # (注意：请把每个句子放在单独一行中， Transifex 将把每一行放置在独立的翻译表单内！)
 
+## 4.7
+
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting
+
+
 ## 4.6
-  * Import your keys using our new Secure Wifi Transfer mechanism
+
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
+
 
 ## 4.5
-  * Detailed description for security problems
+
+  * Detailed description of security problems
   * Display keyserver status per key
   * Support for EdDSA
   * Fix pgp.mit.edu (new certificate)
 
+
 ## 4.4
+
   * New key status displays detailed information why a key is considered insecure or defective
 
 
 ## 4.3
+
   * Better support for large keys
   * Fix import of Gpg4win files with broken encodings
 

OpenKeychain/src/main/res/values-cs/strings.xml

@@ -593,12 +593,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Tato identity byla zneplatněna. Toto není možné vzít zpět.</string>
   <string name="edit_key_edit_subkey_title">Vyberte akci!</string>
-  <string-array name="edit_key_edit_subkey">
-    <item>Změnit expiraci</item>
-    <item>Zneplatnit podklíč</item>
-    <item>Svléknout podklíč</item>
-    <item>Přesunout podklíč do bezpečnostního tokenu</item>
-  </string-array>
   <string name="edit_key_new_subkey">nový podklíč</string>
   <string name="edit_key_error_add_identity">Přidejte alespoň jednu identitu!</string>
   <string name="edit_key_error_add_subkey">Přidejte alespoň jeden podklíč!</string>

OpenKeychain/src/main/res/values-de/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">Einstellungen</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">OpenPGP-Schlüsselserver</string>
-  <string name="title_cache_ttl_preference">Merkdauer für Passwörter</string>
   <string name="title_change_passphrase">Passwort ändern</string>
   <string name="title_share_fingerprint_with">Teile Fingerabdruck über…</string>
   <string name="title_share_key">Teile Schlüssel über...</string>
@@ -152,7 +151,6 @@
   <string name="label_encryption_algorithm">Verschlüsselungsalgorithmus</string>
   <string name="label_hash_algorithm">Hash-Algorithmus</string>
   <string name="label_symmetric">Mit Passwort verschlüsseln</string>
-  <string name="label_passphrase_cache_ttl">Auswahl für Merkdauer anpassen</string>
   <string name="label_passphrase_cache_subs">Passwort pro Unterschlüssel merken</string>
   <string name="label_message_compression">Textkomprimierung</string>
   <string name="label_file_compression">Dateikomprimierung</string>
@@ -691,12 +689,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Diese Identität wurde widerrufen. Dies kann nicht rückgängig gemacht werden.</string>
   <string name="edit_key_edit_subkey_title">Wähle eine Aktion aus!</string>
-  <string-array name="edit_key_edit_subkey">
-    <item>Ablaufdatum ändern</item>
-    <item>Unterschlüssel widerrufen</item>
-    <item>Unterschlüssel kürzen</item>
-    <item>Unterschlüssel auf Security-Token verschieben</item>
-  </string-array>
   <string name="edit_key_new_subkey">neuer Unterschlüssel</string>
   <string name="edit_key_select_usage">Bitte Verwendungszweck des Schlüssels auswählen!</string>
   <string name="edit_key_error_add_identity">Füge mindestens eine Identität hinzu!</string>
@@ -1456,11 +1448,7 @@
   <string name="security_token_status_unbound">Security-Token stimmt überein und kann mit dem Schlüssel verbunden werden</string>
   <string name="security_token_status_partly">Security-Token stimmt überein und ist teilweise mit dem Schlüssel verbunden</string>
   <string name="security_token_create">Halte den Security-Token gegen die Rückseite deines Geräts.</string>
-  <string name="security_token_reset_or_import">Dieses Sicherheits-Token enthält bereits einen Schlüssel. Um es zu benutzen, benötigen wir zusätzliche Schlüsselinformationen. Diese Informationen können auf einem Keyserver gesucht oder aus einer Datei importiert werden.</string>
   <string name="btn_reset">Zurücksetzen</string>
-  <string name="security_token_radio_use_existing">Suche Schlüsselinformation auf Schlüsselserver</string>
-  <string name="security_token_file_radio">Importiere Schlüsselinformation von Datei</string>
-  <string name="security_token_radio_reset">Security-Token zurücksetzen</string>
   <string name="security_token_reset_warning">Das Zurücksetzen des Security-Tokens zerstört die darauf gespeicherten Schlüssel vollständig. Mit diesen Schlüssel verschlüsselte Nachrichten/Dateien können danach nicht mehr entschlüsselt werden!</string>
   <string name="snack_security_token_other">Es ist ein anderer Schlüssel auf dem Security-Token  gespeichert!</string>
   <string name="security_token_error">Fehler: %s</string>
@@ -1607,16 +1595,8 @@
   <string name="title_edit_subkeys">Unterschlüssel bearbeiten</string>
   <string name="btn_search_for_query">Suche nach\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">bis Bildschirm abschaltet</string>
-  <string name="cache_ttl_ten_minutes">für 10 Minuten</string>
-  <string name="cache_ttl_thirty_minutes">für 30 Minuten</string>
   <string name="cache_ttl_one_hour">für eine Stunde</string>
-  <string name="cache_ttl_three_hours">für drei Stunden</string>
   <string name="cache_ttl_one_day">für einen Tag</string>
-  <string name="cache_ttl_three_days">für drei Tage</string>
-  <string name="cache_ttl_forever">für immer</string>
-  <string name="settings_cache_select_three">Wähle bis zu drei Optionen.</string>
-  <string name="settings_cache_ttl_at_least_one">Mindestens eine Option muss ausgewählt werden!</string>
-  <string name="settings_cache_ttl_max_three">Maximal drei Optionen können ausgewählt werden!</string>
   <string name="remember">Merken</string>
   <string name="security_token_error_pgp_app_not_installed">Es wurde keine PGP-Anwendung auf dem Security-Token gefunden</string>
   <string name="prompt_fidesmo_pgp_install_title">PGP installieren?</string>

OpenKeychain/src/main/res/values-es/strings.xml

@@ -15,7 +15,6 @@
   <string name="title_api_registered_apps">Aplicaciones</string>
   <string name="title_key_server_preference">Servidores de claves OpenPGP</string>
   <string name="title_smartpgp_authorities_preference">SmartPGP: Autoridades de confianza</string>
-  <string name="title_cache_ttl_preference">Personalizar opciones de \'Recordar\' </string>
   <string name="title_change_passphrase">Cambiar contraseña</string>
   <string name="title_share_fingerprint_with">Compartir huella digital con...</string>
   <string name="title_share_key">Compartir clave con...</string>
@@ -153,7 +152,6 @@
   <string name="label_encryption_algorithm">Algoritmo de cifrado</string>
   <string name="label_hash_algorithm">Algoritmo hash</string>
   <string name="label_symmetric">Cifrar con contraseña</string>
-  <string name="label_passphrase_cache_ttl">Personalizar opciones de \'Recordar\'</string>
   <string name="label_passphrase_cache_subs">Recordar contraseñas por subclave</string>
   <string name="label_message_compression">Compresión del texto</string>
   <string name="label_file_compression">Compresión del fichero</string>
@@ -595,6 +593,7 @@
   <string name="api_settings_allowed_keys">Claves permitidas</string>
   <string name="api_settings_settings">Configuración</string>
   <string name="api_register_title">¿Permitir el acceso a OpenKeychain?</string>
+  <string name="api_register_text">%s peticiones para usar OpenKeychain como un proveedor de criptografía. Aún se le pedirá permiso antes de que la aplicación pueda usar cualquiera de sus claves para descifrado.\n\nPuede revocar el acceso más tarde en la pantalla \'Aplicaciones\' en OpenKeychain.</string>
   <string name="api_register_allow">Permitir el acceso</string>
   <string name="api_register_disallow">Denegar el acceso</string>
   <string name="api_register_error_select_key">¡Por favor, selecciona una clave!</string>
@@ -632,6 +631,8 @@
   <string name="key_list_fab_qr_code">Escanear código QR</string>
   <string name="key_list_fab_search">Búsqueda de clave</string>
   <string name="key_list_fab_import">Importar desde fichero</string>
+  <string name="key_list_dummy_title">¡Aún no tiene ninguna clave!</string>
+  <string name="key_list_dummy_subtitle">Pulse aquí para crear o importar una.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Editar</string>
   <string name="key_view_action_encrypt">Cifrar texto</string>
@@ -706,7 +707,6 @@
     <item>Cambiar caducidad</item>
     <item>Revocar subclave</item>
     <item>Desnudar subclave</item>
-    <item>Mover subclave al token de seguridad</item>
   </string-array>
   <string name="edit_key_new_subkey">nueva subclave</string>
   <string name="edit_key_select_usage">¡Por favor, seleccione el uso de la clave!</string>
@@ -772,6 +772,7 @@
   <string name="drawer_close">Cerrar el Navigation Drawer</string>
   <string name="my_keys">Mis claves</string>
   <string name="nav_backup">Respaldar/restaurar</string>
+  <string name="nav_transfer">Transferencia wifi segura</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Escriba el texto</string>
   <!--certs-->
@@ -1473,11 +1474,10 @@
   <string name="security_token_status_unbound">El token de seguridad coincide, se puede ligar a la clave</string>
   <string name="security_token_status_partly">El token de seguridad coincide, está parcialmente ligado a la clave</string>
   <string name="security_token_create">Sostenga el token de seguridad contra la parte trasera de su dispositivo.</string>
-  <string name="security_token_reset_or_import">Este token de seguridad ya contiene una clave. Para usarla, necesitamos información adicional de la clave. Esta información se puede buscar en un servidor de claves o se puede importar de un fichero.</string>
+  <string name="security_token_reset_or_import">El token de seguridad ya contiene una clave.</string>
   <string name="btn_reset">Reiniciar</string>
-  <string name="security_token_radio_use_existing">Buscar información de la clave en el servidor de claves</string>
-  <string name="security_token_file_radio">Importar información de la clave desde un fichero</string>
-  <string name="security_token_radio_reset">Reinicializar token de seguridad</string>
+  <string name="security_token_radio_use_existing">Usar la clave existente</string>
+  <string name="security_token_radio_reset">Reinicializar token</string>
   <string name="security_token_reset_warning">Reinicializar el token de seguridad destruirá por completo las claves que almacene. ¡Acto seguido no podrá descifrar los mensajes/ficheros cifrados con esta clave!</string>
   <string name="snack_security_token_other">¡La clave almacenada en el token de seguridad es diferente!</string>
   <string name="security_token_error">Error: %s</string>
@@ -1526,6 +1526,7 @@
   <string name="file_delete_exception">¡No se pudo borrar el fichero original!</string>
   <string name="error_clipboard_empty">¡Portapapeles vacío!</string>
   <string name="error_clipboard_copy">¡Error al copiar datos al portapapeles!</string>
+  <string name="error_clipboard_bad">¡No se pudieron leer las claves en el portapapeles!</string>
   <string name="error_scan_fp">¡Error al escanear huella de validación de clave!</string>
   <string name="error_scan_match">¡Las huellas de validación de clave no coinciden!</string>
   <string name="error_expiry_past">¡La fecha de caducidad es del pasado!</string>
@@ -1625,16 +1626,9 @@
   <string name="title_edit_subkeys">Editar subclaves</string>
   <string name="btn_search_for_query">Buscando\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">hasta que la pantalla se apague</string>
-  <string name="cache_ttl_ten_minutes">durante diez minutos</string>
-  <string name="cache_ttl_thirty_minutes">durante treinta minutos</string>
   <string name="cache_ttl_one_hour">durante una hora</string>
-  <string name="cache_ttl_three_hours">durante tres horas</string>
   <string name="cache_ttl_one_day">durante un día</string>
-  <string name="cache_ttl_three_days">durante tres días</string>
-  <string name="cache_ttl_forever">para siempre</string>
-  <string name="settings_cache_select_three">Seleccione hasta tres.</string>
-  <string name="settings_cache_ttl_at_least_one">¡Ha de seleccionar al menos un ítem!</string>
-  <string name="settings_cache_ttl_max_three">¡No es posible seleccionar más de tres ítems!</string>
+  <string name="cache_ttl_forever">hasta que se limpie</string>
   <string name="remember">Recordar</string>
   <string name="security_token_error_pgp_app_not_installed">No se encontró ninguna aplicación PGP en el token de seguridad</string>
   <string name="prompt_fidesmo_pgp_install_title">¿Instalar PGP?</string>
@@ -1708,6 +1702,11 @@
   <string name="key_health_stripped_subtitle">Pulse para ver detalles</string>
   <string name="key_health_partial_stripped_title">Saludable (parcialmente desnuda)</string>
   <string name="key_health_partial_stripped_subtitle">Pulse para ver detalles</string>
+  <string name="keyserver_title_published">Publicado</string>
+  <string name="keyserver_title_not_published">No publicado</string>
+  <string name="keyserver_title_unknown">Estado del servidor de claves: Desconocido</string>
+  <string name="keyserver_last_updated">Última comprobación: %s</string>
+  <string name="keyserver_last_updated_never">Última comprobación: Nunca</string>
   <string name="key_insecure_bitstrength_2048_problem">Esta clave usa el algoritmo <b>%1$s</b> con una fortaleza de <b>%2$s bits</b>. Una clave segura debe tener una fortaleza de 2048 bits.</string>
   <string name="key_insecure_bitstrength_2048_solution">Esta clave no se puede actualizar. Para una comunicación segura, el titular debe generar una nueva clave.</string>
   <string name="key_insecure_unknown_curve_problem">Esta clave usa el algoritmo <b>%1$s</b>, que no está en lista blanca.</string>
@@ -1739,4 +1738,102 @@
   <string name="dialog_insecure_button_undo">Des-suprimir</string>
   <string name="dialog_insecure_button_view_key">Ver clave</string>
   <string name="dialog_insecure_button_ok">Comprendido</string>
+  <string name="identity_context_forget">Olvidar</string>
+  <string name="button_scan">Escanear</string>
+  <string name="button_more_info">Más información</string>
+  <string name="transfer_scan_explanation">Para compartir o importar la configuración de su clave, establezca una conexión segura escaneando con cualquier dispositivo.</string>
+  <string name="transfer_scan_warning">¡Sólo usar con sus propias claves!</string>
+  <string name="connection_status">Estado de la conexión:</string>
+  <string name="section_transfer_keys">Claves disponibles para transferencia</string>
+  <string name="section_received_keys">Claves recibidas</string>
+  <string name="transfer_scan_only_wifi">Esta característica sólo se puede usar sobre Wifi.</string>
+  <string name="button_import">Importar</string>
+  <string name="transfer_status_connected">Conectado</string>
+  <string name="transfer_status_disconnected">¡Desconectado!</string>
+  <string name="transfer_error_read_incoming">¡No se pudo leer la clave entrante!</string>
+  <string name="transfer_error_connect">¡La conexión falló!</string>
+  <string name="transfer_error_listen">¡Error esperando la conexión!</string>
+  <string name="transfer_error_generic">¡Error de comunicación desconocido!</string>
+  <string name="transfer_error_generic_msg">Error de comunicación: %s</string>
+  <string name="transfer_not_available">Lo sentimos, esta característica sólo se puede usar en Android 5 o superior :(</string>
+  <string name="transfer_list_empty">No hay claves en este dispositivo que se puedan enviar. Esperando claves entrantes...</string>
+  <string name="transfer_connecting">Conectando...</string>
+  <string name="first_time_secure_wifi_transfer">Transferencia wifi segura</string>
+  <string name="menu_secure_wifi_transfer">Transferencia wifi segura</string>
+  <string name="transfer_confirm_cancel">Cancelar</string>
+  <string name="transfer_confirm_ok">Enviar</string>
+  <string name="transfer_confirm_title">¿Enviar su clave?</string>
+  <string name="transfer_confirm_text">Esto transmitirá a su dispositivo conectado el acceso completo a su clave. ¡Nunca debe enviar sus propias claves a dispositivos que no posea!</string>
+  <string name="button_scan_again">Escanear de nuevo</string>
+  <string name="transfer_error_wifi_text">¡La conexión falló!</string>
+  <string name="transfer_error_wifi_text_instructions">Asegúrese de que está en la misma red, y luego vuelva a escanear.</string>
+  <string name="transfer_error_wifi_text_instructions_ssid">Asegúrese de que está en la red \"%s\", y luego vuelva a escanear.</string>
+  <string name="status_check_key">Comprobando estado de la clave...</string>
+  <string name="status_search_local">Buscando en la lista de claves...</string>
+  <string name="status_search_uri">Buscando en el URI del token...</string>
+  <string name="status_search_keyserver">Buscando en los servidores de claves...</string>
+  <string name="status_import">Importando clave...</string>
+  <string name="status_token_promote">Estableciendo clave...</string>
+  <string name="status_token_check">Comprobando establecimiento de la clave...</string>
+  <string name="status_content_uri">Leyendo fichero...</string>
+  <string name="token_reset_confirm_title">¿Reinicializar token de seguridad?</string>
+  <string name="token_reset_confirm_message">Esto borrará de forma irrecuperable la clave almacenada en este token de seguridad. ¡Ya no podrá usar esta clave para descifrado! ¿Está seguro?</string>
+  <string name="token_reset_confirm_ok">Reinicializar</string>
+  <string name="token_status_title">Reuniendo información para el token de segurirdad...</string>
+  <string name="token_result_not_found">¡No se encontró la clave!</string>
+  <string name="token_result_key_found">¡Se encontró la clave!</string>
+  <string name="token_result_token_ok">¡Listo para usar!</string>
+  <string name="token_result_empty">El token está vacío</string>
+  <string name="token_action_retry">Reintentar búsqueda</string>
+  <string name="token_action_load_from_file">Cargar desde fichero</string>
+  <string name="token_action_reset">Reinicializar token de seguridad</string>
+  <string name="token_action_import">Importar</string>
+  <string name="token_action_view_key">Ver clave</string>
+  <string name="token_action_setup">Establecer una nueva clave</string>
+  <string name="token_action_unlock">Desbloquear usando el PIN del admin</string>
+  <string name="token_unlock_attempts_none">Ha agotado los intentos de desbloqueo</string>
+  <plurals name="token_unlock_attempts">
+    <item quantity="one">Le queda 1 intento</item>
+    <item quantity="other">Le quedan %d intentos</item>
+  </plurals>
+  <string name="token_error_locked_indefinitely">Demasiados intentos de reinicialización. ¡El token está bloqueado de forma irrevocable!</string>
+  <string name="token_menu_change_pin">Cambiar PIN</string>
+  <string name="token_menu_view_log">Ver registro</string>
+  <string name="token_unlock_ok">Desbloquear</string>
+  <string name="token_hint_admin_pin">PIN del admin</string>
+  <string name="token_hint_new_pin">PIN nuevo</string>
+  <string name="token_hint_new_pin_repeat">PIN nuevo (repetir)</string>
+  <string name="token_error_admin_min8">¡El PIN del admin debe tener al menos 8 caracteres!</string>
+  <string name="token_error_pin_min6">¡El PIN nuevo debe tener al menos 6 caracteres!</string>
+  <string name="token_error_pin_repeat">¡El PIN no coincide!</string>
+  <string name="msg_ret_curi_error_io">¡Error al leer datos!</string>
+  <string name="msg_ret_curi_error_no_match">No se encontró clave coincidente</string>
+  <string name="msg_ret_curi_error_not_found">¡No se pudo abrir el fichero!</string>
+  <string name="msg_ret_curi_found">Clave encontrada: %s</string>
+  <string name="msg_ret_curi_mismatch">La clave no coincide</string>
+  <string name="msg_ret_curi_ok">Se encontró la clave</string>
+  <string name="msg_ret_curi_open">Abriendo URI: %s</string>
+  <string name="msg_ret_curi_start">Cargando clave desde fichero o documento...</string>
+  <string name="msg_ret_ks_error">¡Error desconocido al buscar clave!</string>
+  <string name="msg_ret_ks_error_not_found">No se encontró clave</string>
+  <string name="msg_ret_ks_fp_match">La huella de validación de la clave descargada coincide</string>
+  <string name="msg_ret_ks_fp_mismatch">¡La huella de validación de la clave descargada no coincide!</string>
+  <string name="msg_ret_ks_ok">No se encontró la clave</string>
+  <string name="msg_ret_ks_start">Buscando clave en los servidores de claves...</string>
+  <string name="msg_ret_local_search">Buscando clave: %s</string>
+  <string name="msg_ret_local_fp_match">La huella de validación de la clave local coincide</string>
+  <string name="msg_ret_local_fp_mismatch">¡La huella de validación de la clave local no coincide!</string>
+  <string name="msg_ret_local_not_found">No se encontró la clave</string>
+  <string name="msg_ret_local_none_found">No se encontró clave coincidente</string>
+  <string name="msg_ret_local_ok">Se encontró la clave</string>
+  <string name="msg_ret_local_secret">La clave local contiene material de clave secreta/privada</string>
+  <string name="msg_ret_local_start">Buscando clave en la lista de claves locales...</string>
+  <string name="msg_ret_uri_error_fetch">¡Error desconocido al descargar URI!</string>
+  <string name="msg_ret_uri_error_parse">¡El URI del token está mal formado!</string>
+  <string name="msg_ret_uri_error_no_match">No se encontró clave coincidente en el URI</string>
+  <string name="msg_ret_uri_fetching">Descargando URI: %s</string>
+  <string name="msg_ret_uri_ok">Se encontró la clave</string>
+  <string name="msg_ret_uri_start">Buscando clave en el URI del token...</string>
+  <string name="msg_ret_uri_null">No hay URI guardado en el token de seguridad</string>
+  <string name="msg_ret_uri_test">Comprobando si la clave encontrada coincide: %s</string>
 </resources>

OpenKeychain/src/main/res/values-eu/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">Ezarpenak</string>
   <string name="title_api_registered_apps">Aplikazioak</string>
   <string name="title_key_server_preference">OpenPGP giltza-zerbitzariak</string>
-  <string name="title_cache_ttl_preference">Norbereratu \'Gogoratu\' hautapenak</string>
   <string name="title_change_passphrase">Aldatu Sarhitza</string>
   <string name="title_share_fingerprint_with">Elkarbanatu hatz-aztarna honekin...</string>
   <string name="title_share_key">Elkarbanatu giltza honekin...</string>
@@ -146,7 +145,6 @@
   <string name="label_encryption_algorithm">Enkriptaketa algoritmoa</string>
   <string name="label_hash_algorithm">Hash algoritmoa</string>
   <string name="label_symmetric">Enkriptatu sarhitzarekin</string>
-  <string name="label_passphrase_cache_ttl">Norbereratu \'Gogoratu\' hautapenak</string>
   <string name="label_passphrase_cache_subs">Gogoratu sarhitzak azpigiltzaz</string>
   <string name="label_message_compression">Idazki konpresioa</string>
   <string name="label_file_compression">Agiri konpresioa</string>
@@ -644,12 +642,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Nortasun hau ukatua izan da. Hau ezin da desegin.</string>
   <string name="edit_key_edit_subkey_title">Hautatu ekintza bat!</string>
-  <string-array name="edit_key_edit_subkey">
-    <item>Aldatu Epemuga</item>
-    <item>Ukatu Azpigiltza</item>
-    <item>Strip Azpigiltza</item>
-    <item>Mugitu Azpigiltza Segurtasun Lekukora</item>
-  </string-array>
   <string name="edit_key_new_subkey">azpigiltza berria</string>
   <string name="edit_key_select_usage">Mesedez hautatu giltza erabilpena!</string>
   <string name="edit_key_error_add_identity">Gehitu nortasun bat gutxienez!</string>
@@ -1291,7 +1283,6 @@
   <string name="security_token_serial_no">Serie Zbk: %s</string>
   <string name="security_token_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
   <string name="btn_reset">Berrezarri</string>
-  <string name="security_token_radio_reset">Berrezarri Segurtasun Lekukoa</string>
   <string name="security_token_error">Akatsa: %s</string>
   <plurals name="security_token_error_pin">
     <item quantity="one">PIN okerra!\n%d saiakera gelditzen da.</item>
@@ -1429,16 +1420,8 @@
   <string name="title_edit_subkeys">Editatu Azpigiltzak</string>
   <string name="btn_search_for_query">Bilatu\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">ikusleihoa itzali arte</string>
-  <string name="cache_ttl_ten_minutes">hamar minutuz</string>
-  <string name="cache_ttl_thirty_minutes">hogeita-hamar minutuz</string>
   <string name="cache_ttl_one_hour">ordubetez</string>
-  <string name="cache_ttl_three_hours">hiru orduz</string>
   <string name="cache_ttl_one_day">egun batez</string>
-  <string name="cache_ttl_three_days">hiru egunez</string>
-  <string name="cache_ttl_forever">betirako</string>
-  <string name="settings_cache_select_three">Hautatu hiru.</string>
-  <string name="settings_cache_ttl_at_least_one">Gai bat hautatu behar da gutxienez!</string>
-  <string name="settings_cache_ttl_max_three">Ezin dira hiru gai baino gehiago hautatu!</string>
   <string name="remember">Gogoratu</string>
   <string name="security_token_error_pgp_app_not_installed">Ez da PGP aplikaziorik aurkitu segurtasun lekukoan</string>
   <string name="prompt_fidesmo_pgp_install_title">Ezarri PGP?</string>

OpenKeychain/src/main/res/values-fi/strings.xml

@@ -32,11 +32,18 @@
   <string name="title_help">Apua</string>
   <string name="title_log_display">Loki</string>
   <string name="title_exchange_keys">Vaihda avaimia</string>
+  <string name="title_advanced_key_info">Lisätietoja</string>
+  <string name="title_delete_secret_key">POISTA avaimesi \'1%s\'?</string>
   <string name="title_manage_my_keys">Hallitse avaimiani</string>
   <!--section-->
   <string name="section_user_ids">Identiteetit</string>
+  <string name="section_security_token">Turvallisuustunnus</string>
+  <string name="section_keybase_proofs">keybase.io todisteet</string>
+  <string name="section_should_you_trust">Pitäiskö sinun luottaa tähän avaimeen?</string>
   <string name="section_keys">Aliavaimet</string>
+  <string name="section_cloud_search">Avain haku</string>
   <string name="section_cloud_search_summary">Avainpalvelin, keybase.io</string>
+  <string name="section_passphrase_cache">Salasanat ja pin-koodit</string>
   <string name="section_gui">Käyttöliittymä</string>
   <string name="section_experimental_features">Kokeelliset ominaisuudet</string>
   <string name="section_certify">Vahvista</string>

OpenKeychain/src/main/res/values-fr/strings.xml

@@ -15,7 +15,6 @@
   <string name="title_api_registered_apps">Applis</string>
   <string name="title_key_server_preference">Serveurs de clés OpenPGP</string>
   <string name="title_smartpgp_authorities_preference">SmartPGP : autorités de confiance</string>
-  <string name="title_cache_ttl_preference">Personnaliser les choix « Mémorisation »</string>
   <string name="title_change_passphrase">Changer le mot de passe</string>
   <string name="title_share_fingerprint_with">Partager l\'empreinte avec...</string>
   <string name="title_share_key">Partager la clé avec...</string>
@@ -153,7 +152,6 @@
   <string name="label_encryption_algorithm">Algorithme de chiffrement</string>
   <string name="label_hash_algorithm">Algorithme de hachage</string>
   <string name="label_symmetric">Chiffrer avec un mot de passe</string>
-  <string name="label_passphrase_cache_ttl">Personnaliser les choix « Mémorisation »</string>
   <string name="label_passphrase_cache_subs">Mémoriser les mots de passe par sous-clés</string>
   <string name="label_message_compression">Compression de texte</string>
   <string name="label_file_compression">Compression des fichiers</string>
@@ -175,7 +173,7 @@
   <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>
-  <string name="label_keyserver_settings_hint">Glisser pour changer l\'ordre, toquer pour éditer/supprimer</string>
+  <string name="label_keyserver_settings_hint">Glisser pour changer l\'ordre, toquer pour modifier ou supprimer</string>
   <string name="label_selected_keyserver_title">Serveurs de clés sélectionnés</string>
   <string name="label_selected_smartpgp_authority_title">Autorité sélectionnée</string>
   <string name="label_preferred">préféré </string>
@@ -595,6 +593,7 @@
   <string name="api_settings_allowed_keys">clés autorisées</string>
   <string name="api_settings_settings">Paramètres</string>
   <string name="api_register_title">Autoriser l\'accès à OpenKeychain ?</string>
+  <string name="api_register_text">%s demandes d\'utiliser OpenKeychain comme fournisseur de cryptographie. Une autorisation vous sera encore demandée avant que l\'appli puisse utiliser l\'une de vos clés pour le déchiffrement.\n\nVous pourrez révoquer l\'accès ultérieurement dans l\'écran « Applis » d\'OpenKeychain.</string>
   <string name="api_register_allow">Autoriser l\'accès</string>
   <string name="api_register_disallow">Refuser l\'accès</string>
   <string name="api_register_error_select_key">Veuillez choisir une clé !</string>
@@ -702,12 +701,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Cette identité a été révoquée ! Cela ne peut pas être annulé.</string>
   <string name="edit_key_edit_subkey_title">Choisissez une action !</string>
-  <string-array name="edit_key_edit_subkey">
-    <item>Changer l\'expiration</item>
-    <item>Révoquer la sous-clé</item>
-    <item>Dépouiller la sous-clé</item>
-    <item>Déplacer la sous-clé vers le jeton de sécurité</item>
-  </string-array>
   <string name="edit_key_new_subkey">nouvelle sous-clé</string>
   <string name="edit_key_select_usage">Veuillez choisir l\'utilisation de la clé !</string>
   <string name="edit_key_error_add_identity">Ajouter au moins une identité !</string>
@@ -772,6 +765,7 @@
   <string name="drawer_close">Fermer le tiroir de navigation</string>
   <string name="my_keys">Mes clés</string>
   <string name="nav_backup">Sauvegarder/Restaurer</string>
+  <string name="nav_transfer">Transfert Wi-Fi sécurisé</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Saisir le texte</string>
   <!--certs-->
@@ -1473,11 +1467,7 @@
   <string name="security_token_status_unbound">Le jeton de sécurité correspond et peut être relié à la clé</string>
   <string name="security_token_status_partly">Le jeton de sécurité correspond et est partiellement relié à la clé</string>
   <string name="security_token_create">Tenir le jeton de sécurité contre le dos de votre appareil.</string>
-  <string name="security_token_reset_or_import">Ce jeton de sécurité contient déjà une clé. Des informations supplémentaires sont requises pour l\'utiliser. Elles peuvent être recherchées sur un serveur de clés ou importer d\'un fichier.</string>
   <string name="btn_reset">Réinitialiser</string>
-  <string name="security_token_radio_use_existing">Rechercher les informations de la clé sur le serveur de clés</string>
-  <string name="security_token_file_radio">Importer les informations de la clé d\'un fichier</string>
-  <string name="security_token_radio_reset">Réinitialiser le jeton de sécurité</string>
   <string name="security_token_reset_warning">La réinitialisation du jeton de sécurité détruit complètement les clés qu\'il contient. Par la suite, vous ne pourrez plus déchiffrer les messages/les fichiers chiffrés avec cette clé !</string>
   <string name="snack_security_token_other">Une clé différente est stockée sur le jeton de sécurité !</string>
   <string name="security_token_error">Erreur : %s</string>
@@ -1544,7 +1534,7 @@
   <string name="linked_create_twitter_handle">Pseudo Twitter</string>
   <string name="linked_create_twitter_2_1">Toucher l\'un des boutons pour twitter le message !</string>
   <string name="linked_create_twitter_2_2">Vous pouvez modifier le gazouillis avant de le publier tant que le texte entre parenthèses reste inchangé.</string>
-  <string name="linked_create_twitter_2_3">Une fois que votre gazouillis est publié sur Tweeter en tant que <b>@%s</b>, toquez sur le bouton Vérifier pour le chercher dans votre fil d\'actualité. </string>
+  <string name="linked_create_twitter_2_3">Une fois que votre gazouillis est publié sur Tweeter en tant que <b>@%s</b>, touchez le bouton Vérifier pour le chercher dans votre fil d\'actualité. </string>
   <string name="linked_create_twitter_2_4">Suite à une vérification probante, touchez le bouton Terminer pour ajouter l\'identité reliée à votre trousseau et compléter le processus.</string>
   <string name="linked_create_verify">Vérifier</string>
   <string name="linked_text_clipboard">La texte a été copié dans le presse-papiers</string>
@@ -1625,16 +1615,8 @@
   <string name="title_edit_subkeys">Modifier les sous-clés</string>
   <string name="btn_search_for_query">Rechercher\n« %s »</string>
   <string name="cache_ttl_lock_screen">jusqu\'à l\'extinction de l\'écran</string>
-  <string name="cache_ttl_ten_minutes">pendant dix minutes</string>
-  <string name="cache_ttl_thirty_minutes">pendant trente minutes</string>
   <string name="cache_ttl_one_hour">pendant une heure</string>
-  <string name="cache_ttl_three_hours">pendant trois heures</string>
   <string name="cache_ttl_one_day">pendant un jour</string>
-  <string name="cache_ttl_three_days">pendant trois jours</string>
-  <string name="cache_ttl_forever">permanent</string>
-  <string name="settings_cache_select_three">En choisir jusqu\'à trois.</string>
-  <string name="settings_cache_ttl_at_least_one">Vous devez choisir au moins un élément !</string>
-  <string name="settings_cache_ttl_max_three">Vous ne pouvez pas choisir plus de trois éléments !</string>
   <string name="remember">Mémorisation</string>
   <string name="security_token_error_pgp_app_not_installed">Aucune appli PGP n\'a été trouvée sur le jeton de sécurité</string>
   <string name="prompt_fidesmo_pgp_install_title">Installer PGP ?</string>
@@ -1745,4 +1727,33 @@
   <string name="dialog_insecure_button_view_key">Visualiser la clé</string>
   <string name="dialog_insecure_button_ok">Compris</string>
   <string name="identity_context_forget">Oublier</string>
+  <string name="button_scan">Lire</string>
+  <string name="button_more_info">Plus d\'infos</string>
+  <string name="transfer_scan_explanation">Pour partager ou importer la configuration de votre clé, établissez une connexion sécurisée en lisant avec l\'un ou l\'autre des appareils.</string>
+  <string name="transfer_scan_warning">À utiliser avec vos propres aux appareils seulement !</string>
+  <string name="connection_status">État de connexion :</string>
+  <string name="section_transfer_keys">Clés disponibles pour le transfert</string>
+  <string name="section_received_keys">Clés reçues</string>
+  <string name="transfer_scan_only_wifi">Cette fonction ne peut être utilisée qu\'avec le Wi-Fi.</string>
+  <string name="button_import">Importer</string>
+  <string name="transfer_status_connected">Connecté</string>
+  <string name="transfer_status_disconnected">Déconnecté !</string>
+  <string name="transfer_error_read_incoming">Échec de lecture de la clé entrante !</string>
+  <string name="transfer_error_connect">Échec de connexion !</string>
+  <string name="transfer_error_listen">Erreur lors de l\'attente de connexion !</string>
+  <string name="transfer_error_generic">Erreur inconnue de communication !</string>
+  <string name="transfer_error_generic_msg">Erreur de communication : %s</string>
+  <string name="transfer_not_available">Désolé, cette fonction ne peut être utilisée qu\'avec Android 5 ou ultérieure :(</string>
+  <string name="transfer_list_empty">Il n\'existe aucune clé sur cet appareil qui puisse être envoyée. En attente de clés entrantes…</string>
+  <string name="transfer_connecting">Connexion…</string>
+  <string name="first_time_secure_wifi_transfer">Transfert Wi-Fi sécurisé</string>
+  <string name="menu_secure_wifi_transfer">Transfert Wi-Fi sécurisé</string>
+  <string name="transfer_confirm_cancel">Annuler</string>
+  <string name="transfer_confirm_ok">Envoyer</string>
+  <string name="transfer_confirm_title">Envoyer votre clé ?</string>
+  <string name="transfer_confirm_text">Cela transférera l\'accès complet à votre clé à l\'appareil connecté. Vous ne devriez jamais envoyer vos propres clés à des appareils dont vous n\'est pas propriétaire !</string>
+  <string name="button_scan_again">Réanalyser</string>
+  <string name="transfer_error_wifi_text">Échec de connexion !</string>
+  <string name="transfer_error_wifi_text_instructions">Assurez-vous d\'être sur le même réseau, puis réanalysez.</string>
+  <string name="transfer_error_wifi_text_instructions_ssid">Assurez-vous d\'être sur le réseau « %s », puis réanalysez.</string>
 </resources>

OpenKeychain/src/main/res/values-it/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">Impostazioni</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Server chiavi OpenPGP</string>
-  <string name="title_cache_ttl_preference">Cambia le scelte da \'Ricordare\'</string>
   <string name="title_change_passphrase">Cambia la password</string>
   <string name="title_share_fingerprint_with">Condivi impronta con...</string>
   <string name="title_share_key">Condividi chiave con...</string>
@@ -146,7 +145,6 @@
   <string name="label_encryption_algorithm">Algoritmo di codifica</string>
   <string name="label_hash_algorithm">Algoritmo Hash</string>
   <string name="label_symmetric">Codifica con password</string>
-  <string name="label_passphrase_cache_ttl">Cambia le scelte da \'Ricordare\'</string>
   <string name="label_passphrase_cache_subs">Ricorda le password di sottochiave</string>
   <string name="label_message_compression">Compressione testo</string>
   <string name="label_file_compression">Compressione file</string>
@@ -1131,15 +1129,8 @@
   <string name="title_edit_identities">Modifica Identità</string>
   <string name="title_edit_subkeys">Modifica Sottochiavi</string>
   <string name="cache_ttl_lock_screen">fino allo spegnimento dello schermo</string>
-  <string name="cache_ttl_ten_minutes">per dieci minuti</string>
-  <string name="cache_ttl_thirty_minutes">per mezz\'ora</string>
   <string name="cache_ttl_one_hour">per un\'ora</string>
-  <string name="cache_ttl_three_hours">per tre ore</string>
   <string name="cache_ttl_one_day">per una giornata</string>
-  <string name="cache_ttl_three_days">per tre giorni</string>
-  <string name="cache_ttl_forever">per sempre</string>
-  <string name="settings_cache_ttl_at_least_one">Almeno un elemento deve essere selezionato!</string>
-  <string name="settings_cache_ttl_max_three">Non puoi selezionare più di tre elementi!</string>
   <string name="security_token_error_pgp_app_not_installed">Nessuna app PGP è stata trovata sul token di sicurezza</string>
   <string name="prompt_fidesmo_pgp_install_title">Installare PGP?</string>
   <string name="prompt_fidesmo_pgp_install_message">Non c\'era nessuna app PGP disponibile sul tuo dispositivo Fidesmo.</string>

OpenKeychain/src/main/res/values-ja/strings.xml

@@ -15,7 +15,6 @@
   <string name="title_api_registered_apps">アプリ</string>
   <string name="title_key_server_preference">OpenPGP鍵サーバ</string>
   <string name="title_smartpgp_authorities_preference">SmartPGP: 信頼済認証局</string>
-  <string name="title_cache_ttl_preference">\'記憶する\' 選択肢をカスタマイズ</string>
   <string name="title_change_passphrase">パスワードの変更</string>
   <string name="title_share_fingerprint_with">...で指紋の共有</string>
   <string name="title_share_key">...で鍵の共有</string>
@@ -153,7 +152,6 @@
   <string name="label_encryption_algorithm">暗号化アルゴリズム</string>
   <string name="label_hash_algorithm">ハッシュアルゴリズム</string>
   <string name="label_symmetric">パスワードで暗号化</string>
-  <string name="label_passphrase_cache_ttl">\'記憶する\' 選択肢をカスタマイズ</string>
   <string name="label_passphrase_cache_subs">副鍵のパスワードを忘れない</string>
   <string name="label_message_compression">テキストの圧縮</string>
   <string name="label_file_compression">ファイルの圧縮</string>
@@ -688,12 +686,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">このIDは破棄されています。続けることができません。</string>
   <string name="edit_key_edit_subkey_title">アクションを選んでください!</string>
-  <string-array name="edit_key_edit_subkey">
-    <item>期限の変更</item>
-    <item>副鍵の破棄</item>
-    <item>副鍵のストリップ</item>
-    <item>副鍵をセキュリティトークンへ移動</item>
-  </string-array>
   <string name="edit_key_new_subkey">新しい副鍵</string>
   <string name="edit_key_select_usage">使用する鍵を選択してください!</string>
   <string name="edit_key_error_add_identity">最低でも1つのユーザIDを追加!</string>
@@ -758,6 +750,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-->
@@ -1444,11 +1437,7 @@
   <string name="security_token_status_unbound">セキュリティトークンが一致、鍵に紐付けることができます</string>
   <string name="security_token_status_partly">セキュリティトークンが一致、鍵が部分的に紐付いています</string>
   <string name="security_token_create">あなたのデバイスの背面にセキュリティトークンを保持してください。</string>
-  <string name="security_token_reset_or_import">このセキュリティトークンにはすでに鍵が含まれています。 使用するには、追加の鍵の情報が必要です。 この情報は、鍵サーバ上で検索することや、ファイルからインポートすることができます。</string>
   <string name="btn_reset">リセット</string>
-  <string name="security_token_radio_use_existing">鍵サーバ上で鍵情報を検索</string>
-  <string name="security_token_file_radio">ファイルから鍵情報をインポート</string>
-  <string name="security_token_radio_reset">セキュリティトークンのリセット</string>
   <string name="security_token_reset_warning">セキュリティトークンをリセットすると、その上の鍵を完全に破壊します。その後は、この鍵で暗号化されたメッセージ/ファイルを復号化することができなくなります!</string>
   <string name="snack_security_token_other">違う鍵がセキュリティトークンに格納されています!</string>
   <string name="security_token_error">エラー: %s</string>
@@ -1594,16 +1583,8 @@
   <string name="title_edit_subkeys">副鍵を編集</string>
   <string name="btn_search_for_query">検索\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">画面オフまで</string>
-  <string name="cache_ttl_ten_minutes">10分間</string>
-  <string name="cache_ttl_thirty_minutes">30分間</string>
   <string name="cache_ttl_one_hour">1時間</string>
-  <string name="cache_ttl_three_hours">3時間</string>
   <string name="cache_ttl_one_day">1日間</string>
-  <string name="cache_ttl_three_days">3日間</string>
-  <string name="cache_ttl_forever">永遠</string>
-  <string name="settings_cache_select_three">3つまで選んでください。</string>
-  <string name="settings_cache_ttl_at_least_one">少なくとも項目を1つ選択する必要があります!</string>
-  <string name="settings_cache_ttl_max_three">3つ以上の項目を選択することはできません!</string>
   <string name="remember">記憶する</string>
   <string name="security_token_error_pgp_app_not_installed">セキュリティトークンでPGPアプリが見つかりません</string>
   <string name="prompt_fidesmo_pgp_install_title">PGPをインストールしますか?</string>
@@ -1714,4 +1695,33 @@
   <string name="dialog_insecure_button_view_key">鍵を表示</string>
   <string name="dialog_insecure_button_ok">了解</string>
   <string name="identity_context_forget">記憶しない</string>
+  <string name="button_scan">スキャン</string>
+  <string name="button_more_info">詳細情報</string>
+  <string name="transfer_scan_explanation">鍵の設定を共有またはインポートするには、いずれかのデバイスでスキャンして安全な接続を確立します。</string>
+  <string name="transfer_scan_warning">あなた自身のデバイスでのみ使用してください!</string>
+  <string name="connection_status">接続ステータス:</string>
+  <string name="section_transfer_keys">転送できる鍵</string>
+  <string name="section_received_keys">受信した鍵</string>
+  <string name="transfer_scan_only_wifi">この機能は Wifi でのみ利用できます。</string>
+  <string name="button_import">インポート</string>
+  <string name="transfer_status_connected">接続しました</string>
+  <string name="transfer_status_disconnected">切断されました!</string>
+  <string name="transfer_error_read_incoming">受け取った鍵の読み込みに失敗しました!</string>
+  <string name="transfer_error_connect">接続に失敗しました!</string>
+  <string name="transfer_error_listen">接続の待機中にエラー!</string>
+  <string name="transfer_error_generic">不明な通信エラー!</string>
+  <string name="transfer_error_generic_msg">通信エラー: %s</string>
+  <string name="transfer_not_available">申し訳ありません。この機能は Android 5 以降でのみ使用できます :(</string>
+  <string name="transfer_list_empty">このデバイス上に送信可能な鍵がありません。 鍵の受信を待機しています…</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="transfer_confirm_title">あなたの鍵を送信しますか?</string>
+  <string name="transfer_confirm_text">これにより、鍵へのフルアクセスが接続されたデバイスに転送されます。 あなたが所有していないデバイスには、自分の鍵を決して送信しないでください!</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>
 </resources>

OpenKeychain/src/main/res/values-nb/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">Innstillinger</string>
   <string name="title_api_registered_apps">Programmer</string>
   <string name="title_key_server_preference">OpenPGP-nøkkeltjenere</string>
-  <string name="title_cache_ttl_preference">Tilpass \"husk\"-valg</string>
   <string name="title_change_passphrase">Endre passord</string>
   <string name="title_share_fingerprint_with">Del fingeravtrykk med…</string>
   <string name="title_share_key">Del nøkkel med…</string>
@@ -139,7 +138,6 @@
   <string name="label_delete_after_decryption">Slett etter kryptering</string>
   <string name="label_encryption_algorithm">Krypteringsalgoritme</string>
   <string name="label_symmetric">Krypter med passord</string>
-  <string name="label_passphrase_cache_ttl">Tilpass \'husk\'-valg</string>
   <string name="label_message_compression">Tekstkomprimering</string>
   <string name="label_file_compression">Filkomprimering</string>
   <string name="label_key_id">Nøkkel-ID</string>
@@ -580,7 +578,6 @@
   <string name="nfc_settings">Innstillinger</string>
   <string name="snack_security_token_view">Vis</string>
   <string name="btn_reset">Tilbakestill</string>
-  <string name="security_token_radio_reset">Tilbakestill sikkerhetssymbol</string>
   <string name="security_token_error">Feil: %s</string>
   <string name="security_token_error_unknown">Ukjent feil</string>
   <string name="security_token_error_try_again">Prøv igjen</string>
@@ -615,12 +612,7 @@
   <string name="share_log_dialog_cancel_button">Avbryt</string>
   <string name="menu_uids_save">Lagre</string>
   <string name="cache_ttl_one_hour">i én time</string>
-  <string name="cache_ttl_three_hours">i tre timer</string>
   <string name="cache_ttl_one_day">i én dag</string>
-  <string name="cache_ttl_three_days">i tre dager</string>
-  <string name="cache_ttl_forever">for alltid</string>
-  <string name="settings_cache_select_three">Velg opptil tre.</string>
-  <string name="settings_cache_ttl_at_least_one">Ihvertfall ett element må velges!</string>
   <string name="remember">Husk</string>
   <string name="prompt_fidesmo_pgp_install_title">Installer PGP?</string>
   <string name="prompt_fidesmo_pgp_install_button_positive">Installer</string>

OpenKeychain/src/main/res/values-nl/strings.xml

@@ -10,12 +10,11 @@
   <string name="title_add_subkey">Voeg subsleutel toe</string>
   <string name="title_change_master_key">Verander meestersleutel</string>
   <string name="title_edit_key">Sleutel bewerken</string>
-  <string name="title_linked_create">Maak een Gekoppelde Identiteit</string>
+  <string name="title_linked_create">Gekoppelde identiteit aanmaken</string>
   <string name="title_preferences">Instellingen</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">OpenPGP-sleutelservers</string>
   <string name="title_smartpgp_authorities_preference">SmartPGP: vertrouwde autoriteiten</string>
-  <string name="title_cache_ttl_preference">Pas \'Onthoud\' keuzes aan</string>
   <string name="title_change_passphrase">Wachtwoord wijzigen</string>
   <string name="title_share_fingerprint_with">Vingerafdruk delen met…</string>
   <string name="title_share_key">Sleutel delen met…</string>
@@ -30,7 +29,7 @@
   <string name="title_send_key">Upload naar sleutelserver</string>
   <string name="title_backup">Sleutel exporteren</string>
   <string name="title_certify_key">Sleutel bevestigen</string>
-  <string name="title_key_details">Sleutel Details</string>
+  <string name="title_key_details">Sleuteldetails</string>
   <string name="title_help">Help</string>
   <string name="title_log_display">Log</string>
   <string name="title_exchange_keys">Sleutels uitwisselen</string>
@@ -42,7 +41,7 @@
   <string name="section_user_ids">Identiteiten</string>
   <string name="section_security_token">Beveiligingscode</string>
   <string name="section_linked_system_contact">Verbonden systeemcontact</string>
-  <string name="section_keybase_proofs">Keybase.io Bewijzen</string>
+  <string name="section_keybase_proofs">Keybase.io-bewijzen</string>
   <string name="section_should_you_trust">Zou je deze sleutel vertrouwen?</string>
   <string name="section_proof_details">Bewijs van verificatie</string>
   <string name="section_keys">Subsleutels</string>
@@ -51,11 +50,11 @@
   <string name="section_passphrase_cache">Wachtwoorden en pincodes</string>
   <string name="section_passphrase_cache_summary">Afhandeling, gebruikersinterface, herrineringstijd</string>
   <string name="section_proxy_settings">Netwerkanonimiteit</string>
-  <string name="section_proxy_settings_summary">Tor, Proxy-instellingen</string>
+  <string name="section_proxy_settings_summary">Tor, proxy-instellingen</string>
   <string name="section_gui">Interface</string>
   <string name="section_sync_settings">Synchronizatie</string>
   <string name="section_sync_settings_summary">Automatische sleutelupdates, toevoegen aan contacten</string>
-  <string name="section_experimental_features">Experimentele Functies</string>
+  <string name="section_experimental_features">Experimentele functies</string>
   <string name="section_certify">Bevestigen</string>
   <string name="section_actions">Acties</string>
   <string name="section_share_key">Sleutel</string>
@@ -71,13 +70,13 @@
   <string name="btn_encrypt_share_file">Bestand versleutelen en delen</string>
   <string name="btn_encrypt_save_file">Bestand versleutelen en opslaan</string>
   <string name="btn_save_file">Bestand opslaan</string>
-  <string name="btn_save">Opslaa</string>
+  <string name="btn_save">Opslaan</string>
   <string name="btn_view_log">Bekijk log</string>
   <string name="btn_do_not_save">Annuleren</string>
   <string name="btn_delete">Verwijderen</string>
   <string name="btn_no_date">Geen einddatum</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_export_to_server">Upload Naar Sleutelserver</string>
+  <string name="btn_okay">Oké</string>
+  <string name="btn_export_to_server">Uploaden naar sleutelserver</string>
   <string name="btn_next">Volgende</string>
   <string name="btn_back">Terug</string>
   <string name="btn_no">Nee</string>
@@ -124,7 +123,7 @@
   <string name="menu_export_all_keys">Alle sleutels exporteren</string>
   <string name="menu_update_all_keys">Alle sleutels bijwerken</string>
   <string name="menu_certify_fingerprint">Bevestig met vingerafdruk</string>
-  <string name="menu_certify_fingerprint_phrases">Bevestig met zi</string>
+  <string name="menu_certify_fingerprint_phrases">Bevestig met zinnen</string>
   <string name="menu_share_log">Deel logboek</string>
   <string name="menu_change_password">Verander wachtwoord</string>
   <string name="menu_advanced">Geavanceerd</string>
@@ -142,10 +141,10 @@
   <string name="label_show_passphrase">Wachtwoord weergeven</string>
   <string name="label_algorithm">Algoritme</string>
   <string name="label_algorithm_colon">Algoritme:</string>
-  <string name="label_ascii_armor">Bestand ASCII Armor</string>
+  <string name="label_ascii_armor">Bestand-ASCII Armor</string>
   <string name="label_file_ascii_armor">ASCII Armor aanzetten</string>
   <string name="label_write_version_header">Laat anderen weten dat je OpenKeychain gebruikt</string>
-  <string name="label_write_version_header_summary">Voegt \'OpenKeychain v2.7\' toe aan OpenPGP ondertekeningen, cijfertekst en geëxporteerde sleutels</string>
+  <string name="label_write_version_header_summary">Voegt \'OpenKeychain v2.7\' toe aan OpenPGP-ondertekeningen, cijfertekst en geëxporteerde sleutels</string>
   <string name="label_asymmetric_from">Ondertekenen met:</string>
   <string name="label_to">Versleutelen naar</string>
   <string name="label_delete_after_encryption">Verwijder bestanden na versleuteling</string>
@@ -153,7 +152,6 @@
   <string name="label_encryption_algorithm">Versleutelingsalgoritme</string>
   <string name="label_hash_algorithm">Hashalgoritme</string>
   <string name="label_symmetric">Versleutelen met wachtwoord</string>
-  <string name="label_passphrase_cache_ttl">Pas \'Onthoud\' keuzes aan</string>
   <string name="label_passphrase_cache_subs">Onthou wachtwoorden per subsleutel</string>
   <string name="label_message_compression">Tekstcompressie</string>
   <string name="label_file_compression">Bestandscompressie</string>
@@ -200,16 +198,16 @@
   <string name="pref_facebook">Facebook</string>
   <string name="pref_facebook_summary">Zoek naar sleutels op Facebook op basis van gebruikersnaam</string>
   <string name="label_sync_settings_keyserver_title">Automatische sleutelupdates</string>
-  <string name="label_sync_settings_keyserver_summary_on">Sleutels worden geüpdatet elke drie dagen vanaf de keyserver van voorkeur</string>
-  <string name="label_sync_settings_keyserver_summary_off">Sleutels worden niet automatisch geüpdatet</string>
-  <string name="label_sync_settings_wifi_title">Synchroniseer aleen op Wi-Fi</string>
+  <string name="label_sync_settings_keyserver_summary_on">Sleutels worden elke drie dagen vanaf de gekozen sleutelserver bijgewerker</string>
+  <string name="label_sync_settings_keyserver_summary_off">Sleutels worden niet automatisch bijgewerkt</string>
+  <string name="label_sync_settings_wifi_title">Synchroniseer alleen via wifi</string>
   <string name="label_sync_settings_contacts_title">Koppel sleutels aan contacten</string>
   <string name="label_sync_settings_contacts_summary_on">Koppel sleutels aan contacten gebaseerd op namen en e-mailadressen. Dit gebeurt volledig offline op je apparaat.</string>
   <string name="label_sync_settings_contacts_summary_off">Nieuwe sleutels zullen niet worden gekoppeld aan contacten</string>
   <!--label shown in Android settings under the OpenKeychain account-->
   <string name="keyserver_sync_settings_title">Automatische sleutelupdates</string>
   <string name="label_experimental_settings_desc_title">Waarschuwing</string>
-  <string name="label_experimental_settings_desc_summary">Deze functies zijn nog niet afgemaakt of zijn resultaten van gebruikerservaringen/beveiligingsonderzoek. Vertrouw daarom niet op hun beveiliging en rapporteer geen problemen die je ervaart!</string>
+  <string name="label_experimental_settings_desc_summary">Deze functies zijn nog niet afgewerkt of zijn resultaten van gebruikerservaringen/beveiligingsonderzoek. Vertrouw daarom niet op hun beveiliging en rapporteer geen problemen die je ervaart!</string>
   <string name="label_experimental_settings_word_confirm_title">Bevestig met zin</string>
   <string name="label_experimental_settings_word_confirm_summary">Bevestig sleutels met zinnen in plaats van hexadecimale vingerafdrukken</string>
   <string name="label_experimental_settings_linked_identities_title">Gekoppelde identiteiten</string>
@@ -230,7 +228,7 @@
   <string name="pref_proxy_type_choice_http">HTTP</string>
   <string name="pref_proxy_type_choice_socks">SOCKS</string>
   <!--OrbotHelper strings-->
-  <string name="orbot_ignore_tor">Gebruik Tor niet</string>
+  <string name="orbot_ignore_tor">Tor niet gebruiken</string>
   <!--InstallDialogFragment strings-->
   <string name="orbot_install_dialog_title">Orbot installeren om Tor te gebruiken?</string>
   <string name="orbot_install_dialog_install">Installeren</string>
@@ -276,17 +274,17 @@
   <string name="choice_select_cert">Selecteer een sleutel</string>
   <string name="filemanager_title_open">Openen…</string>
   <string name="rsa_2048">RSA 2048</string>
-  <string name="rsa_2048_description_html">kleinere bestandsgrootte, wordt beschouwt als veilig tot 2030</string>
+  <string name="rsa_2048_description_html">kleinere bestandsgrootte, wordt beschouwd als veilig tot 2030</string>
   <string name="rsa_3072">RSA 3072</string>
-  <string name="rsa_3072_description_html">aangeraden, wordt beschouwt als veilig tot 2040</string>
+  <string name="rsa_3072_description_html">aangeraden, wordt beschouwd als veilig tot 2040</string>
   <string name="rsa_4096">RSA 4096</string>
-  <string name="rsa_4096_description_html">grotere bestandsgrootte, wordt als veilig beschouwt tot na 2040</string>
+  <string name="rsa_4096_description_html">grotere bestandsgrootte, wordt als veilig beschouwd tot na 2040</string>
   <string name="ecc_p256">ECC P-256</string>
-  <string name="ecc_p256_description_html">heel kleine bestandsgrootte, wordt beschouwt als veilig tot 2040 &lt;br/&gt; &lt;u&gt; experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
+  <string name="ecc_p256_description_html">heel kleine bestandsgrootte, wordt beschouwd als veilig tot 2040 &lt;br/&gt; &lt;u&gt; experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
   <string name="ecc_p384">ECC P-384</string>
-  <string name="ecc_p384_description_html">heel kleine bestandsgrootte, wordt beschouwt als veilig tot 2040 &lt;br/&gt; &lt;u&gt;experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
+  <string name="ecc_p384_description_html">heel kleine bestandsgrootte, wordt beschouwd als veilig tot 2040 &lt;br/&gt; &lt;u&gt;experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
   <string name="ecc_p521">ECC P-521</string>
-  <string name="ecc_p521_description_html">kleine bestandsgrootte, wordt beschouwt als veilig tot na 2040 &lt;br/&gt; &lt;u&gt; experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
+  <string name="ecc_p521_description_html">kleine bestandsgrootte, wordt beschouwd als veilig tot na 2040 &lt;br/&gt; &lt;u&gt; experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
   <string name="ecc_eddsa">ECC EdDSA</string>
   <string name="ecc_eddsa_description_html">kleine bestandsgrootte, wordt beschouwd als veilig tot na 2040 &lt;br/&gt; &lt;u&gt; experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
   <string name="usage_none">Geen (alleen binden aan subsleutel)</string>
@@ -311,7 +309,7 @@
   <string name="pin_for">Voer pincode in voor \'%s\'</string>
   <string name="security_token_pin_for">Voeg pincode in om toegang te krijgen tot beveligingscode voor \'%s\'</string>
   <string name="security_token_nfc_text">Hou het Security Token tegen de NFC-lezer achteraan je apparaat.</string>
-  <string name="security_token_nfc_wait">Houd het Security Token aan de achterkant!</string>
+  <string name="security_token_nfc_wait">Hou het Security Token aan de achterkant!</string>
   <string name="security_token_nfc_finished">Haal het Security Token nu weg.</string>
   <string name="security_token_nfc_try_again_text">Haal het Security Token nu weg en klik Probeer Opnieuw.</string>
   <string name="file_delete_confirmation_title">Oorspronkelijke bestanden verwijderen?</string>
@@ -322,8 +320,8 @@
   <string name="encrypt_sign_clipboard_successful">Succesvol gesigneerd en/of gecodeerd naar klembord.</string>
   <string name="select_encryption_key">Selecteer ten minste één versleutelingssleutel.</string>
   <string name="error_no_encryption_or_signature_key">Kies ten minste één versleutelingssleutel of een ondertekeningssleutel.</string>
-  <string name="specify_file_to_encrypt_to">Gelieve aan te geven naar welk bestand versleuteld moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string>
-  <string name="specify_file_to_decrypt_to">Gelieve aan te geven naar welk bestand ontsleuteld moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string>
+  <string name="specify_file_to_encrypt_to">Gelieve aan te geven naar welk bestand versleuteld moet worden.\nLET OP: Als het bestand al bestaat, zal het overschreven worden!</string>
+  <string name="specify_file_to_decrypt_to">Gelieve aan te geven naar welk bestand ontsleuteld moet worden.\nLET OP: Als het bestand al bestaat, zal het overschreven worden!</string>
   <string name="specify_backup_dest">Een backup zonder je sleutels zal gemaakt worden, geef een bestemming op.\nLET OP: als het bestand al bestaat, zal het overschreven worden!</string>
   <string name="specify_backup_dest_single">Deze sleutel zal gedeeld worden, geef een bestemming op.\nLET OP: Als het bestand al bestaat zal het overschreven worden!</string>
   <string name="specify_backup_dest_secret_single">Een volledige back-up van je sleutel zal worden gemaakt, geef een bestemming op.\nLET OP: als het bestand al bestaat, zal het overschreven worden!</string>
@@ -391,7 +389,7 @@
   <string name="decrypt_result_signature_missing_key">Ondertekend door <b>onbekende publieke sleutel</b></string>
   <string name="decrypt_result_encrypted">Versleuteld</string>
   <string name="decrypt_result_not_encrypted">Niet versleuteld</string>
-  <string name="decrypt_result_insecure">Onveilige Versleuteling</string>
+  <string name="decrypt_result_insecure">Onveilige versleuteling</string>
   <string name="decrypt_result_action_show">Toon</string>
   <string name="decrypt_result_action_Lookup">Zoek</string>
   <string name="decrypt_invalid_text">De ondertekening is ongeldig of de sleutel is ingetrokken/verlopen. Je kan niet zeker zijn wie de tekst geschreven heeft. Ben je zeker dat je ze wil weergeven?</string>
@@ -468,7 +466,7 @@
   <string name="key_size_custom">Aangepaste sleutelgrootte</string>
   <string name="key_size_custom_info">Typ aangepaste sleutellengte (in bits):</string>
   <string name="key_size_custom_info_rsa">RSA sleutellengte moet groter zijn dan 1024 en ten hoogste 16384. Ze moet ook deelbaar zijn door 8.</string>
-  <string name="key_size_custom_info_dsa">DSA sleutellengte moet minstens 512 zijn en maximaal 1024. Het moet ook deelbaar zijn door 64.</string>
+  <string name="key_size_custom_info_dsa">DSA sleutellengte moet minstens 512 zijn en maximaal 1024. Ze moet ook deelbaar zijn door 64.</string>
   <!--elliptic curve names-->
   <string name="key_curve_nist_p256">NIST P-256</string>
   <string name="key_curve_nist_p384">NIST P-384</string>
@@ -491,14 +489,14 @@
   <string name="help_tab_donations">Doneren</string>
   <!--Import-->
   <string name="import_tab_keyserver">Sleutelserver</string>
-  <string name="import_tab_cloud">Zoek Sleutel</string>
+  <string name="import_tab_cloud">Sleutel zoeken</string>
   <string name="import_tab_direct">Bestand/klembord</string>
-  <string name="import_tab_qr_code">QR code/NFC</string>
+  <string name="import_tab_qr_code">QR-code/NFC</string>
   <string name="import_found_keys">%1$d sleutels gevonden</string>
   <string name="import_qr_code_wrong">Formaat van QR-code wordt niet ondersteund (formaatspecificatie: https://github.com/open-keychain/open-keychain/wiki/QR-Codes)!</string>
   <string name="import_qr_code_fp">Vingerafdruk is verkeerd of te kort!</string>
   <string name="import_qr_code_too_short_fingerprint">Vingerafdruk is te kort!</string>
-  <string name="import_qr_code_button">QR code scannen</string>
+  <string name="import_qr_code_button">QR-code scannen</string>
   <string name="import_qr_code_text">Plaats je camera voor de QR-code!</string>
   <string name="btn_import">Importeren</string>
   <string name="btn_import_keys">Alle sleutels importeren</string>
@@ -590,7 +588,7 @@
   <string name="api_settings_revoke">Toegang herroepen</string>
   <string name="api_settings_start">Start applicatie</string>
   <string name="api_settings_package_name">Pakketnaam</string>
-  <string name="api_settings_package_certificate">SHA-256 van Pakketcertificaat</string>
+  <string name="api_settings_package_certificate">SHA-256 van pakketcertificaat</string>
   <string name="api_settings_advanced">Geavanceerd</string>
   <string name="api_settings_allowed_keys">Toegestane sleutels</string>
   <string name="api_settings_settings">Instellingen</string>
@@ -598,17 +596,17 @@
   <string name="api_register_text">%s wil OpenKeychain als versleutelingsaanbieder gebruiken. Je zal nog steeds om toestemming gevraagd worden vooraleer de app een van je sleutels kan gebruiken voor ontsleuteling.\n\nJe kan je toestemming later weer intrekken in het scherm \'Apps\' in OpenKeychain.</string>
   <string name="api_register_allow">Toegang toestaan</string>
   <string name="api_register_disallow">Toegang weigeren</string>
-  <string name="api_register_error_select_key">Selecteert u a.u.b. een sleutel</string>
+  <string name="api_register_error_select_key">Selecteer een sleutel!</string>
   <string name="api_select_pub_keys_missing_text">Geen sleutels gevonden voor deze e-mailadressen:</string>
   <string name="api_select_pub_keys_dublicates_text">Er bestaat meer dan een sleutel voor deze e-mailadressen:</string>
-  <string name="api_select_pub_keys_text">Bekijkt u a.u.b. de ontvangers</string>
+  <string name="api_select_pub_keys_text">Kijk de lijst van ontvangers na!</string>
   <string name="api_select_pub_keys_text_no_user_ids">Gelieve de ontvangers te selecteren!</string>
   <string name="api_error_wrong_signature">Controle van handtekening mislukt! Heb je deze app van een andere bron geïnstalleerd? Als je zeker weet dat dit geen aanval is, haal dan de registratie van deze app in OpenKeychain weg en registreer de app opnieuw.</string>
   <string name="api_select_sign_key_text">Selecteer een van je bestaande sleutels of maak een nieuwe aan.</string>
   <string name="api_select_keys_text">Geen van de toegestane sleutels kan de inhoud ontsleutelen. Gelieve de toegestane sleutels te selecteren.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Delen met QR-code</string>
-  <string name="share_nfc_dialog">Deel met NFC</string>
+  <string name="share_nfc_dialog">Delen met NFC</string>
   <!--retry upload dialog-->
   <string name="retry_up_dialog_title">Uploaden mislukt</string>
   <string name="retry_up_dialog_message">Uploaden mislukt. Wil je het opnieuw proberen?</string>
@@ -616,12 +614,12 @@
   <string name="retry_up_dialog_btn_cancel">Annuleren</string>
   <!--Delete or revoke private key dialog-->
   <string name="del_rev_dialog_message">Als je deze sleutel niet langer wil gebruiken, moet je deze intrekken en uploaden. Kies \'Alleen verwijderen\' als je de sleutel enkel uit OpenKeyChain wil verwijderen maar deze nog wel ergens anders wil blijven gebruiken.</string>
-  <string name="del_rev_dialog_title">Intrekken/Verwijderen sleutel \'%s\'</string>
+  <string name="del_rev_dialog_title">Sleutel \'%s\' intrekken/verwijderen</string>
   <string name="del_rev_dialog_btn_revoke">Intrekken en uploaden</string>
   <string name="del_rev_dialog_btn_delete">Alleen verwijderen</string>
   <!--Delete Or Revoke Dialog spinner-->
   <string name="del_rev_dialog_choice_delete">Alleen verwijderen</string>
-  <string name="del_rev_dialog_choice_rev_upload">Intrekken en Uploaden</string>
+  <string name="del_rev_dialog_choice_rev_upload">Intrekken en uploaden</string>
   <!--Key list-->
   <plurals name="key_list_selected_keys">
     <item quantity="one">1 sleutel geselecteerd.</item>
@@ -630,9 +628,11 @@
   <string name="key_list_empty_text1">Geen sleutels gevonden!</string>
   <string name="key_list_filter_show_all">Alle sleutels weergeven</string>
   <string name="key_list_filter_show_certified">Toon alleen bevestigde sleutels</string>
-  <string name="key_list_fab_qr_code">Scan QR Code</string>
-  <string name="key_list_fab_search">Sleutel Zoeken</string>
-  <string name="key_list_fab_import">Importeer van Bestand</string>
+  <string name="key_list_fab_qr_code">QR-code scannen</string>
+  <string name="key_list_fab_search">Sleutel zoeken</string>
+  <string name="key_list_fab_import">Importeren uit bestand</string>
+  <string name="key_list_dummy_title">Je hebt nog geen sleutels!</string>
+  <string name="key_list_dummy_subtitle">Tik hier om een sleutel aan te maken of te importeren.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Bewerken</string>
   <string name="key_view_action_encrypt">Versleutel tekst</string>
@@ -642,7 +642,7 @@
   <string name="key_view_action_share_with">Delen 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_tab_main">Hoofd Info</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>
   <string name="key_view_tab_keys">Subsleutels</string>
@@ -651,7 +651,7 @@
   <string name="user_id_info_revoked_title">Ingetrokken</string>
   <string name="user_id_info_revoked_text">Deze identiteit is door de sleuteleigenaar ingetrokken. Ze is niet langer geldig.</string>
   <string name="user_id_info_certified_title">Bevestigd</string>
-  <string name="user_id_info_certified_text">Deze identiteit is bevestigd door you.</string>
+  <string name="user_id_info_certified_text">Deze identiteit is bevestigd door jou.</string>
   <string name="user_id_info_uncertified_title">Niet bevestigd</string>
   <string name="user_id_info_uncertified_text">Deze identiteit is nog niet bevestigd. Je kunt er niet zeker van zijn dat de identiteit overeenkomt met een specifiek persoon.</string>
   <string name="user_id_info_invalid_title">Ongeldig</string>
@@ -661,14 +661,14 @@
   <string name="key_trust_start_cloud_search">Zoeken starten</string>
   <string name="key_trust_results_prefix">Keybase.io geeft “bewijzen” die stellen dat de eigenaar van deze sleutel:</string>
   <!--keybase proof stuff-->
-  <string name="keybase_narrative_twitter">Verstuur naar Twitter als %s</string>
+  <string name="keybase_narrative_twitter">Actief op Twitter als %s</string>
   <string name="keybase_narrative_github">Bekend bij GitHub als %s</string>
   <string name="keybase_narrative_dns">Controleert de domein naam/namen %s</string>
   <string name="keybase_narrative_web_site">Kan versturen naar de Web site(s) %s</string>
-  <string name="keybase_narrative_reddit">Verstuur naar Reddit als %s</string>
+  <string name="keybase_narrative_reddit">Actief op Reddit als %s</string>
   <string name="keybase_narrative_coinbase">Bekend bij Coinbase als %s</string>
-  <string name="keybase_narrative_hackernews">Verstuur naar Hacker News als %s</string>
-  <string name="keybase_narrative_unknown">Onbekend bewijs type %s</string>
+  <string name="keybase_narrative_hackernews">Actief op Hacker News als %s</string>
+  <string name="keybase_narrative_unknown">Onbekend bewijstype %s</string>
   <string name="keybase_proof_failure">Helaas kan dit bewijs niet geverifieerd worden.</string>
   <string name="keybase_unknown_proof_failure">Niet-herkend probleem met de bewijschecker</string>
   <string name="keybase_problem_fetching_evidence">Probleem met bewijs</string>
@@ -687,7 +687,7 @@
   <string name="keybase_web_site_proof">Een tekstbestand</string>
   <string name="keybase_github_proof">Een gist</string>
   <string name="keybase_reddit_proof">Een JSON-bestand</string>
-  <string name="keybase_reddit_attribution">toegeschreven door Reddit aan</string>
+  <string name="keybase_reddit_attribution">door Reddit toegeschreven aan</string>
   <string name="keybase_verify">Verifiëren</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Wachtwoord wijzigen</string>
@@ -704,13 +704,12 @@
   <string name="edit_key_edit_user_id_revoked">Deze identiteit is ingetrokken. Dit kan niet ongedaan gemaakt worden.</string>
   <string name="edit_key_edit_subkey_title">Selecteer een actie!</string>
   <string-array name="edit_key_edit_subkey">
-    <item>Verander Vervaldatum</item>
+    <item>Vervaldatum wijzigen</item>
     <item>Subsleutel intrekken</item>
     <item>Subsleutel strippen</item>
-    <item>Verplaats Subsleutel naar Security Token</item>
   </string-array>
   <string name="edit_key_new_subkey">nieuwe subsleutel</string>
-  <string name="edit_key_select_usage">Selecteer sleutel gebruik!</string>
+  <string name="edit_key_select_usage">Selecteer sleutelgebruik!</string>
   <string name="edit_key_error_add_identity">Voeg minstens een identiteit toe!</string>
   <string name="edit_key_error_add_subkey">Voeg minstens een subsleutel toe!</string>
   <string name="edit_key_error_bad_security_token_algo">Algoritme niet ondersteund door Security Token!</string>
@@ -767,12 +766,13 @@
   <string name="show_smartpgp_authority_dialog_title">Autoriteit bewerken</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Sleutels</string>
-  <string name="nav_encrypt_decrypt">Versleutelen/Ontsleutelen</string>
+  <string name="nav_encrypt_decrypt">Versleutelen/ontsleutelen</string>
   <string name="nav_apps">Apps</string>
   <string name="drawer_open">Open navigatiemenu</string>
   <string name="drawer_close">Sluit navigatiemenu</string>
-  <string name="my_keys">Mijn Sleutels</string>
-  <string name="nav_backup">Backup/Herstellen</string>
+  <string name="my_keys">Mijn sleutels</string>
+  <string name="nav_backup">Back-up/herstellen</string>
+  <string name="nav_transfer">Beveiligde wifi-overdracht</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Type tekst</string>
   <!--certs-->
@@ -799,7 +799,7 @@
   <string name="msg_ip_error_remote_ex">Bewerking mislukt door interne fout</string>
   <string name="msg_ip">Bezig met importeren van publieke sleutelbos %s</string>
   <string name="msg_ip_fingerprint_error">Vingerafdruk van geïmporteerde sleutel komt niet overeen zoals verwacht!</string>
-  <string name="msg_ip_fingerprint_ok">Vingerafdrukcontrole OK</string>
+  <string name="msg_ip_fingerprint_ok">Vingerafdrukcontrole oké</string>
   <string name="msg_ip_insert_keyring">Bezig met coderen van sleutelbosgegevens</string>
   <string name="msg_ip_insert_keys">Bezig met analyseren van sleutels</string>
   <string name="msg_ip_prepare">Bezig met voorbereiden van databasebewerkingen</string>
@@ -1010,7 +1010,7 @@
   <string name="msg_mf_error_encode">Codeeruitzondering!</string>
   <string name="msg_mf_error_fingerprint">Eigenlijke vingerafdruk van sleutel komt niet overeen met verwachte vingerafdruk!</string>
   <string name="msg_mf_error_keyid">Geen sleutel-ID. Dit is een bug, gelieve een verslag in te dienen!</string>
-  <string name="msg_mf_error_integrity">Interne fout, integriteitscheck mislukt!</string>
+  <string name="msg_mf_error_integrity">Interne fout, integriteitscontrole mislukt!</string>
   <string name="msg_mf_error_master_none">Geen hoofdcertificaat gevonden om mee te werken! (Allemaal ingetrokken?)</string>
   <string name="msg_mf_error_noexist_primary">Slechte primaire gebruikers-ID opgegeven!</string>
   <string name="msg_mf_error_noexist_revoke">Slechte gebruikers-ID voor intrekking opgegeven!</string>
@@ -1144,7 +1144,7 @@
   <string name="msg_dc_ok_meta_only">Enkel metadata opgevraagd, ontsleutelen wordt overgeslagen</string>
   <string name="msg_dc_ok">Ontsleuteling/verificatie voltooid</string>
   <string name="msg_dc_pass_cached">Wachtwoord wordt uit cache gebruikt</string>
-  <string name="msg_dc_pending_nfc">NFC token vereist, gebruikersinput wordt gevraagd…</string>
+  <string name="msg_dc_pending_nfc">NFC-token vereist, gebruikersinput wordt gevraagd…</string>
   <string name="msg_dc_pending_passphrase">Wachtwoord vereist, gebruikersinput wordt gevraagd…</string>
   <string name="msg_dc_prep_streams">Bezig met voorbereiden van streams voor ontsleuteling</string>
   <string name="msg_dc">Ontsleuteling wordt gestart…</string>
@@ -1154,11 +1154,11 @@
   <string name="msg_dc_trail_sym">Achterlopende, symmetrisch versleutelde gegevens tegengekomen</string>
   <string name="msg_dc_trail_unknown">Achterlopende gegevens van onbekend type tegengekomen</string>
   <string name="msg_dc_unlocking">Bezig met ontgrendelen van geheime sleutel</string>
-  <string name="msg_dc_insecure_encryption_key">Er is een onveilige encryptie sleutel gebruikt! Dit kan om dat de sleutel oud is of de sleutel is gebruikt voor een aanval.</string>
-  <string name="msg_dc_insecure_symmetric_encryption_algo">Er is een onveilig encryptie algoritme gebruikt! Dit kan gebeuren wanneer de applicatie verouderd is of door een aanval.</string>
-  <string name="msg_dc_insecure_hash_algo">Er is een onveilig hash algoritme gebruikt! Dit kan gebeuren wanneer de applicatie verouderd is of door een aanval.</string>
-  <string name="msg_dc_insecure_mdc_missing">Modification Detection Code (MDC) pakket ontbreekt! Dit kan gebeuren wanneer de verleutelingsapplicatie verouderd is of door een downgrade aanval.</string>
-  <string name="msg_dc_insecure_key">Onveilige sleutel: Of de bitlengte van RSA/DSA/ElGamal is te kort of de ECC curve/algoritme wordt als onveilig beschouwd! Dit komt voor wanneer de applicatie verouderd is of door een aanval.</string>
+  <string name="msg_dc_insecure_encryption_key">Er is een onveilige versleutelingssleutel gebruikt! Dit kan gebeuren omdat de sleutel oud is, of door een aanval.</string>
+  <string name="msg_dc_insecure_symmetric_encryption_algo">Er is een onveilig versleutelingsalgoritme gebruikt! Dit kan gebeuren wanneer de applicatie verouderd is, of door een aanval.</string>
+  <string name="msg_dc_insecure_hash_algo">Er is een onveilig hashalgoritme gebruikt! Dit kan gebeuren wanneer de applicatie verouderd is, of door een aanval.</string>
+  <string name="msg_dc_insecure_mdc_missing">Modification Detection Code (MDC)-pakket ontbreekt! Dit kan gebeuren wanneer de verleutelingsapplicatie verouderd is, of door een downgrade-aanval.</string>
+  <string name="msg_dc_insecure_key">Onveilige sleutel: de bitlengte van RSA/DSA/ElGamal is te kort, of de ECC-curve/het ECC-algoritme wordt als onveilig beschouwd! Dit komt voor wanneer de applicatie verouderd is, of door een aanval.</string>
   <!--Messages for VerifySignedLiteralData operation-->
   <string name="msg_vl">Ondertekeningscontrole wordt gestart</string>
   <string name="msg_vl_error_no_siglist">Geen handtekeningslijst in ondertekend pakket van letterlijke gegevens!</string>
@@ -1174,8 +1174,8 @@
   <string name="msg_vl_ok">Oké</string>
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se">Ondertekening/versleuteling wordt gestart</string>
-  <string name="msg_se_input_bytes">Bezig met verwerken van input van byte array</string>
-  <string name="msg_se_input_uri">Bezig met verwerken van input van URI</string>
+  <string name="msg_se_input_bytes">Bezig met verwerken van invoer van byte array</string>
+  <string name="msg_se_input_uri">Bezig met verwerken van invoer van URI</string>
   <string name="msg_se_error_no_input">Geen input gegeven!</string>
   <string name="msg_se_error_input_uri_not_found">Fout bij openen van URI voor lezen!</string>
   <string name="msg_se_error_output_uri_not_found">Fout bij openen van URI voor schrijven!</string>
@@ -1200,7 +1200,7 @@
   <string name="msg_pse_key_unknown">Ontbrekende sleutel voor versleuteling: %s</string>
   <string name="msg_pse_key_warn">Slechte sleutel voor versleuteling: %s</string>
   <string name="msg_pse_ok">Ondertekening/versleuteling geslaagd!</string>
-  <string name="msg_pse_pending_nfc">NFC token vereist, gebruikersinput gevraagd…</string>
+  <string name="msg_pse_pending_nfc">NFC-token vereist, gebruikersinput gevraagd…</string>
   <string name="msg_pse_pending_passphrase">Wachtwoord vereist, gebruikersinput wordt gevraagd…</string>
   <string name="msg_pse_signing">Bezig met ondertekenen van gegevens (zonder versleuteling)</string>
   <string name="msg_pse_signing_cleartext">Bezig met aanmaken van platte tekst-ondertekening</string>
@@ -1255,25 +1255,25 @@
   <string name="msg_import_success">Importeren geslaagd!</string>
   <plurals name="msg_backup">
     <item quantity="one">Backup met één sleutel</item>
-    <item quantity="other">Backup met %d sleutels </item>
+    <item quantity="other">Back-up met %d sleutels </item>
   </plurals>
-  <string name="msg_backup_all">Backup met alle sleutels</string>
-  <string name="msg_backup_public">Bezig met maken van backup van publieke sleutel %s</string>
-  <string name="msg_backup_secret">Bezig met maken van backup van geheime sleutel %s</string>
-  <string name="msg_backup_error_uri_open">Fout bij openen van URI stream!</string>
-  <string name="msg_backup_error_db">Database error!</string>
-  <string name="msg_backup_error_io">Input/output error!</string>
-  <string name="msg_backup_success">Backup geslaagd</string>
+  <string name="msg_backup_all">Back-up met alle sleutels</string>
+  <string name="msg_backup_public">Bezig met maken van back-up van publieke sleutel %s</string>
+  <string name="msg_backup_secret">Bezig met maken van back-up van geheime sleutel %s</string>
+  <string name="msg_backup_error_uri_open">Fout bij openen van URI-stream!</string>
+  <string name="msg_backup_error_db">Databasefout!</string>
+  <string name="msg_backup_error_io">Invoer-/uitvoerfout!</string>
+  <string name="msg_backup_success">Back-up geslaagd</string>
   <string name="msg_upload">Bezig met uploaden van publieke sleutel</string>
-  <string name="msg_upload_proxy_direct">Gebruik proxy: Geen</string>
-  <string name="msg_upload_proxy_tor">Gebruik proxy: TOR</string>
+  <string name="msg_upload_proxy_direct">Gebruik proxy: geen</string>
+  <string name="msg_upload_proxy_tor">Gebruik proxy: Tor</string>
   <string name="msg_upload_proxy">Gebruik proxy: %s</string>
   <string name="msg_upload_server">Server: %s</string>
-  <string name="msg_upload_key">Key ID: %s</string>
-  <string name="msg_upload_error_key">Error bij verwerken van key data!</string>
+  <string name="msg_upload_key">Sleutel-ID: %s</string>
+  <string name="msg_upload_error_key">Fout bij voorverwerken van sleutelgegevens!</string>
   <string name="msg_upload_error_not_found">Sleutel niet gevonden!</string>
   <string name="msg_upload_error_upload">Fout bij uploaden van sleutel naar server! Controleer je internetverbinding</string>
-  <string name="msg_upload_success">Uploaden naar keyserver geslaagd</string>
+  <string name="msg_upload_success">Uploaden naar sleutelserver geslaagd</string>
   <string name="msg_del_error_empty">Niets om te verwijderen!</string>
   <string name="msg_del_error_multi_secret">Geheime sleutels kunnen enkel individueel verwijderd worden!</string>
   <plurals name="msg_del">
@@ -1300,52 +1300,52 @@
   <string name="msg_lv">Gekoppelde identiteit wordt geverifieerd…</string>
   <string name="msg_lv_match">Bezig met zoeken van token</string>
   <string name="msg_lv_match_error">Geen token gevonden!</string>
-  <string name="msg_lv_fp_ok">Vingerafdruk OK.</string>
+  <string name="msg_lv_fp_ok">Vingerafdruk oké.</string>
   <string name="msg_lv_fp_error">Vingerafdruk komt niet overeen!</string>
-  <string name="msg_lv_error_twitter_auth">Error bij het verkrijgen van Twitter auth token!</string>
-  <string name="msg_lv_error_twitter_handle">Twitter account handle komt niet overeen in terugmelding!</string>
-  <string name="msg_lv_error_twitter_response">Onverwachte terugmelding van Twitter API!</string>
-  <string name="msg_lv_error_github_handle">GitHub account handle komt niet overeen in terugmelding!</string>
+  <string name="msg_lv_error_twitter_auth">Fout bij verkrijgen van Twitter-authenticatietoken!</string>
+  <string name="msg_lv_error_twitter_handle">Twitter-accountnaam komt niet overeen in antwoord!</string>
+  <string name="msg_lv_error_twitter_response">Onverwacht antwoord van Twitter-API!</string>
+  <string name="msg_lv_error_github_handle">GitHub-accountnaam komt niet overeen in antwoord!</string>
   <string name="msg_lv_error_github_not_found">Gist bevat geen overeenkomstige bestanden!</string>
   <string name="msg_lv_fetch">Ophalen van URI \'%s\'</string>
   <string name="msg_lv_fetch_redir">Volgen van verwijzing naar \'%s\'</string>
   <string name="msg_lv_fetch_ok">Succesvol opgehaald (HTTP %s)</string>
   <string name="msg_lv_fetch_error">Server fout (HTTP %s)</string>
   <string name="msg_lv_fetch_error_url">URL is verkeerd opgemaakt!</string>
-  <string name="msg_lv_fetch_error_io">IO Error!</string>
-  <string name="msg_lv_fetch_error_format">Formaat error!</string>
+  <string name="msg_lv_fetch_error_io">IO-fout!</string>
+  <string name="msg_lv_fetch_error_format">Formaatfout!</string>
   <string name="msg_lv_fetch_error_nothing">Bron niet gevonden!</string>
   <string name="msg_bench">Bezig met prestatiemeting van enkele bewerkingen…</string>
-  <string name="msg_bench_enc_time">Verslteutel tijd: %ss</string>
+  <string name="msg_bench_enc_time">Versleutelingstijd: %ss</string>
   <string name="msg_bench_enc_time_avg">Gemiddelde tijd voor het versleutelen van 5MB: %ss</string>
   <string name="msg_bench_dec_time">Tijd benodigd voor ontsleutelen: %ss</string>
   <string name="msg_bench_dec_time_avg">Gemiddelde tijd voor het ontsleutelen van 5MB: %ss</string>
   <string name="msg_bench_s2k_100ms_its">aantal S2K iteraties voor 100ms: %s</string>
   <string name="msg_bench_s2k_for_it">Tijd voor %1$s SHA1 S2K iteraties: %2$sms</string>
   <string name="msg_bench_success">Prestatiemeting voltooid!</string>
-  <string name="msg_data">Verwerken van invoerde gegevens</string>
-  <string name="msg_data_openpgp">Bezig met het proberen te verwerken van OpenPGP gegevens</string>
+  <string name="msg_data">Verwerken van ingevoerde gegevens</string>
+  <string name="msg_data_openpgp">Bezig met proberen verwerken van OpenPGP-gegevens</string>
   <string name="msg_data_detached">Vrijstaande handtekening tegengekomen!</string>
-  <string name="msg_data_detached_clear">Eerder met opschonen, niet ondertekende gegevens!</string>
+  <string name="msg_data_detached_clear">Opschonen van eerdere, niet ondertekende gegevens!</string>
   <string name="msg_data_detached_sig">Verwerken van vrijstaande handtekening</string>
   <string name="msg_data_detached_raw">Verwerken van ondertekende gegevens</string>
   <string name="msg_data_detached_nested">Geneste ondertekende gegevens worden overgeslagen!</string>
   <string name="msg_data_detached_trailing">Gegevens na het ondertekende gedeelte worden overgeslagen!</string>
   <string name="msg_data_detached_unsupported">Niet ondersteunde soort vrijstaande handtekening!</string>
-  <string name="msg_data_error_io">Error bij het lezen van ingevoerde data!</string>
-  <string name="msg_data_mime_bad">Kon MIME gegevens niet ontleden</string>
+  <string name="msg_data_error_io">Fout bij het lezen van ingevoerde gegevens!</string>
+  <string name="msg_data_mime_bad">Kon MIME-gegevens niet ontleden</string>
   <string name="msg_data_mime_filename">Bestandsnaam: \'%s\'</string>
-  <string name="msg_data_mime_from_extension">Raden van MIME type vanuit extensie</string>
-  <string name="msg_data_mime_length">Inhoud-Lengte: %s</string>
-  <string name="msg_data_mime_charset">Karakterset is \'%s\'</string>
-  <string name="msg_data_mime_charset_faulty">Karakterset is \'%s\', decoderen is echter mislukt!</string>
-  <string name="msg_data_mime_charset_guess">Karakterset lijkt \'%s\' te zijn</string>
-  <string name="msg_data_mime_charset_unknown">Karakterset is onbekend, of de gegevens zijn geen tekst.</string>
-  <string name="msg_data_mime">Bezig met ontleden van MIME gegevens structuur</string>
+  <string name="msg_data_mime_from_extension">Raden van MIME-type vanuit extensie</string>
+  <string name="msg_data_mime_length">Inhoudslengte: %s</string>
+  <string name="msg_data_mime_charset">Tekenset is \'%s\'</string>
+  <string name="msg_data_mime_charset_faulty">Tekenset is \'%s\', decoderen is echter mislukt!</string>
+  <string name="msg_data_mime_charset_guess">Tekenset lijkt \'%s\' te zijn</string>
+  <string name="msg_data_mime_charset_unknown">Tekenset is onbekend, of de gegevens zijn geen tekst.</string>
+  <string name="msg_data_mime">Bezig met ontleden van MIME-gegevensstructuur</string>
   <string name="msg_data_mime_ok">Klaar met ontleden</string>
-  <string name="msg_data_mime_none">Geen MIME structuur gevonden</string>
-  <string name="msg_data_mime_part">Bezig met verwerken van MIME gedeelte</string>
-  <string name="msg_data_mime_type">Inhoud-Type: %s</string>
+  <string name="msg_data_mime_none">Geen MIME-structuur gevonden</string>
+  <string name="msg_data_mime_part">Bezig met verwerken van MIME-gedeelte</string>
+  <string name="msg_data_mime_type">Inhoudstype: %s</string>
   <string name="msg_data_ok">Gegevensverwerking geslaagd</string>
   <string name="msg_data_skip_mime">MIME-ontleding wordt overgeslagen</string>
   <string name="msg_get_success">Download geslaagd!</string>
@@ -1358,16 +1358,16 @@
   <string name="msg_download_query_failed">Er trad een fout op bij het zoeken naar sleutels.</string>
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_verification">Keybaseverificatie voor %s wordt geprobeerd</string>
-  <string name="msg_keybase_error_no_prover">Geen bewijschecker gevonden voor %s</string>
+  <string name="msg_keybase_error_no_prover">Geen bewijscontrole gevonden voor %s</string>
   <string name="msg_keybase_error_fetching_evidence">Probleem bij ophalen van bewijs</string>
   <string name="msg_keybase_error_key_mismatch">Sleutelvingerafdruk komt niet overeen met die in bewijspost</string>
   <string name="msg_keybase_error_dns_fail">DNS TXT record ophalen mislukt</string>
   <string name="msg_keybase_error_specific">%s</string>
   <string name="msg_keybase_error_msg_payload_mismatch">Ontsleuteld bewijs komt niet overeen met verwachte waarde</string>
   <!--Messages for Mime parsing operation-->
-  <string name="msg_mime_parsing_start">Bezig met ontleden van de MIME structuur</string>
-  <string name="msg_mime_parsing_error">MIME ontleding mislukt</string>
-  <string name="msg_mime_parsing_success">MIME ontleding geslaagd!</string>
+  <string name="msg_mime_parsing_start">Bezig met ontleden van de MIME-structuur</string>
+  <string name="msg_mime_parsing_error">MIME-ontleding mislukt</string>
+  <string name="msg_mime_parsing_success">MIME-ontleding geslaagd!</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_touch_to_clear">Tik om wachtwoorden te wissen.</string>
   <plurals name="passp_cache_notif_n_keys">
@@ -1394,11 +1394,11 @@
   <string name="backup_text">Back-ups die je eigen sleutels bevatten mogen nooit gedeeld worden met anderen!</string>
   <string name="backup_all">Alle sleutels + je eigen sleutels</string>
   <string name="backup_public_keys">Alle sleutels</string>
-  <string name="backup_section">Backup</string>
+  <string name="backup_section">Back-up</string>
   <string name="restore_section">Herstellen</string>
   <!--unsorted-->
   <string name="section_certifier_id">Certificeer</string>
-  <string name="section_cert">Certificaat Details</string>
+  <string name="section_cert">Certificaatgegevens</string>
   <string name="label_user_id">Identiteit</string>
   <string name="unknown_uid"><![CDATA[<onbekend>]]></string>
   <string name="empty_certs">Geen certificaten voor deze sleutel</string>
@@ -1407,7 +1407,7 @@
   <string name="certify_text">De sleutels die je importeert bevatten \'identiteiten\': namen en e-mailadressen. Selecteer precies die voor bevestiging die overeenkomen met wat je had verwacht.</string>
   <string name="certify_fingerprint_text">Vergelijk de vingerafdruk, teken voor teken, met de vingerafdruk op het apparaat van je partner.</string>
   <string name="certify_fingerprint_text_phrases">Vergelijk deze woorden met de woorden op het apparaat van je partner.</string>
-  <string name="label_revocation">Intrek Reden</string>
+  <string name="label_revocation">Reden voor intrekken</string>
   <string name="label_cert_type">Type</string>
   <string name="error_key_not_found">Sleutel niet gevonden!</string>
   <string name="error_key_processing">Fout bij verwerken sleutel!</string>
@@ -1416,10 +1416,10 @@
   <string name="key_no_passphrase">geen wachtwoord</string>
   <string name="key_unavailable">niet beschikbaar</string>
   <string name="secret_cannot_multiple">Je eigen sleutels kunnen enkel individueel verwijderd worden!</string>
-  <string name="title_view_cert">Toon Certificaat Details</string>
+  <string name="title_view_cert">Toon certificaatgegevens</string>
   <string name="unknown">onbekend</string>
   <string name="can_sign_not">kan niet ondertekenen</string>
-  <string name="error_no_encrypt_subkey">Geen codeer-subsleutel beschikbaar!</string>
+  <string name="error_no_encrypt_subkey">Geen versleutelingssubsleutel beschikbaar!</string>
   <string name="contact_show_key">Toon sleutel (%s)</string>
   <string name="swipe_to_update">Veeg naar beneden om van sleutelserver te updaten</string>
   <string name="error_no_file_selected">Selecteer minstens een bestand om te versleutelen!</string>
@@ -1429,7 +1429,7 @@
   <string name="error_empty_text">Voer tekst in om ze te versleutelen!</string>
   <string name="error_log_share_internal">Interne error tijdens het voorbereiden van het logboek!</string>
   <string name="key_colon">Sleutel:</string>
-  <string name="exchange_description">Selecteer om een sleuteluitwisseling te starten het aantal deelnemers aan de rechterkant, en klik vervolgens op de knop “Start uitwisseling”.\n\nJe zal twee vragen gesteld worden om zeker te zijn dat enkel de juiste deelnemers zich in de uitwisseling bevinden en dat hun vingerafdrukken correct zijn.</string>
+  <string name="exchange_description">Selecteer om een sleuteluitwisseling te starten het aantal deelnemers aan de rechterkant, en klik vervolgens op de knop “Uitwisseling starten”.\n\nJe zal twee vragen gesteld worden om zeker te zijn dat enkel de juiste deelnemers zich in de uitwisseling bevinden en dat hun vingerafdrukken correct zijn.</string>
   <string name="btn_start_exchange">Uitwisseling starten</string>
   <string name="user_id_none"><![CDATA[<none>]]></string>
   <!--Android Account-->
@@ -1461,24 +1461,23 @@
   <string name="nfc_wrong_tag">Verkeerde tag. Gelieve opnieuw te proberen.</string>
   <string name="enable_nfc">Activeer NFC in je instellingen</string>
   <string name="no_nfc_support">Dit toestel biedt geen ondersteuning voor NFC</string>
-  <string name="nfc_write_successful">Succesvol geschreven op NFC tag</string>
+  <string name="nfc_write_successful">Succesvol geschreven op NFC-tag</string>
   <string name="unlocked">Ontgrendeld</string>
   <string name="nfc_settings">Instellingen</string>
   <string name="snack_security_token_view">Beeld</string>
   <string name="snack_security_token_import">Importeren</string>
   <string name="button_bind_key">Sleutel binden</string>
   <string name="security_token_serial_no">Serienummer: %s</string>
-  <string name="security_token_key_holder">Sleutel houder: %s</string>
-  <string name="security_token_key_holder_not_set"><![CDATA[Sleutel houder: <niet ingesteld>]]></string>
+  <string name="security_token_key_holder">Sleutelhouder: %s</string>
+  <string name="security_token_key_holder_not_set"><![CDATA[Sleutelhouder: <niet ingesteld>]]></string>
   <string name="security_token_status_bound">Security Token komt overeen en is gekoppeld aan sleutel</string>
   <string name="security_token_status_unbound">Security Token komt overeen, kan gekoppeld worden aan sleutel</string>
   <string name="security_token_status_partly">Security Token komt overeen, gedeeltelijk gekoppeld aan sleutel</string>
   <string name="security_token_create">Hou het Security Token tegen de achterkant van je apparaat.</string>
-  <string name="security_token_reset_or_import">Dit Security Token bevat al een sleutel. Om deze te gebruiken hebben we extra sleutelinformatie nodig. Deze informatie kan gevonden worden op een sleutelserver, of geïmporteerd uit een bestand.</string>
+  <string name="security_token_reset_or_import">Dit Security Token bevat al een sleutel.</string>
   <string name="btn_reset">Reset</string>
-  <string name="security_token_radio_use_existing">Zoek sleutelinformatie op sleutelserver</string>
-  <string name="security_token_file_radio">Importeer sleutelinformatie uit bestand</string>
-  <string name="security_token_radio_reset">Reset Security Token</string>
+  <string name="security_token_radio_use_existing">Bestaande sleutel gebruiken</string>
+  <string name="security_token_radio_reset">Token opnieuw instellen</string>
   <string name="security_token_reset_warning">Het opnieuw instellen van het Security Token maakt alle sleutels op het token ongedaan. Het is daarna niet meer mogelijk om berichten/bestanden te ontsleutelen met deze sleutel!</string>
   <string name="snack_security_token_other">Andere sleutel opgeslagen op Security Token!</string>
   <string name="security_token_error">Error: %s</string>
@@ -1498,7 +1497,7 @@
   <string name="security_token_error_header">Security Token rapporteerde ongeldige %s byte</string>
   <string name="security_token_error_tag_lost">Security Token is te vroeg verwijderd. Houdt het Security Token aan de achterkant totdat de bewerking is beëindigd.</string>
   <string name="security_token_error_iso_dep_not_supported">Security Token biedt geen ondersteuning voor de vereiste communicatiestandaard (ISO-DEP, ISO 14443-4)</string>
-  <string name="security_token_error_try_again">Probeer opnieuw</string>
+  <string name="security_token_error_try_again">Opnieuw proberen</string>
   <string name="btn_delete_original">Oorspronkelijk bestand verwijderen</string>
   <string name="snack_encrypt_filenames_on">Bestandsnamen <b>zijn</b> versleuteld.</string>
   <string name="snack_encrypt_filenames_off">Bestandsnamen <b>zijn niet</b> versleuteld.</string>
@@ -1509,11 +1508,11 @@
   <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>
-  <string name="error_reading_aosp">Kon gegevens niet lezen. Dit is een bug in het Android E-Mail programma! (Issue #290)</string>
-  <string name="error_reading_k9">Incomplete data ontvangen. Probeer opnieuw middels het drukken op \'Download compleet bericht\' in K-9 Mail!</string>
+  <string name="error_reading_aosp">Kon gegevens niet lezen. Dit is een bug in de Android-e-mailcliënt! (probleem #290)</string>
+  <string name="error_reading_k9">Onvolledige gegevens ontvangen. Probeer het opnieuw door in K-9 Mail op \'Volledig bericht downloaden\' te drukken!</string>
   <string name="filename_unknown">Onbekende bestandsnaam (raak aan om te openen)</string>
   <string name="filename_unknown_text">Tekst (raak aan om te tonen)</string>
-  <string name="filename_keys">Sleutel Backup (raak aan om te importeren)</string>
+  <string name="filename_keys">Sleutelback-up (raak aan om te importeren)</string>
   <string name="intent_show">Toon ondertekende/versleutelde inhoud</string>
   <string name="intent_share">Deel ondertekende/versleutelde inhoud</string>
   <string name="view_internal">Bekijken in OpenKeychain</string>
@@ -1527,6 +1526,7 @@
   <string name="file_delete_exception">Oorspronkelijk bestand kon niet worden verwijderd!</string>
   <string name="error_clipboard_empty">Klembord is leeg!</string>
   <string name="error_clipboard_copy">Fout bij kopiëren van gegevens naar klembord!</string>
+  <string name="error_clipboard_bad">Kon sleutels niet lezen uit klembord!</string>
   <string name="error_scan_fp">Fout bij scannen van vingerafdruk!</string>
   <string name="error_scan_match">Vingerafdrukken komen niet overeen!</string>
   <string name="error_expiry_past">Verloopdatum is in het verleden!</string>
@@ -1542,7 +1542,7 @@
   <string name="linked_create_twitter_1_1">Door een gekoppelde identiteit van dit type aan te maken, kan je je sleutel koppelen aan een door jou beheerde Twitter-account.</string>
   <string name="linked_create_twitter_1_2">Dit doe je door een specifieke tweet te versturen op je tijdlijn en vervolgens een gekoppelde identiteit te maken die naar deze tweet verwijst.</string>
   <string name="linked_create_twitter_1_3">Voer je Twitter-schermnaam in om verder te gaan.</string>
-  <string name="linked_create_twitter_handle">Twitter Handle</string>
+  <string name="linked_create_twitter_handle">Twitter-accountnaam</string>
   <string name="linked_create_twitter_2_1">Druk op een knop om de boodschap te twitteren!</string>
   <string name="linked_create_twitter_2_2">Je kunt de tweet bewerken voordat je deze verstuurt mits je de tekst binnen de haakjes niet aanpast. </string>
   <string name="linked_create_twitter_2_3">Wanneer je tweet gepubliceerd is als <b>@%s</b>, raak dan de knop \'Verifiëren\' aan om je tijdlijn te scannen.</string>
@@ -1553,31 +1553,31 @@
   <string name="linked_verified_github">De link tussen deze GitHub-account en de sleutel is beveiligd geverifieerd.<b>Als je gelooft dat de account echt is</b>, bevestig dan deze verificatie dan met je sleutel.</string>
   <string name="linked_verified_dns">De link tussen deze domeinnaam en de sleutel is beveiligd geverifieerd. <b>Als je gelooft dat dit domein echt is</b>, bevestig dan deze verificatie met je sleutel.</string>
   <string name="linked_verified_twitter">De link tussen deze Twitter-account en de sleutel is beveiligd geverifieerd.<b>Als je gelooft dat de account echt is</b>, bevestig dan deze verificatie met je sleutel.</string>
-  <string name="linked_verified_secret_https">Alles lijkt OK.</string>
-  <string name="linked_verified_secret_github">Alles lijkt OK.</string>
-  <string name="linked_verified_secret_dns">Alles lijkt OK.</string>
-  <string name="linked_verified_secret_twitter">Alles lijkt OK.</string>
+  <string name="linked_verified_secret_https">Alles lijkt in orde.</string>
+  <string name="linked_verified_secret_github">Alles lijkt in orde.</string>
+  <string name="linked_verified_secret_dns">Alles lijkt in orde.</string>
+  <string name="linked_verified_secret_twitter">Alles lijkt in orde.</string>
   <plurals name="linked_id_expand">
-    <item quantity="one">Er is nog 1 onbekend identiteit type</item>
-    <item quantity="other">Er zijn meer dan %d onbekende </item>
+    <item quantity="one">Er is nog 1 onbekend identiteitstype</item>
+    <item quantity="other">Er zijn meer dan %d onbekende identiteitstypen</item>
   </plurals>
   <!--Other Linked Identity strings-->
   <string name="linked_select_1">Een \'gekoppelde identiteit\' verbindt je PGP-sleutel aan een bron op het web.</string>
   <string name="linked_select_2">Selecteer een type:</string>
   <string name="linked_id_generic_text">Dit bestand claimt eigenaarschap van de OpenPGP sleutel met de lange id %2$s.\n\nToken voor bewijs:\n%1$s</string>
   <string name="linked_verifying">Verifiëren…</string>
-  <string name="linked_verify_success">Geverifiëerd!</string>
-  <string name="linked_verify_error">Verificatie fout!</string>
+  <string name="linked_verify_success">Geverifieerd!</string>
+  <string name="linked_verify_error">Verificatiefout!</string>
   <string name="linked_verify_pending">Nog niet geverifiëerd</string>
   <string name="linked_need_verify">De bron moet geverifieerd worden voordat je verder kunt gaan!</string>
-  <string name="menu_linked_add_identity">Koppel aan Account</string>
-  <string name="section_linked_identities">Gekoppelde Identiteiten</string>
+  <string name="menu_linked_add_identity">Koppel aan account</string>
+  <string name="section_linked_identities">Gekoppelde identiteiten</string>
   <string name="btn_finish">Afronden</string>
   <string name="linked_title_https">Website (HTTPS)</string>
-  <string name="linked_title_dns">Domein Naam (DNS)</string>
+  <string name="linked_title_dns">Domeinnaam (DNS)</string>
   <string name="linked_title_github">GitHub</string>
   <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Gekoppelde Identiteit</string>
+  <string name="card_linked_identity">Gekoppelde dentiteit</string>
   <string name="linked_button_verify">Verifiëren</string>
   <string name="linked_button_retry">Opnieuw proberen</string>
   <string name="linked_button_retry_step">Laatste stap opnieuw proberen</string>
@@ -1586,58 +1586,51 @@
   <string name="linked_text_verifying">Verifiëren…</string>
   <string name="linked_text_error">Error</string>
   <string name="linked_text_confirming">Bevestigen…</string>
-  <string name="linked_ids_more_unknown">Nog %d onbekende identiteit types</string>
-  <string name="title_linked_id_create">Maak Gekoppelde Identiteit</string>
+  <string name="linked_ids_more_unknown">Nog %d onbekende identiteitstypes</string>
+  <string name="title_linked_id_create">Gekoppelde identiteit aanmaken</string>
   <string name="linked_github_text">Deze bewerking koppelt je sleutel aan je GitHub-account.\nDruk op de knop om verder te gaan.</string>
   <string name="linked_progress_auth_github">Autoriseer met GitHub…</string>
-  <string name="linked_progress_post_gist">Post Gist…</string>
+  <string name="linked_progress_post_gist">Post gist…</string>
   <string name="linked_progress_update_key">Vernieuw sleutel…</string>
-  <string name="linked_button_start">Koppel aan GitHub account</string>
+  <string name="linked_button_start">Koppel aan GitHub-account</string>
   <string name="linked_error_auth_failed">Autorisatie mislukt!</string>
-  <string name="linked_error_timeout">Verbinding timeout!</string>
-  <string name="linked_error_network">Netwerk error!</string>
-  <string name="linked_error_http">Communicatie error: %s</string>
+  <string name="linked_error_timeout">Time-out bij verbinden!</string>
+  <string name="linked_error_network">Netwerkfout!</string>
+  <string name="linked_error_http">Communicatiefout: %s</string>
   <string name="linked_webview_title_github">GitHub-autorisatie</string>
-  <string name="linked_gist_description">OpenKeychain Gekoppelde Identiteit</string>
+  <string name="linked_gist_description">OpenKeychain-gekoppelde identiteit</string>
   <string name="linked_empty">Koppel je sleutel aan GitHub, Twitter of andere websites!</string>
   <string name="snack_btn_overwrite">Overschrijven</string>
   <string name="backup_code_explanation">De back-up wordt beveiligd met een back-upcode. Schrijf deze op voordat je verder gaat!</string>
-  <string name="backup_code_enter">Voer backup code in:</string>
-  <string name="backup_code_ok">Code geaccepteerd!</string>
-  <string name="btn_code_wrotedown">OK, ik heb het opgeschreven!</string>
+  <string name="backup_code_enter">Voer de back-upcode in:</string>
+  <string name="backup_code_ok">Code aanvaard!</string>
+  <string name="btn_code_wrotedown">Oké, ik heb het opgeschreven!</string>
   <string name="backup_code_wrong">De ingevoerde back-upcode is onjuist!\nHeb je ze juist opgeschreven?</string>
-  <string name="btn_backup_share">Backup Delen</string>
-  <string name="btn_backup_save">Backup Opslaan</string>
-  <string name="snack_backup_error_saving">Fout bij het opslaan van de backup!</string>
-  <string name="snack_backup_saved">Backup ogeslagen</string>
-  <string name="snack_backup_exists">Backup bestaat al!</string>
-  <string name="snack_backup_saved_dir">Opgeslagen in de OpenKeychain map</string>
+  <string name="btn_backup_share">Back-up delen</string>
+  <string name="btn_backup_save">Back-up opslaan</string>
+  <string name="snack_backup_error_saving">Fout bij het opslaan van de back-up!</string>
+  <string name="snack_backup_saved">Back-up opgeslagen</string>
+  <string name="snack_backup_exists">Back-up bestaat al!</string>
+  <string name="snack_backup_saved_dir">Opgeslagen in de OpenKeychain-map</string>
   <string name="btn_backup_back">Ga terug om te controleren</string>
   <string name="snack_text_too_long">Tekst is te lang om in zijn geheel te tonen!</string>
   <string name="snack_shared_text_too_long">Gedeelde tekst is geknipt omdat deze te lang was!</string>
   <string name="share_log_dialog_title">Logboek delen?</string>
-  <string name="share_log_dialog_message">Het logboek kan weliswaar zeer handig zijn voor ontwikkelaars om bugs te vinden in OpenKeychain, deze kan echter potentieel gevoelige informatie bevatten zoals gegevens over bijgewerkte sleutels. Wees er zeker van dat je deze informatie wil delen.</string>
+  <string name="share_log_dialog_message">Het logboek kan zeer handig zijn voor ontwikkelaars om bugs te vinden in OpenKeychain, maar kan ook potentieel gevoelige informatie bevatten zoals gegevens over bijgewerkte sleutels. Wees er zeker van dat je deze informatie wil delen.</string>
   <string name="share_log_dialog_share_button">Delen</string>
   <string name="share_log_dialog_cancel_button">Annuleren</string>
   <string name="toast_wrong_mimetype">Verkeerd gegevenstype, er was tekst verwacht!</string>
   <string name="toast_no_text">Geen tekst in gedeelde gegevens!</string>
   <string name="menu_uids_save">Opslaan</string>
-  <string name="title_edit_identities">Bewerk Identiteiten</string>
-  <string name="title_edit_subkeys">Bewerk Subsleutels</string>
-  <string name="btn_search_for_query">Zoek voor\n\'%s\'</string>
-  <string name="cache_ttl_lock_screen">tot het scherm uit gaat</string>
-  <string name="cache_ttl_ten_minutes">voor tien minuten</string>
-  <string name="cache_ttl_thirty_minutes">voor 30 minuten</string>
+  <string name="title_edit_identities">Bewerk identiteiten</string>
+  <string name="title_edit_subkeys">Bewerk subsleutels</string>
+  <string name="btn_search_for_query">Zoek \n\'%s\'</string>
+  <string name="cache_ttl_lock_screen">tot het scherm uitgaat</string>
   <string name="cache_ttl_one_hour">voor een uur</string>
-  <string name="cache_ttl_three_hours">voor drie uren</string>
   <string name="cache_ttl_one_day">voor een dag</string>
-  <string name="cache_ttl_three_days">voor drie dagen</string>
   <string name="cache_ttl_forever">voor altijd</string>
-  <string name="settings_cache_select_three">Pak op voor drie.</string>
-  <string name="settings_cache_ttl_at_least_one">Minimaal één item moet geselecteerd zijn!</string>
-  <string name="settings_cache_ttl_max_three">Meer dan drie items selecteren gaat niet!</string>
   <string name="remember">Onthoud</string>
-  <string name="security_token_error_pgp_app_not_installed">Er is geen PGP app gevonden op het security token</string>
+  <string name="security_token_error_pgp_app_not_installed">Er is geen PGP-app gevonden op het security token</string>
   <string name="prompt_fidesmo_pgp_install_title">PGP installeren?</string>
   <string name="prompt_fidesmo_pgp_install_message">Er is geen PGP-app beschikbaar op je Fidesmo-apparaat.</string>
   <string name="prompt_fidesmo_pgp_install_button_positive">Installeren</string>
@@ -1646,7 +1639,7 @@
   <string name="prompt_fidesmo_app_install_message">Om PGP te installeren heb je de Fidesmo Android-app nodig.</string>
   <string name="prompt_fidesmo_app_install_button_positive">Installeren</string>
   <string name="prompt_fidesmo_app_install_button_negative">Annuleren</string>
-  <string name="help_donation_paypal_item">OpenKeychain Donatie</string>
+  <string name="help_donation_paypal_item">Donatie aan OpenKeychain</string>
   <string-array name="help_donation_google_catalog_values">
     <item>1 EUR</item>
     <item>2 EUR</item>
@@ -1711,9 +1704,9 @@
   <string name="key_health_partial_stripped_subtitle">Tik voor meer info</string>
   <string name="keyserver_title_published">Gepubliceerd</string>
   <string name="keyserver_title_not_published">Niet gepubliceerd</string>
-  <string name="keyserver_title_unknown">Sleutelserver status: Onbekend</string>
+  <string name="keyserver_title_unknown">Sleutelserverstatus: onbekend</string>
   <string name="keyserver_last_updated">Laatst gecontroleerd: %s</string>
-  <string name="keyserver_last_updated_never">Laatst gecontroleerd: Nooit</string>
+  <string name="keyserver_last_updated_never">Laatst gecontroleerd: nooit</string>
   <string name="key_insecure_bitstrength_2048_problem">Deze sleutel gebruikt het <b>%1$s</b>-algoritme met een kracht van <b>%2$s bits</b>. Een veilige sleutel heeft een kracht van 2048 bits nodig.</string>
   <string name="key_insecure_bitstrength_2048_solution">Deze sleutel kan niet bijgewerkt worden. Voor beveiligde communicatie moet de gebruiker een nieuwe sleutel aanmaken.</string>
   <string name="key_insecure_unknown_curve_problem">Deze sleutel gebruikt het <b>%1$s</b>-algoritme, dat niet op de witte lijst staat.</string>
@@ -1746,4 +1739,101 @@
   <string name="dialog_insecure_button_view_key">Sleutel bekijken</string>
   <string name="dialog_insecure_button_ok">Begrepen</string>
   <string name="identity_context_forget">Vergeten</string>
+  <string name="button_scan">Scannen</string>
+  <string name="button_more_info">Meer info</string>
+  <string name="transfer_scan_explanation">Scan met een van de apparaten om een beveiligde verbinding aan te maken en je sleutels te delen of importeren.</string>
+  <string name="transfer_scan_warning">Gebruik dit enkel met je eigen apparaten!</string>
+  <string name="connection_status">Verbindingsstatus:</string>
+  <string name="section_transfer_keys">Sleutels beschikbaar voor overdracht</string>
+  <string name="section_received_keys">Ontvangen sleutels</string>
+  <string name="transfer_scan_only_wifi">Deze functie kan enkel via wifi gebruikt worden</string>
+  <string name="button_import">Importeren</string>
+  <string name="transfer_status_connected">Verbonden</string>
+  <string name="transfer_status_disconnected">Verbinding verbroken!</string>
+  <string name="transfer_error_read_incoming">Fout bij lezen van inkomende sleutel!</string>
+  <string name="transfer_error_connect">Verbinding mislukt!</string>
+  <string name="transfer_error_listen">Fout bij wachten op verbinding!</string>
+  <string name="transfer_error_generic">Onbekende communicatiefout!</string>
+  <string name="transfer_error_generic_msg">Communicatiefout: %s</string>
+  <string name="transfer_not_available">Sorry, deze functie kan enkel gebruikt worden met Android 5 of recenter :(</string>
+  <string name="transfer_list_empty">Geen sleutels op dit apparaat kunnen verzonden worden. Wachten op inkomende sleutels…</string>
+  <string name="transfer_connecting">Verbinden…</string>
+  <string name="first_time_secure_wifi_transfer">Beveiligde wifi-overdracht</string>
+  <string name="menu_secure_wifi_transfer">Beveiligde wifi-overdracht</string>
+  <string name="transfer_confirm_cancel">Annuleren</string>
+  <string name="transfer_confirm_ok">Verzenden</string>
+  <string name="transfer_confirm_title">Je sleutel verzenden?</string>
+  <string name="transfer_confirm_text">Dit zal volledige toegang tot je sleutel overdragen aan het verbonden apparaat. Stuur nooit je eigen sleutels naar apparaten die niet van jou zijn!</string>
+  <string name="button_scan_again">Opnieuw scannen</string>
+  <string name="transfer_error_wifi_text">Verbinding mislukt!</string>
+  <string name="transfer_error_wifi_text_instructions">Zorg dat je je op hetzelfde netwerk bevindt, en scan dan opnieuw.</string>
+  <string name="transfer_error_wifi_text_instructions_ssid">Zorg dat je je op het netwerk \"%s\" bevindt, en scan dan opnieuw.</string>
+  <string name="status_check_key">Sleutelstatus controleren…</string>
+  <string name="status_search_local">Zoeken in sleutellijst…</string>
+  <string name="status_search_uri">Zoeken op token-URI…</string>
+  <string name="status_search_keyserver">Zoeken op sleutelservers…</string>
+  <string name="status_import">Sleutel importeren…</string>
+  <string name="status_token_promote">Sleutel instellen…</string>
+  <string name="status_token_check">Sleutelinstelling controleren…</string>
+  <string name="status_content_uri">Bestand lezen…</string>
+  <string name="token_reset_confirm_title">Security Token opnieuw instellen?</string>
+  <string name="token_reset_confirm_message">Dit zal de sleutel op dit Security Token voorgoed verwijderen. Je zal deze sleutel niet meer kunnen gebruiken voor ontsleuteling! Weet je het zeker?</string>
+  <string name="token_reset_confirm_ok">Opnieuw instellen</string>
+  <string name="token_status_title">Informatie verzamelen voor Security Token…</string>
+  <string name="token_result_not_found">Sleutel niet gevonden!</string>
+  <string name="token_result_key_found">Sleutel gevonden!</string>
+  <string name="token_result_token_ok">Klaar voor gebruik!</string>
+  <string name="token_result_empty">Token is leeg</string>
+  <string name="token_action_retry">Opnieuw zoeken</string>
+  <string name="token_action_load_from_file">Laden uit bestand</string>
+  <string name="token_action_reset">Security Token opnieuw instellen</string>
+  <string name="token_action_import">Importeren</string>
+  <string name="token_action_view_key">Sleutel bekijken</string>
+  <string name="token_action_setup">Instellen met nieuwe sleutel</string>
+  <string name="token_action_unlock">Ontgrendelen met beheerderspincode</string>
+  <string name="token_unlock_attempts_none">Geen pogingen voor ontgrendelen resterend</string>
+  <plurals name="token_unlock_attempts">
+    <item quantity="one">1 poging resterend</item>
+    <item quantity="other">%d pogingen resterend</item>
+  </plurals>
+  <string name="token_error_locked_indefinitely">Te veel pogingen tot ontgrendelen. Token is voorgoed vergrendeld!</string>
+  <string name="token_menu_change_pin">Pincode wijzigen</string>
+  <string name="token_menu_view_log">Log bekijken</string>
+  <string name="token_unlock_ok">Ontgrendelen</string>
+  <string name="token_hint_admin_pin">Beheerderspincode</string>
+  <string name="token_hint_new_pin">Nieuwe pincode</string>
+  <string name="token_hint_new_pin_repeat">Nieuwe pincode (herhalen)</string>
+  <string name="token_error_admin_min8">Beheerderspincode moet 8 of meer tekens bevatten!</string>
+  <string name="token_error_pin_min6">Nieuwe pincode moet 6 of meer tekens bevatten!</string>
+  <string name="token_error_pin_repeat">Pincode komt niet overeen!</string>
+  <string name="msg_ret_curi_error_io">Fout bij lezen van gegevens!</string>
+  <string name="msg_ret_curi_error_no_match">Geen overeenkomstige sleutel gevonden</string>
+  <string name="msg_ret_curi_error_not_found">Kon bestand niet openen!</string>
+  <string name="msg_ret_curi_found">Sleutel gevonden: %s</string>
+  <string name="msg_ret_curi_mismatch">Sleutel komt niet overeen</string>
+  <string name="msg_ret_curi_ok">Sleutel gevonden</string>
+  <string name="msg_ret_curi_open">URI openen: %s</string>
+  <string name="msg_ret_curi_start">Sleutel laden uit bestand of document…</string>
+  <string name="msg_ret_ks_error">Onbekende fout bij zoeken naar sleutel!</string>
+  <string name="msg_ret_ks_error_not_found">Sleutel niet gevonden</string>
+  <string name="msg_ret_ks_fp_match">Vingerafdruk van opgehaalde sleutel komt overeen</string>
+  <string name="msg_ret_ks_fp_mismatch">Vingerafdruk van opgehaalde sleutel komt niet overeen!</string>
+  <string name="msg_ret_ks_ok">Sleutel gevonden!</string>
+  <string name="msg_ret_ks_start">Zoeken naar sleutel op sleutelservers…</string>
+  <string name="msg_ret_local_search">Zoeken naar sleutel: %s</string>
+  <string name="msg_ret_local_fp_match">Vingerafdruk van lokale sleutel komt overeen</string>
+  <string name="msg_ret_local_fp_mismatch">Vingerafdruk van lokale sleutel komt niet overeen!</string>
+  <string name="msg_ret_local_not_found">Sleutel niet gevonden</string>
+  <string name="msg_ret_local_none_found">Geen overeenkomstige sleutel gevonden</string>
+  <string name="msg_ret_local_ok">Sleutel gevonden</string>
+  <string name="msg_ret_local_secret">Lokale sleutel bevat geheime sleutelgegevens</string>
+  <string name="msg_ret_local_start">Zoeken naar sleutel in lokale sleutellijst…</string>
+  <string name="msg_ret_uri_error_fetch">Onbekende fout bij ophalen van URI!</string>
+  <string name="msg_ret_uri_error_parse">Token-URI is verkeerd opgemaakt!</string>
+  <string name="msg_ret_uri_error_no_match">Geen overeenkomstige sleutel gevonden op URI</string>
+  <string name="msg_ret_uri_fetching">URI ophalen: %s</string>
+  <string name="msg_ret_uri_ok">Sleutel gevonden</string>
+  <string name="msg_ret_uri_start">Zoeken naar sleutel op token-URI…</string>
+  <string name="msg_ret_uri_null">Geen URI opgeslagen op Security Token</string>
+  <string name="msg_ret_uri_test">Controleren of gevonden sleutel overeenkomt: %s</string>
 </resources>

OpenKeychain/src/main/res/values-pt-rBR/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">Configurações</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Servidores de chaves OpenPGP</string>
-  <string name="title_cache_ttl_preference">Personalize \'Lembretes\' de suas escolhas</string>
   <string name="title_change_passphrase">Alterar senha</string>
   <string name="title_share_fingerprint_with">Compartilhar impressão digital com...</string>
   <string name="title_share_key">Compartilhar minha chave com...</string>
@@ -147,7 +146,6 @@
   <string name="label_encryption_algorithm">Algoritmo de encriptação</string>
   <string name="label_hash_algorithm">Algoritmo de hash</string>
   <string name="label_symmetric">Encriptar com senha</string>
-  <string name="label_passphrase_cache_ttl">Personalize \'Lembrar\' escolhas</string>
   <string name="label_passphrase_cache_subs">Lembrar senhas por sub-chave</string>
   <string name="label_message_compression">Compressão de texto</string>
   <string name="label_file_compression">Compressão de arquivo</string>
@@ -656,12 +654,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Esta identidade foi revogado. Está ação não pode ser desfeita.</string>
   <string name="edit_key_edit_subkey_title">Selecione uma ação!</string>
-  <string-array name="edit_key_edit_subkey">
-    <item>Modificar Expiração</item>
-    <item>Revogar Sub-chave</item>
-    <item>Extirpar Sub-chave</item>
-    <item>Mover Sub-chave para o Token de Segurança</item>
-  </string-array>
   <string name="edit_key_new_subkey">nova sub-chave</string>
   <string name="edit_key_select_usage">Por favor, selecione o uso da chave!</string>
   <string name="edit_key_error_add_identity">Adicione ao menos uma identidade!</string>
@@ -1390,7 +1382,6 @@
   <string name="security_token_status_partly">O Token de Segurança coincide, parcialmente associado à chave</string>
   <string name="security_token_create">Segure o Token de Segurança contra as costas do seu dispositivo.</string>
   <string name="btn_reset">Redefinir</string>
-  <string name="security_token_radio_reset">Redefinir Token de Segurança</string>
   <string name="security_token_reset_warning">Resetar o Token de Segurança destrói completamente as chaves nele. Após isto, você não será capaz de decriptar mensagens/arquivos encruiptados com estas chaves!</string>
   <string name="snack_security_token_other">Uma chave diferente está armazenada no Token de Segurança!</string>
   <string name="security_token_error">Erro: %s</string>
@@ -1533,16 +1524,8 @@
   <string name="title_edit_subkeys">Editar Sub-chaves</string>
   <string name="btn_search_for_query">Buscar por\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">até desligar a tela</string>
-  <string name="cache_ttl_ten_minutes">por 10 minutos</string>
-  <string name="cache_ttl_thirty_minutes">por 30 minutos</string>
   <string name="cache_ttl_one_hour">por uma hora</string>
-  <string name="cache_ttl_three_hours">por 3 horas</string>
   <string name="cache_ttl_one_day">por um dia</string>
-  <string name="cache_ttl_three_days">por 3 dias</string>
-  <string name="cache_ttl_forever">Para sempre</string>
-  <string name="settings_cache_select_three">Selecione até 3.</string>
-  <string name="settings_cache_ttl_at_least_one">Ao menos um item deve ser selecionado!</string>
-  <string name="settings_cache_ttl_max_three">Não é possível selecionar mais de 3 itens!</string>
   <string name="remember">Lembrar</string>
   <string name="security_token_error_pgp_app_not_installed">Nenhum app PGP foi encontrado no token de segurança</string>
   <string name="prompt_fidesmo_pgp_install_title">Instalar o PGP?</string>

OpenKeychain/src/main/res/values-ru/strings.xml

@@ -15,7 +15,6 @@
   <string name="title_api_registered_apps">Приложения</string>
   <string name="title_key_server_preference">Серверы OpenPGP</string>
   <string name="title_smartpgp_authorities_preference">Центры SmartPGP</string>
-  <string name="title_cache_ttl_preference">Настройка \'Запоминания\'</string>
   <string name="title_change_passphrase">Изменить пароль</string>
   <string name="title_share_fingerprint_with">Отправить отпечаток...</string>
   <string name="title_share_key">Отправить ключ...</string>
@@ -153,7 +152,6 @@
   <string name="label_encryption_algorithm">Алгоритм шифрования</string>
   <string name="label_hash_algorithm">ХЭШ-алгоритм</string>
   <string name="label_symmetric">Зашифровать с паролем</string>
-  <string name="label_passphrase_cache_ttl">Настройка \'Запоминания\'</string>
   <string name="label_passphrase_cache_subs">Запомнить пароли для доп. ключей</string>
   <string name="label_message_compression">Сжатие текста</string>
   <string name="label_file_compression">Сжатие файла</string>
@@ -632,6 +630,7 @@
   <string name="api_settings_allowed_keys">Разрешённые ключи</string>
   <string name="api_settings_settings">Настройки</string>
   <string name="api_register_title">Разрешить доступ к OpenKeychain?</string>
+  <string name="api_register_text">%s запрашивает использование OpenKeychain в качестве криптопровайдера. У вас спросят разрешения, прежде чем приложение сможет использовать ваши ключи для расшифровки.n\nВы сможете отменить доступ в любое время в меню \'Приложения\' в OpenKeychain.</string>
   <string name="api_register_allow">Разрешить доступ</string>
   <string name="api_register_disallow">Запретить доступ</string>
   <string name="api_register_error_select_key">Пожалуйста, выберите ключ!</string>
@@ -671,6 +670,8 @@
   <string name="key_list_fab_qr_code">Сканировать QR-код</string>
   <string name="key_list_fab_search">Поиск ключа</string>
   <string name="key_list_fab_import">Импорт из файла</string>
+  <string name="key_list_dummy_title">У вас пока нет ключей!</string>
+  <string name="key_list_dummy_subtitle">Нажмите здесь, чтобы создать или импортировать ключ.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Изменить</string>
   <string name="key_view_action_encrypt">Зашифровать текст</string>
@@ -742,10 +743,9 @@
   <string name="edit_key_edit_user_id_revoked">Этот идентификатор был отозван. Это не может быть отменено.</string>
   <string name="edit_key_edit_subkey_title">Выберите действие!</string>
   <string-array name="edit_key_edit_subkey">
-    <item>Изменить срок действия</item>
+    <item>Изменить срок истечения</item>
     <item>Аннулировать доп. ключ</item>
-    <item>Отделить доп. ключ</item>
-    <item>Переместить доп. ключ в токен безопасности</item>
+    <item>Удалить доп. ключ</item>
   </string-array>
   <string name="edit_key_new_subkey">новый доп. ключ</string>
   <string name="edit_key_select_usage">Пожалуйста, выберите используемый ключ!</string>
@@ -811,6 +811,7 @@
   <string name="drawer_close">Закрыть панель навигации</string>
   <string name="my_keys">Мои ключи</string>
   <string name="nav_backup">Резервирование/Восстановление</string>
+  <string name="nav_transfer">Безопасная передача через Wi-Fi</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Напишите текст</string>
   <!--certs-->
@@ -1542,11 +1543,10 @@
   <string name="security_token_status_unbound">Токены безопасности совпали, могут быть привязаны к ключу</string>
   <string name="security_token_status_partly">Токены безопасности совпали, частично привязаны к ключу</string>
   <string name="security_token_create">Держите токен безопасности возле задней части вашего устройства.</string>
-  <string name="security_token_reset_or_import">Этот токен безопасности уже содержит ключ. Чтобы его использовать, нужна дополнительная информация о ключе. Её можно найти на сервере ключей или импортировать из файла.</string>
+  <string name="security_token_reset_or_import">Данный токен безопасности уже содержит ключ.</string>
   <string name="btn_reset">Сброс</string>
-  <string name="security_token_radio_use_existing">Найти информацию о ключе на сервере ключей</string>
-  <string name="security_token_file_radio">Импортировать информацию о ключе из файла</string>
-  <string name="security_token_radio_reset">Сбросить токен безопасности</string>
+  <string name="security_token_radio_use_existing">Использовать существующий ключ</string>
+  <string name="security_token_radio_reset">Сбросить токен</string>
   <string name="security_token_reset_warning">Сброс токена безопасности полностью уничтожает ключи на нём. После этого вы не сможете расшифровать сообщения или файлы, зашифрованные с помощью данных ключей!</string>
   <string name="snack_security_token_other">На токене безопасности хранится другой ключ!</string>
   <string name="security_token_error">Ошибка: %s</string>
@@ -1597,6 +1597,7 @@
   <string name="file_delete_exception">Оригинальный файл не может быть удалён!</string>
   <string name="error_clipboard_empty">Буфер обмена пуст!</string>
   <string name="error_clipboard_copy">Ошибка копирования данных в буфер обмена!</string>
+  <string name="error_clipboard_bad">Не удалось прочитать ключи из буфера обмена!</string>
   <string name="error_scan_fp">Ошибка сканирования отпечатка!</string>
   <string name="error_scan_match">Отпечатки не совпадают!</string>
   <string name="error_expiry_past">Дата истечения срока действия в прошлом!</string>
@@ -1698,16 +1699,9 @@
   <string name="title_edit_subkeys">Изменить доп. ключи</string>
   <string name="btn_search_for_query">Искать\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">до отключения экрана</string>
-  <string name="cache_ttl_ten_minutes">в течение десяти минут</string>
-  <string name="cache_ttl_thirty_minutes">в течение тридцати минут</string>
   <string name="cache_ttl_one_hour">в течение часа</string>
-  <string name="cache_ttl_three_hours">в течение трёх часов</string>
   <string name="cache_ttl_one_day">в течение дня</string>
-  <string name="cache_ttl_three_days">в течение трёх дней</string>
-  <string name="cache_ttl_forever">всегда</string>
-  <string name="settings_cache_select_three">Выберите не более трёх параметров</string>
-  <string name="settings_cache_ttl_at_least_one">По крайней мере один элемент должен быть выбран!</string>
-  <string name="settings_cache_ttl_max_three">Нельзя выбрать более трёх элементов!</string>
+  <string name="cache_ttl_forever">до очистки</string>
   <string name="remember">Помнить</string>
   <string name="security_token_error_pgp_app_not_installed">Нет приложения PGP на токене безопасности</string>
   <string name="prompt_fidesmo_pgp_install_title">Установить PGP?</string>
@@ -1818,4 +1812,103 @@
   <string name="dialog_insecure_button_view_key">Просмотреть ключ</string>
   <string name="dialog_insecure_button_ok">Понятно</string>
   <string name="identity_context_forget">Забыть</string>
+  <string name="button_scan">Сканировать</string>
+  <string name="button_more_info">Дополнительная информация</string>
+  <string name="transfer_scan_explanation">Чтобы передать ключ или импортировать его, установите безопасное соединение, включив сканирование на устройстве.</string>
+  <string name="transfer_scan_warning">Используйте только на ваших собственных устройствах!</string>
+  <string name="connection_status">Статус соединения:</string>
+  <string name="section_transfer_keys">Ключи, доступные для передачи</string>
+  <string name="section_received_keys">Полученные ключи</string>
+  <string name="transfer_scan_only_wifi">Эта функция работает только с помощью Wi-Fi.</string>
+  <string name="button_import">Импортировать</string>
+  <string name="transfer_status_connected">Подключено</string>
+  <string name="transfer_status_disconnected">Отключено!</string>
+  <string name="transfer_error_read_incoming">Не удалось прочитать входящий ключ!</string>
+  <string name="transfer_error_connect">Не удалось установить подключение!</string>
+  <string name="transfer_error_listen">Ошибка при ожидании подключения!</string>
+  <string name="transfer_error_generic">Неизвестная ошибка соединения!</string>
+  <string name="transfer_error_generic_msg">Ошибка соединения: %s</string>
+  <string name="transfer_not_available">К сожалению, эта функция доступна только на Android 5 или более новых версиях :(</string>
+  <string name="transfer_list_empty">На устройстве не обнаружены ключи, доступные к отправке. Ждём входящие ключи...</string>
+  <string name="transfer_connecting">Идёт подключение...</string>
+  <string name="first_time_secure_wifi_transfer">Безопасная передача через Wi-Fi</string>
+  <string name="menu_secure_wifi_transfer">Безопасная передача через Wi-Fi</string>
+  <string name="transfer_confirm_cancel">Отмена</string>
+  <string name="transfer_confirm_ok">Отправить</string>
+  <string name="transfer_confirm_title">Отправить ваш ключ?</string>
+  <string name="transfer_confirm_text">Это действие отправит ваш ключ на подключенное устройство. Никогда не отправляйте ваши ключи на чужие устройства!</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="status_check_key">Проверка статуса ключа...</string>
+  <string name="status_search_local">Поиск в списке ключей...</string>
+  <string name="status_search_uri">Поиск в токене Uri…</string>
+  <string name="status_search_keyserver">Поиск на серверах ключей...</string>
+  <string name="status_import">Импорт ключа...</string>
+  <string name="status_token_promote">Настройка ключа...</string>
+  <string name="status_token_check">Проверка ключа...</string>
+  <string name="status_content_uri">Чтение файла...</string>
+  <string name="token_reset_confirm_title">Переустановить токен безопасности?</string>
+  <string name="token_reset_confirm_message">Ключ в данном токене безопасности будет удалён без возможности восстановления. Вы больше не сможете использовать его для расшифровки! Вы уверены?</string>
+  <string name="token_reset_confirm_ok">Сброс</string>
+  <string name="token_status_title">Получение информации из токена безопасности...</string>
+  <string name="token_result_not_found">Ключ не найден!</string>
+  <string name="token_result_key_found">Найден ключ!</string>
+  <string name="token_result_token_ok">Готово к использованию!</string>
+  <string name="token_result_empty">Токен пуст</string>
+  <string name="token_action_retry">Найти заново</string>
+  <string name="token_action_load_from_file">Загрузить из файла</string>
+  <string name="token_action_reset">Сбросить токен безопасности</string>
+  <string name="token_action_import">Импортировать</string>
+  <string name="token_action_view_key">Просмотреть ключ</string>
+  <string name="token_action_setup">Настроить с новым ключом</string>
+  <string name="token_action_unlock">Расблокировать с помощью пароля администратора</string>
+  <string name="token_unlock_attempts_none">Попытки разблокировки законсились</string>
+  <plurals name="token_unlock_attempts">
+    <item quantity="one">Осталось 1 попытка</item>
+    <item quantity="few">Осталось %d попытки</item>
+    <item quantity="many">Осталось %d попыток</item>
+    <item quantity="other">Осталось %d попыток</item>
+  </plurals>
+  <string name="token_error_locked_indefinitely">Слишком много попыток разблокировки. Токен заблокирован без возможности восстановления!</string>
+  <string name="token_menu_change_pin">Изменить пароль</string>
+  <string name="token_menu_view_log">Просмотреть журнал</string>
+  <string name="token_unlock_ok">Разблокировать</string>
+  <string name="token_hint_admin_pin">Пароль администратора</string>
+  <string name="token_hint_new_pin">Новый пароль</string>
+  <string name="token_hint_new_pin_repeat">Новый пароль (повторить)</string>
+  <string name="token_error_admin_min8">Пароль администратора должен состоять из 8 символов или больше!</string>
+  <string name="token_error_pin_min6">Новый пароль должен состоять из 6 символов или больше!</string>
+  <string name="token_error_pin_repeat">Пароли не совпадают!</string>
+  <string name="msg_ret_curi_error_io">Ошибка чтения данных!</string>
+  <string name="msg_ret_curi_error_no_match">Не найдены совпадающие ключи</string>
+  <string name="msg_ret_curi_error_not_found">Не удалось открыть файл!</string>
+  <string name="msg_ret_curi_found">Найден ключ: %s</string>
+  <string name="msg_ret_curi_mismatch">Ключ не совпадает</string>
+  <string name="msg_ret_curi_ok">Найден ключ</string>
+  <string name="msg_ret_curi_open">Открыть Uri: %s</string>
+  <string name="msg_ret_curi_start">Загрузить ключ из файла или документа...</string>
+  <string name="msg_ret_ks_error">Неизвестная ошибка поиска ключа!</string>
+  <string name="msg_ret_ks_error_not_found">Ключ не найден</string>
+  <string name="msg_ret_ks_fp_match">Отпечаток полученного ключа совпадает</string>
+  <string name="msg_ret_ks_fp_mismatch">Отпечаток полученного ключа не совпадает!</string>
+  <string name="msg_ret_ks_ok">Найден ключ</string>
+  <string name="msg_ret_ks_start">Поиск ключа на серверах ключей...</string>
+  <string name="msg_ret_local_search">Найти ключ: %s</string>
+  <string name="msg_ret_local_fp_match">Отпечаток локального ключа совпадает</string>
+  <string name="msg_ret_local_fp_mismatch">Отпечаток локального ключа не совпадает!</string>
+  <string name="msg_ret_local_not_found">Ключ не найден</string>
+  <string name="msg_ret_local_none_found">Не найдены совпадающие ключи</string>
+  <string name="msg_ret_local_ok">Найден ключ</string>
+  <string name="msg_ret_local_secret">Локальный ключ содержит данные секретного ключа</string>
+  <string name="msg_ret_local_start">Поиск ключа в списке локальных ключей...</string>
+  <string name="msg_ret_uri_error_fetch">Неизвестная ошибка получения Uri!</string>
+  <string name="msg_ret_uri_error_parse">Токен Uri поврежден!</string>
+  <string name="msg_ret_uri_error_no_match">Не найдены ключи, совпадающие по Uri</string>
+  <string name="msg_ret_uri_fetching">Получение Uri: %s</string>
+  <string name="msg_ret_uri_ok">Найден ключ</string>
+  <string name="msg_ret_uri_start">Поиск ключа в токене Uri…</string>
+  <string name="msg_ret_uri_null">В токене безопасности нет сохраненных Uri</string>
+  <string name="msg_ret_uri_test">Проверка и поиск совпадающих ключей: %s</string>
 </resources>

OpenKeychain/src/main/res/values-sr/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">Поставке</string>
   <string name="title_api_registered_apps">Апликације</string>
   <string name="title_key_server_preference">ОпенПГП сервери кључева</string>
-  <string name="title_cache_ttl_preference">Прилагођавање избора „памћења“</string>
   <string name="title_change_passphrase">Измена лозинке</string>
   <string name="title_share_fingerprint_with">Подели отисак помоћу…</string>
   <string name="title_share_key">Подели кључ помоћу…</string>
@@ -146,7 +145,6 @@
   <string name="label_encryption_algorithm">Алгоритам шифровања</string>
   <string name="label_hash_algorithm">Алгоритам хеша</string>
   <string name="label_symmetric">Шифровање са лозинком</string>
-  <string name="label_passphrase_cache_ttl">Прилагодите изборе „памћења“</string>
   <string name="label_passphrase_cache_subs">Памти лозинке по поткључу</string>
   <string name="label_message_compression">Компресија текста</string>
   <string name="label_file_compression">Компресија фајла</string>
@@ -663,12 +661,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Идентитет је опозван. Ово не може да се поништи.</string>
   <string name="edit_key_edit_subkey_title">Изаберите радњу!</string>
-  <string-array name="edit_key_edit_subkey">
-    <item>Измени истицање</item>
-    <item>Опозови поткључ</item>
-    <item>Оголи поткључ</item>
-    <item>Премести поткључ у безбедносни токен</item>
-  </string-array>
   <string name="edit_key_new_subkey">нови поткључ</string>
   <string name="edit_key_select_usage">Одредите коришћење кључа!</string>
   <string name="edit_key_error_add_identity">Додајте бар један идентитет!</string>
@@ -1520,16 +1512,8 @@
   <string name="title_edit_subkeys">Уређивање поткључева</string>
   <string name="btn_search_for_query">Тражи\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">док се екран не искључи</string>
-  <string name="cache_ttl_ten_minutes">десет минута</string>
-  <string name="cache_ttl_thirty_minutes">тридесет минута</string>
   <string name="cache_ttl_one_hour">један сат</string>
-  <string name="cache_ttl_three_hours">три сата</string>
   <string name="cache_ttl_one_day">један дан</string>
-  <string name="cache_ttl_three_days">три дана</string>
-  <string name="cache_ttl_forever">заувек</string>
-  <string name="settings_cache_select_three">Изаберите највише три</string>
-  <string name="settings_cache_ttl_at_least_one">Бар једна ставка мора бити изабрана!</string>
-  <string name="settings_cache_ttl_max_three">Не можете изабрати више од три ставке!</string>
   <string name="remember">Запамти</string>
   <string name="prompt_fidesmo_pgp_install_title">Инсталирати ПГП?</string>
   <string name="prompt_fidesmo_pgp_install_message">Нема апликације за ПГП на вашем „Fidesmo“ уређају.</string>

OpenKeychain/src/main/res/values-sv/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">Inställningar</string>
   <string name="title_api_registered_apps">Appar</string>
   <string name="title_key_server_preference">OpenPGP-nyckelservrar</string>
-  <string name="title_cache_ttl_preference">Anpassa \"Kom ihåg\"-val</string>
   <string name="title_change_passphrase">Ändra lösenord</string>
   <string name="title_share_fingerprint_with">Dela fingeravtryck med…</string>
   <string name="title_share_key">Dela nyckel med…</string>
@@ -146,7 +145,6 @@
   <string name="label_encryption_algorithm">Krypteringsalgoritm</string>
   <string name="label_hash_algorithm">Hash-algoritm</string>
   <string name="label_symmetric">Kryptera med lösenord</string>
-  <string name="label_passphrase_cache_ttl">Anpassa \"Kom ihåg\"-val</string>
   <string name="label_passphrase_cache_subs">Kom ihåg lösenord genom undernyckel</string>
   <string name="label_message_compression">Textkompression</string>
   <string name="label_file_compression">Filkompression</string>
@@ -1089,13 +1087,8 @@
   <string name="title_edit_subkeys">Redigera undernycklar </string>
   <string name="btn_search_for_query">Sök efter\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">till skärmen stängs</string>
-  <string name="cache_ttl_ten_minutes">för tio minuter</string>
-  <string name="cache_ttl_thirty_minutes">för trettio minuter</string>
   <string name="cache_ttl_one_hour">för en timme</string>
-  <string name="cache_ttl_three_hours">för tre veckor</string>
   <string name="cache_ttl_one_day">för en dag</string>
-  <string name="cache_ttl_three_days">för tre dagar</string>
-  <string name="cache_ttl_forever">för alltid</string>
   <string name="remember">Kom ihåg</string>
   <string name="security_token_error_pgp_app_not_installed">Ingen PGP-app hittades på säkerhetstoken</string>
   <string name="prompt_fidesmo_pgp_install_title">Installera PGP?</string>

OpenKeychain/src/main/res/values-uk/strings.xml

@@ -15,7 +15,6 @@
   <string name="title_api_registered_apps">Програми</string>
   <string name="title_key_server_preference">Сервери ключів OpenPGP</string>
   <string name="title_smartpgp_authorities_preference">SmartPGP: надійні повноваження</string>
-  <string name="title_cache_ttl_preference">Налаштувати вибрані \'Запам\'ятати\'</string>
   <string name="title_change_passphrase">Змінити пароль</string>
   <string name="title_share_fingerprint_with">Поділитися відбитком із…</string>
   <string name="title_share_key">Поділитися ключем з…</string>
@@ -153,7 +152,6 @@
   <string name="label_encryption_algorithm">Алгоритм шифрування</string>
   <string name="label_hash_algorithm">Хеш алгоритм</string>
   <string name="label_symmetric">Зашифрувати з паролем</string>
-  <string name="label_passphrase_cache_ttl">Налаштувати вибрані \'Запам\'ятати\'</string>
   <string name="label_passphrase_cache_subs">Пам\'ятати паролі залежних ключів</string>
   <string name="label_message_compression">Стиснення тексту</string>
   <string name="label_file_compression">Стиснення файлу</string>
@@ -616,6 +614,7 @@
   <string name="api_settings_allowed_keys">Дозволені ключі</string>
   <string name="api_settings_settings">Параметри</string>
   <string name="api_register_title">Дозволити доступ до OpenKeychain?</string>
+  <string name="api_register_text">%s запитів для використання OpenKeychain як криптопостачальника. У вас проситимуть дозвіл перед тим, як програма зможе використовувати будь-які ваші ключі для шифрування.\n\nВи можете відкликати дозвіл пізніше у вікні \'Програми\' OpenKeychain.</string>
   <string name="api_register_allow">Дозволити доступ</string>
   <string name="api_register_disallow">Не дозволити доступ</string>
   <string name="api_register_error_select_key">Будь ласка, виберіть ключ!</string>
@@ -654,6 +653,8 @@
   <string name="key_list_fab_qr_code">Сканувати QR код</string>
   <string name="key_list_fab_search">Шукати ключ</string>
   <string name="key_list_fab_import">Імпортувати з файлу</string>
+  <string name="key_list_dummy_title">У вас поки немає ключів!</string>
+  <string name="key_list_dummy_subtitle">Натисніть тут,  аби створити чи імпортувати їх.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Змінити</string>
   <string name="key_view_action_encrypt">Зашифрувати текст</string>
@@ -726,9 +727,8 @@
   <string name="edit_key_edit_subkey_title">Виберіть дію!</string>
   <string-array name="edit_key_edit_subkey">
     <item>Змінити термін дії</item>
-    <item>Відкликати ключ</item>
+    <item>Відкликати залежний ключ</item>
     <item>Відділити залежний ключ</item>
-    <item>Перемістити залежний ключ на маркер безпеки</item>
   </string-array>
   <string name="edit_key_new_subkey">новий підключ</string>
   <string name="edit_key_select_usage">Будь ласка, оберіть спосіб використання ключа!</string>
@@ -794,6 +794,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-->
@@ -1510,11 +1511,10 @@
   <string name="security_token_status_unbound">Маркер безпеки збігається та може бути прив\'язаний до ключа</string>
   <string name="security_token_status_partly">Маркер безпеки збігається та частково прив\'язаний до ключа</string>
   <string name="security_token_create">Тримайте маркер безпеки навпроти зворотнього боку Вашого пристрою.</string>
-  <string name="security_token_reset_or_import">Маркер безпеки вже містить ключ. Щоб використовувати його, нам потрібна додаткова інформація. Ця інформація може бути знайдена на сервері ключів чи імпортована з файлу.</string>
+  <string name="security_token_reset_or_import">Маркер безпеки вже містить ключ.</string>
   <string name="btn_reset">Скинути</string>
-  <string name="security_token_radio_use_existing">Пошук інформації про ключ на сервері ключів</string>
-  <string name="security_token_file_radio">Імпорт інформації про ключ з файлу</string>
-  <string name="security_token_radio_reset">Очистити маркер безпеки</string>
+  <string name="security_token_radio_use_existing">Використовувати наявний ключ</string>
+  <string name="security_token_radio_reset">Очистити маркер</string>
   <string name="security_token_reset_warning">Скидання маркера безпеки повністю знищить всі ключі на ньому. Ви не зможете розшифрувати повідомлення/файли зашифровані цим ключем.</string>
   <string name="snack_security_token_other">Різні ключі збережено на маркері безпеки!</string>
   <string name="security_token_error">Помилка: %s</string>
@@ -1664,16 +1664,8 @@
   <string name="title_edit_subkeys">Змінити залежні ключі</string>
   <string name="btn_search_for_query">Шукаю\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">доки не згасне екран</string>
-  <string name="cache_ttl_ten_minutes">на десять хвилин</string>
-  <string name="cache_ttl_thirty_minutes">на тридцять хвилин</string>
   <string name="cache_ttl_one_hour">на одну годину</string>
-  <string name="cache_ttl_three_hours">на три години</string>
   <string name="cache_ttl_one_day">на один день</string>
-  <string name="cache_ttl_three_days">на три дні</string>
-  <string name="cache_ttl_forever">Завжди</string>
-  <string name="settings_cache_select_three">Оберіть не більше трьох.</string>
-  <string name="settings_cache_ttl_at_least_one">Бодай один пункт має бути обрано! </string>
-  <string name="settings_cache_ttl_max_three">Не можна обирати більше трьох пунктів!</string>
   <string name="remember">Нагадати</string>
   <string name="security_token_error_pgp_app_not_installed">Не знайдено програми PGP на маркері безпеки</string>
   <string name="prompt_fidesmo_pgp_install_title">Встановити PGP?</string>
@@ -1784,4 +1776,102 @@
   <string name="dialog_insecure_button_view_key">Дивитись ключ</string>
   <string name="dialog_insecure_button_ok">Отримано</string>
   <string name="identity_context_forget">Забути</string>
+  <string name="button_scan">Сканувати</string>
+  <string name="button_more_info">Докладніше</string>
+  <string name="transfer_scan_explanation">Щоб поділитися чи імпортувати налаштування вашого ключа, встановіть безпечне з\'єднання за допомогою сканування з будь-якого пристрою.</string>
+  <string name="transfer_scan_warning">Використовуйте лише з власними пристроями!</string>
+  <string name="connection_status">Стан з\'єднання:</string>
+  <string name="section_transfer_keys">Доступні ключі для передачі</string>
+  <string name="section_received_keys">Отримані ключі</string>
+  <string name="transfer_scan_only_wifi">Ця функція може використовуватися тільки на Wifi.</string>
+  <string name="button_import">Імпорт</string>
+  <string name="transfer_status_connected">З\'єднано</string>
+  <string name="transfer_status_disconnected">Від\'єднано!</string>
+  <string name="transfer_error_read_incoming">Невдале читання вхідного ключа!</string>
+  <string name="transfer_error_connect">Невдале зʼєднання!</string>
+  <string name="transfer_error_listen">Помилка очікування на з\'єднання!</string>
+  <string name="transfer_error_generic">Невідома комунікаційна помилка!</string>
+  <string name="transfer_error_generic_msg">Комунікаційна помилка: %s</string>
+  <string name="transfer_not_available">На жаль, ця функція може тільки використовуватися на Android 5 чи новішій :(</string>
+  <string name="transfer_list_empty">Немає ключів на цьому пристрої, які можна було б надіслати. Очікування вхідних ключів ...</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="transfer_confirm_title">Надіслати ваш ключ?</string>
+  <string name="transfer_confirm_text">Ця дія передасть повний доступ до вашого ключа на під\'єднаний пристрій. Ви ніколи не повинні надсилати свої ключі на пристрої, якими не володієте!</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="status_check_key">Подивитись статус ключа...</string>
+  <string name="status_search_local">Пошук у списку ключів...</string>
+  <string name="status_search_uri">Пошук за Uri маркера...</string>
+  <string name="status_search_keyserver">Пошук на серверах ключів...</string>
+  <string name="status_import">Імпортується ключ…</string>
+  <string name="status_token_promote">Встановлення ключа...</string>
+  <string name="status_token_check">Перевірка встановлення ключа...</string>
+  <string name="status_content_uri">Читається файл...</string>
+  <string name="token_reset_confirm_title">Очистити маркер безпеки?</string>
+  <string name="token_reset_confirm_message">Це безповоротно видаляє ключ, що зберігається в цьому маркері безпеки. Через це більше не зможете використовувати цей ключ для розшифрування! Справді так вчинити?</string>
+  <string name="token_reset_confirm_ok">Скинути</string>
+  <string name="token_status_title">Збирання даних для маркера безпеки...</string>
+  <string name="token_result_not_found">Ключ не знайдено!</string>
+  <string name="token_result_key_found">Ключ знайдено!</string>
+  <string name="token_result_token_ok">Готове до використання!</string>
+  <string name="token_result_empty">Маркер - порожній</string>
+  <string name="token_action_retry">Повторити пошук</string>
+  <string name="token_action_load_from_file">Завантажити з файлу</string>
+  <string name="token_action_reset">Очистити маркер безпеки</string>
+  <string name="token_action_import">Імпортувати</string>
+  <string name="token_action_view_key">Переглянути ключ</string>
+  <string name="token_action_setup">Налаштувати з новим ключем</string>
+  <string name="token_action_unlock">Розблокувати за допомогою новою pin адміністратора</string>
+  <string name="token_unlock_attempts_none">Не залишилося спроб розблокування</string>
+  <plurals name="token_unlock_attempts">
+    <item quantity="one">залишилася 1 спроба</item>
+    <item quantity="few">залишилися %d спроби</item>
+    <item quantity="other">залишилося %d спроб</item>
+  </plurals>
+  <string name="token_error_locked_indefinitely">Надто багато спроб відновлення. Маркер заблокований безповоротно!</string>
+  <string name="token_menu_change_pin">Змінити Pin</string>
+  <string name="token_menu_view_log">Переглянути журнал</string>
+  <string name="token_unlock_ok">Розблокувати</string>
+  <string name="token_hint_admin_pin">PIN адміністратора</string>
+  <string name="token_hint_new_pin">Новий Pin</string>
+  <string name="token_hint_new_pin_repeat">Новий Pin (ще раз)</string>
+  <string name="token_error_admin_min8">Pin адміністратора повинен мати не менше 8 символів!</string>
+  <string name="token_error_pin_min6">Новий pin повинен мати не менше 6 символів!</string>
+  <string name="token_error_pin_repeat">Не збігається pin!</string>
+  <string name="msg_ret_curi_error_io">Помилка читання даних!</string>
+  <string name="msg_ret_curi_error_no_match">Не знайдено відповідний ключ</string>
+  <string name="msg_ret_curi_error_not_found">Не можливо відкрити файл!</string>
+  <string name="msg_ret_curi_found">Знайдений ключ: %s</string>
+  <string name="msg_ret_curi_mismatch">Ключ не збігається</string>
+  <string name="msg_ret_curi_ok">Ключ знайдено</string>
+  <string name="msg_ret_curi_open">Uri відкриття: %s</string>
+  <string name="msg_ret_curi_start">Завантаження ключа із файлу або документу...</string>
+  <string name="msg_ret_ks_error">Невідома помилка під час пошуку ключа!</string>
+  <string name="msg_ret_ks_error_not_found">Ключ не знайдено</string>
+  <string name="msg_ret_ks_fp_match">Відбиток отриманого ключа збігається</string>
+  <string name="msg_ret_ks_fp_mismatch">Відбиток отриманого ключа не збігається</string>
+  <string name="msg_ret_ks_ok">Ключ знайдено</string>
+  <string name="msg_ret_ks_start">Пошук ключа на серверах ключів...</string>
+  <string name="msg_ret_local_search">Пошук ключа: %s</string>
+  <string name="msg_ret_local_fp_match">Відбиток локального ключа збігається</string>
+  <string name="msg_ret_local_fp_mismatch">Відбиток локального ключа не збігається!</string>
+  <string name="msg_ret_local_not_found">Ключ не знайдено</string>
+  <string name="msg_ret_local_none_found">Не знайдено відповідний ключ</string>
+  <string name="msg_ret_local_ok">Ключ знайдено</string>
+  <string name="msg_ret_local_secret">Локальний ключ містить матеріал секретного ключа</string>
+  <string name="msg_ret_local_start">Пошук ключа у списку локальних ключів…</string>
+  <string name="msg_ret_uri_error_fetch">Невідома помилка отримання Uri!</string>
+  <string name="msg_ret_uri_error_parse">Uri маркера пошкоджено!</string>
+  <string name="msg_ret_uri_error_no_match">Не знайдено відповідний ключ на Uri</string>
+  <string name="msg_ret_uri_fetching">Отримання Uri: %s</string>
+  <string name="msg_ret_uri_ok">Ключ знайдено</string>
+  <string name="msg_ret_uri_start">Пошук ключа за маркером Uri…</string>
+  <string name="msg_ret_uri_null">Жодне Uri не збережено на маркері безпеки</string>
+  <string name="msg_ret_uri_test">Перевірка, чи знайдений ключ збігається: %s</string>
 </resources>

OpenKeychain/src/main/res/values-vi/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">Thiết lập</string>
   <string name="title_api_registered_apps">Ứng dụng đã cấp quyền</string>
   <string name="title_key_server_preference">Máy chủ lưu khóa</string>
-  <string name="title_cache_ttl_preference">Các lựa chọn \'Ghi nhớ\'</string>
   <string name="title_change_passphrase">Đổi mật khẩu</string>
   <string name="title_share_fingerprint_with">Chia sẻ mã nhận dạng với…</string>
   <string name="title_share_key">Chia sẻ khóa với…</string>
@@ -147,7 +146,6 @@
   <string name="label_encryption_algorithm">Thuật toán mã hóa</string>
   <string name="label_hash_algorithm">Thuật toán băm</string>
   <string name="label_symmetric">Mã hóa với mật khẩu</string>
-  <string name="label_passphrase_cache_ttl">Các tùy chọn \'Ghi nhớ\'</string>
   <string name="label_passphrase_cache_subs">Ghi nhớ mật khẩu bằng khóa con</string>
   <string name="label_message_compression">Nén văn bản</string>
   <string name="label_file_compression">Nén tệp tin</string>

OpenKeychain/src/main/res/values-zh-rTW/strings.xml

@@ -13,7 +13,6 @@
   <string name="title_preferences">設定</string>
   <string name="title_api_registered_apps">應用程式</string>
   <string name="title_key_server_preference">OpenPGP金鑰伺服器</string>
-  <string name="title_cache_ttl_preference">自訂\"記住時間\"選項</string>
   <string name="title_change_passphrase">修改金鑰密碼</string>
   <string name="title_share_fingerprint_with">分享指紋…</string>
   <string name="title_share_key">分享金鑰…</string>
@@ -141,7 +140,6 @@
   <string name="label_encryption_algorithm">加密演算法</string>
   <string name="label_hash_algorithm">雜湊演算法</string>
   <string name="label_symmetric">透過密碼加密</string>
-  <string name="label_passphrase_cache_ttl">自訂\"記憶時間\"選項</string>
   <string name="label_message_compression">文字壓縮</string>
   <string name="label_file_compression">檔案壓縮</string>
   <string name="label_key_id">金鑰ID</string>
@@ -741,7 +739,6 @@
   <string name="share_log_dialog_share_button">分享</string>
   <string name="share_log_dialog_cancel_button">取消</string>
   <string name="menu_uids_save">儲存</string>
-  <string name="cache_ttl_forever">永久</string>
   <string name="remember">記住</string>
   <string name="prompt_fidesmo_pgp_install_title">安裝 PGP？</string>
   <string name="prompt_fidesmo_pgp_install_button_positive">安裝</string>

OpenKeychain/src/main/res/values-zh/strings.xml

@@ -14,7 +14,6 @@
   <string name="title_preferences">设置</string>
   <string name="title_api_registered_apps">已注册应用</string>
   <string name="title_key_server_preference">OpenPGP 密钥服务器</string>
-  <string name="title_cache_ttl_preference">自定义记忆时间选项</string>
   <string name="title_change_passphrase">变更密码</string>
   <string name="title_share_fingerprint_with">分享指纹</string>
   <string name="title_share_key">分享密钥</string>
@@ -147,7 +146,6 @@
   <string name="label_encryption_algorithm">加密算法</string>
   <string name="label_hash_algorithm">哈希算法</string>
   <string name="label_symmetric">用密码加密</string>
-  <string name="label_passphrase_cache_ttl">自定义 \'记忆时间\' 选项</string>
   <string name="label_passphrase_cache_subs">保存子密钥的密码</string>
   <string name="label_message_compression">文本压缩</string>
   <string name="label_file_compression">文件压缩</string>
@@ -639,12 +637,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">该用户标识已被吊销，该情况不能恢复</string>
   <string name="edit_key_edit_subkey_title">请选择一个操作！</string>
-  <string-array name="edit_key_edit_subkey">
-    <item>更改有效期</item>
-    <item>吊销子密钥</item>
-    <item>剥离子密钥</item>
-    <item>转移子密钥到安全令牌</item>
-  </string-array>
   <string name="edit_key_new_subkey">新建子密钥</string>
   <string name="edit_key_select_usage">请选择密钥的用途！</string>
   <string name="edit_key_error_add_identity">至少要有一个用户标识！</string>
@@ -1359,7 +1351,6 @@
   <string name="security_token_status_partly">安全信息匹配并且已部分绑定到密钥</string>
   <string name="security_token_create">保持安全令牌在您的手机背部</string>
   <string name="btn_reset">重置</string>
-  <string name="security_token_radio_reset">重置安全令牌</string>
   <string name="security_token_reset_warning">重置安全令牌将完全摧毁其内部的密钥。之后您将无法使用该密钥加解密消息或文件！</string>
   <string name="snack_security_token_other">安全令牌中存有不同的密钥！</string>
   <string name="security_token_error">错误： %s</string>
@@ -1500,16 +1491,8 @@
   <string name="title_edit_subkeys">编辑子密钥</string>
   <string name="btn_search_for_query">查找\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">直到锁屏</string>
-  <string name="cache_ttl_ten_minutes">十分钟</string>
-  <string name="cache_ttl_thirty_minutes">三十分钟</string>
   <string name="cache_ttl_one_hour">一小时</string>
-  <string name="cache_ttl_three_hours">三小时</string>
   <string name="cache_ttl_one_day">一天</string>
-  <string name="cache_ttl_three_days">三天</string>
-  <string name="cache_ttl_forever">永久</string>
-  <string name="settings_cache_select_three">选取一到三个</string>
-  <string name="settings_cache_ttl_at_least_one">至少选择一个项目！</string>
-  <string name="settings_cache_ttl_max_three">不能选择多于三个项目！</string>
   <string name="remember">记住</string>
   <string name="security_token_error_pgp_app_not_installed">在安全令牌中没有找到 PGP 应用</string>
   <string name="prompt_fidesmo_pgp_install_title">安装 PGP？</string>