pull from transifex

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

@@ -12,7 +12,7 @@
   * Dominik Schürmann (Maintainer)
   * Vincent Breitmoser
 
-## Top Contributors
+## أهم المساهِمين
   * Adithya Abraham Philip
   * Andrea Torlaschi
   * Arnaud Fontaine

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,7 +1,10 @@
 [//]: # (Beachte: Bitte schreibe jeden Satz in eine eigene Zeile, Transifex wird jede Zeile in ein eigenes Übesetzungsfeld setzen!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
-  * Improved key import from clipboard
+  * Verbesserter Schlüsselimport aus der Zwischenablage
 
 ## 5.1
   * Support für Ledger Nano S

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (Observe: ¡Por favor ingrese cada enunciado en su propia línea, Transifex coloca cada línea en su propio campo de traducción!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,7 +1,10 @@
 [//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
-  * Improved key import from clipboard
+  * Mejorada la importación de la clave desde el portapapeles
 
 ## 5.1
   * Soporte para Ledger Nano S

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

@@ -1,5 +1,8 @@
 [//]: # (OHARRA: Meseez jarri esaldi bakoitza bere lerroan, Transifex-ek lerroak bere itzulpen eremuan jartzen ditu!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (تذکر: هر جمله در همان خط!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE : veuillez mettre chaque phrase sur sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Amélioration de l’importation des clés à partir du presse-papiers
 
@@ -348,7 +351,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
   * Correctif - Plantage lors de l’ajout de compte sur Froyo
   * Suppression sécurisée de fichiers
-  * Option de suppression du fichier clé après importation
+  * Option de suppression du fichier de clé après importation
   * Chiffrement/déchiffrement de flux (galerie, etc.)
   * Nouvelles options (langue, forcer les signatures v3)
   * Changements dans l’interface

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

@@ -1,5 +1,8 @@
 [//]: # (NOTA: Por avor escriba cada frase na súa propia liña, Transifex pon cada liña no seu propio campo da tradución!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,9 +1,9 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (नोट: कृपया प्रत्येक वाक्य को अपनी पंक्ति में रखें, ट्रांसइफेक्स हर पंक्ति को अपने अनुवाद क्षेत्र में रखता है!)
 
 Advanced screen allows you to
-* share key in non-recommended ways
-* edit identities
-* edit subkeys
-* examine certificates in detail
+* गैर-अनुशंसित तरीकों से कुंजी साझा करें
+* पहचान को संपादित करें
+* उपकुंजी संपादित करें
+* प्रमाणपत्रों की विस्तार से जांच करें
 
-Only proceed if you know what you are doing!
+केवल तभी आगे बढ़ें जब आपको पता हो कि आप क्या कर रहे हैं!

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

@@ -1,4 +1,4 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (नोट: कृपया प्रत्येक वाक्य को अपनी पंक्ति में रखें, ट्रांसइफेक्स हर पंक्ति को अपने अनुवाद क्षेत्र में रखता है!)
 
 [https://www.openkeychain.org](https://www.openkeychain.org)
 

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

@@ -1,28 +1,28 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (नोट: कृपया प्रत्येक वाक्य को अपनी पंक्ति में रखें, ट्रांसइफेक्स हर पंक्ति को अपने अनुवाद क्षेत्र में रखता है!)
 
-## Key Confirmation
-Without confirmation, you cannot be sure if a key really corresponds to a specific person.
-The simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC.
-To confirm keys between more than two persons, we suggest using the key exchange method available for your keys.
+## कुंजी पुष्टि
+पुष्टि के बिना, आपको यकीन नहीं हो सकता है कि क्या कोई कुंजी वास्तव में किसी विशिष्ट व्यक्ति से मेल खाती है।
+किसी कुंजी की पुष्टि करने का सबसे सरल तरीका है क्यूआर कोड को स्कैन करना या एनएफसी के माध्यम से इसका आदान-प्रदान करना।
+दो से अधिक व्यक्तियों के बीच कुंजियों की पुष्टि करने के लिए, हम आपकी कुंजियों के लिए उपलब्ध प्रमुख विनिमय पद्धति का उपयोग करने का सुझाव देते हैं।
 
-## Key Status
+## प्रमुख स्थिति
 
 <img src="status_signature_verified_cutout_24dp"/>  
-Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.  
+पुष्टि की गई: आप पहले ही इस कुंजी की पुष्टि कर चुके हैं, जैसे कि QR कोड स्कैन करके।  
 <img src="status_signature_unverified_cutout_24dp"/>  
-Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.  
+अपुष्ट: यह कुंजी अभी तक पुष्टि नहीं की गई है। आप सुनिश्चित नहीं हो सकते की कुंजी वास्तव में किसी विशिष्ट व्यक्ति से मेल खाती है।  
 <img src="status_signature_expired_cutout_24dp"/>  
-Expired: This key is no longer valid. Only the owner can extend its validity.  
+समय सीमा समाप्त: यह कुंजी अब मान्य नहीं है। केवल मालिक ही इसकी वैधता बढ़ा सकते हैं।  
 <img src="status_signature_revoked_cutout_24dp"/>  
-Revoked: This key is no longer valid. It has been revoked by its owner.
+निरस्त: यह कुंजी अब मान्य नहीं है। इसके मालिक द्वारा इसे निरस्त कर दिया गया है।
 
-## Advanced Information
-A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.
-This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) described in the standard by:
-"The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID."
+## उन्नत जानकारी
+ओपेनकीचैन में एक "कुंजी पुष्टि" ओपनपीजीपी मानक के अनुसार एक प्रमाण पत्र बनाकर कार्यान्वित की जाती है।
+यह प्रमाणन मानक में वर्णित एक ["सामान्य प्रमाणीकरण (0x10)"] (http://tools.ietf.org/html/rfc4880#section-5.2.1.1) है:
+"इस प्रमाण-पत्र को जारी करने वाला इस बात पर कोई विशेष जोर नहीं देता है कि प्रमाण-पत्र ने कितनी अच्छी तरह जाँच की है कि कुंजी का स्वामी वास्तव में उपयोगकर्ता आईडी द्वारा वर्णित व्यक्ति है।"
 
-Traditionally, certifications (also with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
-Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust.
-We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go".
-We also do not implement (potentially transitive) trust signatures or an ownertrust database like in GnuPG.
-Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.
+परंपरागत रूप से, प्रमाणपत्र (उच्च प्रमाणीकरण स्तर के साथ, जैसे "सकारात्मक प्रमाणपत्र" (0x13)) ओपनपीजीपी के वेब ऑफ ट्रस्ट में आयोजित किए जाते हैं।
+इस वेब ऑफ़ ट्रस्ट से संबंधित सामान्य प्रयोज्य समस्याओं से बचने के लिए, महत्वपूर्ण पुष्टि का हमारा मॉडल एक बहुत सरल अवधारणा है।
+हम मानते हैं कि कुंजियाँ केवल एक निश्चित हद तक ही सत्यापित होती हैं जो अभी भी "सक्रिय" होने के लिए पर्याप्त रूप से उपयोग करने योग्य हैं।
+हम ग्नूपीजी की तरह विश्ववसनीय हस्ताक्षरों या एक आत्मीयता डेटाबेस को भी लागू नहीं करते हैं।
+इसके अलावा, कुंजियाँ जिनमें एक विश्वसनीय कुंजी द्वारा प्रमाणित कम से कम एक उपयोगकर्ता आईडी है, को कुंजी लिस्टिंग में "पुष्टि" के रूप में चिह्नित किया जाएगा।

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

@@ -1,4 +1,7 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (नोट: कृपया प्रत्येक वाक्य को अपनी पंक्ति में रखें, ट्रांसइफेक्स हर पंक्ति को अपने अनुवाद क्षेत्र में रखता है!)
+
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
 
 ## 5.2
   * Improved key import from clipboard

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

@@ -1,16 +1,16 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (नोट: कृपया प्रत्येक वाक्य को अपनी पंक्ति में रखें, ट्रांसइफेक्स हर पंक्ति को अपने अनुवाद क्षेत्र में रखता है!)
 
-## How do I activate OpenKeychain in K-9 Mail?
-To use OpenKeychain with K-9 Mail, you want to follow these steps:
-  1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
-  3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
+## मैं के-9 मेल में ओपेनकीचैन को कैसे सक्रिय करूं?
+के-9 मेल के साथ ओपेनकीचैन का उपयोग करने के लिए, आप इन चरणों का पालन करेंगे:
+  1. के-9 मेल खोलें और उस खाता पर लंबे समय तक दबायें जिसके साथ आप ओपेनकीचैन का उपयोग करना चाहते हैं।
+  2. "खाता सेटिंग" चुनें, बहुत नीचे तक स्क्रॉल करें और "कूटलेखन" पर क्लिक करें।
+  3. "ओपनपीजीपी प्रदाता" पर क्लिक करें और सूची से ओपेनकीचैन का चयन करें।
 
-## I found a bug in OpenKeychain!
-Please report the bug using the [issue tracker of OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues).
+## मुझे ओपेनकीचैन में एक त्रुटि मिला!
+[ओपेनकीचैन के समस्या सूची] (https://github.com/openpgp-keychain/openpgp-keychain/issues) का उपयोग करके त्रुटि की सूचना दें।
 
-## Contribute
-If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
+## योगदान
+यदि आप कोड का योगदान करके हमें ओपेनकीचैन को विकसित करने में मदद करना चाहते हैं [गिटहब पर हमारे छोटे गाइड का अनुसरण करें] (https://github.com/openpgp-keychain/openpgp-keychain#contribute-code)।
 
-## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
+## अनुवाद
+ओपेनकीचैन का अनुवाद करने में मदद करें! हर कोई [ट्रांसिफेक्स पर ओपेनकीचैन] (https://www.transifex.com/projects/p/open-keychain/) में भाग ले सकता है।

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

@@ -1,5 +1,8 @@
 [//]: # (MEGJEGYZÉS: minden mondatot külön sorba írjon, a Transifex minden sort a saját fordítási mezőjébe tesz!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Továbbfejlesztett kulcsimportálás a vágólapról
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTA: Si prega di mettere ogni frase in una propria linea, Transifex mette ogni riga nel proprio campo di traduzione!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * クリップボードからの鍵のインポートを改善
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * 클립보드로 부터 가져오기 개선
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (Ter info: Zet iedere zin op een eigen regel, Transifex zet iedere regel in zijn eigen vertalingsveld!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,4 +1,4 @@
-[//]: # (Ter info: Zet iedere zin op een eigen regel, Transifex zet iedere regel in zijn eigen vertalingsveld!)
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 Geavanceerd scherm maakt het mogelijk om
 * een sleutel te delen middels niet-aanbevolen manieren

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

@@ -1,4 +1,4 @@
-[//]: # (Ter info: Zet iedere zin op een eigen regel, Transifex zet iedere regel in zijn eigen vertalingsveld!)
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [https://www.openkeychain.org](https://www.openkeychain.org)
 
@@ -17,9 +17,9 @@ Licentie: GPLv3+
   * Andrea Torlaschi
   * Arnaud Fontaine
   * Ash Hughes
-  * 'mar-v-in'
+  * ‘mar-v-in’
   * Nikita Mikhailov
-  * 'Thialfihar' (ontwikkelaar van APG)
+  * ‘Thialfihar’ (ontwikkelaar van APG)
   * Tim Bray
   * Tobias Erthal
 
@@ -28,23 +28,23 @@ Licentie: GPLv3+
   * Andrea Torlaschi
   * Art O Cathain
   * Brian C. Barnes
-  * Bahtiar 'kalkin' Gadimov
+  * Bahtiar ‘kalkin’ Gadimov
   * Daniel Albert
   * Daniel Hammann
   * Daniel Haß
   * Daniel Nelz
   * Daniel Ramos
   * Greg Witczak
-  * 'iseki'
+  * ‘iseki’
   * Ishan Khanna
-  * 'jellysheep'
-  * 'Jesperbk'
-  * 'jkolo'
+  * ‘jellysheep’
+  * ‘Jesperbk’
+  * ‘jkolo’
   * Joey Castillo
   * Kai Jiang
   * Kartik Arora
-  * 'Kent'
-  * 'ligi'
+  * ‘Kent’
+  * ‘ligi’
   * Lukas Zorich
   * Manoj Khanna
   * Markus Doits
@@ -54,7 +54,7 @@ Licentie: GPLv3+
   * Nikhil Peter Raj
   * Paul Sarbinowski
   * Petter Arvidsson
-  * 'Senecaso'
+  * ‘Senecaso’
   * Signe Rüsch
   * Sreeram Boyapati
-  * 'steelman'
+  * ‘steelman’

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

@@ -14,15 +14,15 @@ Niet bevestigd: deze sleutel is nog niet bevestigd. Je kan niet zeker zijn dat d
 <img src="status_signature_expired_cutout_24dp"/>  
 Verlopen: deze sleutel is niet meer geldig. Enkel de eigenaar kan de geldigheid verlengen.  
 <img src="status_signature_revoked_cutout_24dp"/>  
-Ingetrokken: deze sleutel is niet meer geldig. Ze is door de eigenaar ingetrokken.
+Ingetrokken: deze sleutel is niet meer geldig. Hij is door de eigenaar ingetrokken.
 
 ## Geavanceerde informatie
-Een "sleutelbevestiging" in OpenKeychain is geïmplementeerd door een certificatie aan te maken volgens de OpenPGP-standaard.
-Deze certificatie is een ["generische certificatie (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) omschreven in de standaard als:
-"De uitgever van deze certificatie maakt geen specifieke aanname over hoe goed de certificeerder heeft nagegaan dat de eigenaar van sleutel effectief de persoon is beschreven door het gebruikers-ID."
+Een ‘sleutelbevestiging’ in OpenKeychain is geïmplementeerd door een certificatie aan te maken volgens de OpenPGP-standaard.
+Deze certificatie is een [‘generische certificatie (0x10)’](http://tools.ietf.org/html/rfc4880#section-5.2.1) omschreven in de standaard als:
+‘De uitgever van deze certificatie maakt geen specifieke aanname over hoe goed de certificeerder heeft nagegaan dat de eigenaar van sleutel effectief de persoon is beschreven door het gebruikers-ID.’
 
-Traditioneel worden certificaties (ook met hogere certificatieniveau's, zoals "positieve certificaties" (0x13)) georganiseerd in OpenPGP's Web of Trust.
+Traditioneel worden certificaties (ook met hogere certificatieniveau's, zoals ‘positieve certificaties’ (0x13)) georganiseerd in OpenPGP’s Web of Trust.
 Ons model van sleutelbevestiging is een veel eenvoudige concept om veel voorkomende gebruiksproblemen gerelateerd aan dit Web of Trust te vermijden.
-We nemen aan dat sleutels slechts geverifieerd zijn tot een bepaalde graad die nog steeds bruikbaar genoeg is om "onderweg" uitgevoerd te worden.
+We nemen aan dat sleutels slechts geverifieerd zijn tot een bepaalde graad die nog steeds bruikbaar genoeg is om ‘onderweg’ uitgevoerd te worden.
 We implementeren ook geen (mogelijk transitieve) vertrouwensondertekeningen of een gebruikersvertrouwendatabase zoals in GnuPG.
-Bovendien worden sleutels die minstens een gebruikers-ID gecertificeerd door een vertrouwde sleutel bevatten aangeduid als "bevestigd" in de sleutellijsten.
+Bovendien worden sleutels die minstens een gebruikers-ID gecertificeerd door een vertrouwde sleutel bevatten aangeduid als ‘bevestigd’ in de sleutellijsten.

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

@@ -1,4 +1,7 @@
-[//]: # (Ter info: Zet iedere zin op een eigen regel, Transifex zet iedere regel in zijn eigen vertalingsveld!)
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
 
 ## 5.2
   * Importeren van sleutel vanuit toetsenbord verbeterd
@@ -68,7 +71,7 @@
 ## 4.0
 
   * Experimentele ondersteuning voor Security Tokens via USB
-  * Sta wachtwoordverandering to van gestripte sleutels
+  * Sta wachtwoordverandering toe van gestripte sleutels
 
 
 ## 3.9
@@ -88,20 +91,20 @@
 ## 3.7
 
   * Verbetering van ondersteuning voor Android 6 (permissies, integratie in tekstselectie)
-  * API: Versie 10
+  * API: versie 10
 
 
 ## 3.6
 
-  * Versleutelde backups
+  * Versleutelde back-ups
   * Beveiligingsoplossingen gebaseerd op externe audit
   * Sleutelaanmaakwizard voor YubiKey NEO 
   * Basisondersteuning interne MIME
   * Automatische sleutelsynchronisatie
-  * Experimentele functionaliteit: koppel sleutels aan accounts op Github, Twitter.
+  * Experimentele functionaliteit: koppel sleutels aan accounts op GitHub, Twitter.
   * Experimentele functionaliteit: sleutelbevestiging via zinnen
   * Experimentele functionaliteit: donker thema
-  * API: Versie 9
+  * API: versie 9
 
 
 ## 3.5
@@ -377,19 +380,19 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 ## 1.0.2
 
   * Filterbare sleutellijsten
-  * Slimmere preselectie van cryptosleutels
+  * Slimmere preselectie van versleutelingssleutels
   * Nieuwe intents voor VIEW en SEND, laat toe bestanden te versleutelen/ontsleutelen vanuit bestandsbeheerders
-  * Oplossingen en nieuwe functies (sleutel preselectie) voor K-9 Mail, nieuwe beta build beschikbaar
+  * Oplossingen en nieuwe functies (sleutelpreselectie) voor K-9 Mail, nieuwe bètaversie beschikbaar
 
 
 ## 1.0.1
 
-  * GMail account lijsten was stuk in 1.0.0, weer opgelost
+  * GMail-accountlijsten werkten niet in 1.0.0, weer opgelost
 
 
 ## 1.0.0
 
-  * K-9 Mail integratie, APG ondersteunende beta versie van K-9 Mail
+  * K-9 Mail-integratie, APG-ondersteunende bètaversie van K-9 Mail
   * Ondersteuning voor meer bestandsbeheerders (waaronder ASTRO)
   * Sloveense vertaling
   * Nieuwe database, veel sneller, minder geheugengebruik

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

@@ -1,10 +1,10 @@
-[//]: # (Ter info: Zet iedere zin op een eigen regel, Transifex zet iedere regel in zijn eigen vertalingsveld!)
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Hoe activeer ik OpenKeychain in K-9 Mail?
 Volg deze stappen om OpenKeychain te gebruiken met K-9 Mail:
-  1. Open K-9 Mail en druk lang op de account waarmee je OpenKeychain wil gebruiken.
-  2. Selecteer "Accountinstellingen", scroll helemaal naar beneden en klik op "Cryptografie".
-  3. Klik op "OpenPGP-provider" en selecteer OpenKeychain in de lijst.
+  1. Open K-9 Mail en druk lang op het account waarmee je OpenKeychain wil gebruiken.
+  2. Selecteer ‘Accountinstellingen’, scroll helemaal naar beneden en klik op ‘Cryptografie’.
+  3. Klik op ‘OpenPGP-provider’ en selecteer OpenKeychain in de lijst.
 
 ## Ik heb een bug in OpenKeychain gevonden!
 Rapporteer de bug met de [problementracker van OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues).

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -3,14 +3,14 @@
 ## Jak mogę aktywować OpenKeychain w K-9 Mail?
 Aby używać OpenKeychain z K-9 Mail, wykonaj następujące kroki:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
+  2. Wybierz "Ustawienia konta", zjedź na sam dół stronu i kliknij "Kryptografia".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## Znalazłem błąd w OpenKeychain!
 Please report the bug using the [issue tracker of OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues).
 
 ## Współtwórz
-If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
+Jeżeli chciałbyś pomóc nam w rozwijaniu OpenKeychain przez rozwijanie kody [ zapoznaj się z naszym małym poradnikiem na Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Tłumacze
 Pomóż przetłumaczyć OpenKeychain! Każdy może wziąć udział przez stronę [OpenKeychain w serwisie Transifex](https://www.transifex.com/projects/p/open-keychain/).

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

@@ -1,7 +1,10 @@
 [//]: # (NOTA: coloque cada frase em sua própria linha, o Transifex coloca cada linha em seu próprio campo de tradução!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
-  * Improved key import from clipboard
+  * Melhorias na importação de chaves da área de transferência
 
 ## 5.1
   * Suporte para Ledger Nano S

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Улучшен импорт ключей из буфера обмена
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: #
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (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!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Förbättrad nyckel importera från urklipp
 
@@ -136,7 +139,7 @@
   * Kräver Android 4
   * Omgjort nyckelskärm
   * Förenkla krypteringspreferenser, bättre val av säkra ciffrar
-  * API: Detached signatures, free selection of signing key,...
+  * API: Fristående signaturer, fri urval av signeringsnyckel,...
   * Korrigering: Vissa giltiga nycklar visades som återkallade eller förfallna
   * Acceptera inte signaturer av undernycklar som har förfallit eller återkallats
   * Keybase.io-stöd i avancerad vy
@@ -145,12 +148,12 @@
 
 ## 3.1.2
 
-  * Fix key export to files (now for real)
+  * Åtgärda nyckelexport till filer (nu på riktigt)
 
 
 ## 3.1.1
 
-  * Fix key export to files (they were written partially)
+  * Åtgärda nyckel export till filer (de skrevs delvis)
   * Åtgärda krasch i Android 2.3
 
 
@@ -158,17 +161,17 @@
 
   * Åtgärda krasch i Android 5
   Ny certifieringsskärm
-  * Secure Exchange directly from key list (SafeSlinger library)
-  * New QR Code program flow
+  * Säker utbyte direkt från nyckellistan (SafeSlinger-bibliotek)
+  * Ny QR-kod programflöde
   * Redesigned decrypt screen
-  * New icon usage and colors
-  * Fix import of secret keys from Symantec Encryption Desktop
+  * Ny ikon användning och färger
+  * Åtgärda import av hemliga nycklar från Symantec Encryption Desktop
   * Experimental YubiKey support: Subkey IDs are now checked correctly
 
 
 ## 3.0.1
 
-  * Better handling of large key imports
+  * Bättre hantering av stora viktiga importeringar
   * Improved subkey selection
 
 
@@ -176,12 +179,12 @@
 
   * Propose installable compatible apps in apps list
   * New design for decryption screens
-  * Many fixes for key import, also fixes stripped keys
+  * Många korrigeringar för nyckel importering, åtgärdar också avskalade nycklar
   * Honor and display key authenticate flags
   * User interface to generate custom keys
   * Fixing user ID revocation certificates
   * Ny moln sökning (sökningar över traditionella nyckelservrar och keybase.io)
-  * Support for stripping keys inside OpenKeychain
+  * Stöd för att avskala nycklar inuti OpenKeychain
   * Experimental YubiKey support: Support for signature generation and decryption
 
 
@@ -193,13 +196,13 @@
 
 ## 2.9.1
 
-  * Split encrypt screen into two
+  * Dela krypteringsskärmen i två
   * Fix key flags handling (now supporting Mailvelope 0.7 keys)
   * Improved passphrase handling
   * Key sharing via SafeSlinger
-  * Experimental YubiKey support: Preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
-  * Fix usage of stripped keys
-  * SHA256 as default for compatibility
+  * Stöd för experimentell YubiKey: Föredrar att låta andra PIN-koder, för närvarande endast signering via OpenPGP API fungerar, inte inne i OpenKeychain
+  * Åtgärda användning av avskalade nycklar
+  * SHA256 som standard för kompatibilitet
   * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
   * OpenPGP API hanterar nu återkallade/utgångna nycklar och returnerar alla användar-ids
 
@@ -243,7 +246,7 @@ This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2
 ## 2.6
 
   * Key certifications (thanks to Vincent Breitmoser)
-  * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
+  * Stöd för GnuPG delvis hemliga nycklar (tack vare Vincent Breitmoser)
   * New design for signature verification
   * Custom key length (thanks to Greg Witczak)
   * Fix share-functionality from other apps
@@ -378,7 +381,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
   * Filterable key lists
   * Smarter pre-selection of encryption keys
-  * New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
+  * Ny avsiktlig hantering för VISA och SKICKA, tillåter filer som ska krypteras/dekrypteras ur filhanterare
   * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
 
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (Увага: Будь ласка розміщуйте кожне речення у окремому рядку, Transifex розмістить кожен рядок у відповідному полі для перекладу!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (CHÚ Ý: Xin hãy để mỗi câu văn bản trên một dòng, Transifex sẽ chuyển từng dòng vào cho từng trường đã được dịch sang các ngôn ngữ!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,5 +1,8 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
   * Improved key import from clipboard
 

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

@@ -1,12 +1,15 @@
 [//]: # (注意：请把每个句子放在单独一行中， Transifex 将把每一行放置在独立的翻译表单内！)
 
+## 5.3
+  * Usw keys.openpgp.org as default keyserver
+
 ## 5.2
-  * Improved key import from clipboard
+  * 改进的剪贴板密钥导入
 
 ## 5.1
-  * Support for Ledger Nano S
-  * Support Web Key Directory (WKD) search
-  * Fixed potential API security issue
+  * 对 Ledger Nano S 的支持
+  * 对网络密钥目录（WKD）搜索的支持
+  * 修复了潜在的 API 安全问题
 
 ## 5.0
   * 改善 Autocrypt 支持
@@ -19,26 +22,26 @@
 ## 4.8
 
   * 改善对 USB 安全令牌的支持：Gnuk、Nitrokey 型号、YubiKey 4 型号
-  * Feature to find the position of the device's NFC reader
+  * 寻找设备 NFC 读取器位置的特性
 
 ## 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 Wi-Fi Transfer mechanism
+  * 使用我们新的安全 Wi-Fi 传输机制导入您的密钥
 
 
 ## 4.5
 
-  * Detailed description of security problems
-  * Display keyserver status per key
-  * Support for EdDSA
-  * Fix pgp.mit.edu (new certificate)
+  * 安全问题的详细描述
+  * 显示各个密钥的密钥服务器状态
+  * 对 EdDSA 的支持
+  * 修复 pgp.mit.edu （新证书）
 
 
 ## 4.4

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

@@ -180,7 +180,6 @@
   <!--label shown in Android settings under the OpenKeychain account-->
   <string name="keyserver_sync_settings_title">تحديثات تلقائية للمفاتيح</string>
   <string name="label_experimental_settings_desc_title">تحذير</string>
-  <string name="label_experimental_settings_linked_identities_title">الهويات المرتبطة</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">فعّل تور</string>
   <string name="pref_proxy_tor_summary">يتطلب نتصيب تطبيق أوربوت</string>
@@ -307,6 +306,7 @@
   <string name="progress_verifying_signature">جارٍ التحقق مِن التوقيع …</string>
   <string name="progress_signing">لتوقيع …</string>
   <string name="progress_reading_data">قراءة البيانات …</string>
+  <string name="progress_verifying_keyserver_connection">جارٍ التحقق مِن الاتصال…</string>
   <string name="progress_starting_orbot">جارٍ تشغيل أوربوت …</string>
   <!--action strings-->
   <!--key bit length selections-->
@@ -496,7 +496,9 @@
   <string name="msg_dc_clear_meta_size_unknown">حجم الملف : مجهول</string>
   <string name="msg_dc_clear_meta_time">تاريخ التعديل : %s</string>
   <string name="msg_dc_clear">معالجة البيانات النصية المُجرّدة</string>
+  <string name="msg_dc_error_no_signature">معطيات التوقيع ناقصة!</string>
   <!--Messages for VerifySignedLiteralData operation-->
+  <string name="msg_vl_error_no_signature">معطيات التوقيع ناقصة!</string>
   <string name="msg_vl_clear_meta_file">إسم الملف : %s</string>
   <string name="msg_vl_clear_meta_time">تاريخ التعديل : %s</string>
   <string name="msg_vl_clear_meta_size">حجم الملف : %s</string>
@@ -514,9 +516,9 @@
   <string name="msg_import_fetch_error_not_found">مفتاح غير موجود!</string>
   <string name="msg_backup_error_db">خطأ في قاعدة البيانات !</string>
   <string name="msg_upload">تحميل المفتاح العمومي</string>
+  <string name="msg_upload_server">الخادِم: %s</string>
   <string name="msg_upload_error_not_found">مفتاح غير موجود!</string>
   <string name="msg_upload_success">نجحت عملية الرفع إلى خادم المفاتيح</string>
-  <!--Linked Identity verification-->
   <string name="msg_data_detached_raw">معالجَة البيانات المُوقّعَة</string>
   <string name="msg_data_ok">تمت معالجة البيانات بنجاح</string>
   <string name="msg_get_no_valid_keys">لم يُعثَر على أي مفتاح صحيح سواءا في الملف أو على الحافظة !</string>
@@ -526,6 +528,7 @@
   <!--PassphraseCache-->
   <string name="passp_cache_notif_pwd">كلمة السر</string>
   <!--Keyserver sync-->
+  <string name="keyserver_sync_orbot_notif_msg">انقر لتشغيل تطبيق أوربوت</string>
   <string name="keyserver_sync_orbot_notif_start">بدء تشغيل Orbot</string>
   <!--First Time-->
   <string name="first_time_create_key">أنشئ مفتاحي</string>
@@ -561,27 +564,19 @@
   <string name="nfc_settings">الإعدادات</string>
   <string name="snack_security_token_view">مراجعة</string>
   <string name="snack_security_token_import">إستيراد</string>
+  <string name="security_token_serial_no">الرقم التسلسلي: %s</string>
   <string name="btn_reset">إعادة الضبط</string>
   <string name="security_token_error">خطأ : %s</string>
+  <string name="security_token_error_unknown">خطأ مجهول</string>
+  <string name="security_token_error_try_again">أعد المحاولة</string>
   <string name="btn_delete_original">حذف الملف الأصلي</string>
   <string name="progress_processing">المُعالَجة جارية …</string>
   <string name="file_delete_ok">تمت عملية حذف الملف الأصلي.</string>
   <string name="error_clipboard_empty">الحافظة فارغة !</string>
   <string name="error_clipboard_copy">طرأ خطأ أثناء نسخ البيانات إلى الحافظة !</string>
   <string name="error_clipboard_bad">تعذّرَت قراءة المفاتيح من الحافظة !</string>
-  <string name="linked_create_verify">التحقق</string>
-  <string name="linked_text_clipboard">تم نسخ الملف إلى الحافظة !</string>
   <!--Other Linked Identity strings-->
-  <string name="menu_linked_add_identity">الربط بحساب</string>
-  <string name="section_linked_identities">الهويات المرتبطة</string>
   <string name="btn_finish">نهاية</string>
-  <string name="linked_title_twitter">تويتر</string>
-  <string name="linked_button_verify">التحقق</string>
-  <string name="linked_button_retry">حاول مجددا</string>
-  <string name="linked_button_confirm">تأكيد </string>
-  <string name="linked_button_view">مراجعة</string>
-  <string name="linked_text_error">خطأ</string>
-  <string name="title_linked_id_create">إنشاء هوية مَوْصولة</string>
   <string name="backup_code_explanation">سوف يتم تأمين النسخة الإحتياطية برمز أمان. يُرجى كتابة هذا الرمز في مكان آخَر قبل مُواصلة هذه الخطوة !</string>
   <string name="btn_code_wrotedown">حسنا، لقد قمت بكتابته !</string>
   <string name="btn_backup_back">العودة للتحقق ثانية</string>
@@ -593,6 +588,7 @@
   <string name="title_edit_subkeys">تعديل المفاتيح الفرعية</string>
   <string name="cache_ttl_one_hour">لمدة ساعة</string>
   <string name="cache_ttl_one_day">لمدة يوم</string>
+  <string name="remember">تذكَّر</string>
   <string name="prompt_fidesmo_pgp_install_button_positive">تثبيت</string>
   <string name="prompt_fidesmo_pgp_install_button_negative">إلغاء</string>
   <string name="prompt_fidesmo_app_install_button_positive">تثبيت</string>
@@ -614,6 +610,7 @@
   <string name="key_health_ok_subtitle">المفتاح خال من الأخطاء.</string>
   <string name="key_health_divert_subtitle">المفتاح خال من الأخطاء.</string>
   <string name="key_health_divert_partial_subtitle">إضغط لمعرفة التفاصيل</string>
+  <string name="key_health_expired_title">انقضت صلاحيتها</string>
   <string name="key_health_expired_subtitle">يجب ألاّ يستخدم هذا المفتاح من الآن فصاعدا.</string>
   <string name="key_health_revoked_title">ملغى</string>
   <string name="key_health_insecure_title">غير آمن</string>
@@ -655,13 +652,19 @@
   <string name="token_unlock_ok">إلغاء القفل</string>
   <string name="token_hint_admin_pin">رمز PIN الخاص بالمدير</string>
   <string name="msg_trust_count_none">لا توجد هناك مفاتيح للتحديث</string>
+  <string name="use_key">استخدم مفتاح: %s</string>
   <string name="select_identity_cancel">إلغاء</string>
+  <string name="no_keys_import_title">لديّ مفتاح</string>
   <string name="key_gen_progress">الرجاء الإنتظار </string>
   <string name="key_gen_back">السابق</string>
   <string name="key_gen_finish">نهاية</string>
+  <string name="button_goto_openkeychain">الانتقال إلى أوبن كي تشاين</string>
   <string name="snack_keylist_clipboard_action">الاطلاع</string>
   <string name="notify_title_keysync">تحديث المفاتيح ...</string>
+  <string name="notify_content_keysync">مفتاح %d / %d</string>
   <string name="keylist_header_anonymous">مجهول</string>
   <string name="keylist_header_special">#</string>
+  <string name="button_analytics_no">لا، شكراً</string>
   <string name="snackbutton_analytics_settings">الإعدادات</string>
+  <string name="share_key">شارك المفتاح</string>
 </resources>

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

@@ -79,6 +79,7 @@
   <!--Import-->
   <string name="btn_import">Emporzhiañ</string>
   <!--Generic result toast-->
+  <string name="snackbar_details">Munudoù</string>
   <!--Import result toast-->
   <!--Delete result toast-->
   <!--Revoke result toast (snackbar)-->
@@ -87,6 +88,7 @@
   <!--Remote API-->
   <string name="api_settings_save">Enrollañ</string>
   <string name="api_settings_cancel">Nullañ</string>
+  <string name="api_settings_package_name">Anv ar pak</string>
   <string name="api_settings_advanced">Araokaet</string>
   <string name="api_settings_settings">Arventennoù</string>
   <!--Share-->
@@ -129,7 +131,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -144,12 +145,11 @@
   <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
   <string name="enter_passphrase">Ebarzhiñ ar ger-tremen</string>
   <string name="passphrase">Ger-tremen</string>
+  <string name="passphrase_again">Adarre</string>
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
   <string name="nfc_settings">Arventennoù</string>
   <string name="snack_security_token_import">Emporzhiañ</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_button_retry">Adklask</string>
-  <string name="linked_text_error">Fazi</string>
   <string name="share_log_dialog_share_button">Rannañ</string>
   <string name="share_log_dialog_cancel_button">Nullañ</string>
   <string name="menu_uids_save">Enrollañ</string>
@@ -166,5 +166,6 @@
   <string name="transfer_confirm_ok">Kas</string>
   <string name="token_action_import">Emporzhiañ</string>
   <string name="keylist_header_anonymous">Anonymous</string>
+  <string name="button_analytics_no">Nann, avat</string>
   <string name="snackbutton_analytics_settings">Arventennoù</string>
 </resources>

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

@@ -3,6 +3,7 @@
   <!--GENERAL: Please put all strings inside quotes as described in example 1 on
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <!--title-->
+  <string name="title_decrypt">Desxifra</string>
   <string name="title_preferences">Configuració</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_help">Ajuda</string>
@@ -15,6 +16,7 @@
   <string name="section_fingerprint">Empremta</string>
   <!--button-->
   <string name="btn_save">Desa</string>
+  <string name="btn_view_log">Mostra els registre</string>
   <string name="btn_do_not_save">Cancel·la</string>
   <string name="btn_delete">Esborrar</string>
   <string name="btn_okay">D\'acord</string>
@@ -22,11 +24,14 @@
   <string name="btn_back">Enrera</string>
   <string name="btn_no">No</string>
   <string name="btn_share_decrypted_text">Compartir</string>
+  <string name="btn_copy_decrypted_text">Copia al porta-retalls</string>
+  <string name="btn_encrypt_files">Xifratge de fitxers</string>
   <string name="btn_unlock">Desbloquejar</string>
   <string name="btn_proceed">Procedir</string>
   <string name="btn_add_keyserver">Afegeix</string>
   <!--Shortcut Strings-->
   <!--Content Description-->
+  <string name="cd_encrypt_files">Xifratge de fitxers</string>
   <!--menu-->
   <string name="menu_preferences">Configuració</string>
   <string name="menu_help">Ajuda</string>
@@ -46,6 +51,7 @@
   <string name="label_email">Correu electrònic</string>
   <string name="label_fingerprint">Empremta</string>
   <string name="label_hidden_recipients">Oculta els destinataris</string>
+  <string name="label_enter_keyserver_url">URL</string>
   <string name="label_theme">Tema</string>
   <string name="label_enter_smartpgp_authority_name">Nom</string>
   <!--label shown in Android settings under the OpenKeychain account-->
@@ -92,6 +98,7 @@
   <string name="help_about_version">Versió</string>
   <string name="help_tab_donations">Fes una donació</string>
   <!--Import-->
+  <string name="import_qr_code_button">Escaneja el codi QR</string>
   <string name="btn_import">Subscriu-me</string>
   <string name="btn_refresh">Refresca</string>
   <!--Generic result toast-->
@@ -110,6 +117,7 @@
   <!--Delete or revoke private key dialog-->
   <!--Delete Or Revoke Dialog spinner-->
   <!--Key list-->
+  <string name="key_list_fab_qr_code">Escaneja el codi QR</string>
   <!--Key view-->
   <string name="key_view_action_edit">Editar</string>
   <string name="key_view_tab_start">Inicia</string>
@@ -119,6 +127,7 @@
   <string name="keybase_verify">Verifica</string>
   <!--Edit key-->
   <!--Create key-->
+  <string name="create_key_empty">El camp és necessari</string>
   <string name="create_key_passphrases_not_equal">Les contrasenyes no coincideixen</string>
   <!--View key-->
   <!--Add/Edit keyserver-->
@@ -138,16 +147,22 @@
   <!--Keyring merging log entries-->
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
+  <string name="msg_mf_error_noop">No hi ha res a fer!</string>
   <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed_error_key_not_found">No s’ha trobat la clau.</string>
   <!--Promote key-->
+  <string name="msg_pr_error_key_not_found">No s’ha trobat la clau.</string>
   <!--Other messages used in OperationLogs-->
+  <string name="msg_ek_error_not_found">No s’ha trobat la clau.</string>
   <!--Messages for DecryptVerify operation-->
   <!--Messages for VerifySignedLiteralData operation-->
   <string name="msg_vl_ok">OK</string>
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
+  <string name="msg_crt_warn_not_found">No s’ha trobat la clau.</string>
+  <string name="msg_import_fetch_error_not_found">No s’ha trobat la clau.</string>
+  <string name="msg_upload_error_not_found">No s’ha trobat la clau.</string>
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -157,6 +172,7 @@
   <!--First Time-->
   <!--unsorted-->
   <string name="label_cert_type">Tipus</string>
+  <string name="error_key_not_found">No s’ha trobat la clau.</string>
   <string name="key_unavailable">no disponible</string>
   <string name="unknown">desconegut</string>
   <!--Android Account-->
@@ -170,15 +186,8 @@
   <string name="snack_security_token_view">Visualitza</string>
   <string name="snack_security_token_import">Subscriu-me</string>
   <string name="btn_reset">Reinicia</string>
-  <string name="linked_create_verify">Verifica</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">Fi</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Verifica</string>
-  <string name="linked_button_retry">Reintenta</string>
-  <string name="linked_button_confirm">Confirma</string>
-  <string name="linked_button_view">Visualitza</string>
-  <string name="linked_text_error">Error</string>
   <string name="share_log_dialog_share_button">Compartir</string>
   <string name="share_log_dialog_cancel_button">Cancel·la</string>
   <string name="menu_uids_save">Desa</string>
@@ -191,10 +200,13 @@
   <string name="button_cancel">Cancel·la</string>
   <string name="button_back">Enrera</string>
   <string name="button_got_it">D\'acord</string>
+  <string name="dialog_insecure_button_ok">Entesos</string>
+  <string name="usage_authentication">Autenticació</string>
   <string name="button_import">Subscriu-me</string>
   <string name="transfer_confirm_cancel">Cancel·la</string>
   <string name="transfer_confirm_ok">Envia</string>
   <string name="token_reset_confirm_ok">Reinicia</string>
+  <string name="token_result_not_found">No s’ha trobat la clau.</string>
   <string name="token_action_import">Subscriu-me</string>
   <string name="token_unlock_ok">Desbloquejar</string>
   <string name="select_identity_cancel">Deshabilitar </string>
@@ -202,5 +214,6 @@
   <string name="key_gen_finish">Fi</string>
   <string name="snack_keylist_clipboard_action">Visualitza</string>
   <string name="keylist_header_anonymous">Anònim </string>
+  <string name="button_analytics_no">No, gràcies</string>
   <string name="snackbutton_analytics_settings">Configuració</string>
 </resources>

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

@@ -9,7 +9,6 @@
   <string name="title_decrypt">Rozšifrovat</string>
   <string name="title_add_subkey">Přidat podklíč</string>
   <string name="title_edit_key">Editovat klíč</string>
-  <string name="title_linked_create">Vyrořit propojenou identitu</string>
   <string name="title_preferences">Nastavení</string>
   <string name="title_api_registered_apps">Aplikace</string>
   <string name="title_key_server_preference">OpenPGP keyservery</string>
@@ -190,8 +189,6 @@
   <string name="keyserver_sync_settings_title">Automaticky aktualizovat klíč</string>
   <string name="label_experimental_settings_desc_title">Varovnání</string>
   <string name="label_experimental_settings_desc_summary">Tyto funkce nejsou ještě dokončené nebo neprošli uživatelským testováním/bezpečnostním auditem. Prosím nepoužívejte je v situacích kdy na nich závisí vaše zabezpečení a nehlašte problémy s nimi spojené, pokud na ně narazíte.</string>
-  <string name="label_experimental_settings_linked_identities_title">Propojené identity</string>
-  <string name="label_experimental_settings_linked_identities_summary">Propojit klíče s Twitterem, GitHubem, webem nebo DNS (podobně jako keybase.io ale decentralizované)</string>
   <string name="label_experimental_settings_keybase_summary">Kontaktovat keybase.io pro proofs klíče a ukázat je pokaždé když je klíč zobrazen</string>
   <string name="label_experimental_settings_theme_summary">(Ikony a mnoho obrazovek ještě nejsou uzpůsobené pro temné téma vzhledu)</string>
   <!--Proxy Preferences-->
@@ -878,7 +875,6 @@
   <string name="msg_import_fetch_error_not_found">Klíč nenalezen!</string>
   <string name="msg_backup_error_db">Chyba databáze!</string>
   <string name="msg_upload_error_not_found">Klíč nenalezen!</string>
-  <!--Linked Identity verification-->
   <string name="msg_get_too_many_responses">Dotaz pro vyhledání klíče vrátil příliš mnoho položek. Prosím specifikujte lépe svůj dotaz!</string>
   <string name="msg_get_query_too_short">Vyhledávací dotaz příliš krátký. Prosím specifikujte více dotaz!</string>
   <string name="msg_get_query_too_short_or_too_many_responses">Žádný nebo příliš mnoho klíčů bylo nalezeno. Prosím o vylepšení vašeho dotazu!</string>
@@ -929,16 +925,8 @@
   <string name="snack_security_token_import">Importovat</string>
   <string name="btn_reset">Restartovat</string>
   <string name="security_token_error">Chyba: %s</string>
-  <string name="linked_create_verify">Ověřit</string>
   <!--Other Linked Identity strings-->
-  <string name="section_linked_identities">Propojené identity</string>
   <string name="btn_finish">Dokončit</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Ověřit</string>
-  <string name="linked_button_retry">Opakovat</string>
-  <string name="linked_button_confirm">Potvrdit</string>
-  <string name="linked_button_view">Zobrazit</string>
-  <string name="linked_text_error">Chyba</string>
   <string name="share_log_dialog_share_button">Sdílet</string>
   <string name="share_log_dialog_cancel_button">Zrušit</string>
   <string name="menu_uids_save">Uložit</string>

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

@@ -159,7 +159,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -183,15 +182,8 @@
   <string name="snack_security_token_view">Gennemse</string>
   <string name="snack_security_token_import">Importér</string>
   <string name="btn_reset">Nulstille</string>
-  <string name="linked_create_verify">Verificer</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">Afslut</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Verificer</string>
-  <string name="linked_button_retry">Forsøg igen</string>
-  <string name="linked_button_confirm">Bekræft</string>
-  <string name="linked_button_view">Gennemse</string>
-  <string name="linked_text_error">Fejl</string>
   <string name="share_log_dialog_share_button">Del</string>
   <string name="share_log_dialog_cancel_button">Annuller</string>
   <string name="menu_uids_save">Gem</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Unterschlüssel hinzufügen</string>
   <string name="title_change_master_key">Hauptschlüssel ändern</string>
   <string name="title_edit_key">Schlüssel bearbeiten</string>
-  <string name="title_linked_create">Eine Verknüpfte-Identität erzeugen</string>
   <string name="title_preferences">Einstellungen</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">OpenPGP-Schlüsselserver</string>
@@ -216,8 +215,6 @@
   <string name="keyserver_sync_settings_title">Automatische Schlüsselaktualisierung</string>
   <string name="label_experimental_settings_desc_title">Warnung</string>
   <string name="label_experimental_settings_desc_summary">Diese Funktionen sind noch nicht final oder das Ergebnis von Benutzererfahrungs-/Sicherheitsuntersuchungen. Verlasse dich daher nicht auf deren Sicherheit und melde uns bitte keine auftretenden Probleme!</string>
-  <string name="label_experimental_settings_linked_identities_title">Verknüpfte-Identitäten</string>
-  <string name="label_experimental_settings_linked_identities_summary">Schlüssel mit Twitter, GitHub, Webseiten oder DNS verknüpfen (ähnlich wie bei Keybase.io, aber dezentralisiert)</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io-Nachweise</string>
   <string name="label_experimental_settings_keybase_summary">Keybase.io für Schlüsselnachweise kontaktieren und diese jedesmal zeigen, wenn ein Schlüssel angezeigt wird</string>
   <string name="label_experimental_settings_theme_summary">(Die Symbole und viele Bildschirme sind noch nicht an das dunkle Design angepasst)</string>
@@ -583,11 +580,11 @@
     <item quantity="other">Beglaubigung von %d Schlüsseln ist fehlgeschlagen!</item>
   </plurals>
   <!--Intent labels-->
-  <string name="intent_decrypt_file">Datei mit OpenKeychain entschlüsseln</string>
-  <string name="intent_import_key">Schlüssel mit OpenKeychain importieren</string>
-  <string name="intent_send_encrypt">Mit OpenKeychain verschlüsseln</string>
-  <string name="intent_send_decrypt">Mit OpenKeychain entschlüsseln</string>
-  <string name="intent_autocrypt_setup">Autocrypt Setup Nachricht importieren</string>
+  <string name="intent_decrypt_file">Datei entschlüsseln mit OpenKeychain</string>
+  <string name="intent_import_key">Schlüssel importieren mit OpenKeychain</string>
+  <string name="intent_send_encrypt">Verschlüsseln mit OpenKeychain </string>
+  <string name="intent_send_decrypt">Entschlüsseln mit OpenKeychain </string>
+  <string name="intent_autocrypt_setup">Importiere Autocrypt Setup Nachricht</string>
   <!--Remote API-->
   <string name="api_settings_show_info">Erweiterte Informationen anzeigen</string>
   <string name="api_settings_hide_info">Erweiterte Informationen ausblenden</string>
@@ -1288,25 +1285,6 @@
   <string name="msg_revoke_key">Schlüssel %s wird widerrufen</string>
   <string name="msg_revoke_key_fail">Fehler beim Widerrufen des Schlüssels</string>
   <string name="msg_revoke_ok">Schlüssel erfolgreich widerrufen</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Verknüpfte-Identität wird verifiziert…</string>
-  <string name="msg_lv_match">Nach Token wird gesucht</string>
-  <string name="msg_lv_match_error">Es wurde kein Token in der Ressource gefunden!</string>
-  <string name="msg_lv_fp_ok">Fingerabdruck in Ordnung.</string>
-  <string name="msg_lv_fp_error">Fingerabdrücke stimmen nicht überein!</string>
-  <string name="msg_lv_error_twitter_auth">Fehler beim Erhalten des Twitter-Authentifizierungs-Tokens!</string>
-  <string name="msg_lv_error_twitter_handle">Falsche Handle-Zuordnung des Twitter-Benutzerkontos in der Antwort!</string>
-  <string name="msg_lv_error_twitter_response">Unerwartete Antwort der Twitter-API!</string>
-  <string name="msg_lv_error_github_handle">Falsche Handle-Zuordnung des GitHub-Benutzerkontos in der Antwort!</string>
-  <string name="msg_lv_error_github_not_found">Gist enthält keine übereinstimmenden Dateien!</string>
-  <string name="msg_lv_fetch">URI \'%s\' wird abgerufen</string>
-  <string name="msg_lv_fetch_redir">Weiterleitung auf \'%s\' wird gefolgt</string>
-  <string name="msg_lv_fetch_ok">Erfolgreich abgerufen (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">Serverfehler (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">URL ist fehlerhaft!</string>
-  <string name="msg_lv_fetch_error_io">Ein-/Ausgabefehler!</string>
-  <string name="msg_lv_fetch_error_format">Formatfehler!</string>
-  <string name="msg_lv_fetch_error_nothing">Ressource wurde nicht gefunden!</string>
   <string name="msg_bench">Leistungstest für einige Vorgänge wird ausgeführt...</string>
   <string name="msg_bench_enc_time">Zeit zum Verschlüsseln: %sss</string>
   <string name="msg_bench_enc_time_avg">Durchschnittliche Zeit zum Verschlüsseln von 5MB: %ss</string>
@@ -1525,76 +1503,8 @@
   <string name="error_scan_fp">Fehler beim Scannen des Fingerabdrucks!</string>
   <string name="error_scan_match">Fingerabdrücke stimmten nicht überein!</string>
   <string name="error_expiry_past">Ablaufdatum liegt in der Vergangenheit!</string>
-  <string name="linked_create_https_1_1">Durch das Erzeugen einer Verknüpften-Identität dieses Typs kannst du deinen Schlüssel mit einer Webseite verknüpfen, die du kontrollierst.</string>
-  <string name="linked_create_https_1_2">Um das zu tun veröffentlichst du eine Textdatei auf dieser Webseite, anschließend erzeugst du eine Verknüpfte-Identität, die auf diese diese Datei verweist.</string>
-  <string name="linked_create_https_1_3">Bitte gib eine URL ein, unter der du eine Textdatei als Nachweis hinterlegen kannst. Beachte das dein Server HTTPS unterstützen muss und ein gültiges TLS-Zertifikat benötigt!</string>
-  <string name="linked_create_https_1_4">Beispiel: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_created">Die Nachweisdatei wurde erzeugt. Im nächsten Schritt solltest du sie speichern und zum URI hochladen, den du angegeben hast:</string>
-  <string name="linked_create_https_2_1">Eine Nachweisdatei für diesen URI wurde erzeugt:</string>
-  <string name="linked_create_https_2_2">Im nächsten Schritt solltest du Speichern und diese Datei hochladen.</string>
-  <string name="linked_create_https_2_3">Stelle sicher dass die Datei unter der korrekten URI erreichbar ist, prüfe danach deine Einstellungen.</string>
-  <string name="linked_create_https_2_4">Berühre nach erfolgreicher Verifikation \'Abschließen\', um die Verknüpfte-Identität deinem Schlüsselbund hinzuzufügen und den Vorgang zu beenden.</string>
-  <string name="linked_create_twitter_1_1">Durch das Erzeugen einer Verknüpften-Identität dieses Typs kannst du deinen Schlüssel mit einem Twitter-Benutzerkonto verknüpfen, das du kontrollierst.</string>
-  <string name="linked_create_twitter_1_2">Um das zu tun veröffentlichst du einen bestimmten Tweet in deiner Chronik, anschließend erzeugst du eine Verknüpfte-Identität, die auf diesen Tweet verweist.</string>
-  <string name="linked_create_twitter_1_3">Zum Fortfahren gib bitte deinen Twitter-Namen an.</string>
-  <string name="linked_create_twitter_handle">Twitter-Handle</string>
-  <string name="linked_create_twitter_2_1">Berühre einen der Knöpfe, um den Tweet abzusenden!</string>
-  <string name="linked_create_twitter_2_2">Du kannst den Tweet vor dem Absenden beliebig bearbeiten, solange der Text in Klammern unverändert bleibt.</string>
-  <string name="linked_create_twitter_2_3">Sobald Ihr Tweet als <b>@%s</b> veröffentlicht wird, berühren sie die Schaltfläche Überprüfen, um Ihre Zeitleiste zu scannen.</string>
-  <string name="linked_create_twitter_2_4">Berühre nach erfolgreicher Verifikation \'Abschließen\', um die Verknüpfte-Identität deinem Schlüsselbund hinzuzufügen und den Vorgang zu beenden.</string>
-  <string name="linked_create_verify">Verifizieren</string>
-  <string name="linked_text_clipboard">Text wurde in die Zwischenablage kopiert</string>
-  <string name="linked_verified_https">Die Verknüpfung zwischen dieser Webseite und dem Schlüssel wurde sicher verifiziert. <b>Wenn du glaubst dass die Webseite echt ist</b>, bestätige die Verifikation mit deinem Schlüssel.</string>
-  <string name="linked_verified_github">Die Verknüpfung zwischen diesem GitHub-Benutzerkonto und dem Schlüssel wurde sicher verifiziert. <b>Wenn du glaubst dass dieses Benutzerkonto echt ist</b>, bestätige die Verifikation mit deinem Schlüssel.</string>
-  <string name="linked_verified_dns">Die Verknüpfung zwischen diese Domänennamen und dem Schlüssel wurde sicher verifiziert. <b>Wenn du glaubst dass die Domäne echt ist</b>, bestätige die Verifikation mit deinem Schlüssel.</string>
-  <string name="linked_verified_twitter">Die Verknüpfung zwischen diesem Twitter-Benutzerkonto und dem Schlüssel wurde sicher verifiziert. <b>Wenn du glaubst dass dieses Benutzerkonto echt ist</b>, bestätige die Verifikation mit deinem Schlüssel.</string>
-  <string name="linked_verified_secret_https">Es ist alles in Ordnung.</string>
-  <string name="linked_verified_secret_github">Es ist alles in Ordnung.</string>
-  <string name="linked_verified_secret_dns">Es ist alles in Ordnung.</string>
-  <string name="linked_verified_secret_twitter">Es ist alles in Ordnung.</string>
-  <plurals name="linked_id_expand">
-    <item quantity="one">Es gibt einen weiteren unbekannten Identitätstyp</item>
-    <item quantity="other">Es gibt %d weitere unbekannte Identitätstypen</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">Eine \'Verknüpfte-Identität\' verbindet deinen PGP-Schlüssel mit einem Dienst im Internet.</string>
-  <string name="linked_select_2">Bitte wähle einen Typ aus:</string>
-  <string name="linked_id_generic_text">Diese Datei erhebt Anspruch auf den Besitz des OpenPGP-Schlüssels mit der langen ID %2$s.\n\nToken des Nachweises:\n%1$s</string>
-  <string name="linked_verifying">Wird verifiziert…</string>
-  <string name="linked_verify_success">Verifiziert!</string>
-  <string name="linked_verify_error">Verifikationsfehler!</string>
-  <string name="linked_verify_pending">Noch nicht verifiziert</string>
-  <string name="linked_need_verify">Die Ressource muss verifiziert werden bevor du fortfahren kannst!</string>
-  <string name="menu_linked_add_identity">Mit Benutzerkonto verknüpfen</string>
-  <string name="section_linked_identities">Verknüpfte-Identitäten</string>
   <string name="btn_finish">Abschließen</string>
-  <string name="linked_title_https">Webseite (HTTPS)</string>
-  <string name="linked_title_dns">Domainname (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Verknüpfte-Identität</string>
-  <string name="linked_button_verify">Verifizieren</string>
-  <string name="linked_button_retry">Wiederholen</string>
-  <string name="linked_button_retry_step">Wiederhole letzten Schritt</string>
-  <string name="linked_button_confirm">Bestätigen</string>
-  <string name="linked_button_view">Anzeigen</string>
-  <string name="linked_text_verifying">Wird verifiziert...</string>
-  <string name="linked_text_error">Fehler</string>
-  <string name="linked_text_confirming">Wird bestätigt...</string>
-  <string name="linked_ids_more_unknown">%d weitere unbekannte Identitätstypen</string>
-  <string name="title_linked_id_create">Verknüpfte-Identität erzeugen</string>
-  <string name="linked_github_text">Dieser Vorgang verknüpft deinen Schlüssel mit deinem GitHub-Benutzerkonto.\nBerühre den Knopf um fortzufahren.</string>
-  <string name="linked_progress_auth_github">Mit GitHub authorisieren...</string>
-  <string name="linked_progress_post_gist">Gist wird veröffentlicht...</string>
-  <string name="linked_progress_update_key">Schlüssel wird aktualisiert...</string>
-  <string name="linked_button_start">Mit GitHub-Benutzerkonto verknüpfen</string>
-  <string name="linked_error_auth_failed">Authorisierung ist fehlgeschlagen!</string>
-  <string name="linked_error_timeout">Zeitüberschreitung beim Verbindungsaufbau!</string>
-  <string name="linked_error_network">Netzwerkfehler!</string>
-  <string name="linked_error_http">Kommunikationsfehler: %s</string>
-  <string name="linked_webview_title_github">GitHub-Authorisierung</string>
-  <string name="linked_gist_description">Verknüpfte OpenKeychain-Identität</string>
-  <string name="linked_empty">Verknüpfe deinen Schlüssel mit GitHub, Twitter oder anderen Webseiten!</string>
   <string name="snack_btn_overwrite">Überschreiben</string>
   <string name="backup_code_explanation">Das Backup wird durch einen Backupcode gesichert. Schreibe diesen auf, bevor du fortfährst!</string>
   <string name="backup_code_enter">Bitte gib den Backupcode ein:</string>
@@ -1903,5 +1813,9 @@ Ein sicherer Schlüssel sollte eine Stärke von 2048 Bits besitzen.</string>
   <string name="snackbutton_analytics_settings">Einstellungen</string>
   <string name="subkey_action_create">Teilschlüssel wird erstellt werden</string>
   <string name="subkey_action_revoke">Teilschlüssel wird widerrufen werden</string>
+  <string name="subkey_action_strip">Teilschlüssel wird entfernt werden</string>
+  <string name="subkey_action_expiry_never">Ablauf wird geändert zu \"niemals\"</string>
+  <string name="subkey_action_expiry_date">Ablauf wird geändert zu \"%s\"</string>
+  <string name="share_key_clipboard">Schlüssel per Zwischenablage teilen</string>
   <string name="share_key">Schlüssel teilen</string>
 </resources>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Προσθήκη υποκλειδιού</string>
   <string name="title_change_master_key">Αλλαγή κύριου κλειδιού</string>
   <string name="title_edit_key">Επεξεργασία Κλειδιού</string>
-  <string name="title_linked_create">Δημιουργία Συνδεδεμένης Ταυτότητας</string>
   <string name="title_preferences">Ρυθμίσεις</string>
   <string name="title_api_registered_apps">Εφαρμογές</string>
   <string name="title_key_server_preference">Διακομιστές κλειδιών OpenPGP</string>
@@ -121,6 +120,7 @@
   <string name="orbot_start_dialog_cancel">Ακύρωση</string>
   <!--choice-->
   <string name="choice_none">Καμία</string>
+  <string name="choice_1hour">1 ώρα</string>
   <string name="usage_encrypt">Κρυπτογράφηση</string>
   <string name="error">Σφάλμα</string>
   <!--sentences-->
@@ -152,6 +152,7 @@
   <!--Import-->
   <string name="import_tab_keyserver">Διακομιστής Κλειδιών</string>
   <string name="import_tab_cloud">Αναζήτηση Κλειδιού</string>
+  <string name="import_qr_code_button">Σκανάρισμα κωδικού QR</string>
   <string name="btn_import">Εισαγωγή</string>
   <string name="btn_refresh">Ανανέωση</string>
   <!--Generic result toast-->
@@ -171,6 +172,7 @@
   <!--Delete or revoke private key dialog-->
   <!--Delete Or Revoke Dialog spinner-->
   <!--Key list-->
+  <string name="key_list_fab_qr_code">Σκανάρισμα κωδικού QR</string>
   <string name="key_list_fab_search">Αναζήτηση Κλειδιού</string>
   <!--Key view-->
   <string name="key_view_action_edit">Επεξεργασία</string>
@@ -213,7 +215,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -236,15 +237,8 @@
   <string name="snack_security_token_view">Προβολή</string>
   <string name="snack_security_token_import">Εισαγωγή</string>
   <string name="btn_reset">Μηδενισμός</string>
-  <string name="linked_create_verify">Επιβεβαίωση</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">Τέλος</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Επιβεβαίωση</string>
-  <string name="linked_button_retry">Ξαναδοκιμάστε</string>
-  <string name="linked_button_confirm">Επιβεβαίωση</string>
-  <string name="linked_button_view">Προβολή</string>
-  <string name="linked_text_error">Σφάλμα</string>
   <string name="share_log_dialog_share_button">Κοινή χρήση</string>
   <string name="share_log_dialog_cancel_button">Ακύρωση</string>
   <string name="menu_uids_save">Αποθήκευση</string>
@@ -269,5 +263,6 @@
   <string name="snack_keylist_clipboard_action">Δείτε τα αποτελέσματα</string>
   <string name="keylist_header_anonymous">Ανώνυμος</string>
   <string name="keylist_header_special">#</string>
+  <string name="button_analytics_no">Όχι, ευχαριστώ</string>
   <string name="snackbutton_analytics_settings">Ρυθμίσεις</string>
 </resources>

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

@@ -119,7 +119,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -140,9 +139,6 @@
   <string name="snack_security_token_import">Enporti</string>
   <string name="btn_reset">Rekomencigo</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_button_retry">Reprovi</string>
-  <string name="linked_button_view">Rigardi</string>
-  <string name="linked_text_error">Eraro</string>
   <string name="share_log_dialog_cancel_button">Rezigni</string>
   <string name="menu_uids_save">Konservi</string>
   <string name="prompt_fidesmo_pgp_install_button_negative">Rezigni</string>

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

@@ -9,7 +9,6 @@
   <string name="title_decrypt">Descifrar</string>
   <string name="title_add_subkey">Agregar subclave</string>
   <string name="title_edit_key">Editar clave</string>
-  <string name="title_linked_create">Crear una identidad en LinkedIn</string>
   <string name="title_preferences">Ajustes</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Servidores OpenPGP</string>
@@ -298,7 +297,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -319,12 +317,7 @@
   <string name="snack_security_token_view">Ve</string>
   <string name="snack_security_token_import">Importar</string>
   <string name="security_token_error">Error: %s</string>
-  <string name="linked_create_verify">Verificar</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_button_verify">Verificar</string>
-  <string name="linked_button_confirm">Confirmar</string>
-  <string name="linked_button_view">Ve</string>
-  <string name="linked_text_error">Error</string>
   <string name="share_log_dialog_share_button">Compartir</string>
   <string name="share_log_dialog_cancel_button">Cancelar</string>
   <string name="menu_uids_save">Guardar</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Añadir subclave</string>
   <string name="title_change_master_key">Cambiar clave maestra</string>
   <string name="title_edit_key"> Editar clave</string>
-  <string name="title_linked_create">Crear una identidad vinculada</string>
   <string name="title_preferences">Configuración</string>
   <string name="title_api_registered_apps">Aplicaciones</string>
   <string name="title_key_server_preference">Servidores de claves OpenPGP</string>
@@ -216,8 +215,6 @@
   <string name="keyserver_sync_settings_title">Actualizaciones automáticas de claves</string>
   <string name="label_experimental_settings_desc_title">Advertencia</string>
   <string name="label_experimental_settings_desc_summary">Estas características todavía no están finalizadas o no se han obtenido los resultados de experiencia del usuario y la investigación de seguridad. Por tanto, no confíe en su seguridad y, por favor, ¡no informe de los problemas que encuentre!</string>
-  <string name="label_experimental_settings_linked_identities_title">Identidades vinculadas</string>
-  <string name="label_experimental_settings_linked_identities_summary">Vincula claves con Twitter, GitHub, sitios web o DNS (similar a keybase.io pero descentralizado)</string>
   <string name="label_experimental_settings_keybase_title">Comprobantes de Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Contacta con keybase.io para obtener comprobantes de clave y muestrelos cada vez que se muestra una clave</string>
   <string name="label_experimental_settings_theme_summary">(Los iconos y algunas pantallas todavía no están ajustadas de acuerdo con el tema decorativo oscuro)</string>
@@ -1288,25 +1285,6 @@
   <string name="msg_revoke_key">Revocando clave %s</string>
   <string name="msg_revoke_key_fail">Fallo al revocar clave</string>
   <string name="msg_revoke_ok">Clave revocada con éxito</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Verificando identidad vinculada...</string>
-  <string name="msg_lv_match">Buscando token</string>
-  <string name="msg_lv_match_error">¡No se encontró token en el recurso!</string>
-  <string name="msg_lv_fp_ok">Huella de validación de clave correcta.</string>
-  <string name="msg_lv_fp_error">¡La huella de validación de clave no coincide!</string>
-  <string name="msg_lv_error_twitter_auth">¡Error al obtener token de autentificación de Twitter!</string>
-  <string name="msg_lv_error_twitter_handle">¡El nombre de usuario de la cuenta de Twitter no coincide en la respuesta!</string>
-  <string name="msg_lv_error_twitter_response">¡Respuesta inesperada desde la API de Twitter!</string>
-  <string name="msg_lv_error_github_handle">¡El nombre de usuario de la cuenta de GitHub no coincide en la respuesta!</string>
-  <string name="msg_lv_error_github_not_found">¡Gist no contiene ficheros coincidentes!</string>
-  <string name="msg_lv_fetch">Descargando URI \'%s\'</string>
-  <string name="msg_lv_fetch_redir">Siguiendo redireccionamiento a \'%s\'</string>
-  <string name="msg_lv_fetch_ok">Se completó la descarga (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">Error del servidor (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">¡La URL está mal formada!</string>
-  <string name="msg_lv_fetch_error_io">¡Error de E/S!</string>
-  <string name="msg_lv_fetch_error_format">¡Error de formato!</string>
-  <string name="msg_lv_fetch_error_nothing">¡Recurso no encontrado!</string>
   <string name="msg_bench">Evaluando algunas operaciones...</string>
   <string name="msg_bench_enc_time">Tiempo de cifrado: %ss</string>
   <string name="msg_bench_enc_time_avg">Tiempo medio para cifrar 5MB: %ss</string>
@@ -1525,76 +1503,8 @@
   <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>
-  <string name="linked_create_https_1_1">Al crear una identidad vinculada de este tipo, puede vincular su clave a un sitio web que controle.</string>
-  <string name="linked_create_https_1_2">Para hacer esto, publique un fichero de texto en ese sitio web, y luego cree una identidad vinculada que enlace a ella.</string>
-  <string name="linked_create_https_1_3">Introduzca una URL donde pueda situar un fichero de texto como comprobante. ¡Tenga en cuenta que su servidor soporta HTTPS y tiene un certificado TLS válido!</string>
-  <string name="linked_create_https_1_4">Ejemplo: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_created">El fichero comprobante ha sido creado. Para el siguiente paso, debe guardarlo y subirlo a la URI que indicó:</string>
-  <string name="linked_create_https_2_1">Se ha creado un fichero comprobante para esta URI:</string>
-  <string name="linked_create_https_2_2">Para el siguiente paso, debe guardar y subir este fichero.</string>
-  <string name="linked_create_https_2_3">Asegúrese de que el fichero es accesible en la URI correcta, y luego verifique su configuración.</string>
-  <string name="linked_create_https_2_4">Tras una verificación exitosa, pulse el botón Finalizar para añadir la identidad vinculada a su juego de claves y finalizar el proceso.</string>
-  <string name="linked_create_twitter_1_1">Al crear una identidad vinculada de este tipo, puede vincular su clave a una cuenta de Twitter que controle.</string>
-  <string name="linked_create_twitter_1_2">Para hacer esto, publique un twit específico en su línea de tiempo, y luego cree una identidad vinculada que enlace a este twit.</string>
-  <string name="linked_create_twitter_1_3">Introduzca el nombre en pantalla de su Twitter para continuar.</string>
-  <string name="linked_create_twitter_handle">Nombre de usuario de Twitter</string>
-  <string name="linked_create_twitter_2_1">¡Pulse cualquiera de los botones para twitear el mensaje!</string>
-  <string name="linked_create_twitter_2_2">Puede editar el twit antes de publicarlo, en tanto no modifique el texto dentro de los corchetes.</string>
-  <string name="linked_create_twitter_2_3">Una vez su twit sea publicado como <b>@%s</b>, pulse el botón Verificar para escanear su línea de tiempo en su busca.</string>
-  <string name="linked_create_twitter_2_4">Tras una verificación exitosa, pulse el boton Finalizar para añadir la identidad vinculada a su juego de claves y finalizar el proceso.</string>
-  <string name="linked_create_verify">Verificar</string>
-  <string name="linked_text_clipboard">El texto ha sido copiado al portapapeles</string>
-  <string name="linked_verified_https">El vínculo entre este sitio web y la clave fue verificado con seguridad. <b>Si cree que el sitio web es genuino</b>, confirme esta verificación con su clave.</string>
-  <string name="linked_verified_github">El vínculo entre esta cuenta de GitHub y la clave fue verficado con seguridad. <b>Si cree que la cuenta es genuina</b>, confirme esta verificación con su clave.</string>
-  <string name="linked_verified_dns">El vínculo entre este nombre de dominio y la clave fue verificado con seguridad. <b>Si cree que el dominio es genuino</b>, confirme esta verificación con su clave.</string>
-  <string name="linked_verified_twitter">El vínculo entre esta cuenta de Twitter y la clave fue verificado con seguridad. <b>Si cree que la cuenta es genuina</b>, confirme esta verificación con su clave.</string>
-  <string name="linked_verified_secret_https">Todo parece en orden.</string>
-  <string name="linked_verified_secret_github">Todo parece en orden.</string>
-  <string name="linked_verified_secret_dns">Todo parece en orden.</string>
-  <string name="linked_verified_secret_twitter">Todo parece en orden.</string>
-  <plurals name="linked_id_expand">
-    <item quantity="one">Hay un tipo de identidad desconocida más</item>
-    <item quantity="other">Hay %d tipos de identidad desconocida más</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">Una \'identidad vinculada\' conecta su clave PGP a un recurso en la web.</string>
-  <string name="linked_select_2">Seleccione un tipo:</string>
-  <string name="linked_id_generic_text">Este fichero afirma ser propietario de la clave OpenPGP con identificación larga %2$s.\n\nToken para comprobación:\n%1$s</string>
-  <string name="linked_verifying">Verificando...</string>
-  <string name="linked_verify_success">¡Verificado!</string>
-  <string name="linked_verify_error">¡Error de verificación!</string>
-  <string name="linked_verify_pending">Aún no verificado</string>
-  <string name="linked_need_verify">¡El recurso tiene que ser verificado antes de que pueda continuar!</string>
-  <string name="menu_linked_add_identity">Vincular a cuenta.</string>
-  <string name="section_linked_identities">Identidades enlazadas</string>
   <string name="btn_finish">Finalizar</string>
-  <string name="linked_title_https">Sitio web (HTTPS)</string>
-  <string name="linked_title_dns">Nombre de dominio (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Identidad vinculada</string>
-  <string name="linked_button_verify">Verificar</string>
-  <string name="linked_button_retry">Reintentar</string>
-  <string name="linked_button_retry_step">Vuelva intentar el último paso</string>
-  <string name="linked_button_confirm">Confirmar</string>
-  <string name="linked_button_view">Ver</string>
-  <string name="linked_text_verifying">Verificando...</string>
-  <string name="linked_text_error">Error</string>
-  <string name="linked_text_confirming">Confirmando...</string>
-  <string name="linked_ids_more_unknown">%d tipos de identidad desconocida más</string>
-  <string name="title_linked_id_create">Crear identidad vinculada</string>
-  <string name="linked_github_text">Esta operación vincula su clave a su cuenta de GitHub.\nPulse el botón para continuar.</string>
-  <string name="linked_progress_auth_github">Autorizar con Github...</string>
-  <string name="linked_progress_post_gist">Publicar gist...</string>
-  <string name="linked_progress_update_key">Actualizar clave...</string>
-  <string name="linked_button_start">Vincular a la cuenta de GitHub</string>
-  <string name="linked_error_auth_failed">¡Autorización no exitosa!</string>
-  <string name="linked_error_timeout">¡Tiempo de espera de la conexión vencido!</string>
-  <string name="linked_error_network">¡Error en la red!</string>
-  <string name="linked_error_http">Error de comunicación: %s</string>
-  <string name="linked_webview_title_github">Autorización de Github</string>
-  <string name="linked_gist_description">Identidad vinculada de OpenKeychain</string>
-  <string name="linked_empty">¡Vincule su clave a GitHub, Twitter u otros sitios web!</string>
   <string name="snack_btn_overwrite">Sobreescribir</string>
   <string name="backup_code_explanation">El respaldo será protegido con un código de respaldo. ¡Ingréselo abajo antes de continuar!</string>
   <string name="backup_code_enter">Por favor, ingrese su código de respaldo:</string>
@@ -1900,5 +1810,11 @@
   <string name="snack_analytics_accept">Gracias por ayudar! Puede cambiar esta preferencia en la configuración.</string>
   <string name="snack_analytics_reject">Está bien, no volveremos a preguntar. Puedes cambiar de opinión en la configuración.</string>
   <string name="snackbutton_analytics_settings">Configuración</string>
+  <string name="subkey_action_create">La subclave será creada</string>
+  <string name="subkey_action_revoke">La subclave será revocada</string>
+  <string name="subkey_action_strip">La subclave será removida</string>
+  <string name="subkey_action_expiry_never">Expiración cambiará a nunca</string>
+  <string name="subkey_action_expiry_date">Expiración cambiará a %s</string>
+  <string name="share_key_clipboard">Compartir clave via portapapeles</string>
   <string name="share_key">Compartir clave</string>
 </resources>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Gehitu azpigiltza</string>
   <string name="title_change_master_key">Aldatu giltza maisua</string>
   <string name="title_edit_key">Editatu Giltza</string>
-  <string name="title_linked_create">Sortu Loturatutako Nortasuna</string>
   <string name="title_preferences">Ezarpenak</string>
   <string name="title_api_registered_apps">Aplikazioak</string>
   <string name="title_key_server_preference">OpenPGP giltza-zerbitzariak</string>
@@ -210,8 +209,6 @@
   <string name="keyserver_sync_settings_title">Berezgaitasunez eguneratu giltzak</string>
   <string name="label_experimental_settings_desc_title">Kontuz</string>
   <string name="label_experimental_settings_desc_summary">Ezaugarri hauek ez dute amaitu edo erabiltzaile jarduera/segurtasun emaitzak erdietsita. Honela, ez dira beren segurtasunean ohinarritzen eta mesedez ez jakinarazi aurkitzen dituzun arazoak!</string>
-  <string name="label_experimental_settings_linked_identities_title">Lotutako Nortasunak</string>
-  <string name="label_experimental_settings_linked_identities_summary">Lotu giltzak Twitter, GitHub, webgune edo DNS-ra (keybase.io antzekoa baina zentralizatu gabea)</string>
   <string name="label_experimental_settings_keybase_summary">Jarri harremanetan keybase.io giltzak probatzeko eta erakutsi hauek giltza bat erakusten den bakoitzean</string>
   <string name="label_experimental_settings_theme_summary">(Ikurrak eta ikusleiho asko oraindik ez daude azalgai ilunarekin zehaztuta)</string>
   <string name="label_settings_analytics_title">Ahalbidetu izengabeko estatistika erabilpena</string>
@@ -1157,25 +1154,6 @@
   <string name="msg_revoke_key">%s giltza ukatzen</string>
   <string name="msg_revoke_key_fail">Hutsegitea giltza ukatzerakoan</string>
   <string name="msg_revoke_ok">Giltza ongi ukatu da</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Lotura nortasuna egiaztatzen...</string>
-  <string name="msg_lv_match">Lekukoa bilatzen</string>
-  <string name="msg_lv_match_error">Ez da lekukorik aurkitu baliabidean!</string>
-  <string name="msg_lv_fp_ok">Hatz-aztarna Ongi.</string>
-  <string name="msg_lv_fp_error">Hatz-aztarnak ez datoz bat!</string>
-  <string name="msg_lv_error_twitter_auth">Akatsa Twitter egiaztapen lekukoa lortzerakoan!</string>
-  <string name="msg_lv_error_twitter_handle">Twitter kontu kudeaketa ez dator bat erantzunean!</string>
-  <string name="msg_lv_error_twitter_response">Ustekabeko erantzuna Twitter API-tik!</string>
-  <string name="msg_lv_error_github_handle">GiHub kontu kudeaketa ez dator bat erantzunean!</string>
-  <string name="msg_lv_error_github_not_found">Gist-ek bat ez datozen agiriak ditu!</string>
-  <string name="msg_lv_fetch">\'%s\' URI-a lortzen</string>
-  <string name="msg_lv_fetch_redir">Hurrengo berbideratzea \'%s\'-ra</string>
-  <string name="msg_lv_fetch_ok">Ongi lortuta (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">Zerbitzari akatsa (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">URL-a gaizki-osatuta!</string>
-  <string name="msg_lv_fetch_error_io">SI Akatsa!</string>
-  <string name="msg_lv_fetch_error_format">Heuskarri akatsa!</string>
-  <string name="msg_lv_fetch_error_nothing">Baliabidea ez da aurkitu!</string>
   <string name="msg_bench">Zenbait eragiketaren alderaketa-azterketa egiten...</string>
   <string name="msg_bench_enc_time">Enkriptaketa denbora: %ss</string>
   <string name="msg_bench_enc_time_avg">Bataz-besteko denbora 5M enkriptatzeko: %ss</string>
@@ -1363,74 +1341,8 @@
   <string name="error_scan_fp">Akatsa hatz-aztarna eskaneatzerakoan!</string>
   <string name="error_scan_match">Hatz-aztarnak ez datoz bat!</string>
   <string name="error_expiry_past">Iraungitze eguna iraganda dago!</string>
-  <string name="linked_create_https_1_1">Mota honetako Lotura Nortasun bat sortuz, zure giltza kontrolatzen duzun webgune batera loturatu dezakezu.</string>
-  <string name="linked_create_https_1_2">Hau egiteko, idazki agiri bat argitaratzen duzu webgune honetan, orduan Lotura Nortasun bat sortu bertara lotuz.</string>
-  <string name="linked_create_https_1_3">Mesedez sartu URL bat non idazki agiri bat ezarri daitekeen probatzeko. Ohartu zure zerbitzariak https sostengatu eta baliozko TLS egiaztagiri bat eduki behar duela.</string>
-  <string name="linked_create_https_1_4">Adibidea: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_created">Proba agiria sortu da. Hurrengo urratserako, gorde eta adierazi duzun URI-ra igo behar duzu:</string>
-  <string name="linked_create_https_2_1">URI honentzako proba agiria sortu da:</string>
-  <string name="linked_create_https_2_2">Hurrengo urratserako, agiri hau gorde eta igo behar duzu.</string>
-  <string name="linked_create_https_2_3">Zihurtatu agiria erdietsigarria dela URI zuzenarekin, orduan egiaztatu zure ezarpena.</string>
-  <string name="linked_create_https_2_4">Egiaztapena ongi egin ondoren, ikutu Amaitu botoia Lotura Nortasuna zure giltza-uztaira gehitzeko eta prozesua amaitzeko.</string>
-  <string name="linked_create_twitter_1_1">Mota honetako Lotura Nortasun bat sortuz, zure giltza kontrolatzen duzun zure Twitter kontu batera loturatu dezakezu.</string>
-  <string name="linked_create_twitter_1_2">Hau egiteko, Txio bat argitaratzen duzu zure denbora-lerroan, orduan Lotura Nortasun bat sortu Txio honetara lotuz.</string>
-  <string name="linked_create_twitter_1_3">Mesedez sartu zure Twitter ikusleiho izena jarraitzeko.</string>
-  <string name="linked_create_twitter_handle">Twitter Kudeaketa</string>
-  <string name="linked_create_twitter_2_1">Ikutu edozein botoi mezua txiotzeko!</string>
-  <string name="linked_create_twitter_2_2">Txioa aurkeztu aurretik editatu dezakezu baldin eta parentesi arteko idazkia ez bada aldatzen.</string>
-  <string name="linked_create_twitter_2_4">Ongi egiaztatu ondoren, ikutu Amaitu botoia Lotura Nortasuna zure giltza-uztaira gehitu eta prozesua amaitzeko.</string>
-  <string name="linked_create_verify">Egiaztatu</string>
-  <string name="linked_text_clipboard">Idazkia gakora kopiatu da</string>
-  <string name="linked_verified_https">Webgune honen eta giltzaren arteko lotura segurtasunez egiaztatu da. <b>Webgunea egizkoa dela sinesten baduzu.</b>, baieztatu egiaztapen hau zure giltzarekin.</string>
-  <string name="linked_verified_github">GitHub kontu honen eta giltzaren arteko lotura segurtasunez egiaztatu da. <b>Kontua egizkoa dela sinesten baduzu.</b>, baieztatu egiaztapen hau zure giltzarekin.</string>
-  <string name="linked_verified_dns">Domeinu Izen honen eta giltzaren arteko lotura segurtasunez egiaztatu da. <b>Domeinua egizkoa dela sinesten baduzu.</b>, baieztatu egiaztapen hau zure giltzarekin.</string>
-  <string name="linked_verified_twitter">Twitter kontu honen eta giltzaren arteko lotura segurtasunez egiaztatu da. <b>Kontua egizkoa dela sinesten baduzu.</b>, baieztatu egiaztapen hau zure giltzarekin.</string>
-  <string name="linked_verified_secret_https">Guztiak ongi dirudi.</string>
-  <string name="linked_verified_secret_github">Guztiak ongi dirudi.</string>
-  <string name="linked_verified_secret_dns">Guztiak ongi dirudi.</string>
-  <string name="linked_verified_secret_twitter">Guztiak ongi dirudi.</string>
-  <plurals name="linked_id_expand">
-    <item quantity="one">Beste nortasun mota ezezagun bat dago</item>
-    <item quantity="other">Beste %d nortasun mota ezezagun daude</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">\'lotura nortasuna\' batek zure PGP giltza web-eko baliabide batera elkartzen du</string>
-  <string name="linked_select_2">Mesedez hautatu mota bat:</string>
-  <string name="linked_id_generic_text">Agiriak %2$s id-a duen OpenPGP giltzaren jabetza aldarrikatzen du.\n\nProbarako lekukoa:\n%1$s</string>
-  <string name="linked_verifying">Egiaztatzen...</string>
-  <string name="linked_verify_success">Egiaztatua!</string>
-  <string name="linked_verify_error">Egiaztapen akatsa!</string>
-  <string name="linked_verify_pending">Egiztatu gabe oraindik</string>
-  <string name="linked_need_verify">Baliabidea egiaztatua izan behar da jarraitu aurretik!</string>
-  <string name="menu_linked_add_identity">Loturatu Kontura</string>
-  <string name="section_linked_identities">Lotura Nortasunak</string>
   <string name="btn_finish">Amaitu</string>
-  <string name="linked_title_https">Webgunea (HTTPS)</string>
-  <string name="linked_title_dns">Domeinu Izena (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Lotura Nortasuna</string>
-  <string name="linked_button_verify">Egiaztatu</string>
-  <string name="linked_button_retry">Saiatu berriro</string>
-  <string name="linked_button_retry_step">Saiatu berriro azken urratsa</string>
-  <string name="linked_button_confirm">Baieztatu</string>
-  <string name="linked_button_view">Ikusi</string>
-  <string name="linked_text_verifying">Egiaztatzen...</string>
-  <string name="linked_text_error">Akatsa</string>
-  <string name="linked_text_confirming">Baieztatzen...</string>
-  <string name="linked_ids_more_unknown">%d nortasun mota ezezagun gehiago</string>
-  <string name="title_linked_id_create">Sortu Lotura Nortasuna</string>
-  <string name="linked_github_text">Eragiketa honek zure giltzaren lotura egiten du zure GitHub kontura.\nBesterik gabe ikutu botoia jarraitzeko.</string>
-  <string name="linked_progress_auth_github">Baimendu GitHub-rekin…</string>
-  <string name="linked_progress_update_key">Eguneratu Giltza...</string>
-  <string name="linked_button_start">Lotura GitHub kontura</string>
-  <string name="linked_error_auth_failed">Baimentze hutsegitea!</string>
-  <string name="linked_error_timeout">Elkarketa epezkanpo!</string>
-  <string name="linked_error_network">Sare akatsa!</string>
-  <string name="linked_error_http">Komunikazio akatsa: %s</string>
-  <string name="linked_webview_title_github">GitHub Baimena</string>
-  <string name="linked_gist_description">OpenKeychain Loturatutako Nortasuna</string>
-  <string name="linked_empty">Lotu zure giltza GitHub-era, Twiteera edo beste webgune batzuetara!</string>
   <string name="snack_btn_overwrite">Gainidatzi</string>
   <string name="backup_code_explanation">Babeskopia kode batekin segurtatuko da. Idatzi ezazu jarraitu aurretik!</string>
   <string name="backup_code_enter">Mesedez sartu babeskopia kodea:</string>

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

@@ -172,6 +172,7 @@
   <!--choice-->
   <string name="choice_none">هیـچ</string>
   <string name="choice_1hour">1 ساعت</string>
+  <string name="choice_forever">همیشه</string>
   <string name="usage_sign">امضاء کردن</string>
   <string name="usage_encrypt">رمزگذاری</string>
   <string name="error">خطا </string>
@@ -263,6 +264,7 @@
   <string name="help_tab_donations">حمایت مالی</string>
   <!--Import-->
   <string name="import_tab_keyserver">سرور کلید</string>
+  <string name="import_qr_code_button">اسکن کد QR</string>
   <string name="btn_import">وارد کردن</string>
   <string name="btn_refresh">تازه کردن</string>
   <!--Generic result toast-->
@@ -281,12 +283,15 @@
   <string name="api_settings_settings">تنظیمات</string>
   <!--Share-->
   <!--retry upload dialog-->
+  <string name="retry_up_dialog_title">آپلود ناموفق بود</string>
   <!--Delete or revoke private key dialog-->
   <!--Delete Or Revoke Dialog spinner-->
   <!--Key list-->
+  <string name="key_list_fab_qr_code">اسکن کد QR</string>
   <!--Key view-->
   <string name="key_view_action_edit">ویرایش</string>
   <string name="key_view_action_encrypt">رمزگذاری فایل</string>
+  <string name="key_view_action_certify">تایید کلید</string>
   <string name="key_view_tab_start">شروع</string>
   <string name="key_view_tab_share">به‌اشتراک گذاشتن</string>
   <string name="key_view_tab_keys">زیرکلیدها</string>
@@ -355,7 +360,6 @@
   <string name="msg_crt_warn_not_found">کلید یافت نشد!</string>
   <string name="msg_import_fetch_error_not_found">کلید یافت نشد!</string>
   <string name="msg_upload_error_not_found">کلید یافت نشد!</string>
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_specific">%s</string>
   <!--Messages for Mime parsing operation-->
@@ -364,6 +368,7 @@
   <!--Keyserver sync-->
   <string name="keyserver_sync_orbot_notif_start">اجرای Orbot</string>
   <!--First Time-->
+  <string name="first_time_import_key">درون برد کلید از فایل</string>
   <string name="backup_section">پشتیبان گیری </string>
   <string name="restore_section">بازگرداندن</string>
   <!--unsorted-->
@@ -372,6 +377,7 @@
   <string name="error_key_not_found">کلید یافت نشد!</string>
   <string name="key_unavailable">در دسترس نیست</string>
   <string name="unknown">ناشناخته</string>
+  <string name="key_colon">کلید:</string>
   <!--Android Account-->
   <string name="account_privacy_title">حریم خصوصی</string>
   <!--Passphrase wizard-->
@@ -379,20 +385,15 @@
   <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
   <string name="enter_passphrase">رمزعبور را وارد کنید</string>
   <string name="passphrase">رمز عبور</string>
+  <string name="set_passphrase">تنظیم گذرواژه</string>
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
   <string name="nfc_settings">تنظیمات</string>
   <string name="snack_security_token_view">مشاهده</string>
   <string name="snack_security_token_import">وارد کردن</string>
   <string name="btn_reset">راه اندازی مجدد</string>
-  <string name="linked_create_verify">تایید</string>
+  <string name="security_token_error_unknown">خطا ناشناخته</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">پایان</string>
-  <string name="linked_title_twitter">توییتر</string>
-  <string name="linked_button_verify">تایید</string>
-  <string name="linked_button_retry">تلاش دوباره</string>
-  <string name="linked_button_confirm">تایید </string>
-  <string name="linked_button_view">مشاهده</string>
-  <string name="linked_text_error">خطا </string>
   <string name="share_log_dialog_share_button">به‌اشتراک گذاشتن</string>
   <string name="share_log_dialog_cancel_button">لغو</string>
   <string name="menu_uids_save">ذخيره</string>
@@ -427,5 +428,7 @@
   <string name="key_gen_finish">پایان</string>
   <string name="snack_keylist_clipboard_action">مشاهده</string>
   <string name="notify_title_keysync">درحال آپدیت‌کردن کلیدها...</string>
+  <string name="keylist_header_anonymous">ناشناس</string>
+  <string name="button_analytics_no">نه، ممنون</string>
   <string name="snackbutton_analytics_settings">تنظیمات</string>
 </resources>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Lisää aliavain</string>
   <string name="title_change_master_key">Vaihda yleisavain</string>
   <string name="title_edit_key">Muokkaa avainta</string>
-  <string name="title_linked_create">Luo linkitetty identiteetti</string>
   <string name="title_preferences">Asetukset</string>
   <string name="title_api_registered_apps">Sovellukset</string>
   <string name="title_key_server_preference">OpenPGP-avainpalvelimet</string>
@@ -152,7 +151,6 @@
   <string name="pref_facebook">Facebook</string>
   <!--label shown in Android settings under the OpenKeychain account-->
   <string name="label_experimental_settings_desc_title">Varoitus</string>
-  <string name="label_experimental_settings_linked_identities_title">Linkitetyt identiteetit</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">Ota Tor käyttöö</string>
   <string name="pref_proxy_tor_summary">Orbot tulee olla asennettu</string>
@@ -316,7 +314,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_specific">%s</string>
   <!--Messages for Mime parsing operation-->
@@ -351,33 +348,8 @@
   <string name="security_token_error_unknown">Tuntematon virhe</string>
   <string name="security_token_error_try_again">Yritä uudelleen</string>
   <string name="progress_processing">Käsitellään...</string>
-  <string name="linked_create_twitter_1_3">Syötäthän Twitter-näyttönimesi jatkaaksesi.</string>
-  <string name="linked_create_twitter_handle">Twitter-välikappale</string>
-  <string name="linked_create_verify">Todenna</string>
-  <string name="linked_text_clipboard">Teksti on kopioitu leikepöydälle</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_verifying">Todennetaan...</string>
-  <string name="linked_verify_success">Todennettu!</string>
-  <string name="linked_verify_error">Virhe todennuksessa!</string>
-  <string name="linked_verify_pending">Ei vielä todennettu</string>
-  <string name="linked_need_verify">Resurssi täytyy todentaa ennenkuin voit jatkaa!</string>
-  <string name="menu_linked_add_identity">Linkitä tunnukseen</string>
-  <string name="section_linked_identities">Linkitetyt identiteetit</string>
   <string name="btn_finish">Loppu</string>
-  <string name="linked_title_https">Verkkosivu (HTTPS)</string>
-  <string name="linked_title_dns">Domain-nimi (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Linkitetty identiteetti</string>
-  <string name="linked_button_verify">Todenna</string>
-  <string name="linked_button_retry">Yritä uudelleen</string>
-  <string name="linked_button_confirm">Vahvista</string>
-  <string name="linked_button_view">Näkymä</string>
-  <string name="linked_text_verifying">Todennetaan...</string>
-  <string name="linked_text_error">Virhe</string>
-  <string name="linked_text_confirming">Vahvistetaan...</string>
-  <string name="linked_ids_more_unknown">Vielä %d tunnistamatonta identiteettityyppiä</string>
-  <string name="title_linked_id_create">Luo linkitetty identiteetti</string>
   <string name="share_log_dialog_share_button">Jaa</string>
   <string name="share_log_dialog_cancel_button">Peruuta</string>
   <string name="menu_uids_save">Tallenna</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Ajouter une sous-clé</string>
   <string name="title_change_master_key">Changer la clé maîtresse</string>
   <string name="title_edit_key">Modifier une clé</string>
-  <string name="title_linked_create">Créer une identité reliée</string>
   <string name="title_preferences">Paramètres</string>
   <string name="title_api_registered_apps">Applis</string>
   <string name="title_key_server_preference">Serveurs de clés OpenPGP</string>
@@ -178,7 +177,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 modifier ou supprimer</string>
+  <string name="label_keyserver_settings_hint">Faire glisser pour changer l’ordre, toucher 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>
@@ -216,8 +215,6 @@
   <string name="keyserver_sync_settings_title">Mises à jour automatiques des clés</string>
   <string name="label_experimental_settings_desc_title">Avertissement</string>
   <string name="label_experimental_settings_desc_summary">Ces fonctions ne sont pas encore terminées et n’ont pas fait l’objet de recherche sur leur convivialité ni leur sécurité. Par conséquent, ne vous fiez pas à leur sécurité et veuillez ne pas signaler les problèmes que vous rencontrez.</string>
-  <string name="label_experimental_settings_linked_identities_title">Identités reliées</string>
-  <string name="label_experimental_settings_linked_identities_summary">Relier les clés à Twitter, GitHub, à des sites Web ou DNS (semblable à keybase.io mais décentralisé)</string>
   <string name="label_experimental_settings_keybase_title">Preuves keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Contacter keybase.io pour obtenir des preuves de clé et les afficher chaque fois qu’une clé est affichée</string>
   <string name="label_experimental_settings_theme_summary">(Les icônes et de nombreux écrans ne sont pas encore adaptés au thème sombre)</string>
@@ -387,7 +384,7 @@
   <string name="error_nothing">Rien encore à afficher.</string>
   <string name="error_nothing_import">Aucune clé n’a été trouvée</string>
   <string name="error_contacts_key_id_missing">Échec de récupération de l’ID de clé des contacts</string>
-  <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</string>
+  <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau relevé de bogue pour OpenKeychain.</string>
   <string name="error_denied_storage_permission">Impossible de lire les fichiers du support de stockage, car l’accès a été refusé</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">Non signé</string>
@@ -800,7 +797,7 @@
   <string name="msg_cancelled">L’opération a été annulée.</string>
   <!--Import Public log entries-->
   <string name="msg_ip_apply_batch">Application de l’opération d’insertion par lot.</string>
-  <string name="msg_ip_bad_type_secret">Tentative d’importer le trousseau secret comme public. Cela est un bogue, veuillez remplir un rapport.</string>
+  <string name="msg_ip_bad_type_secret">Tentative d’importer le trousseau secret comme public. Cela est un bogue, veuillez remplir un relevé.</string>
   <string name="msg_ip_delete_old_fail">Aucune ancienne clé de supprimée (création d’une nouvelle ?)</string>
   <string name="msg_ip_delete_old_ok">L’ancienne clé a été supprimée de la base de données</string>
   <string name="msg_ip_encode_fail">Échec d’opération causé par une erreur d’encodage</string>
@@ -892,8 +889,8 @@
   </plurals>
   <string name="msg_ip_uat_classifying">Organisation des attributs utilisateur</string>
   <string name="msg_ip_uat_revoked">L’attribut utilisateur est révoqué</string>
-  <string name="msg_is_bad_type_public">Tentative d’importer le trousseau public comme secret. Cela est un bogue, veuillez remplir un rapport.</string>
-  <string name="msg_is_bad_type_uncanon">Tentative d’importation d’un trousseau sans canonicalisation. Cela est un bogue, veuillez remplir un rapport.</string>
+  <string name="msg_is_bad_type_public">Tentative d’importer le trousseau public comme secret. Cela est un bogue, veuillez remplir un relevé.</string>
+  <string name="msg_is_bad_type_uncanon">Tentative d’importation d’un trousseau sans canonicalisation. Cela est un bogue, veuillez remplir un relevé.</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Importation de la clé secrète %s</string>
   <string name="msg_is_db_exception">Erreur de base de données</string>
@@ -1000,12 +997,12 @@
   <string name="msg_cr_error_no_master">Aucune option de clé maîtresse n’a été spécifiée</string>
   <string name="msg_cr_error_no_user_id">Les trousseaux doivent être créés avec au moins un ID utilisateur</string>
   <string name="msg_cr_error_no_certify">La clé maîtresse doit avoir le drapeau « certifié »</string>
-  <string name="msg_cr_error_null_expiry">L’expiration ne peut pas être « pareille qu’avant » à la création de la clé. Cela est une erreur du programme, veuillez remplir un rapport de bogue.</string>
+  <string name="msg_cr_error_null_expiry">L’expiration ne peut pas être « pareille qu’avant » à la création de la clé. Cela est une erreur du programme, veuillez remplir un relevé de bogue.</string>
   <string name="msg_cr_error_keysize_2048">La taille de la clé doit être supérieure ou égale à 2048</string>
-  <string name="msg_cr_error_no_curve">Aucune taille de clé n’a été spécifiée ! Cela est une erreur de programmation, veuillez remplir un rapport de bogue.</string>
-  <string name="msg_cr_error_no_keysize">Aucune courbe elliptique n’a été spécifiée ! Cela est une erreur de programmation, veuillez remplir un rapport de bogue.</string>
+  <string name="msg_cr_error_no_curve">Aucune taille de clé n’a été spécifiée ! Cela est une erreur de programmation, veuillez remplir un relevé de bogue.</string>
+  <string name="msg_cr_error_no_keysize">Aucune courbe elliptique n’a été spécifiée ! Cela est une erreur de programmation, veuillez remplir un relevé de bogue.</string>
   <string name="msg_cr_error_internal_pgp">Erreur interne OpenPGP</string>
-  <string name="msg_cr_error_unknown_algo">L’algorithme choisi est inconnu. Cela est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
+  <string name="msg_cr_error_unknown_algo">L’algorithme choisi est inconnu. Cela est une erreur de programmation, veuillez remplir un relevé de bogue !</string>
   <string name="msg_cr_error_flags_dsa">Les drapeaux de clé choisis sont incorrects, DSA ne peut pas être utilisé pour le chiffrement.</string>
   <string name="msg_cr_error_flags_elgamal">Les drapeaux de clé choisis sont incorrects, ElGamal ne peut pas être utilisé pour le chiffrement !</string>
   <string name="msg_cr_error_flags_ecdsa">Les drapeaux de clé choisis sont incorrects, ECDSA ne peut pas être utilisé pour le chiffrement !</string>
@@ -1016,19 +1013,19 @@
   <string name="msg_mf_divert">Le jeton de sécurité sera utilisé pour les opérations cryptographiques</string>
   <string name="msg_mf_error_all_keys_stripped">Toutes les clés sont dépouillées</string>
   <string name="msg_mf_error_divert_newsub">La création de nouvelles sous-clés n’est pas prise en charge pour les clés primaires des jetons de sécurité</string>
-  <string name="msg_mf_error_divert_serial">Le numéro de série d’une clé des jetons de sécurité doit être de 16 octets. Cela est une erreur de programmation, veuillez remplir un rapport de bogue.</string>
+  <string name="msg_mf_error_divert_serial">Le numéro de série d’une clé des jetons de sécurité doit être de 16 octets. Cela est une erreur de programmation, veuillez remplir un relevé de bogue.</string>
   <string name="msg_mf_error_encode">Exception d’encodage</string>
   <string name="msg_mf_error_fingerprint">L’empreinte de clé effective ne correspond pas à celle attendue</string>
-  <string name="msg_mf_error_keyid">Aucune ID de clé. Cela est une erreur interne, veuillez remplir un rapport de bogue.</string>
+  <string name="msg_mf_error_keyid">Aucun ID de clé. Cette erreur est interne, veuillez remplir un relevé de bogue.</string>
   <string name="msg_mf_error_integrity">Erreur interne, le contrôle d’intégrité a échoué</string>
   <string name="msg_mf_error_master_none">Aucun certificat maître sur lequel se baser n’a été trouvé. (Tous révoqués ?)</string>
   <string name="msg_mf_error_noexist_primary">Mauvais ID utilisateur principal spécifié</string>
   <string name="msg_mf_error_noexist_revoke">Mauvais ID utilisateur spécifié pour la révocation</string>
-  <string name="msg_mf_error_restricted">Tentative d’exécution d’une opération restreinte sans mot de passe ! Cela est une erreur de programmation, veuillez remplir un rapport de bogue.</string>
+  <string name="msg_mf_error_restricted">Tentative d’exécution d’une opération restreinte sans mot de passe ! Cela est une erreur de programmation, veuillez remplir un relevé de bogue.</string>
   <string name="msg_mf_error_revoked_primary">Les ID utilisateurs révoqués ne peuvent pas être principaux</string>
-  <string name="msg_mf_error_null_expiry">L’expiration ne peut pas être « pareille qu’avant » lors de la création de sous-clés. Cela est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
+  <string name="msg_mf_error_null_expiry">L’expiration ne peut pas être « pareille qu’avant » lors de la création de sous-clés. Cela est une erreur de programmation, veuillez remplir un relevé de bogue !</string>
   <string name="msg_mf_error_noop">Rien à faire !</string>
-  <string name="msg_mf_error_passphrase_master">Erreur fatale de déchiffrement de la clé maîtresse ! Cela est probablement une erreur de programmation, veuillez remplir un rapport de bogue !</string>
+  <string name="msg_mf_error_passphrase_master">Erreur fatale de déchiffrement de la clé maîtresse ! Cela est probablement une erreur de programmation, veuillez remplir un relevé de bogue !</string>
   <string name="msg_mf_error_passphrases_unchanged">Aucun mot de passe n’a été modifié</string>
   <string name="msg_mf_error_pgp">Erreur interne OpenPGP</string>
   <string name="msg_mf_error_sig">Exception de signature</string>
@@ -1160,7 +1157,7 @@
   <string name="msg_se_error_no_input">Aucune entrée n’a été donnée</string>
   <string name="msg_se_error_input_uri_not_found">Erreur d’ouverture de l’URI en lecture</string>
   <string name="msg_se_error_output_uri_not_found">Erreur d’ouverture de l’URI en écriture</string>
-  <string name="msg_se_error_too_many_inputs">Plus d’entrées spécifiées que de sorties. Cela est probablement une erreur de programmation, veuillez remplir un rapport de bogue.</string>
+  <string name="msg_se_error_too_many_inputs">Plus d’entrées spécifiées que de sorties. Cela est probablement une erreur de programmation, veuillez remplir un relevé de bogue.</string>
   <string name="msg_se_success">Opération de signature/chiffrement réussie</string>
   <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_pse_asymmetric">Préparation des clés publiques pour le chiffrement</string>
@@ -1223,8 +1220,8 @@
   <string name="msg_crt_success">Identités certifiées avec succès</string>
   <string name="msg_crt_warn_not_found">La clé est introuvable</string>
   <string name="msg_crt_warn_cert_failed">Échec de génération du certificat</string>
-  <string name="msg_crt_warn_save_failed">Échec d’opération d’enregistrement</string>
-  <string name="msg_crt_warn_upload_failed">Échec d’opération de téléversement</string>
+  <string name="msg_crt_warn_save_failed">Échec de l’opération d’enregistrement</string>
+  <string name="msg_crt_warn_upload_failed">Échec de l’opération de téléversement</string>
   <string name="msg_crt_upload_success">clé téléversée vers le serveur avec succès</string>
   <plurals name="msg_import">
     <item quantity="one">Importation de la clé</item>
@@ -1242,7 +1239,7 @@
   <string name="msg_import_keyserver">Utilisation du serveur de clés %s</string>
   <string name="msg_import_merge">Fusion des données récupérées</string>
   <string name="msg_import_merge_error">Erreur de fusion des données récupérées</string>
-  <string name="msg_import_error">Échec d’opération d’importation</string>
+  <string name="msg_import_error">Échec de l’opération d’importation</string>
   <string name="msg_import_error_io">Échec d’opération causé par une erreur d’E/S</string>
   <string name="msg_import_partial">L’opération d’importation est réussie, avec des erreurs</string>
   <string name="msg_import_success">L’opération d’importation est réussie</string>
@@ -1288,25 +1285,6 @@
   <string name="msg_revoke_key">Révocation de la clé %s</string>
   <string name="msg_revoke_key_fail">Échec de révocation de la clé</string>
   <string name="msg_revoke_ok">clé révoquée avec succès</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Vérification de l’identité reliée…</string>
-  <string name="msg_lv_match">Recherche de jeton</string>
-  <string name="msg_lv_match_error">Aucun jeton n’a été trouvé dans la ressource</string>
-  <string name="msg_lv_fp_ok">Empreinte OK</string>
-  <string name="msg_lv_fp_error">L’empreinte ne correspond pas</string>
-  <string name="msg_lv_error_twitter_auth">Erreur d’obtention du jeton auth de Twitter</string>
-  <string name="msg_lv_error_twitter_handle">Décalage de pseudo de compte Twitter en réponse</string>
-  <string name="msg_lv_error_twitter_response">Réponse inattendue de l’API Twitter</string>
-  <string name="msg_lv_error_github_handle">Décalage de pseudo de compte GitHub en réponse</string>
-  <string name="msg_lv_error_github_not_found">Le gist ne contient aucun fichier correspondant</string>
-  <string name="msg_lv_fetch">Récupération de l’URI « %s »</string>
-  <string name="msg_lv_fetch_redir">Suivi de la redirection vers « %s »</string>
-  <string name="msg_lv_fetch_ok">Récupérée avec succès (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">Erreur de serveur (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">L’URI est mal formée</string>
-  <string name="msg_lv_fetch_error_io">Erreur d’E/S</string>
-  <string name="msg_lv_fetch_error_format">Erreur de format</string>
-  <string name="msg_lv_fetch_error_nothing">La ressource est introuvable</string>
   <string name="msg_bench">Test de performance de certaines opérations…</string>
   <string name="msg_bench_enc_time">Durée de chiffrement : %ss</string>
   <string name="msg_bench_enc_time_avg">Durée moyenne de chiffrement de 5 Mo : %ss</string>
@@ -1371,7 +1349,7 @@
   <string name="passp_cache_notif_pwd">Mot de passe</string>
   <!--Keyserver sync-->
   <string name="keyserver_sync_orbot_notif_title">Synchroniser à partir des serveurs, Orbot exigé</string>
-  <string name="keyserver_sync_orbot_notif_msg">Toquer pour démarrer Orbot</string>
+  <string name="keyserver_sync_orbot_notif_msg">Toucher pour démarrer Orbot</string>
   <string name="keyserver_sync_orbot_notif_start">Lancer Orbot</string>
   <string name="keyserver_sync_orbot_notif_ignore">Directe</string>
   <!--First Time-->
@@ -1380,7 +1358,7 @@
   <string name="first_time_import_key">Importer la clé d’un fichier</string>
   <string name="first_time_security_token">Utiliser un jeton de sécurité</string>
   <string name="first_time_security_token_subtitle">(Fidesmo, YubiKey NEO, SIGILANCE, …)</string>
-  <string name="first_time_skip">Ignorer le paramétrage</string>
+  <string name="first_time_skip">Ignorer la configuration</string>
   <string name="first_time_blank_security_token">Voulez-vous utiliser ce jeton de sécurité vide avec OpenKeychain ?\n\nVeuillez retirer le jeton de sécurité maintenant, vous serez informé quand elle sera requis de nouveau</string>
   <string name="first_time_blank_security_token_yes">Utiliser ce jeton de sécurité</string>
   <string name="backup_text">Les sauvegardes incluant vos propres clés ne doivent jamais être partagées avec d’autres personnes</string>
@@ -1525,76 +1503,8 @@
   <string name="error_scan_fp">Erreur de lecture de l’empreinte</string>
   <string name="error_scan_match">Les empreintes ne correspondent pas</string>
   <string name="error_expiry_past">La date d’expiration est dans le passé</string>
-  <string name="linked_create_https_1_1">En créant une identité reliée de ce type, vous pouvez relier votre clé à un site Web que vous contrôlez.</string>
-  <string name="linked_create_https_1_2">Pour ce faire, vous publiez un fichier texte sur ce site Web et créez ensuite une identité reliée à ce fichier.</string>
-  <string name="linked_create_https_1_3">Veuillez saisir l’URL d’un site où vous pouvez disposer un fichier texte comme preuve. Veuillez prendre note que votre serveur doit prendre https en charge et avoir un certificat TLS valide.</string>
-  <string name="linked_create_https_1_4">Exemple : https://exemple.com/clépgp.txt</string>
-  <string name="linked_create_https_created">Le fichier de preuve a été créé. La prochaine étape est de l’enregistrer et de le téléverser vers l’URI indiquée :</string>
-  <string name="linked_create_https_2_1">Un fichier de preuve a été créé pour cette URI :</string>
-  <string name="linked_create_https_2_2">La prochaine étape est d’enregistrer et de téléverser ce fichier.</string>
-  <string name="linked_create_https_2_3">Assurez-vous que le fichier est atteignable à la bonne URI, puis vérifiez le tout.</string>
-  <string name="linked_create_https_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_twitter_1_1">En créant une identité reliée de ce type, vous pouvez relier votre clé à un compte Twitter que vous contrôlez.</string>
-  <string name="linked_create_twitter_1_2">Pour ce faire, vous publiez un gazouillis particulier sur votre fil d’actualité et créez ensuite une identité reliée à ce gazouillis.</string>
-  <string name="linked_create_twitter_1_3">Veuillez saisir votre nom d’utilisateur Twitter pour continuer.</string>
-  <string name="linked_create_twitter_handle">Pseudo Twitter</string>
-  <string name="linked_create_twitter_2_1">Toucher l’un des boutons pour tweeter 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>, touchez le bouton Vérifier pour le chercher dans votre fil d’actualité. </string>
-  <string name="linked_create_twitter_2_4">Après une vérification réussie, 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>
-  <string name="linked_verified_https">Le lien entre le site Web et la clé a été vérifié de façon sécuritaire. <b>Si vous pensez que le site est authentique</b>, confirmez cette vérification avec votre clé.</string>
-  <string name="linked_verified_github">Le lien entre ce compte GitHub et la clé a été vérifié de façon sécuritaire. <b>Si vous pensez que le compte est authentique</b>, confirmez cette vérification avec votre clé.</string>
-  <string name="linked_verified_dns">Le lien entre ce nom de domaine et la clé a été vérifié de façon sécuritaire. <b>Si vous pensez que le nom de domaine est authentique</b>, confirmez cette vérification avec votre clé.</string>
-  <string name="linked_verified_twitter">Le lien entre ce compte Twitter et la clé a été vérifié de façon sécuritaire. <b>Si vous pensez que le compte est authentique</b>, confirmez cette vérification avec votre clé.</string>
-  <string name="linked_verified_secret_https">Tout semble en règle.</string>
-  <string name="linked_verified_secret_github">Tout semble en règle.</string>
-  <string name="linked_verified_secret_dns">Tout semble en règle.</string>
-  <string name="linked_verified_secret_twitter">Tout semble en règle.</string>
-  <plurals name="linked_id_expand">
-    <item quantity="one">Il y a un autre type d’identité inconnu</item>
-    <item quantity="other">Il y a %d autres types d’identité inconnus</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">Une « identité reliée » connecte votre clé PGP à une ressource sur le Web.</string>
-  <string name="linked_select_2">Veuillez choisir un type :</string>
-  <string name="linked_id_generic_text">Ce fichier revendique la propriété de la clé OpenPGP ayant %2$s pour ID long.\n\nJeton pour preuve :\n%1$s</string>
-  <string name="linked_verifying">Vérification…</string>
-  <string name="linked_verify_success">Vérifiée</string>
-  <string name="linked_verify_error">Erreur de vérification</string>
-  <string name="linked_verify_pending">Pas encore vérifiée</string>
-  <string name="linked_need_verify">La ressource doit être vérifiée avant que vous ne puissiez continuer</string>
-  <string name="menu_linked_add_identity">Relier au compte</string>
-  <string name="section_linked_identities">Identités reliées</string>
   <string name="btn_finish">Terminer</string>
-  <string name="linked_title_https">Site Web (HTTPS)</string>
-  <string name="linked_title_dns">Nom de domaine (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Identité reliée</string>
-  <string name="linked_button_verify">Vérifier</string>
-  <string name="linked_button_retry">Ressayer</string>
-  <string name="linked_button_retry_step">Ressayer la dernière étape</string>
-  <string name="linked_button_confirm">Confirmer</string>
-  <string name="linked_button_view">Visualiser</string>
-  <string name="linked_text_verifying">Vérification…</string>
-  <string name="linked_text_error">Erreur</string>
-  <string name="linked_text_confirming">Confirmation…</string>
-  <string name="linked_ids_more_unknown">%d autres types d’identité inconnus</string>
-  <string name="title_linked_id_create">Créer l’identité reliée</string>
-  <string name="linked_github_text">Cette opération relie votre clé à votre compte GitHub.\nTouchez juste le bouton pour continuer.</string>
-  <string name="linked_progress_auth_github">Autorisation avec GitHub…</string>
-  <string name="linked_progress_post_gist">Publication du Gist…</string>
-  <string name="linked_progress_update_key">Mise à jour de la clé…</string>
-  <string name="linked_button_start">Relier au compte GitHub</string>
-  <string name="linked_error_auth_failed">Échec d’autorisation</string>
-  <string name="linked_error_timeout">La connexion est arrivée au bout de son délai</string>
-  <string name="linked_error_network">Erreur réseau</string>
-  <string name="linked_error_http">Erreur de communication : %s</string>
-  <string name="linked_webview_title_github">Autorisation GitHub</string>
-  <string name="linked_gist_description">Identité reliée à OpenKeychain</string>
-  <string name="linked_empty">Reliez votre clé à GitHub, Twitter ou autre sites Web</string>
   <string name="snack_btn_overwrite">Écraser</string>
   <string name="backup_code_explanation">La sauvegarde sera sécurisée par un code de sauvegarde. Prenez-le en note avant de continuer.</string>
   <string name="backup_code_enter">Veuillez saisir le code de sauvegarde :</string>
@@ -1712,7 +1622,7 @@
   <string name="key_insecure_unknown_curve_problem">Cette clé utilise l’algorithme <b>%1$s</b> qui ne fait pas partie de la liste blanche.</string>
   <string name="key_insecure_unknown_curve_solution">Cette clé ne peut pas être mise à niveau. Pour des communications sécurisées, le propriétaire doit générer une nouvelle clé.</string>
   <string name="key_insecure_unidentified_problem">Cette clé pose un problème non identifié.</string>
-  <string name="key_insecure_unidentified_solution">Veuillez envoyer un rapport de bogue.</string>
+  <string name="key_insecure_unidentified_solution">Veuillez envoyer un relevé de bogue.</string>
   <string name="key_expiry_text">Cette clé est arrivée à expiration le <b>%1$s</b>.</string>
   <string name="dialog_insecure_title">Avertissement de sécurité</string>
   <string name="dialog_insecure_recommend_title">Action recommandée</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Engadir subchave</string>
   <string name="title_change_master_key">Cambiar a chave mestra</string>
   <string name="title_edit_key">Editar Chave</string>
-  <string name="title_linked_create">Crear unha identidade ligada</string>
   <string name="title_preferences">Axustes</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Servidores de chaves OpenPGP</string>
@@ -214,8 +213,6 @@
   <string name="keyserver_sync_settings_title">Actualización automática de chaves</string>
   <string name="label_experimental_settings_desc_title">Aviso</string>
   <string name="label_experimental_settings_desc_summary">Estas características aínda non están rematadas ou son resultado da investigación da experiencia de usuaria e/ou seguridade. Xa que logo, non confíe na súa seguridade e por favor non informe sobre os fallos que poida atopar!</string>
-  <string name="label_experimental_settings_linked_identities_title">Identidades ligadas</string>
-  <string name="label_experimental_settings_linked_identities_summary">Ligar chaves a Twitter, GitHub, sitios web ou DNS (semellante a keybase.io pero descentralizado)</string>
   <string name="label_experimental_settings_keybase_title">probas de Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Pedirlle probas de chave a keybase.io e expoñelas cada vez que se mostra a chave</string>
   <string name="label_experimental_settings_theme_summary">(As iconas  e moitas pantallas non están aínda ben axustadas ao decorado oscuro)</string>
@@ -1142,10 +1139,6 @@
   <string name="msg_revoke_key">Revogando chave %s</string>
   <string name="msg_revoke_key_fail">Erro revogando a chave</string>
   <string name="msg_revoke_ok">Chave revogada correctamente</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Verificando identidade ligada</string>
-  <string name="msg_lv_fp_ok">Pegada dixital correcta.</string>
-  <string name="msg_lv_fp_error">A pegada dixital non se corresponde!</string>
   <string name="msg_bench_enc_time">Tempo de cifrado: %ss</string>
   <string name="msg_bench_enc_time_avg">Tempo medio en cifrar 5MB: %ss</string>
   <string name="msg_bench_dec_time">Tempo de descifrado: %ss</string>
@@ -1265,49 +1258,8 @@
   <string name="error_scan_fp">Erro escaneando a pegada dixital!</string>
   <string name="error_scan_match">As pegadas dixitais non coinciden!</string>
   <string name="error_expiry_past">A data de caducidade está no pasado!</string>
-  <string name="linked_create_https_1_4">Exemplo: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_2_4">Após unha verificación correcta, toca o botón de Finalizar para engadir a Identidade Ligada no teu chaveiro e rematar o proceso.</string>
-  <string name="linked_create_twitter_2_4">Após unha verificación correcta, toca o botón de Finalizar para engadir a Identidade Ligada no teu chaveiro e rematar o proceso.</string>
-  <string name="linked_create_verify">Verificar</string>
-  <string name="linked_text_clipboard">Copiouse o texto ao portapapeis!</string>
-  <string name="linked_verified_secret_https">Todo semella estar en orde.</string>
-  <string name="linked_verified_secret_github">Todo semella estar en orde.</string>
-  <string name="linked_verified_secret_dns">Todo semella estar en orde.</string>
-  <string name="linked_verified_secret_twitter">Todo semella estar en orde.</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_verifying">Verificando...</string>
-  <string name="linked_verify_success">Verificado!</string>
-  <string name="linked_verify_error">Erro de verificación!</string>
-  <string name="linked_verify_pending">Aínda non verificado</string>
-  <string name="menu_linked_add_identity">Ligar a unha conta</string>
-  <string name="section_linked_identities">Identidades ligadas</string>
   <string name="btn_finish">Rematar</string>
-  <string name="linked_title_https">Sitio web (HTTPS)</string>
-  <string name="linked_title_dns">Nome de dominio (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Identidade Ligada</string>
-  <string name="linked_button_verify">Verificar</string>
-  <string name="linked_button_retry">Intentar de novo</string>
-  <string name="linked_button_retry_step">Tentar de novo o último paso</string>
-  <string name="linked_button_confirm">Confirmar</string>
-  <string name="linked_button_view">Ver</string>
-  <string name="linked_text_verifying">Verificando...</string>
-  <string name="linked_text_error">Fallo</string>
-  <string name="linked_text_confirming">Confirmando...</string>
-  <string name="title_linked_id_create">Crear Identidade Ligada</string>
-  <string name="linked_github_text">Esta operación liga a túa chave coa túa conta de GitHub.\nSimplesmente toca o botón para continuar.</string>
-  <string name="linked_progress_auth_github">Autorizar con GitHub...</string>
-  <string name="linked_progress_post_gist">Publicar un Gist...</string>
-  <string name="linked_progress_update_key">Actualizar Chave...</string>
-  <string name="linked_button_start">Ligar a conta de GitHub</string>
-  <string name="linked_error_auth_failed">Autorización falida!</string>
-  <string name="linked_error_timeout">Tempo de conexión esgotado!</string>
-  <string name="linked_error_network">Erro de rede!</string>
-  <string name="linked_error_http">Erro de comunicación: %s</string>
-  <string name="linked_webview_title_github">Autorización de GitHub</string>
-  <string name="linked_gist_description">Identidade ligada no OpenKeychain</string>
-  <string name="linked_empty">Liga a túa chave a GitHub, Twitter ou outros sitios web!</string>
   <string name="snack_btn_overwrite">Sobreescribir</string>
   <string name="backup_code_explanation">A copia de seguranza será asegurada mediante un código de respaldo. Escríbeo antes de proceder!</string>
   <string name="backup_code_enter">Por favor, introduza o código de respaldo:</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">ઉપચાવી ઉમેરો</string>
   <string name="title_change_master_key">મુખ્ય ચાવી બદલો</string>
   <string name="title_edit_key">ચાવી સુધારો</string>
-  <string name="title_linked_create">જોડેલી ઓળખ બનાવો</string>
   <string name="title_preferences">સેટિંગ્સ</string>
   <string name="title_api_registered_apps">એપ્સ</string>
   <string name="title_key_server_preference">OpenPGP ચાવી સર્વરો</string>
@@ -183,6 +182,7 @@
   <!--choice-->
   <string name="choice_none">એકે નહિ</string>
   <string name="usage_encrypt">એનક્રિપ્ટ</string>
+  <string name="error">ભૂલ</string>
   <!--sentences-->
   <!--errors
          no punctuation, all lowercase,
@@ -202,6 +202,7 @@
   <!--compression-->
   <!--Help-->
   <string name="help_tab_changelog">નોંધણીઓ બદલો</string>
+  <string name="help_tab_about">વિશે</string>
   <string name="help_about_version">Version:</string>
   <!--Import-->
   <string name="import_tab_keyserver">ચાવી સર્વર</string>
@@ -243,6 +244,7 @@
   <string name="nav_apps">એપ્સ</string>
   <!--hints-->
   <!--certs-->
+  <string name="cert_none">કંઈ નહીં</string>
   <string name="cert_verify_ok">બરાબર</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
   <!--Import Public log entries-->
@@ -260,7 +262,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -277,11 +278,7 @@
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
   <string name="nfc_settings">સેટિંગ્સ</string>
   <string name="btn_reset">ફરી ગોઠવો</string>
-  <string name="linked_create_verify">chakaso</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_button_verify">chakaso</string>
-  <string name="linked_button_retry">ફરી પ્રયત્ન કરો</string>
-  <string name="linked_button_confirm">પુષ્ટિ કરો </string>
   <string name="share_log_dialog_share_button">શેર કરો</string>
   <string name="share_log_dialog_cancel_button">રદ્ કરો</string>
   <string name="menu_uids_save">સંગ્રહો</string>
@@ -295,6 +292,7 @@
   <string name="transfer_confirm_cancel">રદ્ કરો</string>
   <string name="token_reset_confirm_ok">ફરી ગોઠવો</string>
   <string name="token_unlock_ok">લોક ખોલો</string>
+  <string name="select_identity_cancel">નિષ્ક્રિય કરો</string>
   <string name="key_gen_back">પહેલાનું</string>
   <string name="snackbutton_analytics_settings">સેટિંગ્સ</string>
 </resources>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">उपकुंजी जोड़ें</string>
   <string name="title_change_master_key">मास्टर कुंजी बदले</string>
   <string name="title_edit_key">संपादित कुंजी</string>
-  <string name="title_linked_create">एक  लिंक्डन  पहचान बनाने</string>
   <string name="title_preferences">सेटिंग</string>
   <string name="title_api_registered_apps">एप्लिकेशन</string>
   <string name="title_change_passphrase">पासवर्ड परिवर्तन </string>
@@ -60,6 +59,7 @@
   <string name="label_enter_keyserver_url">यूआरएल</string>
   <string name="label_theme">विषय</string>
   <string name="label_enter_smartpgp_authority_name">नाम</string>
+  <string name="pref_facebook">फेसबुक</string>
   <!--label shown in Android settings under the OpenKeychain account-->
   <string name="label_experimental_settings_desc_title">चेतावनी</string>
   <!--Proxy Preferences-->
@@ -116,6 +116,7 @@
   <!--Certify result toast-->
   <!--Intent labels-->
   <!--Remote API-->
+  <string name="api_settings_no_key">कोई भी कुंजी चयनित नहीं है</string>
   <string name="api_settings_save">बचाना</string>
   <string name="api_settings_cancel">रद्द करना</string>
   <string name="api_settings_advanced">उन्नत</string>
@@ -163,7 +164,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -188,11 +188,6 @@
   <string name="security_token_error_try_again">पुनः प्रयास करें</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">समाप्त</string>
-  <string name="linked_title_github">गीथहब</string>
-  <string name="linked_title_twitter">ट्विटर</string>
-  <string name="linked_button_retry">पुन: प्रयास करें</string>
-  <string name="linked_button_view">राय</string>
-  <string name="linked_text_error">त्रुटि</string>
   <string name="share_log_dialog_share_button">शेयर</string>
   <string name="share_log_dialog_cancel_button">रद्द करना</string>
   <string name="menu_uids_save">बचाना</string>
@@ -216,5 +211,6 @@
   <string name="key_gen_back">पिछला</string>
   <string name="key_gen_finish">समाप्त</string>
   <string name="snack_keylist_clipboard_action">राय</string>
+  <string name="button_analytics_no">जी नहीं, धन्यवाद</string>
   <string name="snackbutton_analytics_settings">सेटिंग्स</string>
 </resources>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Alkulcs hozzáadása</string>
   <string name="title_change_master_key">Mesterkulcs megváltoztatása</string>
   <string name="title_edit_key">Kulcs szerkesztése</string>
-  <string name="title_linked_create">Kapcsolt személyazonosság létrehozása</string>
   <string name="title_preferences">Beállítások</string>
   <string name="title_api_registered_apps">Alkalmazások</string>
   <string name="title_key_server_preference">OpenPGP kulcskiszolgálók</string>
@@ -216,8 +215,6 @@
   <string name="keyserver_sync_settings_title">Automatikus kulcsfrissítések</string>
   <string name="label_experimental_settings_desc_title">Figyelmeztetés</string>
   <string name="label_experimental_settings_desc_summary">Ezek a funkciók még nincsenek befejezve, vagy felhasználói élmény és biztonsági kutatást eredményei. Emiatt ne bízzon a biztonságukban, és ne jelentse a felmerülő hibákat!</string>
-  <string name="label_experimental_settings_linked_identities_title">Kapcsolt személyazonosságok</string>
-  <string name="label_experimental_settings_linked_identities_summary">Kulcsok összekapcsolása Twitter, GitHub, weblapok vagy DNS (hasonló a keybase.io-hoz, csak decentralizált) azonosítókkal</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io igazolások</string>
   <string name="label_experimental_settings_keybase_summary">Kapcsolatfelvétel a keybase.io-val a kulcsigazolásokért, és megtekintés minden alkalommal, amikor egy kulcs megjelenik</string>
   <string name="label_experimental_settings_theme_summary">(Az ikonok és számos képernyő még nem lett hozzáigazítva a sötét témához)</string>
@@ -481,6 +478,7 @@
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Jelszó megváltoztatása</string>
   <!--Create key-->
+  <string name="create_key_empty">Ez a mező kötelező</string>
   <string name="create_key_passphrases_not_equal">A jelszavak nem egyeznek</string>
   <string name="create_key_yubi_key_pin">PIN</string>
   <!--View key-->
@@ -534,7 +532,6 @@
   <string name="msg_upload_proxy_direct">Proxy használata: Egyik sem</string>
   <string name="msg_upload_proxy_tor">Proxy használata: TOR</string>
   <string name="msg_upload_proxy">Proxy használata: %s</string>
-  <!--Linked Identity verification-->
   <string name="msg_bench_dec_time_avg">Átlagos idő 5MB visszafejtéséhez: %ss</string>
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
@@ -569,16 +566,8 @@
   <string name="security_token_error">Hiba: %s</string>
   <string name="security_token_error_unknown">Ismeretlen hiba</string>
   <string name="error_expiry_past">Lejárati dátum a múltban van!</string>
-  <string name="linked_create_verify">Megerősít</string>
   <!--Other Linked Identity strings-->
-  <string name="section_linked_identities">Kapcsolt személyazonosságok</string>
   <string name="btn_finish">Befejezés</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Megerősít</string>
-  <string name="linked_button_retry">Ismétlés</string>
-  <string name="linked_button_confirm">Megerősít</string>
-  <string name="linked_button_view">Megtekintés</string>
-  <string name="linked_text_error">Hiba</string>
   <string name="share_log_dialog_share_button">Megoszt</string>
   <string name="share_log_dialog_cancel_button">Mégse</string>
   <string name="menu_uids_save">Mentés</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Tambah kunci tambahan</string>
   <string name="title_change_master_key">Ubah kunci master</string>
   <string name="title_edit_key">Edit kunci</string>
-  <string name="title_linked_create">Buat identitas yang tersambung</string>
   <string name="title_preferences">Pengaturan</string>
   <string name="title_api_registered_apps">Aplikasi</string>
   <string name="title_key_server_preference">Server kunci OpenPGP</string>
@@ -191,7 +190,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_specific">%s</string>
   <!--Messages for Mime parsing operation-->
@@ -220,16 +218,8 @@
   <string name="snack_security_token_view">Lihat</string>
   <string name="snack_security_token_import">impor</string>
   <string name="btn_reset">Reset</string>
-  <string name="linked_create_verify">Verifikasi</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">Selesai</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Verifikasi</string>
-  <string name="linked_button_retry">Coba Ulang</string>
-  <string name="linked_button_confirm">Konfirmasi</string>
-  <string name="linked_button_view">Lihat</string>
-  <string name="linked_text_error">Kesalahan</string>
   <string name="share_log_dialog_share_button">Share </string>
   <string name="share_log_dialog_cancel_button">Batalkan</string>
   <string name="menu_uids_save">Simpan</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Aggiungi sottochiave</string>
   <string name="title_change_master_key">Cambia la chiave principale</string>
   <string name="title_edit_key">Modifica chiave</string>
-  <string name="title_linked_create">Creare un\'identità collegata</string>
   <string name="title_preferences">Impostazioni</string>
   <string name="title_api_registered_apps">Applicazioni</string>
   <string name="title_key_server_preference">Server chiavi OpenPGP</string>
@@ -198,8 +197,6 @@
   <string name="keyserver_sync_settings_title">Aggiornamenti automatici delle chiavi</string>
   <string name="label_experimental_settings_desc_title">Attenzione</string>
   <string name="label_experimental_settings_desc_summary">Queste funzioni non sono ancora finite o testate da utenti/ricerche di sicurezza. Perciò non contare sulla loro sicurezza e per favore non segnalare i problemi che riscontri!</string>
-  <string name="label_experimental_settings_linked_identities_title">Identità collegate</string>
-  <string name="label_experimental_settings_linked_identities_summary">Collega le chiavi a Twitter, GitHub, siti o DNS (simile a keybase.io ma decentralizzato)</string>
   <string name="label_experimental_settings_keybase_summary">Contatta keybase.io per avere prove e mostrale ogni volta che visualizzo una chiave</string>
   <string name="label_experimental_settings_theme_summary">(Le icone e molte schermate non sono ancora modificate correttamente per il tema scuro)</string>
   <!--Proxy Preferences-->
@@ -1001,12 +998,6 @@
   <string name="msg_revoke_key">Revoca chiave %s</string>
   <string name="msg_revoke_key_fail">Revoca chiave fallita</string>
   <string name="msg_revoke_ok">Chiave revocata con successo</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv_error_twitter_response">Risposta inaspettata dalle api di Twitter!</string>
-  <string name="msg_lv_fetch_error">Errore del server (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_io">Errore di input output!</string>
-  <string name="msg_lv_fetch_error_format">Errore di formato!</string>
-  <string name="msg_lv_fetch_error_nothing">Risorsa non trovata!</string>
   <string name="msg_bench_enc_time">Tempo di codifica: %ss</string>
   <string name="msg_bench_dec_time">Tempo di decodifica: %ss</string>
   <string name="msg_bench_success">Benchmark completato!</string>
@@ -1107,34 +1098,8 @@
   <string name="error_clipboard_empty">Gli appunti sono vuoti!</string>
   <string name="error_clipboard_copy">Errore durante copia dei dati negli appunti!</string>
   <string name="error_expiry_past">La data di scadenza non può essere nel passato!</string>
-  <string name="linked_create_https_1_4">Esempio: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_verify">Verifica</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_verifying">Verifica in corso...</string>
-  <string name="linked_verify_success">Verificato!</string>
-  <string name="linked_verify_error">Errore di verifica!</string>
-  <string name="linked_verify_pending">Non ancora verificato</string>
-  <string name="menu_linked_add_identity">Collega all\'account</string>
-  <string name="section_linked_identities">Identità collegate</string>
   <string name="btn_finish">Concludi</string>
-  <string name="linked_title_https">Sito (HTTPS)</string>
-  <string name="linked_title_dns">Nome a dominio (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Verifica</string>
-  <string name="linked_button_retry">Riprova</string>
-  <string name="linked_button_confirm">Conferma</string>
-  <string name="linked_button_view">Guarda</string>
-  <string name="linked_text_verifying">Verifica in corso...</string>
-  <string name="linked_text_error">Errore</string>
-  <string name="linked_text_confirming">Conferma in corso...</string>
-  <string name="linked_progress_update_key">Aggiorna chiave...</string>
-  <string name="linked_button_start">Collega all\'account di GitHub</string>
-  <string name="linked_error_auth_failed">Autorizzazione fallita!</string>
-  <string name="linked_error_timeout">Connessione scaduta!</string>
-  <string name="linked_error_network">Si è verificato un errore di rete!</string>
-  <string name="linked_webview_title_github">Autorizzazione di GitHub</string>
-  <string name="linked_empty">Condividi la tua chiave a GitHub, Twitter o altri siti web!</string>
   <string name="snack_btn_overwrite">Sovrascrivi</string>
   <string name="backup_code_enter">Per favore inserisci il codice di backup:</string>
   <string name="backup_code_ok">Codice accettato!</string>
@@ -1210,5 +1175,6 @@
   <string name="keylist_item_key_id">ID chiave: %s</string>
   <string name="keylist_header_anonymous">Anonimo</string>
   <string name="keylist_header_special">#</string>
+  <string name="button_analytics_no">No, grazie</string>
   <string name="snackbutton_analytics_settings">Impostazioni</string>
 </resources>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">副鍵の追加</string>
   <string name="title_change_master_key">主鍵の変更</string>
   <string name="title_edit_key">鍵の編集</string>
-  <string name="title_linked_create">リンクしたユーザIDを作成</string>
   <string name="title_preferences">設定</string>
   <string name="title_api_registered_apps">アプリ</string>
   <string name="title_key_server_preference">OpenPGP鍵サーバ</string>
@@ -207,8 +206,6 @@
   <string name="keyserver_sync_settings_title">鍵の自動アップデート</string>
   <string name="label_experimental_settings_desc_title">注意</string>
   <string name="label_experimental_settings_desc_summary">これらの機能はまだ完成していないか、ユーザーエクスペリエンス/セキュリティ研究の結果ではありません。そのため、このセキュリティに依存したり、遭遇した問題を報告しないでください!</string>
-  <string name="label_experimental_settings_linked_identities_title">リンクしたユーザID</string>
-  <string name="label_experimental_settings_linked_identities_summary">Twitter、GitHub、Webサイト、またはDNSに鍵をリンク (keybase.ioに似ていますが、分散型)</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io 検証</string>
   <string name="label_experimental_settings_keybase_summary">鍵の検証のためkeybase.ioに連絡し、鍵が表示されるたびに表示します</string>
   <string name="label_experimental_settings_theme_summary">(アイコンおよび多くの画面は、まだダークテーマに応じて調整されていません)</string>
@@ -1226,25 +1223,6 @@
   <string name="msg_revoke_key">鍵 %s を破棄中</string>
   <string name="msg_revoke_key_fail">鍵の破棄に失敗しました</string>
   <string name="msg_revoke_ok">鍵の破棄に成功しました</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">リンクしたユーザIDの検証中…</string>
-  <string name="msg_lv_match">トークンを検索</string>
-  <string name="msg_lv_match_error">リソースにトークンが見つかりません!</string>
-  <string name="msg_lv_fp_ok">指紋OK。</string>
-  <string name="msg_lv_fp_error">指紋不一致!</string>
-  <string name="msg_lv_error_twitter_auth">Twitter認証トークン取得エラー!</string>
-  <string name="msg_lv_error_twitter_handle">応答で、Twitterアカウントハンドルが不整合です!</string>
-  <string name="msg_lv_error_twitter_response">Twitter APIから予期しない応答!</string>
-  <string name="msg_lv_error_github_handle">応答で、GitHubアカウントハンドルが不整合です!</string>
-  <string name="msg_lv_error_github_not_found">Gistは、一致するファイルが含まれていません!</string>
-  <string name="msg_lv_fetch">URI \'%s\' 取得中</string>
-  <string name="msg_lv_fetch_redir">\'%s\' へのリダイレクト続行中</string>
-  <string name="msg_lv_fetch_ok">取得に成功しました (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">サーバエラー (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">URLが不正な形式です!</string>
-  <string name="msg_lv_fetch_error_io">IOエラー!</string>
-  <string name="msg_lv_fetch_error_format">フォーマットエラー!</string>
-  <string name="msg_lv_fetch_error_nothing">リソースが見つかりません!</string>
   <string name="msg_bench">いくつかの操作をベンチマーク中…</string>
   <string name="msg_bench_enc_time">暗号化時間: %ss</string>
   <string name="msg_bench_enc_time_avg">5M を暗号化する平均時間: %ss</string>
@@ -1451,75 +1429,8 @@
   <string name="error_scan_fp">指紋の読み取りエラー!</string>
   <string name="error_scan_match">指紋が一致しません!</string>
   <string name="error_expiry_past">期限切れ日が過去です!</string>
-  <string name="linked_create_https_1_1">この種別のリンクしたユーザIDを作成することにより、あなたの鍵を制御するWebサイトにリンクすることができます。</string>
-  <string name="linked_create_https_1_2">これを行うには、このウェブサイトにテキストファイルを公開します。その後、それにリンクするIDを作成します。</string>
-  <string name="linked_create_https_1_3">検証のためにテキストファイルを配置することができるURLを入力してください。サーバがHTTPSをサポートして、有効なTLS証明書が必要であることに注意してください!</string>
-  <string name="linked_create_https_1_4">例: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_created">検証ファイルが作成されました。次のステップでは、それを保存して、あなたが示されたURIにアップロードする必要があります:</string>
-  <string name="linked_create_https_2_1">このURIの検証ファイルが作成されました:</string>
-  <string name="linked_create_https_2_2">次のステップでは、このファイルを保存して、アップロードしてください。</string>
-  <string name="linked_create_https_2_3">ファイルが正しいURIで到達可能であることを確認してください。その後、セットアップを確認します。</string>
-  <string name="linked_create_https_2_4">検証に成功した後、終了ボタンを押して、鍵輪にリンクされたIDを追加し、処理を終了してください。</string>
-  <string name="linked_create_twitter_1_1">この種別のリンクしたユーザIDを作成することにより、あなたの鍵を制御するTwitterアカウントにリンクすることができます。</string>
-  <string name="linked_create_twitter_1_2">これを行うには、あなたのタイムラインで特定のツイートを公開し、その後、このツイートへのリンクされたIDを作成します。</string>
-  <string name="linked_create_twitter_1_3">続行するにはTwitterのスクリーンネームを入力してください。</string>
-  <string name="linked_create_twitter_handle">Twitter ハンドル</string>
-  <string name="linked_create_twitter_2_1">ボタンをクリックして、メッセージをツィートしてください!</string>
-  <string name="linked_create_twitter_2_2">括弧内のテキストが変更されていない限り、投稿する前にツイートを編集することができます。</string>
-  <string name="linked_create_twitter_2_3"><b>@%s</b> としてあなたのツィートが公開されたら、検証ボタンをクリックして、タイムラインをスキャンしてください。</string>
-  <string name="linked_create_twitter_2_4">検証に成功した後、終了ボタンを押して、鍵輪にリンクされたIDを追加し、処理を終了してください。</string>
-  <string name="linked_create_verify">検証</string>
-  <string name="linked_text_clipboard">テキストをクリップボードにコピーしました</string>
-  <string name="linked_verified_https">このウェブサイトと鍵の間のリンクは確実に検証しました。<b>あなたがウェブサイトが本物であると思われる場合</b>、あなたの鍵でこの検証を確認します。</string>
-  <string name="linked_verified_github">このGitHubアカウントと鍵の間のリンクは確実に検証しました。<b>あなたがアカウントが本物であると思われる場合</b>、あなたの鍵でこの検証を確認します。</string>
-  <string name="linked_verified_dns">このドメイン名と鍵の間のリンクは確実に検証しました。<b>あなたがドメインが本物であると思われる場合</b>、あなたの鍵でこの検証を確認します。</string>
-  <string name="linked_verified_twitter">このTwitterアカウントと鍵の間のリンクは確実に検証しました。<b>あなたがアカウントが本物であると思われる場合</b>、あなたの鍵でこの検証を確認します。</string>
-  <string name="linked_verified_secret_https">すべて順番に検索します。</string>
-  <string name="linked_verified_secret_github">すべて順番に検索します。</string>
-  <string name="linked_verified_secret_dns">すべて順番に検索します。</string>
-  <string name="linked_verified_secret_twitter">すべて順番に検索します。</string>
-  <plurals name="linked_id_expand">
-    <item quantity="other">%d 以上の不明なユーザID種別があります</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">\'リンクしたユーザID\' は、あなたのPGP鍵をWeb上のリソースに接続します。</string>
-  <string name="linked_select_2">種別を選択してください: </string>
-  <string name="linked_id_generic_text">このファイルは、長いID %2$s のOpenPGP鍵の所有権を請求しています。\n\n検証のトークン:\n%1$s</string>
-  <string name="linked_verifying">検証中…</string>
-  <string name="linked_verify_success">検証しました!</string>
-  <string name="linked_verify_error">検証エラー!</string>
-  <string name="linked_verify_pending">未検証</string>
-  <string name="linked_need_verify">次に進む前に、リソースを検証する必要があります!</string>
-  <string name="menu_linked_add_identity">アカウントへリンク</string>
-  <string name="section_linked_identities">リンクしたユーザID</string>
   <string name="btn_finish">終了</string>
-  <string name="linked_title_https">Webサイト (HTTPS)</string>
-  <string name="linked_title_dns">ドメイン名 (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">リンクしたユーザID</string>
-  <string name="linked_button_verify">検証</string>
-  <string name="linked_button_retry">リトライ</string>
-  <string name="linked_button_retry_step">最後のステップを再試行</string>
-  <string name="linked_button_confirm">確認</string>
-  <string name="linked_button_view">閲覧</string>
-  <string name="linked_text_verifying">検証中…</string>
-  <string name="linked_text_error">エラー</string>
-  <string name="linked_text_confirming">確認中…</string>
-  <string name="linked_ids_more_unknown">%d 以上の不明なユーザID種別</string>
-  <string name="title_linked_id_create">リンクしたユーザIDを作成</string>
-  <string name="linked_github_text">この操作で、鍵をあなたのGitHubアカウントにリンクします。\nボタンを押すと続行します。</string>
-  <string name="linked_progress_auth_github">GitHubで認証…</string>
-  <string name="linked_progress_post_gist">Gistを投稿…</string>
-  <string name="linked_progress_update_key">鍵のアップデート…</string>
-  <string name="linked_button_start">GitHubアカウントへリンク</string>
-  <string name="linked_error_auth_failed">認証に失敗!</string>
-  <string name="linked_error_timeout">接続タイムアウト!</string>
-  <string name="linked_error_network">ネットワークエラー!</string>
-  <string name="linked_error_http">通信エラー: %s</string>
-  <string name="linked_webview_title_github">GitHub認証</string>
-  <string name="linked_gist_description">OpenKeychain リンクしたユーザID</string>
-  <string name="linked_empty">GitHub、Twitter、またはその他のWebサイトに鍵をリンク!</string>
   <string name="snack_btn_overwrite">上書</string>
   <string name="backup_code_explanation">バックアップは、バックアップコードで保護されます。先に進む前に、それを書き留めてください!</string>
   <string name="backup_code_enter">バックアップコードを入力してください:</string>

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

@@ -88,7 +88,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">서브키 추가</string>
   <string name="title_change_master_key">마스터키 변경</string>
   <string name="title_edit_key">키 수정</string>
-  <string name="title_linked_create">연결된 신원 만들기</string>
   <string name="title_preferences">설정</string>
   <string name="title_api_registered_apps">앱</string>
   <string name="title_key_server_preference">OpenPGP 키서버</string>
@@ -206,8 +205,6 @@
   <string name="keyserver_sync_settings_title">자동 키 갱신</string>
   <string name="label_experimental_settings_desc_title">경고</string>
   <string name="label_experimental_settings_desc_summary">이 기능들은 아직 완성되지 않았거나 유저 경험/보안 연구의 결과가 아닙니다. 그러니 이 기능의 보안성에 의존하거나 겪는 문제를 보고하지 말아주세요!</string>
-  <string name="label_experimental_settings_linked_identities_title">연결된 신원</string>
-  <string name="label_experimental_settings_linked_identities_summary">키를 Twitter, GitHub, 웹사이트 혹은 DNS에 연결 (keybase.io와 비슷하지만 중앙집중되지 않음)</string>
   <string name="label_experimental_settings_keybase_summary">keybase.io에 연결해서 키가 표시될 때 마다 키 증명을 표시</string>
   <string name="label_experimental_settings_theme_summary">(아이콘이나 많은 화면이 검은 테마에 알맞게 아직 조정되지 않았습니다)</string>
   <string name="label_settings_analytics_title">익명 사용 통계 허가</string>
@@ -824,7 +821,6 @@
   <string name="msg_import_fetch_error_not_found">키를 찾을 수 없습니다!</string>
   <string name="msg_import_fetch_facebook">Facebook으로 부터 검색: %s</string>
   <string name="msg_upload_error_not_found">키를 찾을 수 없습니다!</string>
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_specific">%s</string>
   <!--Messages for Mime parsing operation-->
@@ -860,19 +856,8 @@
   <string name="security_token_create">보안 토큰을 기기 뒷면에 접촉 해주세요.</string>
   <string name="btn_reset">다시 놓기</string>
   <string name="security_token_error">에러: %s</string>
-  <string name="linked_create_verify">검증</string>
   <!--Other Linked Identity strings-->
-  <string name="section_linked_identities">연결된 신원</string>
   <string name="btn_finish">종료</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">검증</string>
-  <string name="linked_button_retry">재시도</string>
-  <string name="linked_button_confirm">확인</string>
-  <string name="linked_button_view">보기</string>
-  <string name="linked_text_error">에러</string>
-  <string name="linked_progress_auth_github">GitHub로 인증 ...</string>
-  <string name="linked_error_auth_failed">인증에 실패했습니다!</string>
-  <string name="linked_webview_title_github">GitHub 인증</string>
   <string name="share_log_dialog_share_button">공유</string>
   <string name="share_log_dialog_cancel_button">취소</string>
   <string name="menu_uids_save">저장</string>
@@ -881,10 +866,13 @@
   <string name="prompt_fidesmo_app_install_button_positive">설치</string>
   <string name="prompt_fidesmo_app_install_button_negative">취소</string>
   <string name="redirect_import_key_no">Close</string>
+  <string name="button_allow">허용하기</string>
   <string name="button_cancel">취소</string>
   <string name="button_back">뒤로</string>
+  <string name="button_got_it">알겠습니다</string>
   <string name="keyserver_title_published">게시됨</string>
   <string name="keyserver_title_not_published">출판되지 않았습니다.</string>
+  <string name="dialog_insecure_button_ok">알겠습니다</string>
   <string name="button_import">가져오기</string>
   <string name="transfer_status_connected">접속됨</string>
   <string name="transfer_connecting">접속중...</string>

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

@@ -92,7 +92,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -105,10 +104,7 @@
   <!--TODO: rename all the things!-->
   <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
-  <string name="linked_create_verify">Probare</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_button_verify">Probare</string>
-  <string name="linked_text_error">Erratum</string>
   <string name="share_log_dialog_cancel_button">Claudere</string>
   <string name="menu_uids_save">Memorare</string>
   <string name="prompt_fidesmo_pgp_install_button_negative">Claudere</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Legg til undernøkkel</string>
   <string name="title_change_master_key">Endre hovednøkkel</string>
   <string name="title_edit_key">Rediger nøkkel</string>
-  <string name="title_linked_create">Lag en tilknyttet identitet</string>
   <string name="title_preferences">Innstillinger</string>
   <string name="title_api_registered_apps">Programmer</string>
   <string name="title_key_server_preference">OpenPGP-nøkkeltjenere</string>
@@ -206,8 +205,6 @@
   <string name="keyserver_sync_settings_title">Automatiske nøkkeloppdateringer</string>
   <string name="label_experimental_settings_desc_title">Advarsel</string>
   <string name="label_experimental_settings_desc_summary">Disse funksjonene er ikke ferdige enda, eller resultat av brukererfaring/sikkerhetsforskning. Som sådan, bør du ikke stole på at de er sikre, og ikke rapportere feil du kommer over!</string>
-  <string name="label_experimental_settings_linked_identities_title">Lenkede identiteter</string>
-  <string name="label_experimental_settings_linked_identities_summary">Lenk nøkler til Twitter, GitHub, nettsider eller DNS (likt keybase.io, men desentralisert)</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io-bevis</string>
   <string name="label_experimental_settings_keybase_summary">Kontakt keybase.io for nøkkelbevis og vis dem hver gang en nøkkel vises</string>
   <string name="label_experimental_settings_theme_summary">(Ikonene og mange av skjermene er ikke justert i henhold til den mørke drakten)</string>
@@ -712,7 +709,6 @@
     <item quantity="one">Lyktes i å slette nøkkelen</item>
     <item quantity="other">Lyktes i å slette %d nøkler</item>
   </plurals>
-  <!--Linked Identity verification-->
   <string name="msg_get_success">Vellykket nedlasting!</string>
   <string name="msg_get_no_valid_keys">Ingen gyldige nøkler ble funnet i filen/utklippstavlen!</string>
   <!--Messages for Keybase Verification operation-->
@@ -786,28 +782,8 @@
   <string name="security_token_error_try_again">Prøv igjen</string>
   <string name="btn_delete_original">Slett orginalfil</string>
   <string name="file_delete_ok">Originalfil slettet.</string>
-  <string name="linked_create_verify">Bekreft</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_verifying">Bekrefter…</string>
-  <string name="linked_verify_success">Bekreftet!</string>
-  <string name="linked_verify_error">Bekreftelsesfeil!</string>
-  <string name="linked_verify_pending">Ikke bekreftet enda</string>
-  <string name="section_linked_identities">Lenkede identiteter</string>
   <string name="btn_finish">Ferdig</string>
-  <string name="linked_title_https">Nettside (HTTPS)</string>
-  <string name="linked_title_dns">Domenenavn (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Bekreft</string>
-  <string name="linked_button_retry">Prøv igjen</string>
-  <string name="linked_button_retry_step">Gjenta siste steg</string>
-  <string name="linked_button_confirm">Bekreft</string>
-  <string name="linked_button_view">Vis</string>
-  <string name="linked_text_verifying">Bekrefter…</string>
-  <string name="linked_text_error">Feil</string>
-  <string name="linked_text_confirming">Bekrefter…</string>
-  <string name="linked_button_start">Lenk til GitHub-konto</string>
-  <string name="linked_error_network">Nettverksfeil!</string>
   <string name="snack_btn_overwrite">Overskriv</string>
   <string name="backup_code_explanation">Sikkerhetskopien vil bli sikret med en sikkerhetskopieringskode. Skriv den ned før du fortsetter!</string>
   <string name="backup_code_enter">Vennligst skriv inn sikkerhetskopiens kode:</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Adicionar subchave</string>
   <string name="title_change_master_key">Modificar chave-mestra</string>
   <string name="title_edit_key">Editar chave</string>
-  <string name="title_linked_create">Criar uma Identidade Vinculada</string>
   <string name="title_preferences">Configurações</string>
   <string name="title_api_registered_apps">Aplicativos</string>
   <string name="title_key_server_preference">Servidores de chaves OpenPGP</string>
@@ -165,6 +164,7 @@
   <string name="label_creation">Criação</string>
   <string name="label_creation_colon">Criação:</string>
   <string name="label_expiry">Data de expiração</string>
+  <string name="label_valid_from">Válido desde</string>
   <string name="label_usage">Uso</string>
   <string name="label_revoked">Revogada</string>
   <string name="label_insecure">Insegura</string>
@@ -215,11 +215,11 @@
   <string name="keyserver_sync_settings_title">Atualização automática de chaves</string>
   <string name="label_experimental_settings_desc_title">Aviso</string>
   <string name="label_experimental_settings_desc_summary">Esses recursos ainda não estão finalizados ou resultam de pesquisas de experiência/segurança do usuário. Dessa forma, não confie em sua segurança e, por favor, não relate problemas que encontre!</string>
-  <string name="label_experimental_settings_linked_identities_title">Identidades Vinculadas</string>
-  <string name="label_experimental_settings_linked_identities_summary">Vincule suas chaves para o Twitter, GitHub, websites ou DNS (semelhante ao keybase.io mas de forma descentralizada)</string>
   <string name="label_experimental_settings_keybase_title">Provas Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Contate o keybase.io para as provas de chaves e mostre-as toda vez que uma chave for exibida</string>
   <string name="label_experimental_settings_theme_summary">(Os ícones e algumas telas ainda não foram adaptados para o tema escuro)</string>
+  <string name="label_settings_analytics_title">Permitir estatísticas anônimas de uso</string>
+  <string name="label_settings_analytics_summary">Se habilitado, envia estatísticas anônimas de uso para ajudar a melhorar a aplicação</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">Ativar Tor</string>
   <string name="pref_proxy_tor_summary">Requer que o Orbot esteja instalado</string>
@@ -438,6 +438,7 @@
   <string name="progress_modify_passphrase">modificando senha...</string>
   <string name="progress_modify_pin">modificando PIN...</string>
   <string name="progress_modify_admin_pin">modificando PIN Administrativo...</string>
+  <string name="progress_exporting_key">exportando chave...</string>
   <string name="progress_exporting_keys">exportando chaves...</string>
   <string name="progress_start">preparando operação...</string>
   <string name="progress_extracting_signature_key">extraindo chave de assinatura...</string>
@@ -1284,25 +1285,6 @@
   <string name="msg_revoke_key">Revogando chave %s</string>
   <string name="msg_revoke_key_fail">Falha ao revogar chave</string>
   <string name="msg_revoke_ok">Chave revogada com sucesso</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Verificando identidades vinculadas...</string>
-  <string name="msg_lv_match">Procurando token</string>
-  <string name="msg_lv_match_error">Nenhum token encontrado no recurso!</string>
-  <string name="msg_lv_fp_ok">Impressão digital OK</string>
-  <string name="msg_lv_fp_error">Impressão digital não confere!</string>
-  <string name="msg_lv_error_twitter_auth">Erro ao obter o token de autenticação do Twitter!</string>
-  <string name="msg_lv_error_twitter_handle">Nome da conta do Twitter não confere com a resposta!</string>
-  <string name="msg_lv_error_twitter_response">Resposta inesperada da API do Twitter!</string>
-  <string name="msg_lv_error_github_handle">Nome da conta do GitHub não confere com a resposta!</string>
-  <string name="msg_lv_error_github_not_found">O Gist não contém arquivos coincidentes!</string>
-  <string name="msg_lv_fetch">Obtendo URI \'%s\'</string>
-  <string name="msg_lv_fetch_redir">Seguindo redirecionamento para \'%s\'</string>
-  <string name="msg_lv_fetch_ok">Obtida com sucesso (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">Erro do servidor (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">A URL está mal-formada!</string>
-  <string name="msg_lv_fetch_error_io">Erro de E/S</string>
-  <string name="msg_lv_fetch_error_format">Erro de formato!</string>
-  <string name="msg_lv_fetch_error_nothing">Recurso não encontrado!</string>
   <string name="msg_bench">Avaliando o desempenho de algumas operações...</string>
   <string name="msg_bench_enc_time">Duração da encriptação: %ss</string>
   <string name="msg_bench_enc_time_avg">Tempo médio para encriptar 5MB: %ss</string>
@@ -1521,76 +1503,8 @@
   <string name="error_scan_fp">Erro ao ler a impressão digital!</string>
   <string name="error_scan_match">As impressões digitais não coincidem!</string>
   <string name="error_expiry_past">A data de expiração está no passado!</string>
-  <string name="linked_create_https_1_1">Ao criar uma Identidade Vinculada deste tipo, você pode vincular sua chave aos websites que controla.</string>
-  <string name="linked_create_https_1_2">Para fazer isto, você publica um arquivo-texto no website, e então cria uma Identidade Vinculada que aponta para ele.</string>
-  <string name="linked_create_https_1_3">Por favor, insira uma URL onde você possa armazenar seu arquivo de texto de prova. Note que seu servidor precisa suportar HTTPS e ter um certificado TLS válido!</string>
-  <string name="linked_create_https_1_4">Exemplo: https://exemplo.com/chavepgp.txt</string>
-  <string name="linked_create_https_created">O arquivo de prova foi criado. Para o próximo passo você deve salvar e enviá-lo para a URI que você indicou:</string>
-  <string name="linked_create_https_2_1">Uma prova para esta URI foi criada:</string>
-  <string name="linked_create_https_2_2">Para o próximo passo, você deve salvar e enviar este arquivo.</string>
-  <string name="linked_create_https_2_3">Certifique-se que o arquivo é alcançável na URI correta, e verifique sua configuração.</string>
-  <string name="linked_create_https_2_4">Após uma verificação com sucesso, toque o botão Concluir para adicionar a Identidade Vinculada ao seu chaveiro e finalizar o processo.</string>
-  <string name="linked_create_twitter_1_1">Ao criar uma Identidade Vinculada deste ticpo, você pode vincular sua chave a uma conta do Twitter que você controla.</string>
-  <string name="linked_create_twitter_1_2">Para fazer isso, você publica um tweet específico na sua linha do tempo, e então cria uma Identidade Vinculada que aponta para ele.</string>
-  <string name="linked_create_twitter_1_3">Por favor, insira seu nome de usuário do Twitter para prosseguir.</string>
-  <string name="linked_create_twitter_handle">Arroba no Twitter</string>
-  <string name="linked_create_twitter_2_1">Toque qualquer dos botões para tuitar a mensagem!</string>
-  <string name="linked_create_twitter_2_2">Você pode editar o tweet antes de postá-lo, contanto que o texto dentro dos colchetes não seja modificado.</string>
-  <string name="linked_create_twitter_2_3">Quando seu tweet for publicado como <b>@%s</b>, toque para varrer sua linha do tempo por ele.</string>
-  <string name="linked_create_twitter_2_4">Após uma verificação com sucesso, toque o botão Concluir para adicionar a Identidade Vinculada ao seu chaveiro e finalizar o processo.</string>
-  <string name="linked_create_verify">Verificar</string>
-  <string name="linked_text_clipboard">O texto foi copiado para a área de transferência</string>
-  <string name="linked_verified_https">O vínculo entre este website e a chave foi seguramente verificado. <b>Se você acredita que este website é genuíno</b>, confirme a verificação com sua chave.</string>
-  <string name="linked_verified_github">O vínculo entre esta conta do GitHub e a chave foi seguramente verificado. <b>Se você acredita que esta conta é genuína</b>, confirme a verificação com sua chave.</string>
-  <string name="linked_verified_dns">O vínculo entre este Domínio e a chave foi seguramente verificado. <b>Se você acredita que este Domínio é genuíno</b>, confirme a verificação com sua chave.</string>
-  <string name="linked_verified_twitter">O vínculo entre esta conta do Twitter e a chave foi seguramente verificado. <b>Se você acredita que esta conta é genuína</b>, confirme a verificação com sua chave.</string>
-  <string name="linked_verified_secret_https">Tudo parece estar em ordem.</string>
-  <string name="linked_verified_secret_github">Tudo parece estar em ordem.</string>
-  <string name="linked_verified_secret_dns">Tudo parece estar em ordem.</string>
-  <string name="linked_verified_secret_twitter">Tudo parece estar em ordem.</string>
-  <plurals name="linked_id_expand">
-    <item quantity="one">Existe outro tipo de identidade desconhecido</item>
-    <item quantity="other">Existem outros %d tipos de identidade desconhecidos</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">Uma \'identidade vinculada\' conecta sua chave PGP a um recurso na Web.</string>
-  <string name="linked_select_2">Por favor, selecione um tipo:</string>
-  <string name="linked_id_generic_text">Este arquivo reinvindica a posse da chave OpenPGP com o ID longo %2$s.\n\nToken para prova:\n%1$s</string>
-  <string name="linked_verifying">Verificando...</string>
-  <string name="linked_verify_success">Verificado!</string>
-  <string name="linked_verify_error">Erro na verificação!</string>
-  <string name="linked_verify_pending">Ainda não verificado</string>
-  <string name="linked_need_verify">Este recurso precisa ser verificado antes que você possa prosseguir!</string>
-  <string name="menu_linked_add_identity">Vincular a Conta</string>
-  <string name="section_linked_identities">Identidades Vinculadas</string>
   <string name="btn_finish">Concluir</string>
-  <string name="linked_title_https">Website (HTTPS)</string>
-  <string name="linked_title_dns">Domínio (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Identidade Vinculada</string>
-  <string name="linked_button_verify">Verificar</string>
-  <string name="linked_button_retry">Retentar</string>
-  <string name="linked_button_retry_step">Retentar último passo</string>
-  <string name="linked_button_confirm">Confirmar</string>
-  <string name="linked_button_view">Exibir</string>
-  <string name="linked_text_verifying">Verificando...</string>
-  <string name="linked_text_error">Erro</string>
-  <string name="linked_text_confirming">Confirmando...</string>
-  <string name="linked_ids_more_unknown">%d outros tipos de identidade desconhecidos</string>
-  <string name="title_linked_id_create">Criar Identidade Vinculada</string>
-  <string name="linked_github_text">Esta operação vincula sua chave à sua conta do GitHub.\nApenas toque o botão para continuar.</string>
-  <string name="linked_progress_auth_github">Autorizar com o GitHub...</string>
-  <string name="linked_progress_post_gist">Postar Gist...</string>
-  <string name="linked_progress_update_key">Atualizar Chave...</string>
-  <string name="linked_button_start">Vincular a conta do GitHub</string>
-  <string name="linked_error_auth_failed">Falha na autorização!</string>
-  <string name="linked_error_timeout">Fim do tempo-limite da conexão!</string>
-  <string name="linked_error_network">Erro de rede!</string>
-  <string name="linked_error_http">Erro de comunicação: %s</string>
-  <string name="linked_webview_title_github">Autorização do GitHub</string>
-  <string name="linked_gist_description">Identidade Vinculada do OpenKeychain</string>
-  <string name="linked_empty">Vincule sua chave ao GitHub, witter ou outros sites!</string>
   <string name="snack_btn_overwrite">Sobrescrever</string>
   <string name="backup_code_explanation">O backup será protegido com um código de backup. Anote-o antes de prosseguir!</string>
   <string name="backup_code_enter">Por favor, insira o código do backup:</string>
@@ -1890,5 +1804,17 @@
   <string name="keylist_item_key_id">ID da Chave: %s</string>
   <string name="keylist_header_anonymous">Anônimo</string>
   <string name="keylist_header_special">#</string>
+  <string name="dialog_analytics_consent">Para melhorar a experiência para todos os usuários, o OpenKeychain pode coletar estatísticas anônimas de uso?\n\nPara saber mais, consulte nossa <a href="https://openkeychain.org/help/privacy-policy">Política de Privacidade</a>.</string>
+  <string name="button_analytics_yes">Sim, eu quero ajudar!</string>
+  <string name="button_analytics_no">Não, obrigado</string>
+  <string name="snack_analytics_accept">Obrigado por nos ajudar! Você pode alterar esta preferência nas configurações.</string>
+  <string name="snack_analytics_reject">Sem problema, não iremos pedir de novo. Você pode mudar de ideia nas configurações.</string>
   <string name="snackbutton_analytics_settings">Configurações</string>
+  <string name="subkey_action_create">A subchave será criada</string>
+  <string name="subkey_action_revoke">A subchave será revogada</string>
+  <string name="subkey_action_strip">A subchave será extirpada</string>
+  <string name="subkey_action_expiry_never">A expiração será alterada para nunca</string>
+  <string name="subkey_action_expiry_date">A expiração será alterada para %s</string>
+  <string name="share_key_clipboard">Compartilhar chave via área de transferência</string>
+  <string name="share_key">Compartilhar chave</string>
 </resources>

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

@@ -324,7 +324,6 @@
   <string name="msg_import_fetch_error_not_found">Cheia nu a fost găsită!</string>
   <string name="msg_backup_error_db">Eroare bază de date!</string>
   <string name="msg_upload_error_not_found">Cheia nu a fost găsită!</string>
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_specific">%s</string>
   <!--Messages for Mime parsing operation-->
@@ -370,22 +369,8 @@
   <string name="btn_reset">Resetează </string>
   <string name="security_token_error_unknown">Eroare necunoscută</string>
   <string name="security_token_error_try_again">Încearcă din nou</string>
-  <string name="linked_create_verify">Verifică</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_verifying">Se verifică...</string>
-  <string name="linked_verify_success">Verificat!</string>
-  <string name="linked_verify_error">Eroare la verificare!</string>
   <string name="btn_finish">Termină</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Verifică</string>
-  <string name="linked_button_retry">Reâncearcă</string>
-  <string name="linked_button_confirm">Confirmă</string>
-  <string name="linked_button_view">Vizualizare</string>
-  <string name="linked_text_verifying">Se verifică...</string>
-  <string name="linked_text_error">Eroare</string>
-  <string name="linked_text_confirming">Se confirmă...</string>
-  <string name="linked_progress_auth_github">Autorizează prin GitHub...</string>
   <string name="snack_btn_overwrite">Suprascrie</string>
   <string name="backup_code_ok">Cod acceptat!</string>
   <string name="share_log_dialog_share_button">Partajează</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Добавить подключ</string>
   <string name="title_change_master_key">Изменить основной ключ</string>
   <string name="title_edit_key">Изменить ключ</string>
-  <string name="title_linked_create">Создать связанный идентификатор</string>
   <string name="title_preferences">Настройки</string>
   <string name="title_api_registered_apps">Приложения</string>
   <string name="title_key_server_preference">Серверы OpenPGP</string>
@@ -204,7 +203,7 @@
   <string name="pref_facebook">Facebook</string>
   <string name="pref_facebook_summary">Искать ключи на Facebook по имени пользователя</string>
   <string name="pref_wkd">Web Key Directory</string>
-  <string name="pref_wkd_summary">Найти ключи, используя Web Key Directory</string>
+  <string name="pref_wkd_summary">Искать ключи, используя Web Key Directory</string>
   <string name="label_sync_settings_keyserver_title">Автообновление ключей</string>
   <string name="label_sync_settings_keyserver_summary_on">Каждые три дня ключи будут обновляться с предпочитаемого сервера ключей</string>
   <string name="label_sync_settings_keyserver_summary_off">Ключи не обновляются автоматически</string>
@@ -216,12 +215,10 @@
   <string name="keyserver_sync_settings_title">Автообновление ключей</string>
   <string name="label_experimental_settings_desc_title">Предупреждение</string>
   <string name="label_experimental_settings_desc_summary">Эти новые возможности ещё не закончены и/или пока только изучаются. Проще говоря, не стоит полагаться на их безопасность. Пожалуйста, не сообщайте о связанных с ними проблемах!</string>
-  <string name="label_experimental_settings_linked_identities_title">Связанные идентификаторы</string>
-  <string name="label_experimental_settings_linked_identities_summary">Привязать ключи к Twitter, GitHub, веб-сайту или DNS (по аналогии с keybase.io, но децентрализованно)</string>
   <string name="label_experimental_settings_keybase_title">Подтверждение Keybase.io </string>
   <string name="label_experimental_settings_keybase_summary">Опрашивать keybase.io для подтверждения ключей и показывать это каждый раз при отображении ключей</string>
   <string name="label_experimental_settings_theme_summary">(Значки и многие экраны ещё не скорректированы для тёмной темы)</string>
-  <string name="label_settings_analytics_title">Разрешить отправку анонимной статистики</string>
+  <string name="label_settings_analytics_title">Отправлять анонимную статистику</string>
   <string name="label_settings_analytics_summary">Если данная функция включена, приложение будет отправлять анонимную статистику для помощи разработчикам</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">Использовать Tor</string>
@@ -1349,25 +1346,6 @@
   <string name="msg_revoke_key">Аннулирование ключа %s</string>
   <string name="msg_revoke_key_fail">Ошибка при аннулировании ключа</string>
   <string name="msg_revoke_ok">Ключ успешно аннулирован</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Проверка связанного идентификатора…</string>
-  <string name="msg_lv_match">Поиск токена</string>
-  <string name="msg_lv_match_error">Токен не найден в ресурсе!</string>
-  <string name="msg_lv_fp_ok">Отпечатки совпадают.</string>
-  <string name="msg_lv_fp_error">Несоответствие отпечатков!</string>
-  <string name="msg_lv_error_twitter_auth">Ошибка при получении токена аутентификации Twitter!</string>
-  <string name="msg_lv_error_twitter_handle">Дескриптор учётной записи Twitter не соответствует ответному!</string>
-  <string name="msg_lv_error_twitter_response">Неожиданный ответ от API сервиса Twitter!</string>
-  <string name="msg_lv_error_github_handle">Дескриптор учётной записи GitHub не соответствует ответному!</string>
-  <string name="msg_lv_error_github_not_found">Gist не содержит соответствующие файлы!</string>
-  <string name="msg_lv_fetch">URL извлечения \'%s\'</string>
-  <string name="msg_lv_fetch_redir">Следование перенаправлению на \'%s\'</string>
-  <string name="msg_lv_fetch_ok">Успешно извлечено (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">Ошибка сервера (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">URL-адрес некорректен!</string>
-  <string name="msg_lv_fetch_error_io">Ошибка ввода-вывода!</string>
-  <string name="msg_lv_fetch_error_format">Ошибка формата!</string>
-  <string name="msg_lv_fetch_error_nothing">Ресурс не найден!</string>
   <string name="msg_bench">Анализ быстродействия некоторых операций…</string>
   <string name="msg_bench_enc_time">Время шифрования: %s сек.</string>
   <string name="msg_bench_enc_time_avg">Среднее время шифрования 5 Мб: %s сек.</string>
@@ -1590,78 +1568,8 @@
   <string name="error_scan_fp">Ошибка сканирования отпечатка!</string>
   <string name="error_scan_match">Отпечатки не совпадают!</string>
   <string name="error_expiry_past">Дата истечения срока действия в прошлом!</string>
-  <string name="linked_create_https_1_1">Создавая связанный идентификатор данного типа, можно привязать свой ключ к управляемому вами веб-сайту.</string>
-  <string name="linked_create_https_1_2">Чтобы сделать это, вы публикуете текстовый файл на данном сайте, затем создаете связанный идентификатор, который привязывается к нему.</string>
-  <string name="linked_create_https_1_3">Пожалуйста, введите URL, где вы сможете разместить текстовый файл доказательства. Обратите внимание, что ваш сервер должен поддерживать протокол HTTPS и иметь действительный сертификат TLS!</string>
-  <string name="linked_create_https_1_4">Например: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_created">Файл доказательства был создан. Для следующего шага вы должны сохранить и загрузить этот файл на указанный вами URL:</string>
-  <string name="linked_create_https_2_1">Файл доказательства для этого URL был создан:</string>
-  <string name="linked_create_https_2_2">Для следующего шага вы должны сохранить и загрузить этот файл.</string>
-  <string name="linked_create_https_2_3">Убедитесь, что файл доступен по правильному URL, затем проверьте настройки.</string>
-  <string name="linked_create_https_2_4">После успешной проверки нажмите кнопку Готово, чтобы добавить связанный идентификатор в вашу связку и завершить процесс.</string>
-  <string name="linked_create_twitter_1_1">Создавая связанный идентификатор данного типа, можно привязать свой ключ к управляемой вами учётной записи Twitter.</string>
-  <string name="linked_create_twitter_1_2">Чтобы сделать это, вам необходимо опубликовать специфический твит на своей ленте, а затем создать связанный идентификатор, ссылающийся на данный твит.</string>
-  <string name="linked_create_twitter_1_3">Пожалуйста, введите свой псевдоним в Twitter, чтобы продолжить.</string>
-  <string name="linked_create_twitter_handle">Обработчик Twitter</string>
-  <string name="linked_create_twitter_2_1">Нажмите любую кнопку, чтобы твитнуть сообщение!</string>
-  <string name="linked_create_twitter_2_2">Вы можете редактировать твит перед отправкой, пока текст в скобках не изменён.</string>
-  <string name="linked_create_twitter_2_3">При публикации твита <b>@%s</b>, нажмите на кнопку Проверить для сканирования таймлайна.</string>
-  <string name="linked_create_twitter_2_4">После успешной проверки нажмите кнопку Готово, чтобы добавить связанный идентификатор в вашу связку и завершить процесс.</string>
-  <string name="linked_create_verify">Проверить</string>
-  <string name="linked_text_clipboard">Текст был скопирован в буфер обмена</string>
-  <string name="linked_verified_https">Связь между этим веб-сайтом и ключом была надёжно проверена. <b>Если вы считаете, что сайт является подлинным</b>, подтвердите эту проверку своим ключом.</string>
-  <string name="linked_verified_github">Связь между этим аккаунтом GitHub и ключом была надёжно проверена. <b>Если вы считаете, что аккаунт является подлинным</b>, подтвердите эту проверку своим ключом.</string>
-  <string name="linked_verified_dns">Связь между этим доменным именем и ключом была надёжно проверена. <b>Если вы считаете, что домен является подлинным</b>, подтвердите эту проверку своим ключом.</string>
-  <string name="linked_verified_twitter">Связь между этим аккаунтом Twitter и ключом была надёжно проверена. <b>Если вы считаете, что аккаунт является подлинным</b>, подтвердите эту проверку своим ключом.</string>
-  <string name="linked_verified_secret_https">Всё выглядит в порядке.</string>
-  <string name="linked_verified_secret_github">Всё выглядит в порядке.</string>
-  <string name="linked_verified_secret_dns">Всё выглядит в порядке.</string>
-  <string name="linked_verified_secret_twitter">Всё выглядит в порядке.</string>
-  <plurals name="linked_id_expand">
-    <item quantity="one">Здесь ещё один неизвестный тип идентификатора</item>
-    <item quantity="few">Здесь ещё %d неизвестных типа идентификаторов</item>
-    <item quantity="many">Здесь ещё %d неизвестных типов идентификаторов</item>
-    <item quantity="other">Здесь ещё %d неизвестных типов идентификаторов</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">\'Связывание идентификатора\' привязывает ваш PGP-ключ к ресурсу в интернете.</string>
-  <string name="linked_select_2">Пожалуйста, выберите тип:</string>
-  <string name="linked_id_generic_text">Этот файл требует владельца OpenPGP-ключа с полным ID %2$s.\n\nТокен для доказательства:\n%1$s</string>
-  <string name="linked_verifying">Проверка…</string>
-  <string name="linked_verify_success">Проверено!</string>
-  <string name="linked_verify_error">Ошибка проверки!</string>
-  <string name="linked_verify_pending">Ещё не проверено</string>
-  <string name="linked_need_verify">Ресурс должен быть проверен, прежде чем продолжать!</string>
-  <string name="menu_linked_add_identity">Связать с аккаунтом</string>
-  <string name="section_linked_identities">Связанные идентификаторы</string>
   <string name="btn_finish">Завершить</string>
-  <string name="linked_title_https">Сайт (HTTPS)</string>
-  <string name="linked_title_dns">Доменное имя (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Связанный идентификатор</string>
-  <string name="linked_button_verify">Проверить</string>
-  <string name="linked_button_retry">Повторить</string>
-  <string name="linked_button_retry_step">Повторить последний шаг</string>
-  <string name="linked_button_confirm">Подтвердить</string>
-  <string name="linked_button_view">Просмотр</string>
-  <string name="linked_text_verifying">Проверка…</string>
-  <string name="linked_text_error">Ошибка</string>
-  <string name="linked_text_confirming">Подтверждение…</string>
-  <string name="linked_ids_more_unknown">Ещё %d неизвестных типов идентификаторов</string>
-  <string name="title_linked_id_create">Создать связанный идентификатор</string>
-  <string name="linked_github_text">Эта операция связывает ключ с вашей учётной записью GitHub.\nПросто нажмите кнопку для продолжения.</string>
-  <string name="linked_progress_auth_github">Авторизация при помощи GitHub...</string>
-  <string name="linked_progress_post_gist">Отправить gist…</string>
-  <string name="linked_progress_update_key">Обновить ключ...</string>
-  <string name="linked_button_start">Ссылка на аккаунт GitHub</string>
-  <string name="linked_error_auth_failed">Авторизация не удалась!</string>
-  <string name="linked_error_timeout">Время соединения вышло!</string>
-  <string name="linked_error_network">Ошибка сети!</string>
-  <string name="linked_error_http">Коммуникационная ошибка: %s</string>
-  <string name="linked_webview_title_github">Авторизация GitHub</string>
-  <string name="linked_gist_description">Связанный идентификатор OpenKeychain</string>
-  <string name="linked_empty">Привяжите свой ключ к GitHub, Twitter или другому сайту!</string>
   <string name="snack_btn_overwrite">Перезаписать</string>
   <string name="backup_code_explanation">Резервная копия будет защищена кодом. Запишите его, прежде чем продолжить!</string>
   <string name="backup_code_enter">Пожалуйста, введите резервный код:</string>
@@ -1922,7 +1830,7 @@
   </plurals>
   <string name="button_locate_nfc">Где мой NFC-ридер?</string>
   <string name="label_usb_untested_summary">Если данная функция включена, вы можете использовать USB-ридеры смарт-карт, которые не были полностью протестированы.</string>
-  <string name="label_usb_untested">Разрешить использование непротестированных USB-устройств</string>
+  <string name="label_usb_untested">Использовать непротестированные USB-устройства</string>
   <string name="use_key">Использовать ключ: %s</string>
   <string name="use_key_no_name">Использовать ключ: <![CDATA[<no name>]]></string>
   <string name="title_select_key">%s хочет настроить сквозное шифрование для этого адреса:</string>

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

@@ -11,6 +11,7 @@
   <string name="title_edit_key">Uredi ključ</string>
   <string name="title_preferences">Nastavitve</string>
   <string name="title_api_registered_apps">Aplikacije</string>
+  <string name="title_change_passphrase">Spremeni geslo</string>
   <string name="title_share_fingerprint_with">Deli prstni odtis z...</string>
   <string name="title_share_key">Deli ključ z...</string>
   <string name="title_share_file">Deli datoteko z...</string>
@@ -164,11 +165,26 @@
   <string name="choice_8hours">8 ur</string>
   <string name="choice_forever">za vedno</string>
   <string name="filemanager_title_open">Odpri...</string>
+  <string name="rsa_2048">RSA 2048</string>
+  <string name="rsa_2048_description_html">manjša velikost, se smatra za varno do 2030</string>
+  <string name="rsa_3072">RSA 3072</string>
+  <string name="rsa_3072_description_html">priporočeno, se smatra za varno do 2040</string>
+  <string name="rsa_4096">RSA 4096</string>
+  <string name="rsa_4096_description_html">večja velikost, se smatra za varno do 2040+</string>
+  <string name="ecc_p256">ECC P-256</string>
+  <string name="ecc_p256_description_html">zelo majhna velikost, se smatra za varno do 2040 &lt;br/&gt; &lt;u&gt;eksperimentalno in še ne podprto z vsemi programi&lt;/u&gt;</string>
+  <string name="ecc_p384">ECC P-384</string>
+  <string name="ecc_p384_description_html">zelo majhna velikost, se smatra za varno do 2040 &lt;br/&gt; &lt;u&gt;eksperimentalno in še ne podprto z vsemi programi&lt;/u&gt;</string>
+  <string name="ecc_p521">ECC P-521</string>
+  <string name="ecc_p521_description_html">majhna velikost, se smatra za varno do 2040+ &lt;br/&gt; &lt;u&gt;eksperimentalno in še ne podprto z vsemi programi&lt;/u&gt;</string>
+  <string name="ecc_eddsa">ECC EdDSA</string>
+  <string name="ecc_eddsa_description_html">majhna velikost, se smatra za varno do 2040+ &lt;br/&gt; &lt;u&gt;eksperimentalno in še ne podprto z vsemi programi&lt;/u&gt;</string>
   <string name="usage_sign">Podpiši</string>
   <string name="usage_encrypt">Šifriraj</string>
   <string name="error">Napaka</string>
   <string name="error_message">Napaka: %s</string>
   <!--sentences-->
+  <string name="wrong_passphrase">Napačno geslo</string>
   <string name="no_filemanager_installed">Nimate nameščenega združljivega upravljalnika datotek.</string>
   <string name="pin_for">Vnesite PIN kodo za \'%s\'</string>
   <string name="file_delete_confirmation_title">Izbrišem izvirne datoteke?</string>
@@ -306,6 +322,7 @@
   <string name="help_tab_changelog">Dnevnik sprememb</string>
   <string name="help_tab_about">O aplikaciji</string>
   <string name="help_about_version">Različica:</string>
+  <string name="help_tab_donations">Doniraj</string>
   <!--Import-->
   <string name="import_tab_keyserver">Strežnik</string>
   <string name="import_tab_cloud">Iskanje ključev</string>
@@ -459,6 +476,7 @@
   <string name="keybase_reddit_proof">Datoteka JSON</string>
   <string name="keybase_verify">Overi</string>
   <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">Spremeni geslo</string>
   <string name="edit_key_action_add_identity">Dodaj identiteto</string>
   <string name="edit_key_action_add_subkey">Dodaj podključ</string>
   <string name="edit_key_edit_user_id_title">Izberite dejanje!</string>
@@ -748,7 +766,6 @@
   <string name="msg_backup_error_db">Napaka v bazi podatkov!</string>
   <string name="msg_upload_error_not_found">Ključ ni bil najden!</string>
   <string name="msg_del_error_multi_secret">Zasebne ključe je mogoče izbrisati zgolj posamično!</string>
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_key_mismatch">Prstni odtis ključa ne ustreza tistemu v dokazilu</string>
   <string name="msg_keybase_error_msg_payload_mismatch">Dešifrirano dokazilo ne ustreza pričakovani vrednosti</string>
@@ -780,6 +797,7 @@
   <string name="contact_show_key">Prikaži ključ (%s)</string>
   <string name="key_colon">Ključ:</string>
   <!--Android Account-->
+  <string name="account_privacy_title">Zasebnost</string>
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
   <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
@@ -790,13 +808,8 @@
   <string name="snack_security_token_import">Uvozi</string>
   <string name="btn_reset">Ponastavi</string>
   <string name="security_token_error">Napaka: %s</string>
-  <string name="linked_create_verify">Overi</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">Končaj</string>
-  <string name="linked_button_verify">Overi</string>
-  <string name="linked_button_retry">Poizkusi ponovno</string>
-  <string name="linked_button_confirm">Potrdi</string>
-  <string name="linked_text_error">Napaka</string>
   <string name="share_log_dialog_share_button">Deli</string>
   <string name="share_log_dialog_cancel_button">Prekliči</string>
   <string name="menu_uids_save">Shrani</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Додај поткључ</string>
   <string name="title_change_master_key">Измени главни кључ</string>
   <string name="title_edit_key">Уреди кључ</string>
-  <string name="title_linked_create">Направи повезани идентитет</string>
   <string name="title_preferences">Поставке</string>
   <string name="title_api_registered_apps">Апликације</string>
   <string name="title_key_server_preference">ОпенПГП сервери кључева</string>
@@ -192,8 +191,6 @@
   <string name="keyserver_sync_settings_title">Аутоматско ажурирање кључева</string>
   <string name="label_experimental_settings_desc_title">Упозорење</string>
   <string name="label_experimental_settings_desc_summary">Ове функције још нису завршене или су резултат истраживања корисничког искуства и безбедности. Стога се не ослањајте на њихову безбедност и молимо вас да не пријављујете грешке на које наиђете!</string>
-  <string name="label_experimental_settings_linked_identities_title">Повезани идентитети</string>
-  <string name="label_experimental_settings_linked_identities_summary">Повезивање кључева са Твитером, Гитхабом, вебсајтовима или ДНС-ом (слично као keybase.io али децентрализовано)</string>
   <string name="label_experimental_settings_keybase_summary">Тражење доказа кључева на keybase.io и њихов приказ приликом приказивања кључа</string>
   <string name="label_experimental_settings_theme_summary">(Иконе и многи екрани још нису прилагођени за тамну тему)</string>
   <!--Proxy Preferences-->
@@ -1190,23 +1187,6 @@
   <string name="msg_revoke_key">Опозивам кључ %s</string>
   <string name="msg_revoke_key_fail">Неуспех опозивања кључа</string>
   <string name="msg_revoke_ok">Успешно опозван кључ</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Проверавам повезани идентитет…</string>
-  <string name="msg_lv_match">Тражим токен</string>
-  <string name="msg_lv_match_error">Токен није нађен у ресурсу!</string>
-  <string name="msg_lv_fp_ok">Отисак је у реду.</string>
-  <string name="msg_lv_fp_error">Отисак се не поклапа!</string>
-  <string name="msg_lv_error_twitter_auth">Грешка добављања аутентификацијског токена за Твитер!</string>
-  <string name="msg_lv_error_twitter_response">Неочекивани одзив Твитер АПИ-ја!</string>
-  <string name="msg_lv_error_github_not_found">Гист не садржи поклапајуће фајлове!</string>
-  <string name="msg_lv_fetch">Добављам УРИ „%s“</string>
-  <string name="msg_lv_fetch_redir">Пратим преусмерење на „%s“</string>
-  <string name="msg_lv_fetch_ok">Успешно добављено (ХТТП %s)</string>
-  <string name="msg_lv_fetch_error">Грешка сервера (ХТТП %s)</string>
-  <string name="msg_lv_fetch_error_url">УРЛ је деформисан!</string>
-  <string name="msg_lv_fetch_error_io">У/И грешка!</string>
-  <string name="msg_lv_fetch_error_format">Грешка формата!</string>
-  <string name="msg_lv_fetch_error_nothing">Ресурс није нађен!</string>
   <string name="msg_bench">Мерим перформансе неких радњи…</string>
   <string name="msg_bench_enc_time">Време шифровања: %ss</string>
   <string name="msg_bench_enc_time_avg">Просечно време шифровања 5 MB: %ss</string>
@@ -1389,67 +1369,8 @@
   <string name="error_scan_fp">Грешка очитавања отиска!</string>
   <string name="error_scan_match">Отисци се не поклапају!</string>
   <string name="error_expiry_past">Датум истицања је у прошлости!</string>
-  <string name="linked_create_https_1_1">Прављењем повезаног идентитета овог типа можете да повежете ваш кључ са вашим вебсајтом.</string>
-  <string name="linked_create_https_1_3">Унесите УРЛ где ћете да сместите текстуални фајл за доказ. Имајте на уму да ваш сервер мора да подржава https и има исправан ТЛС сертификат!</string>
-  <string name="linked_create_https_1_4">На пример: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_created">Фајл доказа је направљен. У следећем кораку требате да га сачувате и отпремите на наведени УРИ:</string>
-  <string name="linked_create_https_2_1">Фајл доказа за овај УРИ је направљен:</string>
-  <string name="linked_create_https_2_2">У следећем кораку требало би да сачувате и отпремите овај фајл.</string>
-  <string name="linked_create_https_2_3">Уверите се да је фајл доступан на тачном УРИ-ију, затим проверите подешавања.</string>
-  <string name="linked_create_https_2_4">Након успешне провере, тапните дугме Заврши да бисте додали повезани идентитет на ваш привезак и завршили поступак.</string>
-  <string name="linked_create_twitter_1_1">Прављењем повезаног идентитета овог типа можете да повежете ваш кључ са вашим налогом на Твитеру.</string>
-  <string name="linked_create_twitter_1_3">За наставак унесите ваше Твитер екранско име.</string>
-  <string name="linked_create_twitter_2_1">Тапните било које дугме да твитујете поруку!</string>
-  <string name="linked_create_twitter_2_2">Можете да уредите твит пре објаве али пазите да текст унутар заграда остане неизмењен.</string>
-  <string name="linked_create_twitter_2_4">Након успешне провере, тапните дугме Заврши да бисте додали повезани идентитет на ваш привезак и завршили поступак.</string>
-  <string name="linked_create_verify">Провери</string>
-  <string name="linked_text_clipboard">Текст је копиран на клипборд</string>
-  <string name="linked_verified_secret_https">Све изгледа у реду.</string>
-  <string name="linked_verified_secret_github">Све изгледа у реду.</string>
-  <string name="linked_verified_secret_dns">Све изгледа у реду.</string>
-  <string name="linked_verified_secret_twitter">Све изгледа у реду.</string>
-  <plurals name="linked_id_expand">
-    <item quantity="one">Има још један непознат тип идентитета</item>
-    <item quantity="few">Има још %d непозната типа идентитета</item>
-    <item quantity="other">Има још %d непознатих типова идентитета</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">„Повезани идентитет“ повезује ваш ПГП кључ са ресурсом на вебу.</string>
-  <string name="linked_select_2">Изаберите тип:</string>
-  <string name="linked_id_generic_text">Овај фајл потврђује власништво ОпенПГП кључа са дугим ИД-ом %2$s.\n\nЗнак за доказ:\n%1$s</string>
-  <string name="linked_verifying">Проверавам…</string>
-  <string name="linked_verify_success">Проверен!</string>
-  <string name="linked_verify_error">Грешка провере!</string>
-  <string name="linked_verify_pending">Још није проверен</string>
-  <string name="linked_need_verify">Ресурс мора бити проверен пре него наставите!</string>
-  <string name="menu_linked_add_identity">Повежи са налогом</string>
-  <string name="section_linked_identities">Повезани идентитети</string>
   <string name="btn_finish">Заврши</string>
-  <string name="linked_title_https">Вебсајт (ХТТПС)</string>
-  <string name="linked_title_dns">Име домене (DNS)</string>
-  <string name="linked_title_github">Гитхаб</string>
-  <string name="linked_title_twitter">Твитер</string>
-  <string name="card_linked_identity">Повезани идентитет</string>
-  <string name="linked_button_verify">Провери</string>
-  <string name="linked_button_retry">Покушај поново</string>
-  <string name="linked_button_retry_step">Поново покушај последњи корак</string>
-  <string name="linked_button_confirm">Потврди</string>
-  <string name="linked_button_view">Прикажи</string>
-  <string name="linked_text_verifying">Проверавам…</string>
-  <string name="linked_text_error">Грешка</string>
-  <string name="linked_text_confirming">Потврђујем…</string>
-  <string name="linked_ids_more_unknown">још %d непознатих типова идентитета</string>
-  <string name="title_linked_id_create">Направи повезани идентитет</string>
-  <string name="linked_github_text">Ова радња ће повезати ваш кључ са вашим Гитхаб налогом.\nТапните дугме за наставак.</string>
-  <string name="linked_progress_update_key">Ажурирам кључ…</string>
-  <string name="linked_button_start">Повежи са Гитхаб налогом</string>
-  <string name="linked_error_auth_failed">Овлашћивање није успело!</string>
-  <string name="linked_error_timeout">Истекло прековреме повезивања!</string>
-  <string name="linked_error_network">Грешка мреже!</string>
-  <string name="linked_error_http">Грешка комуникације: %s</string>
-  <string name="linked_webview_title_github">Гитхаб овлашћење</string>
-  <string name="linked_gist_description">Повезани идентитет Отвореног кључарника</string>
-  <string name="linked_empty">Повежите ваш кључ са Гитхабом, Твитером или осталим сајтовима!</string>
   <string name="snack_btn_overwrite">Пребриши</string>
   <string name="backup_code_explanation">Резерва ће бити обезбеђена кôдом за резерву. Запишите га пре него што наставите даље!</string>
   <string name="backup_code_enter">Унесите кôд за резерву:</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Lägg till undernyckel</string>
   <string name="title_change_master_key">Ändra huvudnyckel</string>
   <string name="title_edit_key">Redigera nyckel</string>
-  <string name="title_linked_create">Skapa en länkad identitet</string>
   <string name="title_preferences">Inställningar</string>
   <string name="title_api_registered_apps">Appar</string>
   <string name="title_key_server_preference">OpenPGP-nyckelservrar</string>
@@ -36,6 +35,7 @@
   <string name="title_advanced_key_info">Avancerat</string>
   <string name="title_delete_secret_key">Radera DIN nyckel \"%s\"?</string>
   <string name="title_manage_my_keys">Hantera mina nycklar</string>
+  <string name="title_alert_strip">Avskala den här undernyckeln</string>
   <!--section-->
   <string name="section_user_ids">Identiteter</string>
   <string name="section_security_token">Säkerhetstoken</string>
@@ -182,6 +182,7 @@
   <string name="label_selected_smartpgp_authority_title">Vald auktoritet</string>
   <string name="label_preferred">föredraget</string>
   <string name="label_enable_compression">Aktivera kompression</string>
+  <string name="label_enable_self_encrypt">Kryptera till signerare</string>
   <string name="label_encrypt_filenames">Kryptera filnamn</string>
   <string name="label_hidden_recipients">Dölj mottagare</string>
   <string name="label_smartpgp_verify">SmartPGP: Verifiera certifikat</string>
@@ -214,8 +215,6 @@
   <string name="keyserver_sync_settings_title">Automatiska nyckeluppdateringar</string>
   <string name="label_experimental_settings_desc_title">Varning</string>
   <string name="label_experimental_settings_desc_summary">Dessa funktioner är ännu inte färdiga eller resultat av användarupplevelse/säkerhetsforskning. Lita därför inte på deras säkerhet och var snäll och rapportera inte problem du stöter på!</string>
-  <string name="label_experimental_settings_linked_identities_title">Länkade identiteter</string>
-  <string name="label_experimental_settings_linked_identities_summary">Länka nycklarna till Twitter, GitHub, webbplatser eller DNS (liknande keybase.io men decentraliserade)</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io proofs</string>
   <string name="label_experimental_settings_keybase_summary">Kontakta keybase.io för nyckelbevis och visa dem varje gång en nyckel visas</string>
   <string name="label_experimental_settings_theme_summary">(Ikonerna och många skärmar är ännu inte justerade för mörkt tema)</string>
@@ -301,6 +300,7 @@
   <string name="error_message">Fel: %s</string>
   <string name="theme_dark">Mörk</string>
   <string name="theme_light">Ljus</string>
+  <string name="strip">Avskala den</string>
   <!--sentences-->
   <string name="wrong_passphrase">Fel lösenord.</string>
   <string name="no_filemanager_installed">Ingen kompatibel filhanterare är installerad.</string>
@@ -339,6 +339,7 @@
   <string name="public_key_deletetion_confirmation">Radera nyckel \'%s\'?</string>
   <string name="also_export_secret_keys">Exportera även privata nycklar</string>
   <string name="reinstall_openkeychain">Du stötte på ett känd fel hos Android. Installera om OpenKeychain om du vill koppla ihop dina kontakter med nycklar.</string>
+  <string name="alert_strip">Att avskala den här undernyckeln gör den oanvändbar på den här enheten!</string>
   <string name="key_exported">Exporterade 1 nyckel.</string>
   <string name="keys_exported">Exporterade %d nycklar.</string>
   <string name="no_keys_exported">Inga nycklar exporterades.</string>
@@ -411,6 +412,7 @@
   <string name="progress_downloading">hämtar…</string>
   <string name="progress_saving">sparar…</string>
   <string name="progress_importing">importerar…</string>
+  <string name="progress_benchmarking">jämför...</string>
   <string name="progress_revoking_uploading">Återkallar och skicka nyckel…</string>
   <string name="progress_updating">Uppdaterar nycklar...</string>
   <string name="progress_exporting">exporterar…</string>
@@ -431,7 +433,7 @@
   <string name="progress_modify_primaryuid">ändrar primärt användar-ID…</string>
   <string name="progress_modify_subkeychange">modifierar undernycklar…</string>
   <string name="progress_modify_subkeyrevoke">återkallar undernycklar…</string>
-  <string name="progress_modify_subkeystrip">rensar undernycklar…</string>
+  <string name="progress_modify_subkeystrip">avskalar undernycklar…</string>
   <string name="progress_modify_subkeyadd">lägger till undernycklar…</string>
   <string name="progress_modify_passphrase">byter lösenord...</string>
   <string name="progress_modify_pin">ändrar PIN-kod...</string>
@@ -673,9 +675,11 @@
   <string name="keybase_narrative_reddit">Inlägg till Reddit som %s</string>
   <string name="keybase_narrative_coinbase">Är känd på Coinbase som %s</string>
   <string name="keybase_narrative_hackernews">Inlägg till Hacker News as %s</string>
+  <string name="keybase_narrative_unknown">Okänd bevis typ %s</string>
   <string name="keybase_proof_failure">Tyvärr kan detta bevis inte verifieras.</string>
   <string name="keybase_problem_fetching_evidence">Problem med bevis</string>
   <string name="keybase_dns_query_failure">Hämtning av DNS TXT-post misslyckades</string>
+  <string name="keybase_message_payload_mismatch">Dekrypterad bevispost matchar inte förväntat värde</string>
   <string name="keybase_message_fetching_data">Hämtar bevis</string>
   <string name="keybase_proof_succeeded">Detta bevis har verifierats!</string>
   <string name="keybase_a_post">En post</string>
@@ -714,6 +718,7 @@
   <string name="edit_key_error_bad_security_token_algo">Algoritmen stöds inte av säkerhetstoken!</string>
   <string name="edit_key_error_bad_security_token_size">RSA-nyckeln som är lägre än 2048 bitar stöds inte av säkerhetstoken sedan OpenPGP-kortspecifikation 3.x!</string>
   <string name="edit_key_error_bad_security_token_curve">Curve stöds inte av säkerhetstoken!</string>
+  <string name="edit_key_error_bad_security_token_stripped">Det går inte att flytta nyckeln till säkerhetstoken (antingen avskalad eller redan på säkerhetstoken)!</string>
   <!--Create key-->
   <string name="create_key_upload">Publicera på nyckelservrar</string>
   <string name="create_key_empty">Detta fält krävs</string>
@@ -787,6 +792,7 @@
   <string name="msg_internal_error">Intern fel!</string>
   <string name="msg_cancelled">Operation avbruten.</string>
   <!--Import Public log entries-->
+  <string name="msg_ip_apply_batch">Tillämpa inmatning av batchoperation.</string>
   <string name="msg_ip_bad_type_secret">Försökte att importera hemlig nyckelring som publik. Detta är ett fel, skicka en felrapport!</string>
   <string name="msg_ip_delete_old_fail">Ingen gammal nyckel raderad (skapa en ny?)</string>
   <string name="msg_ip_delete_old_ok">Raderade gammal nyckel från databas</string>
@@ -891,6 +897,10 @@
   <string name="msg_is_merge_special">Sammanfoga i självcertifikatdata från offentlig nyckelring</string>
   <string name="msg_is_pubring_generate">Genererar publik nyckelring från privat nyckelring</string>
   <string name="msg_is_subkey_nonexistent">Undernyckel %s inte tillgänglig i privat nyckelring</string>
+  <string name="msg_is_subkey_ok">Märkt hemlig undernyckel %s som tillgänglig</string>
+  <string name="msg_is_subkey_empty">Märkt hemlig undernyckel %s  som tillgänglig, med tomt lösenord</string>
+  <string name="msg_is_subkey_stripped">Märkt hemlig undernyckel %s som avskalad</string>
+  <string name="msg_is_subkey_divert">Märkt hemlig undernyckel %s som nyckel på Säkerhetstoken</string>
   <string name="msg_is_success_identical">Nyckelringen innehåller ingen ny information, inget att göra</string>
   <string name="msg_is_success">Importerade privat nyckelring</string>
   <!--Keyring Canonicalization log entries-->
@@ -899,17 +909,25 @@
   <string name="msg_kc_error_master_algo">Den här huvudnyckeln använder en okänd (%s) algoritm!</string>
   <string name="msg_kc_master">Bearbetar huvudnyckel</string>
   <string name="msg_kc_master_bad_type">Tar bort huvudnyckelcertifikat av okänd typ (%s)</string>
+  <string name="msg_kc_master_bad_local">Tar bort huvudnyckelcertifikat med \"lokal\" flagga</string>
   <string name="msg_kc_master_bad_err">Tar bort dåligt huvudnyckelcertifikat</string>
   <string name="msg_kc_master_bad_time">Tar bort återkallelsecertifikat för nyckelring med framtida tidstämpel</string>
+  <string name="msg_kc_master_bad_type_uid">Tar bort användar-ID-certifikat i dåligt läge</string>
   <string name="msg_kc_master_bad">Tar bort dåligt huvudnyckelcertifikat</string>
+  <string name="msg_kc_master_local">Tar bort huvudnyckelcertifikat med \"lokal\" flagga</string>
   <string name="msg_kc_revoke_dup">Tar bort överflödigt återkallelsecertifikat för nyckelring</string>
+  <string name="msg_kc_notation_empty">Ta bort tomt notationscertifikat</string>
   <string name="msg_kc_sub">Bearbetar undernyckel %s</string>
+  <string name="msg_kc_sub_bad_time">Tar bort undernyckelbindningscertifikat med framtida tidsstämpel</string>
+  <string name="msg_kc_sub_bad_time_early">Undernyckelbindningscertifikatet har tidigare tidsstämpel än dess nyckel!</string>
+  <string name="msg_kc_sub_bad_type">Okänd undernyckel certifikattyp: %s</string>
   <string name="msg_kc_sub_no_cert">Inget giltigt certifikat hittades för %s, tar bort från nyckelring</string>
   <string name="msg_kc_sub_revoke_bad_err">Tar bort dåligt återkallelsecertifikat för undernyckel</string>
   <string name="msg_kc_sub_revoke_bad">Tar bort dåligt återkallelsecertifikat för undernyckel</string>
   <string name="msg_kc_sub_revoke_dup">Tar bort överflödigt återkallelsecertifikat för undernyckel</string>
   <string name="msg_kc_sub_unknown_algo">Undernyckel använder en okänd algoritm, importerar inte…</string>
   <string name="msg_kc_uid_bad_err">Tar bort dåligt eget-certifikat för användar-ID \'%s\'</string>
+  <string name="msg_kc_uid_bad_local">Ta bort user ID-certifikat med \"lokal\" flagga</string>
   <string name="msg_kc_uid_bad_time">Tar bort användar-ID med framtida tidstämpel</string>
   <string name="msg_kc_uid_bad">Tar bort dåligt eget-certifikat för användar-ID \'%s\'</string>
   <string name="msg_kc_uid_cert_dup">Tar bort föråldrat eget-certifikat för användar-ID \'%s\'</string>
@@ -921,7 +939,11 @@
   <string name="msg_kc_uat_jpeg">Bearbetar användarattribut av typ JPEG</string>
   <string name="msg_kc_uat_unknown">Bearbetar användarattribut av okänd typ</string>
   <string name="msg_kc_uat_bad_err">Tar bort dåligt självcertifikat för användarattribut</string>
+  <string name="msg_kc_uat_bad_local">Ta bort användarattributcertifikat med \"lokal\" flagga</string>
+  <string name="msg_kc_uat_bad_time">Tar bort användarattribut med framtida tidsstämpel</string>
+  <string name="msg_kc_uat_bad_type">Tar bort användarattributcertifikat av okänd typ (%s)</string>
   <string name="msg_kc_uat_bad">Tar bort dåligt självcertifikat för användarattribut</string>
+  <string name="msg_kc_uat_cert_dup">Tar bort inaktuellt självcertifikat för användarattribut</string>
   <string name="msg_kc_uat_remove">Tar bort ogiltigt användarattribut</string>
   <string name="msg_kc_uat_warn_encoding">Användar-ID verifieras inte som UTF-8!</string>
   <!--Keyring merging log entries-->
@@ -938,6 +960,7 @@
   <string name="msg_cr_error_no_user_id">Nyckelringar måste skapas med minst ett användar-ID!</string>
   <string name="msg_cr_error_no_certify">Huvudnyckel måste ha en certifieringsflagga!</string>
   <string name="msg_cr_error_keysize_2048">Nyckelstorleken måste vara större eller lika med 2048!</string>
+  <string name="msg_cr_error_no_keysize">Ingen elliptisk kurva specificerad! Detta är ett programmeringsfel, vänligen lämna in en felrapport!</string>
   <string name="msg_cr_error_internal_pgp">Internt OpenPGP-fel!</string>
   <string name="msg_cr_error_unknown_algo">Okänd algoritm vald. Detta är ett programmeringsfel, skicka en felrapport!</string>
   <string name="msg_cr_error_flags_dsa">Dåliga nyckelflaggor valda, DSA kan inte användas för kryptering!</string>
@@ -946,40 +969,73 @@
   <string name="msg_cr_error_flags_ecdh">Dåliga nyckelflaggor valda, ECDH kan inte användas för signering!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Modifierar nyckelring %s</string>
+  <string name="msg_mf_divert">Kommer att använda säkerhetstoken för kryptooperationer</string>
+  <string name="msg_mf_error_all_keys_stripped">Alla nycklar är avskalade!</string>
+  <string name="msg_mf_error_divert_newsub">Skapandet av nya undernycklar stöds inte för primära nycklar på säkerhetstoken!</string>
+  <string name="msg_mf_error_divert_serial">Serienumret för en nyckel på säkerhetstoken måste vara 16 byte! Detta är ett programmeringsfel, vänligen lämna in en felrapport!</string>
+  <string name="msg_mf_error_encode">Kodnings undantag!</string>
   <string name="msg_mf_error_fingerprint">Det verkliga nyckelfingeravtrycket stämmer inte överens med det som förväntades!</string>
   <string name="msg_mf_error_keyid">Inget nyckel-ID. Det här är ett internt fel, skicka en felrapport!</string>
+  <string name="msg_mf_error_integrity">Internt fel, integritetskontrollen misslyckades!</string>
+  <string name="msg_mf_error_master_none">Inget huvudcertifikat befinns fungera på! (Alla återkallade?)</string>
   <string name="msg_mf_error_noexist_primary">Dåligt primärt användar-ID angivet!</string>
+  <string name="msg_mf_error_noexist_revoke">Dåligt användar-ID för återkallelse angivet!</string>
+  <string name="msg_mf_error_restricted">Försökte utföra begränsad operation utan lösenord! Detta är ett programmeringsfel, vänligen lämna in en felrapport!</string>
   <string name="msg_mf_error_revoked_primary">Återkallade användar-ID:n kan inte vara primära!</string>
+  <string name="msg_mf_error_null_expiry">Utgångstiden kan inte vara \"samma som tidigare\" på undernyckelskapandet. Detta är ett programmeringsfel, vänligen lämna in en felrapport!</string>
   <string name="msg_mf_error_noop">Inget att göra!</string>
+  <string name="msg_mf_error_passphrase_master">Allvarligt fel vid dekryptering av huvudnyckeln! Detta är sannolikt ett programmeringsfel, vänligen lämna in en felrapport!</string>
   <string name="msg_mf_error_passphrases_unchanged">Inget lösenord ändrat!</string>
   <string name="msg_mf_error_pgp">Internt OpenPGP-fel!</string>
+  <string name="msg_mf_error_sig">Undantag för signatur!</string>
+  <string name="msg_mf_error_sub_stripped">Det går inte att ändra avskalad undernyckel %s!</string>
+  <string name="msg_mf_error_conflicting_nfc_commands">Det går inte att flytta nyckeln till säkerhetstoken i samma åtgärd som skapar en signatur på kortet.</string>
+  <string name="msg_mf_error_duplicate_keytocard_for_slot">Säkerhetstoken stöder endast en öppning per nyckeltyp.</string>
+  <string name="msg_mf_error_invalid_flags_for_keytocard">Olämpliga nyckelflaggor för säkerhetstoken-nyckel.</string>
+  <string name="msg_mf_master">Ändring av huvudcertifieringar</string>
   <string name="msg_mf_passphrase">Ändra lösenord för nyckelring</string>
   <string name="msg_mf_pin">Ändrar PIN-kod på kort</string>
   <string name="msg_mf_admin_pin">Ändrar administratörs PIN-kod på kort</string>
   <string name="msg_mf_passphrase_key">Återkrypterar undernyckel %s med nytt lösenord</string>
+  <string name="msg_mf_passphrase_empty_retry">Inställning av nytt lösenord misslyckades, försök igen med tomt gammalt lösenord</string>
+  <string name="msg_mf_passphrase_fail">Lösenord för undernyckel kunde inte ändras! (Har den en annan än de andra nycklarna?)</string>
   <string name="msg_mf_primary_replace_old">Ersätter certifikat för tidigare primärt användar-ID</string>
   <string name="msg_mf_primary_new">Genererar nytt certifikat för nytt primärt användar-ID</string>
+  <string name="msg_mf_restricted_mode">Ändra till begränsat driftläge</string>
   <string name="msg_mf_subkey_change">Modifierar undernyckel %s</string>
+  <string name="msg_mf_require_divert">Använda säkerhetstoken för kryptooperationer</string>
   <string name="msg_mf_require_passphrase">Lösenord krävs för operationer</string>
   <string name="msg_mf_subkey_new">Lägger till ny undernyckel av typen %s</string>
   <string name="msg_mf_subkey_new_id">Nytt undernyckel-ID: %s</string>
   <string name="msg_mf_error_past_expiry">Utgångsdatum kan inte vara i det förflutna!</string>
   <string name="msg_mf_subkey_revoke">Återkallar undernyckel %s</string>
-  <string name="msg_mf_subkey_strip">Rensar undernyckel %s</string>
+  <string name="msg_mf_subkey_strip">Avskalar undernyckel %s</string>
+  <string name="msg_mf_keytocard_start">Flytta undernyckeln %s till säkerhetstoken</string>
+  <string name="msg_mf_keytocard_finish">Flyttade %1$s till säkerhetstoken %2$s</string>
+  <string name="msg_mf_success">Nyckelringen modifierad</string>
   <string name="msg_mf_uid_add">Lägger till användar-ID %s</string>
   <string name="msg_mf_uid_primary">Ändrar primärt användar-ID till %s</string>
   <string name="msg_mf_uid_revoke">Återkallar användar-ID %s</string>
   <string name="msg_mf_uid_error_empty">Användar-ID får inte vara tomt!</string>
+  <string name="msg_mf_uat_error_empty">Användarattribut får inte vara tomt!</string>
+  <string name="msg_mf_uat_add_image">Lägger till användarattribut av typen bild</string>
+  <string name="msg_mf_uat_add_unknown">Lägger till användarattribut av okänd typ</string>
+  <string name="msg_mf_unlock_error">Fel vid upplåsning av nyckelring!</string>
   <string name="msg_mf_unlock">Låser upp nyckelring</string>
   <!--Edit Key (higher level than modify)-->
   <string name="msg_ed">Utför nyckeloperation</string>
   <string name="msg_ed_caching_new">Cachelagra nytt lösenord</string>
+  <string name="msg_ed_error_no_parcel">Saknas SaveKeyringParcel! (detta är en bugg, vänligen rapportera)</string>
   <string name="msg_ed_error_key_not_found">Nyckel hittades inte!</string>
+  <string name="msg_ed_error_extract_public_upload">Fel vid uppackande av offentlig nyckel för uppladdning!</string>
+  <string name="msg_ed_fetching">Hämta nyckel för att ändra (%s)</string>
   <string name="msg_ed_success">Nyckeloperation lyckades</string>
   <!--Promote key-->
   <string name="msg_pr_error_key_not_found">Nyckel hittades inte!</string>
+  <string name="msg_pr_fetching">Hämtar nyckel för att ändra (%s)</string>
+  <string name="msg_pr_subkey_nomatch">Undernyckel inte på säkerhetstoken: %s</string>
   <!--Other messages used in OperationLogs-->
-  <string name="msg_ek_error_dummy">Kan inte redigera nyckelring med en rensad huvudnyckel!</string>
+  <string name="msg_ek_error_dummy">Kan inte redigera nyckelring med en avskalad huvudnyckel!</string>
   <string name="msg_ek_error_not_found">Nyckel hittades inte!</string>
   <!--Messages for DecryptVerify operation-->
   <string name="msg_dc_askip_bad_flags">Nyckeln är inte en krypteringsnyckel, hoppar över...</string>
@@ -992,18 +1048,30 @@
   <string name="msg_dc_clear_meta_mime">MIME-typ: %s</string>
   <string name="msg_dc_clear_meta_size">Filstorlek: %s</string>
   <string name="msg_dc_clear_meta_size_unknown">Filstorlek: Okänd</string>
+  <string name="msg_dc_clear_meta_time">Ändringstid: %s</string>
   <string name="msg_dc_clear_signature_bad">Signaturkontroll INTE OK!</string>
   <string name="msg_dc_clear_signature_check">Verifierar signaturdata</string>
   <string name="msg_dc_clear_signature_ok">Signaturkontroll OK</string>
   <string name="msg_dc_clear_signature">Sparar signaturdata till senare</string>
   <string name="msg_dc_clear">Bearbetar klartextdata</string>
+  <string name="msg_dc_error_bad_passphrase">Fel vid upplåsning av nyckel, dåligt lösenord!</string>
+  <string name="msg_dc_error_sym_passphrase">Fel vid dekryptering av data! (Dåligt lösenord?)</string>
+  <string name="msg_dc_error_corrupt_data">Data är korrupt!</string>
   <string name="msg_dc_error_extract_key">Okänt fel vid upplåsning av nyckel</string>
   <string name="msg_dc_error_integrity_check">Fel vid integritetskontroll!</string>
   <string name="msg_dc_error_invalid_data">Ingen giltig OpenPGP krypterad eller signerad data hittad!</string>
+  <string name="msg_dc_error_io">Stötte på ett fel vid läsning av inmatningsdata!</string>
+  <string name="msg_dc_error_input">Fel vid öppning av inmatningsdataström!</string>
   <string name="msg_dc_error_no_data">Ingen krypterad data hittad i strömmen!</string>
   <string name="msg_dc_error_no_key">Ingen krypterad data med känd hemlig nyckel hittad i strömmen!</string>
   <string name="msg_dc_error_no_signature">Saknar signaturdata!</string>
+  <string name="msg_dc_error_pgp_exception">Stötte på OpenPGP-undantag under drift!</string>
+  <string name="msg_dc_integrity_check_ok">Integritetskontroll OK!</string>
   <string name="msg_dc_ok_meta_only">Endast metadata krävdes, hoppar över dekryptering</string>
+  <string name="msg_dc_ok">Dekryptering/verifiering klar</string>
+  <string name="msg_dc_pass_cached">Använda lösenord från cache</string>
+  <string name="msg_dc_pending_nfc">NFC-token krävs, begär användarinmatning…</string>
+  <string name="msg_dc_pending_passphrase">Lösenord krävs, begär användarinmatning…</string>
   <string name="msg_dc_prep_streams">Förbereder strömmar för dekryptering</string>
   <string name="msg_dc">Startar dekrypteringsoperation…</string>
   <string name="msg_dc_sym_skip">Symmetrisk data inte tillåten, hoppar över…</string>
@@ -1014,15 +1082,18 @@
   <string name="msg_dc_insecure_hash_algo">Osäker hashalgoritm har använts! Detta kan hända för att applikationen har gått ur datumet, eller från en attack.</string>
   <!--Messages for VerifySignedLiteralData operation-->
   <string name="msg_vl">Startar signaturkolk</string>
+  <string name="msg_vl_error_wrong_key">Meddelandet inte signerat med förväntad nyckel!</string>
   <string name="msg_vl_error_no_signature">Saknar signaturdata!</string>
   <string name="msg_vl_clear_meta_file">Filnamn: %s</string>
   <string name="msg_vl_clear_meta_mime">MIME-typ: %s</string>
+  <string name="msg_vl_clear_meta_time">Ändringstid: %s</string>
   <string name="msg_vl_clear_meta_size">Filstorlek: %s</string>
   <string name="msg_vl_clear_signature_check">Verifierar signaturdata</string>
   <string name="msg_vl_error_integrity_check">Fel vid integritetskontroll!</string>
   <string name="msg_vl_ok">Ok</string>
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se">Startar signerings/krypterings procedur</string>
+  <string name="msg_se_error_no_input">Ingen inmatning ges!</string>
   <string name="msg_se_success">Signering/kryptering lyckades!</string>
   <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_pse_asymmetric">Förbereder öppna nycklar för kryptering</string>
@@ -1030,48 +1101,80 @@
   <string name="msg_pse_encrypting">Krypterar data</string>
   <string name="msg_pse_error_bad_passphrase">Dåligt lösenord!</string>
   <string name="msg_pse_error_key_sign">Den valda signeringsnyckeln kan inte signera data!</string>
+  <string name="msg_pse_error_sign_key">Fel vid hämtning av signeringsnyckeln!</string>
   <string name="msg_pse_error_nfc">NFC datafel!</string>
   <string name="msg_pse_error_no_passphrase">Inget lösenord angivet!</string>
   <string name="msg_pse_error_pgp">Internt OpenPGP-fel!</string>
+  <string name="msg_pse_error_sig">Stötte på OpenPGP-signatur undantag!</string>
   <string name="msg_pse_error_unlock">Okänt fel vid upplåsning av nyckel</string>
+  <string name="msg_pse_error_key_not_allowed">Nyckel vald för kryptering är inte tillåten</string>
   <string name="msg_pse_error_revoked_or_expired">Återkallad/utgången nyckel kan inte användas för signaturgenerering eller kryptering</string>
   <string name="msg_pse_key_ok">Kryptering för nyckel: %s</string>
   <string name="msg_pse_key_unknown">Saknad nyckel för kryptering: %s</string>
   <string name="msg_pse_key_warn">Dålig nyckel för kryptering: %s</string>
   <string name="msg_pse_ok">Signerings/krypterings proceduren lyckades!</string>
+  <string name="msg_pse_pending_nfc">NFC-token krävs, begär användarinmatning…</string>
+  <string name="msg_pse_pending_passphrase">Lösenord krävs, begär användarinmatning…</string>
   <string name="msg_pse_signing">Signerar data (utan kryptering)</string>
   <string name="msg_pse_signing_cleartext">Skapar signatur i klartext</string>
+  <string name="msg_pse_signing_detached">Skapar fristående signatur</string>
   <string name="msg_pse_sigcrypting">Krypterar data med signatur</string>
   <string name="msg_pse">Startar signerings- och/eller krypteringsprocedur</string>
   <string name="msg_pse_symmetric">Förbereder symmetrisk kryptering</string>
   <!--Messages for Authentication operation-->
+  <string name="msg_auth">Startar autentiseringsoperation</string>
+  <string name="msg_auth_error_key_not_allowed">Nyckel vald för autentisering är inte tillåten</string>
   <string name="msg_auth_error_revoked_or_expired">Återkallad/utgången nyckel kan inte användas för autentisering</string>
+  <string name="msg_auth_error_unlock">Okänd fel vid upplåsning av nyckel!</string>
+  <string name="msg_auth_pending_nfc">NFC-token krävs, begär användarinmatning…</string>
+  <string name="msg_auth_pending_passphrase">Lösenord krävs, begär användarinmatning…</string>
   <string name="msg_auth_error_bad_passphrase">Dåligt lösenord!</string>
   <string name="msg_auth_error_nfc">NFC-datafel!</string>
+  <string name="msg_auth_error_sig">Stötte på OpenPGP-signatur undantag!</string>
+  <string name="msg_auth_ok">Autentiseringsoperation lyckad!</string>
   <string name="msg_crt_certifying">Genererar certifieringar</string>
+  <plurals name="msg_crt_certify_uids">
+    <item quantity="one">Certifierar ett användar-ID för nyckeln %2$s</item>
+    <item quantity="other">Certifierar %1$d användar-ID för nyckeln %2$s</item>
+  </plurals>
+  <plurals name="msg_crt_certify_uats">
+    <item quantity="one">Certifierar ett användarattribut för nyckeln %2$s</item>
+    <item quantity="other">Certifierar %1$d användarattribut för nyckeln %2$s</item>
+  </plurals>
+  <string name="msg_crt_error_self">Kan inte utfärda självcertifikat så här!</string>
   <string name="msg_crt_error_master_not_found">Huvudnyckel hittades inte!</string>
   <string name="msg_crt_error_nothing">Inga nycklar certifierade!</string>
   <string name="msg_crt_error_unlock">Fel vid upplåsning av huvudnyckel!</string>
   <string name="msg_crt">Certifierar nyckelringar</string>
+  <string name="msg_crt_master_fetch">Hämta certifierande huvudnyckel</string>
+  <string name="msg_crt_nfc_return">Återgår till NFC-skärmen</string>
   <string name="msg_crt_save">Sparar certifierad nyckel %s</string>
   <string name="msg_crt_saving">Sparar nyckelringar</string>
   <string name="msg_crt_unlock">Låser upp huvudnyckel</string>
   <string name="msg_crt_success">Certifierade identiteter</string>
   <string name="msg_crt_warn_not_found">Nyckel hittades inte!</string>
   <string name="msg_crt_warn_cert_failed">Certifikat generering misslyckades!</string>
+  <string name="msg_crt_warn_save_failed">Spara operation misslyckades!</string>
+  <string name="msg_crt_warn_upload_failed">Uppladdningsoperationen misslyckades!</string>
   <string name="msg_crt_upload_success">Skickade nyckel till server</string>
   <plurals name="msg_import">
     <item quantity="one">Importerar nyckel</item>
     <item quantity="other">Importerar %d nycklar</item>
   </plurals>
+  <string name="msg_import_fetch_error_decode">Fel vid avkodning av hämtad nyckelring!</string>
+  <string name="msg_import_fetch_error">Nyckeln kunde inte hämtas! (Nätverksproblem?)</string>
   <string name="msg_import_fetch_error_not_found">Nyckel hittades inte!</string>
+  <string name="msg_import_fetch_error_keyserver">Det gick inte att hämta nyckeln från nyckelservrar: %s</string>
+  <string name="msg_import_fetch_error_keyserver_secret">Det går inte att importera hemlig nyckel från nyckelserver!</string>
   <string name="msg_import_fetch_keybase">Hämtar från keybase.io: %s</string>
   <string name="msg_import_fetch_facebook">Hämtar från Facebook: %s</string>
   <string name="msg_import_fetch_keyserver">Hämtar från nyckelserver: %s</string>
   <string name="msg_import_fetch_keyserver_ok">Nyckelhämtning lyckades</string>
   <string name="msg_import_keyserver">Använder nyckelserver %s</string>
   <string name="msg_import_merge">Slår ihop data som tagits emot</string>
+  <string name="msg_import_merge_error">Fel vid sammanslagning av hämtad data!</string>
   <string name="msg_import_error">Importoperation misslyckades!</string>
+  <string name="msg_import_error_io">Importeringsoperationen misslyckades på grund av i/o-fel!</string>
   <string name="msg_import_partial">Importoperation lyckades, med fel!</string>
   <string name="msg_import_success">Importoperation lyckades!</string>
   <plurals name="msg_backup">
@@ -1081,13 +1184,17 @@
   <string name="msg_backup_all">Säkerhetskopiering med alla nycklar</string>
   <string name="msg_backup_public">Skapa säkerhetskopia av publik nyckel %s</string>
   <string name="msg_backup_secret">Skapa säkerhetskopia av hemlig nyckel %s</string>
+  <string name="msg_backup_error_uri_open">Fel vid öppnande av URI-ström!</string>
   <string name="msg_backup_error_db">Databasfel!</string>
+  <string name="msg_backup_error_io">Inmatnings-/utmatningsfel!</string>
   <string name="msg_backup_success">Säkerhetskopieringen lyckades</string>
+  <string name="msg_upload">Ladda upp offentlig nyckel</string>
   <string name="msg_upload_proxy_direct">Använder proxy: Ingen</string>
   <string name="msg_upload_proxy_tor">Använder proxy: TOR</string>
   <string name="msg_upload_proxy">Använder proxy: %s</string>
   <string name="msg_upload_server">Server: %s</string>
   <string name="msg_upload_key">Nyckel-ID: %s</string>
+  <string name="msg_upload_error_key">Fel vid förbehandling av viktig data!</string>
   <string name="msg_upload_error_not_found">Nyckel hittades inte!</string>
   <string name="msg_upload_error_upload">Fel vid sändning av nyckel till server! Kontrollera din internetanslutning</string>
   <string name="msg_upload_success">Sändning till nyckelserver lyckades</string>
@@ -1108,17 +1215,10 @@
     <item quantity="other">Misslyckades med att radera %d nycklar</item>
   </plurals>
   <string name="msg_revoke_error_empty">Inget att återkalla!</string>
+  <string name="msg_revoke_error_not_found">Kan inte hitta nyckeln för att återkalla!</string>
   <string name="msg_revoke_key">Återkallar nyckel %s</string>
+  <string name="msg_revoke_key_fail">Misslyckades att återkalla nyckeln</string>
   <string name="msg_revoke_ok">Återkallat nyckel</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Verifierar länkad identitet...</string>
-  <string name="msg_lv_match">Söker efter token</string>
-  <string name="msg_lv_fetch_ok">Hämtning lyckades (HTTP%s)</string>
-  <string name="msg_lv_fetch_error">Serverfel (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">URL är felaktig!</string>
-  <string name="msg_lv_fetch_error_io">IO-fel!</string>
-  <string name="msg_lv_fetch_error_format">Formatfel!</string>
-  <string name="msg_lv_fetch_error_nothing">Resurs hittades inte!</string>
   <string name="msg_bench_enc_time">Krypteringstid: %ss</string>
   <string name="msg_bench_enc_time_avg">Genomsnittlig tidsåtgång för att kryptera 5 MB: %ss</string>
   <string name="msg_bench_dec_time">Dekrypteringstid: %ss</string>
@@ -1127,13 +1227,16 @@
   <string name="msg_data">Bearbetar inmatningsdata</string>
   <string name="msg_data_openpgp">Försöker att behandla OpenPGP-data</string>
   <string name="msg_data_detached_clear">Rensar tidigare, osignerad data!</string>
+  <string name="msg_data_detached_trailing">Hoppa över efterföljande data efter signerad del!</string>
   <string name="msg_data_mime_filename">Filnamn: \'%s\'</string>
   <string name="msg_data_mime_from_extension">Gissar MIME-typ från utökning</string>
   <string name="msg_data_mime_length">Innehållslängd: %s</string>
   <string name="msg_data_mime_charset">Teckenuppsättning är \"%s\"</string>
   <string name="msg_data_mime_charset_faulty">Teckenuppsättning är \"%s\", men avkodning misslyckades!</string>
+  <string name="msg_data_mime_part">Bearbetar MIME-del</string>
   <string name="msg_data_mime_type">Innehållstyp: %s</string>
   <string name="msg_get_success">Hämtning lyckades!</string>
+  <string name="msg_get_file_not_found">Inmatningsfilen hittades inte!</string>
   <string name="msg_get_no_valid_keys">Inga giltiga nycklar hittades i fil/urklipp!</string>
   <string name="msg_get_too_many_responses">Nyckel sökfråga gav alltför många kandidater. Vänligen förfina din förfråga!</string>
   <string name="msg_get_query_too_short">Sökfråga för kort. Vänligen förfina din förfråga!</string>
@@ -1142,6 +1245,7 @@
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_dns_fail">Hämtning av DNS TXT-post misslyckades</string>
   <string name="msg_keybase_error_specific">%s</string>
+  <string name="msg_keybase_error_msg_payload_mismatch">Dekrypterad bevispost matchar inte förväntat värde</string>
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
   <string name="passp_cache_notif_touch_to_clear">Tryck för att rensa lösenord.</string>
@@ -1180,11 +1284,13 @@
   <string name="certs_text">Endast validerade själv certifikat och validerade certifikat som skapats med dina nycklar visas här.</string>
   <string name="section_uids_to_certify">Identiteter för</string>
   <string name="certify_text">Nycklarna du importerar innehåller \"identiteter\": namn och e-postadresser. Välja exakt de för bekräftelse som matchar vad du förväntade dig.</string>
+  <string name="certify_fingerprint_text">Jämför fingeravtrycket, tecken efter tecken, med det som visas på din partners enhet.</string>
   <string name="label_revocation">Anledning till återkallelse</string>
   <string name="label_cert_type">Typ</string>
   <string name="error_key_not_found">Nyckel hittades inte!</string>
   <string name="error_key_processing">Fel vid bearbetning av nyckel!</string>
-  <string name="key_stripped">rensad</string>
+  <string name="key_stripped">avskalad</string>
+  <string name="key_divert">på säkerhetstoken</string>
   <string name="key_no_passphrase">inget lösenord</string>
   <string name="key_unavailable">otillgänglig</string>
   <string name="secret_cannot_multiple">Dina egna nycklar kan bara raderas var för sig!</string>
@@ -1205,6 +1311,7 @@
   <string name="user_id_none"><![CDATA[<none>]]></string>
   <!--Android Account-->
   <string name="account_privacy_title">Integritet</string>
+  <string name="account_privacy_text">OpenKeychain synkroniserar inte dina kontakter med Internet. Det länkar bara kontakter till nycklar baserat på namn och e-postadresser. Detta görs frånkopplat på din enhet.</string>
   <string name="sync_notification_permission_required_title">Tillgång till kontakter krävs</string>
   <string name="sync_notification_permission_required_text">Tryck för att konfigurera länkning till kontakter</string>
   <!--Passphrase wizard-->
@@ -1235,67 +1342,65 @@
   <string name="snack_security_token_view">Visa</string>
   <string name="snack_security_token_import">Importera</string>
   <string name="security_token_serial_no">Serienummer: %s</string>
+  <string name="security_token_status_partly">Säkerhetstoken matchar, delvis bunden till nyckel</string>
   <string name="security_token_create">Håll säkerhetstoken mot baksidan av din enhet.</string>
   <string name="btn_reset">Återställ</string>
   <string name="security_token_radio_use_existing">Använd befintlig nyckel</string>
+  <string name="security_token_radio_reset">Återställ token</string>
   <string name="security_token_reset_warning">Återställning av säkerhetstecken förstör fullständigt nycklarna på den. Efteråt kommer du inte att kunna dekryptera meddelanden/filer krypterade med denna nyckel!</string>
   <string name="security_token_error">Fel: %s</string>
+  <string name="security_token_error_wrong_length">Inmatad PIN-kod är för kort. PIN:er är minst 6 siffror långa.\n(Fel: Fel längd)</string>
+  <string name="security_token_error_conditions_not_satisfied">Villkoren för användning är inte uppfyllda.</string>
+  <string name="security_token_error_security_not_satisfied">Fel PIN!\n(Kom ihåg att du bara har 3 försök!)</string>
+  <string name="security_token_error_authentication_blocked">PIN blockerad efter alltför många försök.</string>
   <string name="security_token_error_data_not_found">Nyckel eller objekt hittades inte.</string>
   <string name="security_token_error_unknown">Okänt fel</string>
+  <string name="security_token_error_header">Säkerhetstoken rapporterade ogiltig %s byte.</string>
+  <string name="security_token_error_tag_lost">Säkerhetstoken har tagits bort för tidigt. Håll säkerhetstoken på baksidan tills operationen är klar.</string>
+  <string name="security_token_error_iso_dep_not_supported">Säkerhetstoken stöder inte den nödvändiga kommunikationsstandarden (ISO-DEP, ISO 14443-4)</string>
+  <string name="security_token_error_generic">Kommunikationsfel. Förmodligen har säkerhetstoken tagits bort för tidigt.</string>
   <string name="security_token_error_try_again">Försök igen</string>
+  <string name="security_token_not_supported">Denna säkerhetstoken stöds inte ännu av OpenKeychain</string>
   <string name="btn_delete_original">Radera ursprunglig fil</string>
   <string name="snack_encrypt_filenames_on">Filnamn <b>är</b> krypterad.</string>
   <string name="snack_encrypt_filenames_off">Filnamn <b>är inte</b> krypterade.</string>
+  <string name="snack_armor_on">Utmatning kodad som text.</string>
+  <string name="snack_armor_off">Utmatning kodad som binär.</string>
+  <string name="snack_compression_on">Komprimering <b>aktiverad</b>.</string>
+  <string name="snack_compression_off">Komprimering <b>inaktiverad</b>.</string>
+  <string name="snack_self_encrypt_on">Kryptera till signerare <b>aktiverad</b>.</string>
+  <string name="snack_self_encrypt_off">Kryptera till signerare <b>inaktiverad</b>.</string>
   <string name="error_loading_keys">Fel vid inläsning av nycklar!</string>
   <string name="error_empty_log">(fel, tom logg)</string>
+  <string name="error_reading_text">Kunde inte läsa indata för att dekryptera!</string>
+  <string name="filename_unknown">Okänt filnamn (tryck för att öppna)</string>
+  <string name="filename_unknown_text">Text (tryck för att visa)</string>
   <string name="filename_keys">Nyckel säkerhetskopiering (rör för att importera)</string>
   <string name="intent_show">Visa krypterat/signerat innehåll</string>
   <string name="intent_share">Dela krypterat/signerat innehåll</string>
   <string name="view_internal">Visa i OpenKeychain</string>
+  <string name="error_preparing_data">Fel vid förberedning av data!</string>
   <string name="label_clip_title">Krypterad data</string>
   <string name="progress_processing">Bearbetar...</string>
   <string name="error_saving_file">Fil vid sparande av fil!</string>
   <string name="file_saved">Fil sparad!</string>
   <string name="file_delete_ok">Originalfilen borttagen.</string>
+  <string name="file_delete_none">Ingen fil borttagen! (Redan borttagen?)</string>
+  <string name="file_delete_exception">Originalfilen kunde inte tas bort!</string>
   <string name="error_clipboard_empty">Urklipp är tomt!</string>
+  <string name="error_clipboard_copy">Fel vid kopiering av data till urklipp!</string>
   <string name="error_clipboard_bad">Det gick inte att läsa nycklar från urklipp!</string>
-  <string name="linked_create_https_1_1">Genom att skapa en länkad identitet av denna typ, kan du länka din nyckel till en webbplats som du styr.</string>
-  <string name="linked_create_https_1_2">För att göra detta, publicerar du en textfil på denna webbplats, sedan skapa en länkad identitet som länkar till den.</string>
-  <string name="linked_create_https_created">Bevisfilen har skapats. För nästa steg bör du spara och skicka den till URI:n du angav:</string>
-  <string name="linked_create_https_2_1">En bevisfil för denna URI har skapats:</string>
-  <string name="linked_create_verify">Verifiera</string>
-  <string name="linked_text_clipboard">Text har kopierats till urklipp</string>
-  <string name="linked_verified_https">Kopplingen mellan denna webbplats och nyckeln har säkert verifierats. <b>Om du anser att webbplatsen är äkta</b>, bekräfta denna verifiering med din nyckel.</string>
-  <string name="linked_verified_github">Kopplingen mellan detta GitHub konto och nyckeln har säkert verifierats. <b>Om du tror att kontot är äkta</b>, bekräfta denna verifikation med din nyckel.</string>
-  <string name="linked_verified_dns">Kopplingen mellan detta domännamn och nyckeln har säkert verifierats. <b>Om du tror att domänen är äkta</b>, bekräfta denna verifikation med din nyckel.</string>
-  <string name="linked_verified_twitter">Kopplingen mellan detta Twitter konto och nyckeln har säkert verifierats. <b>Om du tror att kontot är äkta</b>, bekräfta denna verifikation med din nyckel.</string>
+  <string name="error_scan_fp">Fel vid skanning av fingeravtryck!</string>
+  <string name="error_scan_match">Fingeravtryck matchade inte!</string>
+  <string name="error_expiry_past">Utgångsdatum är i det förflutna!</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_verifying">Verifierar...</string>
-  <string name="linked_verify_success">Verifierad!</string>
-  <string name="linked_verify_pending">Inte verifierad ännu</string>
-  <string name="menu_linked_add_identity">Länka till konto</string>
-  <string name="section_linked_identities">Länkade identiteter</string>
   <string name="btn_finish">Färdig</string>
-  <string name="linked_title_https">Webbsida (HTTPS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Länkad identitet</string>
-  <string name="linked_button_verify">Verifiera</string>
-  <string name="linked_button_retry">Försök igen</string>
-  <string name="linked_button_confirm">Bekräfta</string>
-  <string name="linked_button_view">Visa</string>
-  <string name="linked_text_verifying">Verifierar...</string>
-  <string name="linked_text_error">Fel</string>
-  <string name="linked_text_confirming">Bekräftar…</string>
-  <string name="title_linked_id_create">Skapa länkad identitet</string>
-  <string name="linked_progress_update_key">Uppdatera nyckel...</string>
-  <string name="linked_button_start">Länka till GitHub konto</string>
-  <string name="linked_error_network">Nätverksfel!</string>
   <string name="snack_btn_overwrite">Skriv över</string>
   <string name="backup_code_explanation">Säkerhetskopian kommer att säkras med en säkerhetskod. Skriv ner den innan du fortsätter!</string>
   <string name="backup_code_enter">Ange säkerhetskopieringskod:</string>
   <string name="backup_code_ok">Kod accepterad!</string>
   <string name="btn_code_wrotedown">OK, jag skrev ner det!</string>
+  <string name="backup_code_wrong">Säkerhetskopieringskoden du angav är fel!\nSkriv du ner det korrekt?</string>
   <string name="btn_backup_share">Dela säkerhetskopia</string>
   <string name="btn_backup_save">Spara säkerhetskopia</string>
   <string name="btn_backup_export">Exportera säkerhetskopiering</string>
@@ -1304,9 +1409,12 @@
   <string name="snack_backup_exists">Säkerhetskopia existerar redan!</string>
   <string name="snack_backup_saved_dir">Sparade till OpenKeychain-katalogen</string>
   <string name="snack_text_too_long">Texten är för lång för att visas i sin helhet!</string>
+  <string name="snack_shared_text_too_long">Delad text klipptes eftersom den var för lång!</string>
   <string name="share_log_dialog_title">Dela logg?</string>
   <string name="share_log_dialog_share_button">Dela</string>
   <string name="share_log_dialog_cancel_button">Avbryt</string>
+  <string name="toast_wrong_mimetype">Fel datatyp, text förväntades!</string>
+  <string name="toast_no_text">Ingen text i delade data!</string>
   <string name="menu_uids_save">Spara</string>
   <string name="title_edit_identities">Redigera identiteter</string>
   <string name="title_edit_subkeys">Redigera undernycklar </string>
@@ -1335,18 +1443,23 @@
     <item>100 EUR</item>
   </string-array>
   <string name="redirect_import_key_title">Skanna med OpenKeychain!</string>
+  <string name="redirect_import_key_message">Du skannade en OpenPGP QR-kod med en annan app. Vänligen skanna med Openkeychain direkt för att vara säker.</string>
   <string name="redirect_import_key_yes">Skanna igen</string>
   <string name="redirect_import_key_no">Stäng</string>
   <string name="request_permission_title">Tillåt åtkomst till din nyckel?</string>
   <string name="request_permission_msg">%1$s begär tillgång till en av dina nycklar, vilket gör det möjligt att dekryptera meddelanden som skickas till denna nyckel. Du kan återkalla åtkomst senare i OpenKeychain.</string>
+  <string name="requested_key_unavailable_warning">Denna nyckel är inte tillgänglig. För att använda den måste du importera den som en av dina egna!</string>
   <string name="button_allow">Godkänn</string>
   <string name="button_cancel">Avbryt</string>
   <string name="button_back">Tillbaka</string>
   <string name="button_got_it">Förstått</string>
+  <string name="requested_key_label">Begärd nyckel:</string>
   <string name="title_key_status">Nyckelstatus</string>
+  <string name="caption_secret_status">Den här nyckeln är din. Du kan använda den för att:</string>
   <string name="cap_title_confirm">Bekräfta andra nycklar</string>
   <string name="cap_cert_ok">Denna nyckel kan bekräfta andra nycklar.</string>
   <string name="cap_cert_divert">Denna nyckel kan bekräfta andra nycklar, med hjälp av en säkerhetstoken.</string>
+  <string name="cap_cert_stripped">Denna nyckel är avskalad, den kan INTE bekräfta andra nycklar.</string>
   <string name="cap_cert_unavailable">Denna nyckel är inte konfigurerad för att bekräfta tangenterna!</string>
   <string name="cap_title_sign">Signera meddelanden</string>
   <string name="cap_sign_ok">Denna nyckel kan signera/skicka meddelanden.</string>
@@ -1368,30 +1481,41 @@
   <string name="key_health_ok_subtitle">Inga nyckelproblem hittades.</string>
   <string name="key_health_divert_title">Hälsosam (säkerhetstoken)</string>
   <string name="key_health_divert_subtitle">Inga nyckelproblem hittades.</string>
-  <string name="key_health_divert_partial_title">Hälsosam (partiell token)</string>
+  <string name="key_health_divert_partial_title">Hälsosam (delvis token)</string>
   <string name="key_health_divert_partial_subtitle">Klicka för detaljer</string>
   <string name="key_health_expired_title">Utgången</string>
+  <string name="key_health_expired_subtitle">Denna nyckel bör inte användas längre.</string>
   <string name="key_health_revoked_title">Upphävd</string>
+  <string name="key_health_revoked_subtitle">Den här nyckeln kan inte användas längre.</string>
   <string name="key_health_insecure_title">Osäker</string>
   <string name="key_health_insecure_subtitle">Denna nyckel är inte säker!</string>
+  <string name="key_health_broken_title">Defekt</string>
   <string name="key_health_broken_subtitle">Klicka för detaljer</string>
   <string name="key_health_sign_only_title">Hälsosam (signeringsnyckel)</string>
   <string name="key_health_sign_only_subtitle">Klicka för detaljer</string>
   <string name="key_health_stripped_title">Hälsosam (avskalad)</string>
   <string name="key_health_stripped_subtitle">Klicka för detaljer</string>
-  <string name="key_health_partial_stripped_title">Hälsosam (partiellt avskalad)</string>
+  <string name="key_health_partial_stripped_title">Hälsosam (delvis avskalad)</string>
   <string name="key_health_partial_stripped_subtitle">Klicka för detaljer</string>
   <string name="keyserver_title_published">Publicerad</string>
   <string name="keyserver_title_not_published">Ej publicerad</string>
   <string name="keyserver_title_unknown">Nyckelserver status: Okänd</string>
   <string name="keyserver_last_updated">Senast kontrollerad: %s</string>
   <string name="keyserver_last_updated_never">Senast kontrollerad: Aldrig</string>
+  <string name="key_insecure_bitstrength_2048_problem">Denna nyckel använder algoritmen <b>%1$s</b> med en styrka av <b>%2$s bitar</b>. En säker nyckel ska ha en styrka på 2048 bitar.</string>
+  <string name="key_insecure_bitstrength_2048_solution">Denna nyckel kan inte uppgraderas. För säker kommunikation måste ägaren generera en ny nyckel.</string>
   <string name="key_insecure_unknown_curve_problem">Denna nyckel använder <b>%1$s</b> algoritmen, som inte är vitlistad.</string>
+  <string name="key_insecure_unknown_curve_solution">Denna nyckel kan inte uppgraderas. För säker kommunikation måste ägaren generera en ny nyckel.</string>
   <string name="key_insecure_unidentified_problem">Det finns ett oidentifierat problem med denna nyckel.</string>
   <string name="key_insecure_unidentified_solution">Vänligen skicka in en felrapport.</string>
   <string name="key_expiry_text">Denna nyckel löpte ut <b>%1$s</b>.</string>
   <string name="dialog_insecure_title">Säkerhetsvarning</string>
   <string name="dialog_insecure_recommend_title">Rekommenderad åtgärd</string>
+  <string name="insecure_encrypt_bitstrength">Nyckeln du använde för att ta emot (dekryptera) detta meddelande är föråldrad!\n\nAlgoritmen (%s) är konfigurerad med en styrka på 1024 bitar eller mindre, vilket har ansetts vara osäkert för allmänt bruk sedan 2006.</string>
+  <string name="insecure_encrypt_bitstrength_suggestion">Nyckeln som används är osäker och kan inte uppgraderas. För att kommunicera säkert måste du skapa en ny nyckel!</string>
+  <string name="insecure_sign_bitstrength">Nyckeln du använde för att skicka (signera) detta meddelande är föråldrad!\n\nAlgoritmen (%s) är konfigurerad med en styrka på 1024 bitar eller mindre, vilket har ansetts vara osäkert för allmänt bruk sedan 2006.</string>
+  <string name="insecure_sign_bitstrength_suggestion">Nyckeln som används är osäker och kan inte uppgraderas. För att kommunicera säkert måste avsändaren skapa en ny nyckel!</string>
+  <string name="insecure_encrypt_not_whitelisted_curve">Nyckeln som mottog (dekrypterade) detta meddelande använder den elliptiska kurvan med OID %1$s, som inte är vitlistad!</string>
   <string name="insecure_mdc_suggestion">En saknad MDC är ett problem i sändningsprogrammet, eller en attack. För säker end-to-end kommunikation, ska meddelanden också signeras av avsändaren!</string>
   <string name="dialog_insecure_button_view_key">Visa nyckel</string>
   <string name="dialog_insecure_button_ok">Förstått</string>
@@ -1401,11 +1525,14 @@
   <string name="transfer_scan_explanation">För att dela eller importera din nyckelinställning, skapa en säker anslutning genom att skanna med endera enhet.</string>
   <string name="transfer_scan_warning">Använd endast med dina egna enheter!</string>
   <string name="connection_status">Anslutningsstatus:</string>
+  <string name="section_received_keys">Mottagna nycklar</string>
   <string name="transfer_scan_only_wifi">Den här funktionen kan endast användas över Wi-Fi.</string>
   <string name="button_import">Importera</string>
   <string name="transfer_status_connected">Ansluten</string>
   <string name="transfer_status_disconnected">Frånkopplad!</string>
   <string name="transfer_error_connect">Anslutningen misslyckades!</string>
+  <string name="transfer_error_generic">Okänt kommunikationsfel!</string>
+  <string name="transfer_error_generic_msg">Kommunikationsfel: %s</string>
   <string name="transfer_connecting">Ansluter...</string>
   <string name="first_time_secure_wifi_transfer">Säker Wi-Fi-överföring</string>
   <string name="menu_secure_wifi_transfer">Säker Wi-Fi-överföring</string>
@@ -1419,13 +1546,24 @@
   <string name="status_search_keyserver">Söker på nyckelservrar...</string>
   <string name="status_import">Importerar nyckel...</string>
   <string name="status_token_promote">Ställer in nyckeln...</string>
+  <string name="status_token_check">Kontrollera nyckelinställningar…</string>
   <string name="status_content_uri">Läser fil...</string>
   <string name="token_reset_confirm_title">Återställ säkerhetstoken?</string>
   <string name="token_reset_confirm_ok">Återställ</string>
   <string name="token_result_not_found">Nyckel hittades inte!</string>
   <string name="token_result_key_found">Nyckel hittad!</string>
+  <string name="token_result_token_ok">Klar för användning!</string>
+  <string name="token_result_empty">Token är tom</string>
+  <string name="token_action_load_from_file">Läs in från fil</string>
+  <string name="token_action_reset">Återställ säkerhetstoken</string>
   <string name="token_action_import">Importera</string>
   <string name="token_action_view_key">Visa nyckel</string>
+  <string name="token_action_setup">Ställ in med ny nyckel</string>
+  <string name="token_unlock_attempts_none">Inga upplåsningsförsök kvar</string>
+  <plurals name="token_unlock_attempts">
+    <item quantity="one">1 försök kvar</item>
+    <item quantity="other">%d försök kvar</item>
+  </plurals>
   <string name="token_error_cannot_reset_gnuk_old">Gnuk Token/Nitrokey Start stöder inte återställning före version 1.2.5</string>
   <string name="token_menu_change_pin">Ändra PIN-kod</string>
   <string name="token_menu_view_log">Visa logg</string>
@@ -1442,11 +1580,14 @@
   <string name="msg_ret_curi_open">Öppningswebbadress: %s</string>
   <string name="msg_ret_ks_error_not_found">Nyckel hittades inte</string>
   <string name="msg_ret_ks_ok">Nyckel hittad</string>
+  <string name="msg_ret_ks_start">Söker efter nyckel på nyckelservrar…</string>
   <string name="msg_ret_local_not_found">Nyckel hittades inte</string>
   <string name="msg_ret_local_none_found">Ingen matchande nyckel hittades</string>
   <string name="msg_ret_local_ok">Nyckel hittad</string>
   <string name="msg_ret_uri_fetching">Hämtar webbadress: %s</string>
   <string name="msg_ret_uri_ok">Nyckel hittad</string>
+  <string name="msg_trust">Uppdaterar förtroendeinformation…</string>
+  <string name="msg_trust_key">Uppdatera nycklar signerade av %s</string>
   <string name="msg_trust_count_none">Inga nycklar att uppdatera</string>
   <plurals name="msg_trust_count">
     <item quantity="one">Uppdaterar 1 nyckel</item>
@@ -1457,13 +1598,32 @@
   <string name="use_key">Använd nyckel: %s</string>
   <string name="use_key_no_name">Använd nyckel: <![CDATA[<no name>]]></string>
   <string name="select_identity_cancel">Inaktivera</string>
+  <string name="select_identity_create">Skapa en nyckel för mig</string>
+  <string name="menu_list_unrelated_keys">Lista orelaterade nycklar</string>
+  <string name="no_keys_gen_title">Detta är en ny adress</string>
+  <string name="no_keys_import_title">Jag har redan en nyckel</string>
+  <string name="key_list_import">Använd en annan nyckel</string>
+  <string name="key_gen_progress">Vänligen vänta…</string>
   <string name="key_gen_back">Tillbaka</string>
   <string name="key_gen_finish">Avsluta</string>
   <string name="button_goto_openkeychain">Gå till OpenKeychain</string>
+  <string name="snack_keylist_clipboard_title">Hittade nyckel data i urklipp!</string>
   <string name="snack_keylist_clipboard_action">Visa</string>
+  <string name="notify_channel_keysync">Nyckelserver uppdatering</string>
+  <string name="notify_channel_permission">Tillståndsbegäran</string>
   <string name="notify_channel_passcache">Lösenordsfras-cache</string>
+  <string name="notify_channel_orbot">Orbot status</string>
   <string name="notify_title_keysync">Uppdaterar nycklar...</string>
+  <string name="notify_title_keysync_finished">Uppdaterade %d nycklar</string>
   <string name="notify_content_keysync">Nyckel %d / %d</string>
+  <string name="snack_keysync_start">Började uppdatera alla nycklar…</string>
+  <string name="snack_keysync_finished">Nyckeluppdatering lyckades</string>
+  <string name="snack_keysync_error">Ett fel uppstod vid uppdatering av alla nycklar</string>
+  <string name="keychoice_cannot_encrypt">Den här nyckeln kan inte användas för kryptering!</string>
+  <string name="keychoice_cannot_sign">Den här nyckeln kan inte användas för signering!</string>
+  <string name="keychoice_insecure">Den här nyckeln kan inte användas eftersom den är osäker!</string>
+  <string name="keychoice_revoked">Den här nyckeln kan inte användas eftersom den har återkallats!</string>
+  <string name="keychoice_expired">Den här nyckeln kan inte användas eftersom den har löpt ut!</string>
   <string name="keylist_item_key_id">Nyckel-ID: %s</string>
   <string name="keylist_header_anonymous">Anonym</string>
   <string name="keylist_header_special">#</string>
@@ -1475,6 +1635,7 @@
   <string name="snackbutton_analytics_settings">Inställningar</string>
   <string name="subkey_action_create">Undernyckel kommer att skapas</string>
   <string name="subkey_action_revoke">Undernyckel kommer att återkallas</string>
+  <string name="subkey_action_strip">Undernyckeln kommer att avskalas</string>
   <string name="subkey_action_expiry_never">Utgången kommer att ändras till aldrig</string>
   <string name="subkey_action_expiry_date">Utgången kommer att ändras till %s</string>
   <string name="share_key_clipboard">Dela nyckeln via urklipp</string>

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

@@ -103,7 +103,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -119,8 +118,6 @@
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
   <string name="nfc_settings">సెట్టింగులు</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_button_retry">మళ్ళీ ప్రయత్నించు</string>
-  <string name="linked_text_error">లోపం</string>
   <string name="share_log_dialog_share_button">వంతు</string>
   <string name="share_log_dialog_cancel_button">రద్దు</string>
   <string name="prompt_fidesmo_pgp_install_button_negative">రద్దు</string>

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

@@ -3,15 +3,20 @@
   <!--GENERAL: Please put all strings inside quotes as described in example 1 on
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <!--title-->
+  <string name="title_encrypt_text">การเข้ารหัสลับของข้อความ</string>
+  <string name="title_encrypt_files">การเข้ารหัสลับของข้อความ</string>
+  <string name="title_decrypt">ถอดรหัส</string>
   <string name="title_preferences">การตั้งค่า</string>
   <string name="title_api_registered_apps">แอป</string>
   <string name="title_help">ช่วยเหลือ</string>
   <string name="title_log_display">บันทึก</string>
   <string name="title_advanced_key_info">ขั้นสูง</string>
   <!--section-->
+  <string name="section_keys">กุญแจย่อย</string>
   <string name="section_certify">ยืนยัน</string>
   <string name="section_share_key">รหัสกุญแจ</string>
   <string name="section_fingerprint">ลายนิ้วมือ</string>
+  <string name="section_encrypt">การเข้ารหัสลับของข้อความ</string>
   <!--button-->
   <string name="btn_save">บันทึก</string>
   <string name="btn_do_not_save">ยกเลิก</string>
@@ -20,16 +25,20 @@
   <string name="btn_next">ต่อไป</string>
   <string name="btn_back">ย้อนกลับ</string>
   <string name="btn_no">ไม่ใช่</string>
+  <string name="btn_copy_decrypted_text">คัดลอกคลิปบอร์ด</string>
+  <string name="btn_encrypt_files">เข้ารหัสลับ</string>
   <string name="btn_unlock">ปลดล็อค</string>
   <string name="btn_proceed">ดำเนิน</string>
   <string name="btn_add_keyserver">เพิ่ม</string>
   <!--Shortcut Strings-->
   <!--Content Description-->
+  <string name="cd_encrypt_files">เข้ารหัสลับ</string>
   <!--menu-->
   <string name="menu_preferences">การตั้งค่า</string>
   <string name="menu_help">ช่วยเหลือ</string>
   <string name="menu_search">ค้นหา</string>
   <string name="menu_open">เปิด</string>
+  <string name="menu_change_password">เปลี่ยนรหัสผ่าน</string>
   <string name="menu_advanced">ขั้นสูง</string>
   <string name="menu_keyserver_add">เพิ่ม</string>
   <!--label-->
@@ -37,10 +46,14 @@
   <string name="label_file">แฟ้ม</string>
   <string name="label_passphrase">รหัสผ่าน</string>
   <string name="label_unlock">กำลังปลดล็อค...</string>
+  <string name="label_algorithm">อัลกอริทึม</string>
+  <string name="label_key_id">รหัสระบุกุญแจ</string>
+  <string name="label_key_id_colon">รหัสระบุกุญแจ</string>
   <string name="label_key_type">ชนิด</string>
   <string name="label_name">ชื่อเอกสาร</string>
   <string name="label_email">อีเมล</string>
   <string name="label_fingerprint">ลายนิ้วมือ</string>
+  <string name="label_preferred">ที่ต้องการ</string>
   <string name="label_hidden_recipients">ซ่อนผู้รับ:</string>
   <string name="label_enter_smartpgp_authority_name">ชื่อเอกสาร</string>
   <!--label shown in Android settings under the OpenKeychain account-->
@@ -56,6 +69,7 @@
   <string name="orbot_start_dialog_cancel">ยกเลิก</string>
   <!--choice-->
   <string name="choice_none">ไม่มี</string>
+  <string name="usage_encrypt">การเข้ารหัสลับของข้อความ</string>
   <string name="error">ข้อผิดพลาด</string>
   <!--sentences-->
   <!--errors
@@ -63,6 +77,7 @@
          they will be put after "error_message", e.g. "Error: file not found"-->
   <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
+  <string name="decrypt_result_action_show">แสดง</string>
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_cancel">ยกเลิก</string>
@@ -101,12 +116,15 @@
   <!--Key list-->
   <!--Key view-->
   <string name="key_view_action_edit">แก้ไข</string>
+  <string name="key_view_action_certify">ยืนหยันกุญแจ</string>
   <string name="key_view_tab_start">เริ่ม</string>
+  <string name="key_view_tab_keys">กุญแจย่อย</string>
   <!--Key trust-->
   <!--keybase proof stuff-->
   <string name="keybase_verify">ตรวจยืนยัน</string>
   <!--Edit key-->
   <!--Create key-->
+  <string name="create_key_passphrases_not_equal">รหัสผ่านไม่ตรงกัน</string>
   <!--View key-->
   <!--Add/Edit keyserver-->
   <!--Add/Edit SmartPGP authority-->
@@ -115,6 +133,7 @@
   <!--hints-->
   <!--certs-->
   <string name="cert_none">เปล่า</string>
+  <string name="cert_revoke">ถูกยกเลิก</string>
   <string name="cert_verify_ok">ตกลง</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
   <!--Import Public log entries-->
@@ -124,23 +143,31 @@
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed_error_key_not_found">ไม่พบกุญแจ</string>
   <!--Promote key-->
+  <string name="msg_pr_error_key_not_found">ไม่พบกุญแจ</string>
   <!--Other messages used in OperationLogs-->
+  <string name="msg_ek_error_not_found">ไม่พบกุญแจ</string>
   <!--Messages for DecryptVerify operation-->
   <!--Messages for VerifySignedLiteralData operation-->
   <string name="msg_vl_ok">ตกลง</string>
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
+  <string name="msg_crt_warn_not_found">ไม่พบกุญแจ</string>
+  <string name="msg_import_fetch_error_not_found">ไม่พบกุญแจ</string>
+  <string name="msg_upload_error_not_found">ไม่พบกุญแจ</string>
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
   <string name="passp_cache_notif_pwd">รหัสผ่าน</string>
   <!--Keyserver sync-->
   <!--First Time-->
+  <string name="first_time_import_key">นำเข้ากุญแจจากไฟล์</string>
+  <string name="backup_section">สำรอง</string>
   <!--unsorted-->
   <string name="label_cert_type">ชนิด</string>
+  <string name="error_key_not_found">ไม่พบกุญแจ</string>
   <string name="unknown">ไม่ทราบ</string>
   <!--Android Account-->
   <string name="account_privacy_title">ความเป็นส่วนตัว</string>
@@ -153,14 +180,8 @@
   <string name="snack_security_token_view">มองดู</string>
   <string name="snack_security_token_import">นำเข้า</string>
   <string name="btn_reset">ล้างทิ้ง</string>
-  <string name="linked_create_verify">ตรวจยืนยัน</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">เสร็จ</string>
-  <string name="linked_button_verify">ตรวจยืนยัน</string>
-  <string name="linked_button_retry">ลองใหม่</string>
-  <string name="linked_button_confirm">ยืนยัน</string>
-  <string name="linked_button_view">มองดู</string>
-  <string name="linked_text_error">ข้อผิดพลาด</string>
   <string name="share_log_dialog_cancel_button">ยกเลิก</string>
   <string name="menu_uids_save">บันทึก</string>
   <string name="prompt_fidesmo_pgp_install_button_positive">ติดตั้ง</string>
@@ -170,10 +191,14 @@
   <string name="redirect_import_key_no">ปิด</string>
   <string name="button_cancel">ยกเลิก</string>
   <string name="button_back">ย้อนกลับ</string>
+  <string name="button_got_it">ได้รับมัน</string>
+  <string name="dialog_insecure_button_ok">ได้รับมัน</string>
   <string name="button_import">นำเข้า</string>
+  <string name="transfer_status_connected">เชื่อมต่อสำเร็จ</string>
   <string name="transfer_confirm_cancel">ยกเลิก</string>
   <string name="transfer_confirm_ok">ส่ง</string>
   <string name="token_reset_confirm_ok">ล้างทิ้ง</string>
+  <string name="token_result_not_found">ไม่พบกุญแจ</string>
   <string name="token_action_import">นำเข้า</string>
   <string name="token_unlock_ok">ปลดล็อค</string>
   <string name="select_identity_cancel">ปิดการใช้งาน</string>

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

@@ -39,6 +39,7 @@
   <string name="btn_encrypt_share_file">Şifrele ve dosyayı paylaş</string>
   <string name="btn_encrypt_save_file">Şifrele ve dosyayı kaydet</string>
   <string name="btn_save">Kaydet</string>
+  <string name="btn_view_log">Günlüğü görüntüle</string>
   <string name="btn_do_not_save">İptal</string>
   <string name="btn_delete">Sil</string>
   <string name="btn_no_date">Zaman Aşımı Yok</string>
@@ -434,7 +435,6 @@
   <string name="msg_backup_error_io">Giriş/çıkış hatası!</string>
   <string name="msg_upload_error_not_found">Anahtar bulunamadı!</string>
   <string name="msg_del_error_empty">Silinecek bir şey yok!</string>
-  <!--Linked Identity verification-->
   <string name="msg_get_success">Başarıyla indirildi!</string>
   <string name="msg_download_query_failed">Anahtarlar aranırken bir hata oluştu.</string>
   <!--Messages for Keybase Verification operation-->
@@ -485,15 +485,8 @@
   <string name="security_token_error">Hata: %s</string>
   <string name="security_token_error_unknown">Bilinmeyen Hata</string>
   <string name="security_token_error_try_again">Tekrar dene</string>
-  <string name="linked_create_verify">Doğrula</string>
   <!--Other Linked Identity strings-->
   <string name="btn_finish">Bitti</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Doğrula</string>
-  <string name="linked_button_retry">Tekrar dene</string>
-  <string name="linked_button_confirm">Onayla</string>
-  <string name="linked_button_view">Göster</string>
-  <string name="linked_text_error">Hata</string>
   <string name="share_log_dialog_share_button">Paylaş</string>
   <string name="share_log_dialog_cancel_button">Kapat</string>
   <string name="menu_uids_save">Kaydet</string>
@@ -512,6 +505,7 @@
   <string name="dialog_insecure_button_ok">Anladım</string>
   <string name="button_import">İçe Aktar</string>
   <string name="transfer_status_connected">Bağlanıldı</string>
+  <string name="transfer_status_disconnected">Bağlantı kesildi!</string>
   <string name="transfer_connecting">Bağlanılıyor...</string>
   <string name="transfer_confirm_cancel">Kapat</string>
   <string name="transfer_confirm_ok">Gönder</string>
@@ -526,5 +520,6 @@
   <string name="key_gen_finish">Bitti</string>
   <string name="snack_keylist_clipboard_action">Göster</string>
   <string name="notify_channel_passcache">Parola önbelleği</string>
+  <string name="button_analytics_no">Hayır, teşekkürler</string>
   <string name="snackbutton_analytics_settings">Ayarlar</string>
 </resources>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Додати підключ</string>
   <string name="title_change_master_key">Змінити основний ключ</string>
   <string name="title_edit_key">Редагувати ключ</string>
-  <string name="title_linked_create">Створити зв\'язану сутність</string>
   <string name="title_preferences">Налаштування</string>
   <string name="title_api_registered_apps">Програми</string>
   <string name="title_key_server_preference">Сервери ключів OpenPGP</string>
@@ -216,11 +215,11 @@
   <string name="keyserver_sync_settings_title">Автоматичне оновлення ключів</string>
   <string name="label_experimental_settings_desc_title">Попередження</string>
   <string name="label_experimental_settings_desc_summary">Ці можливості ще в розробці. Будь ласка, не сподівайтесь на їх безпеку та не повідомляйте про проблеми їхнього використання!</string>
-  <string name="label_experimental_settings_linked_identities_title">Пов\'язані ідентифікатори</string>
-  <string name="label_experimental_settings_linked_identities_summary">Прив\'язувати ключі до Twitter, GitHub, веб-сайтів чи DNS (подібно до keybase.io, але децентралізовано)</string>
   <string name="label_experimental_settings_keybase_title">Перевірки Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Контактувати з keybase.io для підтвердження ключа та показувати дійсності щоразу, коли ключ відображено</string>
   <string name="label_experimental_settings_theme_summary">(Піктограми та більшість екранів не налаштовані для темної теми)</string>
+  <string name="label_settings_analytics_title">Дозволити анонімну статистику про використання</string>
+  <string name="label_settings_analytics_summary">Якщо увімкнено, надсилає анонімну статистику про використання, щоби допомогти покращити цей застосунок</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">Увімкнути Tor</string>
   <string name="pref_proxy_tor_summary">Потребує інсталяції Orbot</string>
@@ -1350,25 +1349,6 @@
   <string name="msg_revoke_key">Відкликання ключа %s</string>
   <string name="msg_revoke_key_fail">Відкликання ключа невдале</string>
   <string name="msg_revoke_ok">Ключ успішно відкликано</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">Перевірка пов\'язаної ідентичності...</string>
-  <string name="msg_lv_match">Пошук маркера</string>
-  <string name="msg_lv_match_error">Маркер не знайдено в ресурсах!</string>
-  <string name="msg_lv_fp_ok">Відбиток - добрий.</string>
-  <string name="msg_lv_fp_error">Відбитки різні!</string>
-  <string name="msg_lv_error_twitter_auth">Помилка отримання маркера авторизації Twitter!</string>
-  <string name="msg_lv_error_twitter_handle">Ідентифікатор профілю Twitter не збігається у відповіді!</string>
-  <string name="msg_lv_error_twitter_response">Неочікувана відповідь від Twitter API!</string>
-  <string name="msg_lv_error_github_handle">Назва профілю GitHub не збігається у відповіді!</string>
-  <string name="msg_lv_error_github_not_found">Gist не містить файлів, що збігаються!</string>
-  <string name="msg_lv_fetch">Отримання URI \'%s\'</string>
-  <string name="msg_lv_fetch_redir">Слідую за перенаправленням до \'%s\'</string>
-  <string name="msg_lv_fetch_ok">Успішно отримано (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">Помилка сервера (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">URL пошкоджено!</string>
-  <string name="msg_lv_fetch_error_io">Помилка вводу-виводу!</string>
-  <string name="msg_lv_fetch_error_format">Помилка формату!</string>
-  <string name="msg_lv_fetch_error_nothing">Ресурс не знайдено!</string>
   <string name="msg_bench">Тестування деяких операцій...</string>
   <string name="msg_bench_enc_time">Час шифрування: %ss</string>
   <string name="msg_bench_enc_time_avg">Середній час шифрування 5 МБ: %ss</string>
@@ -1591,78 +1571,8 @@
   <string name="error_scan_fp">Помилка сканування відбитку</string>
   <string name="error_scan_match">Відбитки не збігаються</string>
   <string name="error_expiry_past">Дата закінчення у минулому!</string>
-  <string name="linked_create_https_1_1">Створюючи пов\'язану сутність такого типу, Ви можете прив\'язати Ваш ключ до веб сайту, який Ви контролюєте.</string>
-  <string name="linked_create_https_1_2">Щоб це зробити, Ви маєте опублікувати текстовий файл на сайті і потім створити пов\'язану сутність, що веде до нього.</string>
-  <string name="linked_create_https_1_3">Будь ласка, введіть URL, де Ви збираєтесь розмістити файл підтвердження. Зауважте, що Ваш сервер має підтримувати https та мати дійсний сертифікат TLS! </string>
-  <string name="linked_create_https_1_4">Наприклад: https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_created">Файл підтвердження було створено. Наступним кроком Вам необхідно зберегти та завантажити його до URI, який Ви вказали:</string>
-  <string name="linked_create_https_2_1">Файл підтвердження для цього URI було створено:</string>
-  <string name="linked_create_https_2_2">Наступна дія, Ви маєте зберегти та вивантажити цей файл.</string>
-  <string name="linked_create_https_2_3">Перевірте, чи файл доступний через коректний URI, потім перевірте налаштування.</string>
-  <string name="linked_create_https_2_4">Після успішної перевірки торкніться кнопки Завершити та додайте пов\'язану сутність до Вашої в\'язки ключів і закінчіть процес.</string>
-  <string name="linked_create_twitter_1_1">Створюючи пов\'язану сутність такого типу, Ви можете прив\'язати Ваш ключ до профілю Твітера, який Ви контролюєте.</string>
-  <string name="linked_create_twitter_1_2">Щоб це зробити, Вам необхідно опублікувати особливий твіт у Вашому життєписі, потім необхідно створити пов\'язану сутність до цього твіту.</string>
-  <string name="linked_create_twitter_1_3">Бідь ласка, введіть Ваше ім\'я у Twitter для продовження.</string>
-  <string name="linked_create_twitter_handle"> Ім\'я у Twitter</string>
-  <string name="linked_create_twitter_2_1">Торкніться іншої кнопки, щоб твітнути це повідомлення!</string>
-  <string name="linked_create_twitter_2_2">Ви можете редагувати твіт до публікації, поки текст в дужках є незмінним.</string>
-  <string name="linked_create_twitter_2_3">Після публікації вашого твіта як <b>@%s</b>, торкніться кнопки \"Перевірити\" для сканування життєпису.</string>
-  <string name="linked_create_twitter_2_4">Після успішної перевірки торкніться кнопки Завершити та додайте пов\'язану сутність до Вашої в\'язки ключів і закінчіть процес.</string>
-  <string name="linked_create_verify">Перевірити</string>
-  <string name="linked_text_clipboard">Текст скопійовано у буфер обміну</string>
-  <string name="linked_verified_https">Зв\'язок між сайтом та ключем було безпечно перевірено. <b>Якщо Ви вважаєте, що сайт справжній</b>, підтвердіть перевірку вашим ключем..</string>
-  <string name="linked_verified_github">Зв\'язок між профілем GitHub та ключем було безпечно перевірено. <b>Якщо Ви вважаєте, що профіль справжній</b>, підтвердіть перевірку Вашим ключем..</string>
-  <string name="linked_verified_dns">Зв\'язок між Доменим іменем та ключем було безпечно перевірено. <b>Якщо Ви вважаєте, що Домен справжній</b>, підтвердіть перевірку Вашим ключем..</string>
-  <string name="linked_verified_twitter">Зв\'язок між профілем Twitter та ключем було безпечно перевірено. <b>Якщо Ви вважаєте, що профіль справжній</b>, підтвердіть перевірку Вашим ключем..</string>
-  <string name="linked_verified_secret_https">Все виглядає в порядку.</string>
-  <string name="linked_verified_secret_github">Все виглядає в порядку.</string>
-  <string name="linked_verified_secret_dns">Все виглядає в порядку.</string>
-  <string name="linked_verified_secret_twitter">Все виглядає в порядку.</string>
-  <plurals name="linked_id_expand">
-    <item quantity="one">Є більше однієї сутності невідомого типу</item>
-    <item quantity="few">Є більше %d невідомих типів сутностей</item>
-    <item quantity="many">Є більше %d невідомих типів сутностей</item>
-    <item quantity="other">Є більше %d невідомих типів сутностей</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">\'Пов\'язана сутність\' зв\'язує Ваш PGP ключ до ресурсу в інтернеті.</string>
-  <string name="linked_select_2">Будь ласка, виберіть тип:</string>
-  <string name="linked_id_generic_text">Цей файл стверджує володіння ключем OpenPGP з ідентифікатором %2$s.\n\nМаркер підтвердження:\n%1$s</string>
-  <string name="linked_verifying">Перевіряю...</string>
-  <string name="linked_verify_success">Перевірено!</string>
-  <string name="linked_verify_error">Помилка перевірки!</string>
-  <string name="linked_verify_pending">Не перевірено</string>
-  <string name="linked_need_verify">Ресурс повинен бути перевірений, перш ніж продовжити!</string>
-  <string name="menu_linked_add_identity">Прив\'язати до профілю</string>
-  <string name="section_linked_identities">Пов\'язані сутності</string>
   <string name="btn_finish">Закінчити</string>
-  <string name="linked_title_https">Вебсайт (HTTPS)</string>
-  <string name="linked_title_dns">Доменне ім\'я (DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">Пов\'язана сутність</string>
-  <string name="linked_button_verify">Перевірити</string>
-  <string name="linked_button_retry">Повторити</string>
-  <string name="linked_button_retry_step">Повторити останню дію</string>
-  <string name="linked_button_confirm">Підтвердити</string>
-  <string name="linked_button_view">Перегляд</string>
-  <string name="linked_text_verifying">Перевірка...</string>
-  <string name="linked_text_error">Помилка</string>
-  <string name="linked_text_confirming">Підтвердження...</string>
-  <string name="linked_ids_more_unknown">%d невідомих типів сутностей</string>
-  <string name="title_linked_id_create">Створити пов\'язану ідентичність</string>
-  <string name="linked_github_text">Ця операція пов\'яже Ваш ключ із профілем GitHub.\nТоркніться кнопки для продовження..</string>
-  <string name="linked_progress_auth_github">Авторизуватись через GitHub…</string>
-  <string name="linked_progress_post_gist">Дописувати на Gist…</string>
-  <string name="linked_progress_update_key">Оновити ключ...</string>
-  <string name="linked_button_start">Прив\'язати до профілю GitHub</string>
-  <string name="linked_error_auth_failed">Авторизація невдала!</string>
-  <string name="linked_error_timeout">Перебільшення періоду очікування для з\'єднання</string>
-  <string name="linked_error_network">Помилка мережі!</string>
-  <string name="linked_error_http">Комунікаційна помилка: %s</string>
-  <string name="linked_webview_title_github">GitHub авторизація</string>
-  <string name="linked_gist_description">Пов\'язана сутність OpenKeychain</string>
-  <string name="linked_empty">Зв\'яжіть Ваш ключ з GitHub, Twitter чи іншими вебсайтами!</string>
   <string name="snack_btn_overwrite">Переписати</string>
   <string name="backup_code_explanation">Резервна копія буде захищена резервним кодом. Запишіть його перед продовженням!</string>
   <string name="backup_code_enter">Будь ласка, введіть код резервної копії:</string>
@@ -1949,7 +1859,9 @@
   <string name="snack_keylist_clipboard_title">Знайдено дані ключів у буфері обміну!</string>
   <string name="snack_keylist_clipboard_action">Переглянути</string>
   <string name="notify_channel_keysync">Оновлення сервера ключів</string>
+  <string name="notify_channel_permission">Запити на дозвіл</string>
   <string name="notify_channel_passcache">Кеш парольної фрази</string>
+  <string name="notify_channel_orbot">Стан Orbot</string>
   <string name="notify_title_keysync">Оновлення ключів...</string>
   <string name="notify_title_keysync_finished">Завершено оновлення %d ключів</string>
   <string name="notify_content_keysync">Ключ %d / %d</string>
@@ -1964,5 +1876,16 @@
   <string name="keylist_item_key_id">Ідентифікатор ключа: %s</string>
   <string name="keylist_header_anonymous">Анонімно</string>
   <string name="keylist_header_special">#</string>
+  <string name="dialog_analytics_consent">Щоб покращити досвід для всіх користувачів, чи може OpenKeychain збирати анонімну статистику про використання?\n\nЩоби дізнатися більше, див. нашу <a href="https://openkeychain.org/help/privacy-policy">Політику конфіденційності</a>.</string>
+  <string name="button_analytics_yes">Так, я хочу допомогти!</string>
+  <string name="button_analytics_no">Ні, дякую</string>
+  <string name="snack_analytics_accept">Дякуємо за допомогу! Ви можете змінити цей параметр у налаштуваннях.</string>
+  <string name="snack_analytics_reject">Усе добре, ми не будемо запитувати вас знову. Ви можете змінити свою думку в налаштуваннях.</string>
   <string name="snackbutton_analytics_settings">Налаштування</string>
+  <string name="subkey_action_create">Підключ буде створено</string>
+  <string name="subkey_action_revoke">Підключ буде відкликано</string>
+  <string name="subkey_action_expiry_never">Термін дії буде змінено на ніколи</string>
+  <string name="subkey_action_expiry_date">Термін дії буде змінено на %s</string>
+  <string name="share_key_clipboard">Поділитися ключем через буфер обміну</string>
+  <string name="share_key">Поділитися ключем</string>
 </resources>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">Thêm khóa con</string>
   <string name="title_change_master_key">Thay đổi khóa chính</string>
   <string name="title_edit_key">Sửa khóa</string>
-  <string name="title_linked_create">Tạo định danh kết hợp với khóa</string>
   <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>
@@ -193,8 +192,6 @@
   <string name="keyserver_sync_settings_title">Cập nhật khóa tự động</string>
   <string name="label_experimental_settings_desc_title">Cảnh báo</string>
   <string name="label_experimental_settings_desc_summary">Tính năng này hiện chưa được hoàn thành hoặc chỉ mới là kết quả nghiên cứu/thử nghiệm. Do vậy, bạn đừng tin cậy vào tính an toàn của chúng cũng như không cần thiết phải thông báo với chúng tôi!</string>
-  <string name="label_experimental_settings_linked_identities_title">Các định danh đã liên kết</string>
-  <string name="label_experimental_settings_linked_identities_summary">Liên kết khóa với Twitter, GitHub, website hoặc DNS (tương tự như đưa lên keybase.io nhưng có phân cấp)</string>
   <string name="label_experimental_settings_keybase_summary">Liên hệ với keybase.io để minh chứng khóa và hiển thị chúng mỗi khi khóa được gọi</string>
   <string name="label_experimental_settings_theme_summary">(Các biểu tượng và nhiều màn hình không được thêm vào giao diện dạng tối)</string>
   <!--Proxy Preferences-->
@@ -278,6 +275,7 @@
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Đổi mật khẩu</string>
   <!--Create key-->
+  <string name="create_key_empty">Trường bắt buộc </string>
   <string name="create_key_yubi_key_pin">Mã PIN</string>
   <!--View key-->
   <!--Add/Edit keyserver-->
@@ -310,7 +308,6 @@
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--Messages for Authentication operation-->
-  <!--Linked Identity verification-->
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_specific">%s</string>
   <!--Messages for Mime parsing operation-->
@@ -337,16 +334,8 @@
   <string name="snack_security_token_view">Xem</string>
   <string name="snack_security_token_import">Nhập</string>
   <string name="btn_reset">Đặt lại</string>
-  <string name="linked_create_verify">Phối kiểm</string>
   <!--Other Linked Identity strings-->
-  <string name="section_linked_identities">Các định danh đã liên kết</string>
   <string name="btn_finish">Kết thúc</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">Phối kiểm</string>
-  <string name="linked_button_retry">Thử lại</string>
-  <string name="linked_button_confirm">Xác nhận</string>
-  <string name="linked_button_view">Xem</string>
-  <string name="linked_text_error">Lỗi</string>
   <string name="share_log_dialog_share_button">Chia sẻ</string>
   <string name="share_log_dialog_cancel_button">Hủy</string>
   <string name="menu_uids_save">Lưu</string>

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

@@ -10,7 +10,6 @@
   <string name="title_add_subkey">新增子金鑰</string>
   <string name="title_change_master_key">修改主密匙</string>
   <string name="title_edit_key">編輯金鑰</string>
-  <string name="title_linked_create">建立一個已連結的身份識別</string>
   <string name="title_preferences">設定</string>
   <string name="title_api_registered_apps">應用程式</string>
   <string name="title_key_server_preference">OpenPGP金鑰伺服器</string>
@@ -190,24 +189,34 @@
   <string name="label_smartpgp_verify">SmartPGP: 驗證憑證</string>
   <string name="label_smartpgp_roots">SmartPGP: 可信任的授權者
 </string>
+  <string name="label_verify_keyserver_connection">測試連接</string>
   <string name="label_only_trusted_keyserver">只有信任的金鑰伺服器</string>
   <string name="label_enter_keyserver_url">網址</string>
+  <string name="label_enter_keyserver_onion">可選的 Tor .onion URL</string>
   <string name="label_keyserver_dialog_delete">刪除金鑰伺服器</string>
   <string name="label_theme">主題</string>
   <string name="label_enter_smartpgp_authority_name">名稱</string>
+  <string name="label_smartpgp_authority_dialog_delete">刪除許可權</string>
   <string name="pref_keyserver">OpenPGP金鑰伺服器</string>
   <string name="pref_keyserver_summary">透過已選擇的金鑰伺服器搜尋金鑰(HKP 協定)</string>
   <string name="pref_keybase">keybase.io</string>
   <string name="pref_keybase_summary">在keybase.io上搜尋金鑰</string>
   <string name="pref_facebook">Facebook</string>
   <string name="pref_facebook_summary">在 Facebook 上以使用者名稱搜尋金鑰</string>
+  <string name="pref_wkd">網路金鑰目錄</string>
+  <string name="pref_wkd_summary">使用網路金鑰目錄搜尋金鑰</string>
   <string name="label_sync_settings_keyserver_title">自動更新金鑰</string>
+  <string name="label_sync_settings_keyserver_summary_on">每三天更新金鑰至喜好的 keyserver 一次</string>
   <string name="label_sync_settings_keyserver_summary_off">金鑰不會自動更新</string>
   <string name="label_sync_settings_wifi_title">只以 Wi-Fi 同步</string>
+  <string name="label_sync_settings_contacts_title">關聯金鑰至聯絡人</string>
+  <string name="label_sync_settings_contacts_summary_on">連接金鑰至聯絡人(基於姓名和電子郵件地址)。這只在您的裝置上離線進行。</string>
+  <string name="label_sync_settings_contacts_summary_off">新的金鑰將不會與聯絡人連接</string>
   <!--label shown in Android settings under the OpenKeychain account-->
   <string name="keyserver_sync_settings_title">自動金鑰同步</string>
   <string name="label_experimental_settings_desc_title">警告</string>
-  <string name="label_experimental_settings_linked_identities_title">連結身份</string>
+  <string name="label_experimental_settings_keybase_title">Keybase.io 證明</string>
+  <string name="label_settings_analytics_title">允許匿名的使用資料收集</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">啟用洋蔥(Tor)網路</string>
   <string name="pref_proxy_tor_summary">必須已安裝 Orbot</string>
@@ -260,10 +269,18 @@
   <string name="choice_select_cert">選擇一個金鑰</string>
   <string name="filemanager_title_open">開啟…</string>
   <string name="rsa_2048">RSA 2048</string>
+  <string name="rsa_2048_description_html">檔案較小，但直到 2030 年依舊安全</string>
   <string name="rsa_3072">RSA 3072</string>
+  <string name="rsa_3072_description_html">推薦，直到 2040 年依舊安全</string>
   <string name="rsa_4096">RSA 4096</string>
+  <string name="rsa_4096_description_html">檔案較大，直到 2040 年後依舊安全</string>
+  <string name="ecc_p256">ECC P-256</string>
+  <string name="ecc_p384">ECC P-384</string>
+  <string name="ecc_p521">ECC P-521</string>
+  <string name="ecc_eddsa">ECC EdDSA</string>
   <string name="usage_sign">簽名</string>
   <string name="usage_encrypt">加密</string>
+  <string name="usage_sign_and_encrypt">簽署並加密</string>
   <string name="error">錯誤</string>
   <string name="error_message">錯誤: %s</string>
   <string name="theme_dark">深色</string>
@@ -276,6 +293,7 @@
   <string name="passphrase_for_symmetric_encryption">輸入密碼</string>
   <string name="passphrase_for">輸入 %s 的密碼</string>
   <string name="passphrase_for_any">輸入密碼</string>
+  <string name="passphrase_transfer">輸入轉移碼</string>
   <string name="pin_for">輸入 \'%s\' 的 PIN</string>
   <string name="file_delete_confirmation_title">刪除原始檔案？</string>
   <string name="file_delete_confirmation">下列的檔案將會被刪除：%s</string>
@@ -316,6 +334,7 @@
   <string name="error_file_delete_failed">尚未被刪除。請手動刪除他們 !</string>
   <string name="error_file_added_already">%s 已經加入。</string>
   <string name="error_file_not_found">找不到檔案</string>
+  <string name="error_bad_data">已損毀的資料!</string>
   <string name="error_no_secret_key_found">沒有適合的私鑰</string>
   <string name="error_external_storage_not_ready">外部儲存空間尚未就緒</string>
   <string name="error_key_size_minimum512bit">金鑰長度必須大於512位元</string>
@@ -358,8 +377,10 @@
   <string name="progress_done">完成。</string>
   <string name="progress_cancel">取消</string>
   <string name="progress_cancelling">正在取消…</string>
+  <string name="progress_downloading">下載中...</string>
   <string name="progress_saving">正在儲存…</string>
   <string name="progress_importing">匯入中…</string>
+  <string name="progress_benchmarking">基準測試中...</string>
   <string name="progress_revoking_uploading">正在撤銷並上傳金鑰...</string>
   <string name="progress_updating">正在更新金鑰...</string>
   <string name="progress_exporting">匯出中…</string>
@@ -448,12 +469,18 @@
   <string name="import_qr_code_button">掃描二維條碼</string>
   <string name="import_qr_code_text">將您的相機對準 QR Code !</string>
   <string name="btn_import">匯入</string>
+  <string name="btn_import_keys">匯入所有的金鑰</string>
+  <string name="btn_view_list">檢視列表</string>
   <string name="btn_refresh">重新整理</string>
+  <string name="btn_go_to_key">前往金鑰</string>
   <!--Generic result toast-->
   <string name="snackbar_details">詳細資訊</string>
   <string name="with_warnings">，包含警告</string>
   <string name="with_cancelled">，直到被取消</string>
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="other">成功匯入%1$d個金鑰</item>
+  </plurals>
   <plurals name="import_keys_added">
     <item quantity="other">成功匯入%1$d金鑰%2$s。</item>
   </plurals>
@@ -479,6 +506,7 @@
     <item quantity="other">成功刪除 %1$d 金鑰%2$s。</item>
   </plurals>
   <string name="delete_nothing">沒有東西可以刪除。</string>
+  <string name="delete_cancelled">刪除已取消。</string>
   <!--Revoke result toast (snackbar)-->
   <string name="revoke_ok">成功撤銷金鑰。</string>
   <string name="revoke_fail">錯誤的撤銷金鑰!</string>
@@ -725,8 +753,10 @@
   <string name="msg_kc_sub">正在處理子金鑰%s</string>
   <!--Keyring merging log entries-->
   <!--createSecretKeyRing-->
+  <string name="msg_cr_error_internal_pgp">OpenPGP 內部錯誤！</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mf_error_noop">無事可做</string>
+  <string name="msg_mf_error_pgp">OpenPGP 內部錯誤！</string>
   <string name="msg_mf_subkey_strip">正在卸除子金鑰%s</string>
   <!--Edit Key (higher level than modify)-->
   <string name="msg_ed_error_key_not_found">找不到金鑰！</string>
@@ -735,14 +765,36 @@
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_not_found">找不到金鑰！</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_clear_meta_file">檔案名：%s</string>
+  <string name="msg_dc_clear_meta_mime">MIME 類型: %s</string>
+  <string name="msg_dc_clear_meta_size">檔案大小: %s</string>
+  <string name="msg_dc_clear_meta_time">修改日期: %s</string>
+  <string name="msg_dc_clear_signature_check">驗證簽名資料中</string>
   <string name="msg_dc_error_invalid_data">沒有找到有效的OpenPGP加密或簽署內容！</string>
   <string name="msg_dc">開始解密…</string>
+  <string name="msg_dc_unlocking">解鎖金鑰</string>
+  <string name="msg_dc_insecure_encryption_key">使用了不安全的加密金鑰！這可能是因為金鑰過期，也可能是來自網路攻擊。</string>
   <!--Messages for VerifySignedLiteralData operation-->
+  <string name="msg_vl">開始檢查簽名</string>
+  <string name="msg_vl_clear_meta_file">檔案名: %s</string>
+  <string name="msg_vl_clear_meta_mime">MIME 類型: %s</string>
+  <string name="msg_vl_clear_meta_time">修改日期: %s</string>
+  <string name="msg_vl_clear_meta_size">檔案大小: %s</string>
+  <string name="msg_vl_clear_signature_check">驗證簽名資料中</string>
   <string name="msg_vl_ok">OK</string>
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_error_bad_passphrase">密碼錯誤！</string>
+  <string name="msg_pse_error_nfc">NFC 資料錯誤！</string>
+  <string name="msg_pse_error_no_passphrase">未提供密碼！</string>
+  <string name="msg_pse_error_pgp">OpenPGP 內部錯誤！</string>
   <string name="msg_pse">開始簽名並/或加密…</string>
   <!--Messages for Authentication operation-->
+  <string name="msg_auth_error_bad_passphrase">密碼錯誤！</string>
+  <string name="msg_auth_error_nfc">NFC 資料錯誤！</string>
+  <string name="msg_crt_certifying">正在生成憑證</string>
+  <string name="msg_crt">正在認證鑰匙圈</string>
+  <string name="msg_crt_saving">正在保存鑰匙圈</string>
   <string name="msg_crt_warn_not_found">找不到金鑰！</string>
   <string name="msg_crt_warn_cert_failed">產生認證失敗！</string>
   <string name="msg_crt_warn_save_failed">儲存失敗！</string>
@@ -754,13 +806,26 @@
   <string name="msg_import_fetch_keyserver_ok">成功取得金鑰</string>
   <string name="msg_import_keyserver">使用金鑰伺服器%s</string>
   <string name="msg_import_merge">正在合併取得的資料</string>
+  <string name="msg_backup_all">備份所有金鑰</string>
   <string name="msg_backup_error_db">資料庫錯誤！</string>
   <string name="msg_backup_error_io">輸入/輸出錯誤！</string>
   <string name="msg_backup_success">備份處理成功</string>
+  <string name="msg_upload_proxy_direct">使用代理伺服器: 無</string>
+  <string name="msg_upload_proxy_tor">使用代理伺服器: TOR</string>
+  <string name="msg_upload_proxy">使用代理伺服器: %s</string>
+  <string name="msg_upload_server">伺服器: %s</string>
+  <string name="msg_upload_key">金鑰 ID: %s</string>
   <string name="msg_upload_error_not_found">找不到金鑰！</string>
   <string name="msg_del_error_empty">沒有東西可以刪除！</string>
   <string name="msg_del_error_multi_secret">私鑰只能分別刪除！</string>
-  <!--Linked Identity verification-->
+  <plurals name="msg_del">
+    <item quantity="other">正在刪除 %d 金鑰</item>
+  </plurals>
+  <string name="msg_del_key">正在刪除金鑰 %s</string>
+  <string name="msg_del_key_fail">刪除金鑰 %s 出錯</string>
+  <plurals name="msg_del_ok">
+    <item quantity="other">成功刪除 %d 金鑰 </item>
+  </plurals>
   <string name="msg_get_success">下載成功！</string>
   <string name="msg_get_no_valid_keys">在檔案/剪貼簿中找不到有效的金鑰！</string>
   <string name="msg_download_query_failed">查詢金鑰的時候發生錯誤。</string>
@@ -776,6 +841,7 @@
   <string name="first_time_import_key">從檔案匯入金鑰</string>
   <string name="first_time_skip">跳過設置</string>
   <string name="backup_section">備份</string>
+  <string name="restore_section">恢復</string>
   <!--unsorted-->
   <string name="section_certifier_id">認證者</string>
   <string name="section_cert">憑證內容</string>
@@ -789,6 +855,7 @@
   <string name="error_key_not_found">找不到金鑰！</string>
   <string name="error_key_processing">處理金鑰時出錯！</string>
   <string name="key_stripped">已分離</string>
+  <string name="key_no_passphrase">沒有密碼</string>
   <string name="key_unavailable">無法使用</string>
   <string name="secret_cannot_multiple">您的金鑰只能個別地刪除！</string>
   <string name="title_view_cert">查看認證內容</string>
@@ -807,8 +874,18 @@
   <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
   <string name="enter_passphrase">輸入密碼</string>
   <string name="passphrase">密碼</string>
+  <string name="noPassphrase">沒有密碼</string>
+  <string name="no_passphrase_set">未設定密碼</string>
+  <string name="passphrases_match">密碼相符</string>
+  <string name="passphrase_saved">密碼已儲存</string>
+  <string name="passphrase_invalid">密碼無效</string>
+  <string name="missing_passphrase">密碼遺失</string>
   <string name="passphrase_again">再一次</string>
+  <string name="lockpattern">鎖定圖案</string>
+  <string name="lockpatternNFC">NFC+鎖定圖案</string>
   <string name="unlock_method">解鎖方法</string>
+  <string name="set_passphrase">設定密碼</string>
+  <string name="draw_lockpattern">繪出鎖定圖案</string>
   <string name="nfc_title">NFC</string>
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
   <string name="nfc_wrong_tag">錯誤的標籤。請再試一次。</string>
@@ -824,19 +901,8 @@
   <string name="security_token_error">錯誤: %s</string>
   <string name="security_token_error_unknown">不明的錯誤</string>
   <string name="security_token_error_try_again">重試</string>
-  <string name="linked_create_verify">驗證　</string>
   <!--Other Linked Identity strings-->
-  <string name="linked_verifying">驗證中...</string>
-  <string name="section_linked_identities">連結身份</string>
   <string name="btn_finish">結束</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="linked_button_verify">驗證　</string>
-  <string name="linked_button_retry">重試</string>
-  <string name="linked_button_confirm">確認</string>
-  <string name="linked_button_view">查看</string>
-  <string name="linked_text_verifying">驗證中...</string>
-  <string name="linked_text_error">錯誤</string>
-  <string name="linked_text_confirming">確認中...</string>
   <string name="btn_backup_share">分享備份</string>
   <string name="snack_backup_saved">備份已儲存</string>
   <string name="snack_backup_exists">備份已存在</string>
@@ -893,11 +959,20 @@
   <string name="key_gen_progress">請稍候...</string>
   <string name="key_gen_back">返回</string>
   <string name="key_gen_finish">結束</string>
+  <string name="button_goto_openkeychain">前往 Openkeychain</string>
   <string name="snack_keylist_clipboard_action">檢視</string>
   <string name="notify_channel_passcache">快取口令</string>
+  <string name="notify_channel_orbot">Orbot 狀態</string>
   <string name="notify_title_keysync">正在更新金鑰...</string>
+  <string name="keylist_item_key_id">金鑰 ID: %s</string>
+  <string name="keylist_header_anonymous">匿名</string>
   <string name="keylist_header_special">#</string>
   <string name="button_analytics_yes">是的，我想協助！</string>
   <string name="button_analytics_no">不用，謝謝</string>
   <string name="snackbutton_analytics_settings">設定</string>
+  <string name="subkey_action_create">子金鑰將被創建</string>
+  <string name="subkey_action_revoke">子金鑰將被撤銷</string>
+  <string name="subkey_action_strip">子金鑰將被分離</string>
+  <string name="share_key_clipboard">通過剪貼簿共用金鑰</string>
+  <string name="share_key">分享金鑰</string>
 </resources>

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

@@ -10,10 +10,10 @@
   <string name="title_add_subkey">添加子密钥</string>
   <string name="title_change_master_key">更改主密钥</string>
   <string name="title_edit_key">编辑密钥</string>
-  <string name="title_linked_create">创建一个关联用户标识</string>
   <string name="title_preferences">设置</string>
   <string name="title_api_registered_apps">已注册应用</string>
   <string name="title_key_server_preference">OpenPGP 密钥服务器</string>
+  <string name="title_smartpgp_authorities_preference">智能PGP:可信任的权威机构</string>
   <string name="title_change_passphrase">变更密码</string>
   <string name="title_share_fingerprint_with">分享指纹</string>
   <string name="title_share_key">分享密钥</string>
@@ -100,6 +100,7 @@
   <string name="btn_saved">已保存！</string>
   <string name="btn_not_matching">不匹配</string>
   <!--Shortcut Strings-->
+  <string name="shortcut_debug">调试行为</string>
   <!--Content Description-->
   <string name="cd_encrypt_files">加密文件</string>
   <string name="cd_exchange_keys">交换密钥</string>
@@ -183,6 +184,7 @@
   <string name="label_encrypt_filenames">加密文件名</string>
   <string name="label_hidden_recipients">隐藏收件人</string>
   <string name="label_smartpgp_verify">SmartPGP：验证证书</string>
+  <string name="label_smartpgp_roots">智能PGP:可信任的权威机构</string>
   <string name="label_verify_keyserver_connection">连接测试</string>
   <string name="label_only_trusted_keyserver">只信任该密钥服务器</string>
   <string name="label_enter_keyserver_url">URL</string>
@@ -190,6 +192,7 @@
   <string name="label_keyserver_dialog_delete">删除密钥服务器</string>
   <string name="label_theme">主题</string>
   <string name="label_enter_smartpgp_authority_name">名称</string>
+  <string name="label_smartpgp_authority_dialog_delete">删除受信方</string>
   <string name="pref_keyserver">OpenPGP 密钥服务器</string>
   <string name="pref_keyserver_summary">在指定的 OpenPGP 密钥服务器上搜索（HKP协议）</string>
   <string name="pref_keybase">keybase.io</string>
@@ -209,8 +212,6 @@
   <string name="keyserver_sync_settings_title">自动更新密钥</string>
   <string name="label_experimental_settings_desc_title">警告</string>
   <string name="label_experimental_settings_desc_summary">这些功能目前尚未完成或者缺少用户经验性/安全性的研究结果。所以，不保证他们是安全的，请不要对我们发牢骚！</string>
-  <string name="label_experimental_settings_linked_identities_title">关联用户标识</string>
-  <string name="label_experimental_settings_linked_identities_summary">将密钥与 Twitter, GitHub, 网站或者 DNS 关联 (类似 Keybase.io 但是去中心化的)</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io 证明</string>
   <string name="label_experimental_settings_keybase_summary">每次展示密钥时自动从keybase.io获取证明并显示它们</string>
   <string name="label_experimental_settings_theme_summary">（图标和某些界面还未根据深色主题进行调整）</string>
@@ -276,9 +277,11 @@
   <string name="rsa_4096_description_html">较大的文件，在 2040 年之后若干年内也被认为是安全的</string>
   <string name="ecc_p256">ECC P-256</string>
   <string name="ecc_p256_description_html">非常小的文件尺寸，在 2040 年之前被认为是安全的 &lt;br/&gt; &lt;u&gt;试验性质且不被所有实现所支持&lt;/u&gt;</string>
+  <string name="ecc_p384">ECC P-384</string>
   <string name="ecc_p384_description_html">非常小的文件尺寸，在 2040 年之前被认为是安全的 &lt;br/&gt; &lt;u&gt;试验性质且不被所有实现所支持&lt;/u&gt;</string>
   <string name="ecc_p521">ECC P-521</string>
   <string name="ecc_p521_description_html">较小的文件尺寸，在 2040 之后若干年也被认为是安全的 &lt;br/&gt; &lt;u&gt;试验性质且不被所有实现所支持&lt;/u&gt;</string>
+  <string name="ecc_eddsa">ECC EdDSA（爱德华曲线数字签名算法）</string>
   <string name="ecc_eddsa_description_html">较小的文件尺寸，在 2040 之后若干年也被认为是安全的 &lt;br/&gt; &lt;u&gt;试验性质且不被所有实现所支持&lt;/u&gt;</string>
   <string name="usage_none">无 (只绑定子密钥)</string>
   <string name="usage_sign">签名</string>
@@ -301,6 +304,7 @@
   <string name="passphrase_keyboard_hint_alpha">切换到字母键盘</string>
   <string name="passphrase_keyboard_hint_numeric">切换到数字键盘</string>
   <string name="passphrase_transfer">输入传输密码</string>
+  <string name="passphrase_transfer_autocrypt">输入传输密码以导入此 Autocrypt 安装信息。</string>
   <string name="pin_for">输入 \'%s\' 的 PIN 码</string>
   <string name="security_token_pin_for">输入 PIN 码以访问 \'%s\' 的安全令牌</string>
   <string name="security_token_nfc_text">将安全令牌贴近设备背面的 NFC 标志.</string>
@@ -332,6 +336,7 @@
   <string name="no_keys_exported">没有导出任何密钥。</string>
   <string name="key_creation_el_gamal_info">注意：只有子密钥才支持 ElGamal.</string>
   <string name="key_not_found">找不到密钥 %08X</string>
+  <string name="authentication_subkey_not_found">此密钥无身份验证子密钥。</string>
   <plurals name="bad_keys_encountered">
     <item quantity="other">忽略了 %d 个无效密钥。您也许在导出密钥时使用了选项\n --export-secret-subkeys\n请确认您是用\n --export-secret-keys\n选项导出密钥。</item>
   </plurals>
@@ -530,6 +535,9 @@
   <plurals name="delete_ok">
     <item quantity="other">成功删除了 %1$d 个密钥%2$s。</item>
   </plurals>
+  <plurals name="delete_fail">
+    <item quantity="other">删除 %1$d 个密钥时发生错误。</item>
+  </plurals>
   <string name="delete_nothing">没有待删除的密钥。</string>
   <string name="delete_cancelled"> 删除操作已取消。 </string>
   <!--Revoke result toast (snackbar)-->
@@ -567,6 +575,7 @@
   <string name="api_settings_advanced">更多密钥详情</string>
   <string name="api_settings_allowed_keys">允许的密钥</string>
   <string name="api_settings_settings">设置</string>
+  <string name="api_register_title">允许到OpenKeyChain的访问吗？</string>
   <string name="api_register_allow">允许访问</string>
   <string name="api_register_disallow">禁止访问</string>
   <string name="api_register_error_select_key">请选择一个密钥！</string>
@@ -603,6 +612,8 @@
   <string name="key_list_fab_qr_code">扫描二维码</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>
@@ -706,6 +717,7 @@
   <string name="create_key_yubi_key_pin_repeat">重复PIN</string>
   <string name="create_key_yubi_key_pin_not_correct">错误的PIN!</string>
   <string name="create_key_yubi_key_pin_too_short">PIN最少要求为6位数字!</string>
+  <string name="create_key_yubi_key_algorithm_sign_text">签名密钥</string>
   <!--View key-->
   <string name="view_key_my_key">我的密钥</string>
   <string name="view_key_verified">已确认的密钥</string>
@@ -722,6 +734,7 @@
   <string name="keyserver_preference_deleted">%s 已删除</string>
   <string name="keyserver_preference_cannot_delete_last">由于至少要有一个密钥服务器，所以不能删除最后一个密钥服务器</string>
   <!--Add/Edit SmartPGP authority-->
+  <string name="add_smartpgp_authority_dialog_title">添加受信方</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">密钥</string>
   <string name="nav_encrypt_decrypt">加密/解密</string>
@@ -954,6 +967,7 @@
   <string name="msg_cr_error_flags_ecdh">选择了一个错误的密钥标签，ECDH不能用于签名！</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">变更密钥环中 %s</string>
+  <string name="msg_mf_error_all_keys_stripped">所有密钥已被剥离！</string>
   <string name="msg_mf_error_encode">编码异常！</string>
   <string name="msg_mf_error_fingerprint">实际的密钥指纹与期望值不匹配！</string>
   <string name="msg_mf_error_keyid">无密钥ID。这是一个内部错误，请发送错误报告！</string>
@@ -966,6 +980,7 @@
   <string name="msg_mf_error_null_expiry">在子密钥创建过程中不允许过期时间为“与之前相同”。这是一个编程错误，请发送错误报告！</string>
   <string name="msg_mf_error_noop">无事可做！</string>
   <string name="msg_mf_error_passphrase_master">解密主密钥时发生致命错误！这可能是一个编程错误，请发送错误报告！</string>
+  <string name="msg_mf_error_passphrases_unchanged">未变更任何密码！</string>
   <string name="msg_mf_error_pgp">OpenPGP 内部错误！</string>
   <string name="msg_mf_error_sig">签名异常！</string>
   <string name="msg_mf_error_sub_stripped">不能修改已移除的子密钥 %s！</string>
@@ -1033,6 +1048,7 @@
   <string name="msg_dc_clear_meta_file">文件名：%s</string>
   <string name="msg_dc_clear_meta_mime">MIME 类型：%s</string>
   <string name="msg_dc_clear_meta_size">文件大小：%s</string>
+  <string name="msg_dc_clear_meta_size_unknown">文件大小： 未知</string>
   <string name="msg_dc_clear_meta_time">修改时间：%s</string>
   <string name="msg_dc_clear_signature_bad">指纹检验异常！</string>
   <string name="msg_dc_clear_signature_check">正在检验签名数据</string>
@@ -1040,12 +1056,14 @@
   <string name="msg_dc_clear_signature">保存签名数据备用</string>
   <string name="msg_dc_clear">正在处理明文数据</string>
   <string name="msg_dc_error_bad_passphrase">无法解锁密钥，密码错误！</string>
+  <string name="msg_dc_error_sym_passphrase">解密数据时发生错误 （密码错误？）</string>
   <string name="msg_dc_error_corrupt_data">数据已损坏！</string>
   <string name="msg_dc_error_extract_key">解锁密钥时发生未知错误！</string>
   <string name="msg_dc_error_integrity_check">完整性检查错误！</string>
   <string name="msg_dc_error_invalid_data">未找到有效的 OpenPGP 加密或签名数据！</string>
   <string name="msg_dc_error_io">读取输入时出错！</string>
   <string name="msg_dc_error_input">打开输入数据流时出错！</string>
+  <string name="msg_dc_error_input_denied">打开输入数据流时发生错误：访问被拒绝！</string>
   <string name="msg_dc_error_no_data">数据流中没有发现加密数据！</string>
   <string name="msg_dc_error_no_key">数据流中没有找到用已知密钥加密的数据！</string>
   <string name="msg_dc_error_no_signature">缺失签名数据！</string>
@@ -1116,6 +1134,9 @@
   <string name="msg_pse">开始签名/加密操作</string>
   <string name="msg_pse_symmetric">正在准备对称加密</string>
   <!--Messages for Authentication operation-->
+  <string name="msg_auth">正在开始验证操作</string>
+  <string name="msg_auth_error_key_auth">无法找到已选的验证密钥</string>
+  <string name="msg_auth_error_unlock">解锁密钥时出现未知错误！</string>
   <string name="msg_crt_certifying">正在生成证书</string>
   <plurals name="msg_crt_certify_uids">
     <item quantity="other">正在认证密钥 %2$s 的 %1$d 个用户标识。</item>
@@ -1196,25 +1217,6 @@
   <string name="msg_revoke_key">正在吊销密钥 %s</string>
   <string name="msg_revoke_key_fail">不能成功吊销密钥</string>
   <string name="msg_revoke_ok">吊销密钥成功</string>
-  <!--Linked Identity verification-->
-  <string name="msg_lv">正在验证关联用户标识...</string>
-  <string name="msg_lv_match">正在查找令牌</string>
-  <string name="msg_lv_match_error">未在资源中找到令牌！</string>
-  <string name="msg_lv_fp_ok">指纹正常.</string>
-  <string name="msg_lv_fp_error">指纹不匹配！</string>
-  <string name="msg_lv_error_twitter_auth">获取 Twitter 授权令牌时出错！</string>
-  <string name="msg_lv_error_twitter_handle">回应的 Twitter 账号用户名不匹配！</string>
-  <string name="msg_lv_error_twitter_response">从 Twitter 接口收到意外响应！</string>
-  <string name="msg_lv_error_github_handle">回应的 GitHub  账号用户名不匹配！</string>
-  <string name="msg_lv_error_github_not_found">Gist 中未包含匹配文件！</string>
-  <string name="msg_lv_fetch">正在加载 \'%s\'</string>
-  <string name="msg_lv_fetch_redir">正在重定向至 \'%s\'</string>
-  <string name="msg_lv_fetch_ok">获取成功 (HTTP %s)</string>
-  <string name="msg_lv_fetch_error">服务器错误 (HTTP %s)</string>
-  <string name="msg_lv_fetch_error_url">URL 格式不正确！</string>
-  <string name="msg_lv_fetch_error_io">输入输出错误！</string>
-  <string name="msg_lv_fetch_error_format">格式错误！</string>
-  <string name="msg_lv_fetch_error_nothing">未找到资源！</string>
   <string name="msg_bench">正在进行某些操作的性能测试...</string>
   <string name="msg_bench_enc_time">加密时间: %ss</string>
   <string name="msg_bench_enc_time_avg">5MB 加密平均时间: %ss</string>
@@ -1269,10 +1271,15 @@
   <string name="msg_mime_parsing_success">MIME 解析成功！</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_touch_to_clear">点击以清除密码缓存</string>
+  <plurals name="passp_cache_notif_n_keys">
+    <item quantity="other">已保存 %d 个密码</item>
+  </plurals>
+  <string name="passp_cache_notif_keys">已缓存的密码</string>
   <string name="passp_cache_notif_clear">清除密码</string>
   <string name="passp_cache_notif_pwd">密码</string>
   <!--Keyserver sync-->
   <string name="keyserver_sync_orbot_notif_title">需要 Orbot 才能从服务器同步</string>
+  <string name="keyserver_sync_orbot_notif_msg">轻按以启动Orbot</string>
   <string name="keyserver_sync_orbot_notif_start">打开Orbot</string>
   <string name="keyserver_sync_orbot_notif_ignore">直连</string>
   <!--First Time-->
@@ -1285,6 +1292,8 @@
   <string name="first_time_blank_security_token">您希望将此空白的安全令牌用于 OpenKeychain 吗？\n\n现在请将安全令牌移开，当再次需要时，我们会提示您！</string>
   <string name="first_time_blank_security_token_yes">使用该安全令牌</string>
   <string name="backup_text">含有您私钥的备份在任何情况下都不能分享给其他人！</string>
+  <string name="backup_all">完整备份（已加密的）</string>
+  <string name="backup_public_keys">仅导出联系人密钥</string>
   <string name="backup_section">备份</string>
   <string name="restore_section">恢复</string>
   <!--unsorted-->
@@ -1363,6 +1372,7 @@
   <string name="security_token_status_partly">安全信息匹配并且已部分绑定到密钥</string>
   <string name="security_token_create">请将安全令牌贴在您设备的背部</string>
   <string name="btn_reset">重置</string>
+  <string name="security_token_radio_use_existing">使用现存的密钥</string>
   <string name="security_token_reset_warning">重置安全令牌将完全摧毁其内部的密钥。之后您将无法使用该密钥加解密消息或文件！</string>
   <string name="snack_security_token_other">安全令牌中存有不同的密钥！</string>
   <string name="security_token_error">错误： %s</string>
@@ -1370,7 +1380,9 @@
     <item quantity="other">PIN码错误！\n剩余%d次尝试机会。</item>
   </plurals>
   <string name="security_token_error_terminated">安全令牌处于停用状态。</string>
+  <string name="security_token_error_wrong_length">输入的PIN码太短了。PIN码要求至少6位。 \n(错误：错误的长度)</string>
   <string name="security_token_error_conditions_not_satisfied">使用条件不满足。</string>
+  <string name="security_token_error_security_not_satisfied">PIN码错误！ \n（请牢记你只有3次机会！）</string>
   <string name="security_token_error_authentication_blocked">由于太多的尝试，PIN已被阻止。</string>
   <string name="security_token_error_data_not_found">未找到密钥或对象。</string>
   <string name="security_token_error_unknown">未知错误</string>
@@ -1409,74 +1421,8 @@
   <string name="error_scan_fp">扫描指纹时出错！</string>
   <string name="error_scan_match">指纹不匹配！</string>
   <string name="error_expiry_past">过期时间为过去！</string>
-  <string name="linked_create_https_1_1">通过创建一个该类型的关联用户标识，您可以将您的密钥连接到您控制的一个网站。</string>
-  <string name="linked_create_https_1_2">请在您的网站上发布一个文本文档，然后再创建一个链接到它的关联用户标识。</string>
-  <string name="linked_create_https_1_3">请输入放置了用于证明的文本文件的URL。注意，您的服务器必须支持 https 并拥有有效的 TLS 证书！</string>
-  <string name="linked_create_https_1_4">范例:https://example.com/pgpkey.txt</string>
-  <string name="linked_create_https_created">已创建证明文件 。下一步，您应该将其保存并上传到您声明的位置：</string>
-  <string name="linked_create_https_2_1">已为此位置创建证明文件：</string>
-  <string name="linked_create_https_2_2">下一步，您应该保存并上传此文件。</string>
-  <string name="linked_create_https_2_3">请确保该文件存在于正确位置并可访问，然后验证安装。</string>
-  <string name="linked_create_https_2_4">验证成功之后，触摸完成按钮将关联用户标识加入您的密钥环，从而完成操作。</string>
-  <string name="linked_create_twitter_1_1">通过创建一个该类型的关联用户标识，您可以将您的密钥连接到您控制的一个Twitter账号。</string>
-  <string name="linked_create_twitter_1_2">请在您的时间线上发布一条指定推文，然后再创建一个链接到该推文的关联用户标识。</string>
-  <string name="linked_create_twitter_1_3">请输入您的 Twitter  屏幕名称以继续。</string>
-  <string name="linked_create_twitter_handle">Twitter 用户名</string>
-  <string name="linked_create_twitter_2_1">点击任意按钮发布此信息！</string>
-  <string name="linked_create_twitter_2_2">在发布之前，您可以编辑，只要不修改括号内的文本即可。</string>
-  <string name="linked_create_twitter_2_4">验证成功之后，触摸完成按钮将关联用户标识加入您的密钥环，从而完成操作。</string>
-  <string name="linked_create_verify">校验</string>
-  <string name="linked_text_clipboard">文本已复制到剪贴板</string>
-  <string name="linked_verified_https">此网站与密钥的关联已被安全验证。<b>如果你相信网站是真的</b>，用您的密钥确认此次验证。</string>
-  <string name="linked_verified_github">GitHub 账号与密钥的关联已被安全验证。<b>如果你相信账号是真的</b>，用您的密钥确认此次验证。</string>
-  <string name="linked_verified_dns">此域名与密钥的关联已被安全验证。<b>如果你相信域名是真的</b>，用您的密钥确认此次验证。</string>
-  <string name="linked_verified_twitter">Twitter 账号与密钥的关联已被安全验证。<b>如果你相信账号是真的</b>，用您的密钥确认此次验证。</string>
-  <string name="linked_verified_secret_https">一切正常。</string>
-  <string name="linked_verified_secret_github">一切正常。</string>
-  <string name="linked_verified_secret_dns">一切正常。</string>
-  <string name="linked_verified_secret_twitter">一切正常。</string>
-  <plurals name="linked_id_expand">
-    <item quantity="other">共有 %d 个以上未知的用户标识类型</item>
-  </plurals>
   <!--Other Linked Identity strings-->
-  <string name="linked_select_1">\'关联用户标识\' 将您的 PGP 密钥关联到网络资源上。</string>
-  <string name="linked_select_2">请选择一个类型:</string>
-  <string name="linked_id_generic_text">此文件声明拥有 OpenPGP  密钥 %2$s 的所有权。\n\n证明令牌：\n%1$s</string>
-  <string name="linked_verifying">正在校验…</string>
-  <string name="linked_verify_success">已通过验证！</string>
-  <string name="linked_verify_error">认证错误！</string>
-  <string name="linked_verify_pending">尚未验证</string>
-  <string name="linked_need_verify">资源必须被校验后才能继续操作！</string>
-  <string name="menu_linked_add_identity">关联到帐户</string>
-  <string name="section_linked_identities">关联用户标识</string>
   <string name="btn_finish">完成</string>
-  <string name="linked_title_https">网站 (HTTPS)</string>
-  <string name="linked_title_dns">域名(DNS)</string>
-  <string name="linked_title_github">GitHub</string>
-  <string name="linked_title_twitter">Twitter</string>
-  <string name="card_linked_identity">关联用户标识</string>
-  <string name="linked_button_verify">校验</string>
-  <string name="linked_button_retry">重试</string>
-  <string name="linked_button_retry_step">重试上一步骤</string>
-  <string name="linked_button_confirm">确认</string>
-  <string name="linked_button_view">查看</string>
-  <string name="linked_text_verifying">正在校验…</string>
-  <string name="linked_text_error">错误</string>
-  <string name="linked_text_confirming">确认中...</string>
-  <string name="linked_ids_more_unknown">%d 个以上未知用户标识类型</string>
-  <string name="title_linked_id_create">创建关联用户标识</string>
-  <string name="linked_github_text">本操作将关联您的密钥到 GitHub 账户。\n触摸按钮以继续。</string>
-  <string name="linked_progress_auth_github">使用 GitHub 授权…</string>
-  <string name="linked_progress_post_gist">提交摘要...</string>
-  <string name="linked_progress_update_key">更新密钥...</string>
-  <string name="linked_button_start">关联到GitHub帐户</string>
-  <string name="linked_error_auth_failed">验证失败!</string>
-  <string name="linked_error_timeout">连接超时！</string>
-  <string name="linked_error_network">网络错误！</string>
-  <string name="linked_error_http">通讯错误:%s</string>
-  <string name="linked_webview_title_github">GitHub授权</string>
-  <string name="linked_gist_description">OpenKeychain 关联用户标识</string>
-  <string name="linked_empty">关联您的密钥到 GitHub，Twitter 或其它网站！</string>
   <string name="snack_btn_overwrite">重写</string>
   <string name="backup_code_explanation">备份将使用代码加密。请在继续操作前将其抄写下来！</string>
   <string name="backup_code_enter">请输入备份代码:</string>
@@ -1485,6 +1431,7 @@
   <string name="backup_code_wrong">您输入的备份代码不正确！\n您确认已将代码正确抄写下来了吗？</string>
   <string name="btn_backup_share">分享备份</string>
   <string name="btn_backup_save">保存备份</string>
+  <string name="btn_backup_export">导出备份</string>
   <string name="snack_backup_error_saving">备份时出现错误！</string>
   <string name="snack_backup_saved">备份已保存</string>
   <string name="snack_backup_exists">备份已存在!</string>
@@ -1505,6 +1452,7 @@
   <string name="cache_ttl_lock_screen">直到锁屏</string>
   <string name="cache_ttl_one_hour">一小时</string>
   <string name="cache_ttl_one_day">一天</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>
@@ -1529,12 +1477,16 @@
   <string name="redirect_import_key_message">您使用第三方应用扫描了一个 OpenPGP 二维码。请直接使用 Openkeychain 扫描以确保安全。</string>
   <string name="redirect_import_key_yes">重新扫描</string>
   <string name="redirect_import_key_no">关闭</string>
+  <string name="request_permission_title">允许到你的密钥的访问吗？</string>
+  <string name="button_allow">允许</string>
   <string name="button_cancel">取消</string>
   <string name="button_back">返回</string>
+  <string name="button_got_it">知道了</string>
   <string name="title_key_status">密钥状态</string>
   <string name="cap_title_confirm">确认其他密钥</string>
   <string name="cap_cert_ok">此密钥可用于确认其他密钥。</string>
   <string name="cap_cert_divert">此密钥可在安全令牌的配合下确认其他密钥。</string>
+  <string name="cap_cert_stripped">这个密钥已被剥离，它不能确认其他的密钥。</string>
   <string name="cap_title_sign">签名消息</string>
   <string name="cap_sign_ok">此密钥可用于签名/发送消息。</string>
   <string name="cap_sign_divert">此密钥可在安全令牌的配合下签名/发送消息。</string>
@@ -1571,33 +1523,59 @@
   <string name="key_health_partial_stripped_subtitle">点击查看详情</string>
   <string name="keyserver_title_published">已公开</string>
   <string name="keyserver_title_not_published">未公开</string>
+  <string name="keyserver_title_unknown">密钥服务器状态：未知</string>
   <string name="keyserver_last_updated">上一次检查：%s</string>
   <string name="keyserver_last_updated_never">上一次检查：无</string>
+  <string name="key_insecure_unidentified_solution">请发送一个缺陷报告。</string>
+  <string name="key_expiry_text">该密钥已于 <b>%1$s</b> 过期</string>
   <string name="dialog_insecure_title">安全警告</string>
+  <string name="dialog_insecure_recommend_title">建议的操作</string>
+  <string name="insecure_encrypt_bitstrength_suggestion">正在使用的密钥是不安全的，并且无法被升级。为了更安全地通信，你必须创建一个新的密钥！</string>
+  <string name="insecure_sign_bitstrength_suggestion">正在使用的密钥是不安全的，并且无法被升级。为了更安全地通信，发送者必须创建一个新的密钥！</string>
   <string name="dialog_insecure_override_title">忽略此警告</string>
   <string name="dialog_insecure_override_ok_title">警告已忽略</string>
+  <string name="dialog_insecure_button_view_key">查看密钥</string>
+  <string name="dialog_insecure_button_ok">知道了</string>
   <string name="usage_authentication">认证</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_keyserver">正在于密钥服务器中搜索......</string>
+  <string name="status_import">正在导入密钥......</string>
   <string name="token_reset_confirm_ok">重置</string>
   <string name="token_result_not_found">未找到密钥</string>
   <string name="token_action_reset">重置安全令牌</string>
   <string name="token_action_import">导入</string>
+  <string name="token_action_view_key">查看密钥</string>
   <string name="token_unlock_ok">解锁</string>
   <string name="token_hint_admin_pin">Admin PIN</string>
   <string name="label_usb_untested_summary">若启用，则可以使用未被测试过的 USB 读卡器。</string>