Pull from transifex

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

@@ -0,0 +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-da/help_about.md

@@ -0,0 +1,72 @@
+[//]: # (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](https://www.openkeychain.org) is an OpenPGP implementation for Android.
+
+License: GPLv3+
+
+[//]: # (NOTE: Alphabetic ordering)
+
+## Main Developers
+  * Dominik Schürmann (Maintainer)
+  * Vincent Breitmoser
+
+## Top Contributors
+  * Adithya Abraham Philip
+  * Ash Hughes
+  * 'mar-v-in'
+  * 'Thialfihar' (APG developer)
+  * Tim Bray
+
+## Occasional Contributors
+  * Art O Cathain
+  * Brian C. Barnes
+  * Bahtiar 'kalkin' Gadimov
+  * Daniel Albert
+  * Daniel Hammann
+  * Daniel Haß
+  * Daniel Nelz
+  * Daniel Ramos
+  * Greg Witczak
+  * 'iseki'
+  * Ishan Khanna
+  * 'jellysheep'
+  * 'Jesperbk'
+  * 'jkolo'
+  * Joey Castillo
+  * Kai Jiang
+  * Kartik Arora
+  * 'Kent'
+  * 'ligi'
+  * Lukas Zorich
+  * Manoj Khanna
+  * Markus Doits
+  * Miroojin Bakshi
+  * Morgan Gangwere
+  * Nikhil Peter Raj
+  * Paul Sarbinowski
+  * 'Senecaso'
+  * Signe Rüsch
+  * Sreeram Boyapati
+  * 'steelman'
+
+[//]: # (NOTE: Alphabetic ordering)
+
+## Libraries
+  * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
+  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
+  * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2)
+  * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache License v2)
+  * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2)
+  * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2)
+  * [MiniDNS](https://github.com/rtreffer/minidns) (Apache License v2)
+  * [OkHttp](https://square.github.io/okhttp/) (Apache License v2)
+  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2)
+  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
+  * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
+  * [BouncyCastle](https://github.com/open-keychain/bouncycastle) (MIT X11 License)
+  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
+  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2)
+  * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
+  * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2)

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

@@ -0,0 +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 to use 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.  
+<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."
+
+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.

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

@@ -0,0 +1,337 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
+## 4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+
+## 3.9
+
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+
+
+## 3.8
+
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+  * Facebook key import
+
+
+## 3.7
+
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
+
+
+## 3.6
+
+  * Encrypted backups
+  * Security fixes based on external security audit
+  * YubiKey NEO key creation wizard
+  * Basic internal MIME support
+  * Automatic key synchronization
+  * Experimental feature: link keys to Github, Twitter accounts
+  * Experimental feature: key confirmation via phrases
+  * Experimental feature: dark theme
+  * API: Version 9
+
+
+## 3.5
+
+  * Key revocation on key deletion
+  * Improved checks for insecure cryptography
+  * Fix: Don't close OpenKeychain after first time wizard succeeds
+  * API: Version 8
+
+
+## 3.4
+
+  * Anonymous key download over Tor
+  * Proxy support
+  * Better YubiKey error handling
+
+
+## 3.3
+
+  * New decryption screen
+  * Decryption of multiple files at once
+  * Better handling of YubiKey errors
+
+
+## 3.2
+
+  * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,...
+  * Material design
+  * Integration of QR Code Scanning (New permissions required)
+  * Improved key creation wizard
+  * Fix missing contacts after sync
+  * Requires Android 4
+  * Redesigned key screen
+  * Simplify crypto preferences, better selection of secure ciphers
+  * API: Detached signatures, free selection of signing key,...
+  * Fix: Some valid keys were shown revoked or expired
+  * Don't accept signatures by expired or revoked subkeys
+  * Keybase.io support in advanced view
+  * Method to update all keys at once
+
+
+## 3.1.2
+
+  * Fix key export to files (now for real)
+
+
+## 3.1.1
+
+  * Fix key export to files (they were written partially)
+  * Fix crash on Android 2.3
+
+
+## 3.1
+
+  * Fix crash on Android 5
+  * New certify screen
+  * Secure Exchange directly from key list (SafeSlinger library)
+  * New QR Code program flow
+  * Redesigned decrypt screen
+  * New icon usage and colors
+  * Fix import of secret keys from Symantec Encryption Desktop
+  * Experimental YubiKey support: Subkey IDs are now checked correctly
+
+
+## 3.0.1
+
+  * Better handling of large key imports
+  * Improved subkey selection
+
+
+## 3.0
+
+  * Propose installable compatible apps in apps list
+  * New design for decryption screens
+  * Many fixes for key import, also fixes stripped keys
+  * Honor and display key authenticate flags
+  * User interface to generate custom keys
+  * Fixing user id revocation certificates
+  * New cloud search (searches over traditional keyservers and keybase.io)
+  * Support for stripping keys inside OpenKeychain
+  * Experimental YubiKey support: Support for signature generation and decryption
+
+
+## 2.9.2
+
+  * Fix keys broken in 2.9.1
+  * Experimental YubiKey support: Decryption now working via API
+
+
+## 2.9.1
+
+  * Split encrypt screen into two
+  * 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
+  * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
+  * OpenPGP API now handles revoked/expired keys and returns all user ids
+
+
+## 2.9
+
+  * Fixing crashes introduced in v2.8
+  * Experimental ECC support
+  * Experimental YubiKey support: Only signing with imported keys
+
+
+## 2.8
+
+  * So many bugs have been fixed in this release that we focus on the main new features
+  * Key edit: awesome new design, key revocation
+  * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
+  * New first time screen
+  * New key creation screen: autocompletion of name and email based on your personal Android accounts
+  * File encryption: awesome new design, support for encrypting multiple files
+  * New icons to show status of key (by Brennan Novak)
+  * Important bug fix: Importing of large key collections from a file is now possible
+  * Notification showing cached passphrases
+  * Keys are connected to Android's contacts
+
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
+
+## 2.7
+
+  * Purple! (Dominik, Vincent)
+  * New key view design (Dominik, Vincent)
+  * New flat Android buttons (Dominik, Vincent)
+  * API fixes (Dominik)
+  * Keybase.io import (Tim Bray)
+
+
+## 2.6.1
+
+  * Some fixes for regression bugs
+
+
+## 2.6
+
+  * Key certifications (thanks to Vincent Breitmoser)
+  * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
+  * New design for signature verification
+  * Custom key length (thanks to Greg Witczak)
+  * Fix share-functionality from other apps
+
+
+## 2.5
+
+  * Fix decryption of symmetric OpenPGP messages/files
+  * Refactored key edit screen (thanks to Ash Hughes)
+  * New modern design for encrypt/decrypt screens
+  * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)
+
+
+## 2.4
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
+
+  * New unified key list
+  * Colorized key fingerprint
+  * Support for keyserver ports
+  * Deactivate possibility to generate weak keys
+  * Much more internal work on the API
+  * Certify user ids
+  * Keyserver query based on machine-readable output
+  * Lock navigation drawer on tablets
+  * Suggestions for emails on creation of keys
+  * Search in public key lists
+  * And much more improvements and fixes…
+
+
+## 2.3.1
+
+  * Hotfix for crash when upgrading from old versions
+
+
+## 2.3
+
+  * Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
+  * Fix setting expiry dates on keys (thanks to Ash Hughes)
+  * More internal fixes when editing keys (thanks to Ash Hughes)
+  * Querying keyservers directly from the import screen
+  * Fix layout and dialog style on Android 2.2-3.0
+  * Fix crash on keys with empty user ids
+  * Fix crash and empty lists when coming back from signing screen
+  * Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source
+  * Fix upload of key from signing screen
+
+
+## 2.2
+
+  * New design with navigation drawer
+  * New public key list design
+  * New public key view
+  * Bug fixes for importing of keys
+  * Key cross-certification (thanks to Ash Hughes)
+  * Handle UTF-8 passwords properly (thanks to Ash Hughes)
+  * First version with new languages (thanks to the contributors on Transifex)
+  * Sharing of keys via QR Codes fixed and improved
+  * Package signature verification for API
+
+
+## 2.1.1
+
+  * API Updates, preparation for K-9 Mail integration
+
+
+## 2.1
+
+  * Lots of bug fixes
+  * New API for developers
+  * PRNG bug fix by Google
+
+
+## 2.0
+
+  * Complete redesign
+  * Share public keys via QR codes, NFC beam
+  * Sign keys
+  * Upload keys to server
+  * Fixes import issues
+  * New AIDL API
+
+
+## 1.0.8
+
+  * Basic keyserver support
+  * App2sd
+  * More choices for passphrase cache: 1, 2, 4, 8, hours
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Bugfixes
+  * Optimizations
+
+
+## 1.0.7
+
+  * Fixed problem with signature verification of texts with trailing newline
+  * More options for passphrase cache time to live (20, 40, 60 mins)
+
+
+## 1.0.6
+
+  * Account adding crash on Froyo fixed
+  * Secure file deletion
+  * Option to delete key file after import
+  * Stream encryption/decryption (gallery, etc.)
+  * New options (language, force v3 signatures)
+  * Interface changes
+  * Bugfixes
+
+
+## 1.0.5
+
+  * German and Italian translation
+  * Much smaller package, due to reduced BC sources
+  * New preferences GUI
+  * Layout adjustment for localization
+  * Signature bugfix
+
+
+## 1.0.4
+
+  * Fixed another crash caused by some SDK bug with query builder
+
+
+## 1.0.3
+
+  * Fixed crashes during encryption/signing and possibly key export
+
+
+## 1.0.2
+
+  * 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
+  * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
+
+
+## 1.0.1
+
+  * GMail account listing was broken in 1.0.0, fixed again
+
+
+## 1.0.0
+
+  * K-9 Mail integration, APG supporting beta build of K-9 Mail
+  * Support of more file managers (including ASTRO)
+  * Slovenian translation
+  * New database, much faster, less memory usage
+  * Defined Intents and content provider for other apps
+  * Bugfixes

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

@@ -0,0 +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.
+
+## I found a bug in OpenKeychain!
+Please report the bug using the [issue tracker of OpenKeychain](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).
+
+## Translations
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).

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

@@ -1,6 +1,6 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
-Advanced screen allows you to
+Asetusikkuna sallii sinun
 * jakaa avaimen ei-suositelluilla tavoilla
 * Muokkaa identiteetit
 * editoi aliavaimet

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

@@ -2,11 +2,11 @@
 
 [https://www.openkeychain.org](https://www.openkeychain.org)
 
-[OpenKeychain](https://www.openkeychain.org) is an OpenPGP implementation for Android.
+[OpenKeychain](https://www.openkeychain.org) on OpenPGP toteutus Androidille.
 
-License: GPLv3+
+Lisenssi: GPLv3+
 
-[//]: # (NOTE: Alphabetic ordering)
+[//]: # (Huom.: Aakkosjärjestys)
 
 ## Pääkehittäjät
   * Dominik Schürmann (Ylläpitäjä)
@@ -16,10 +16,10 @@ License: GPLv3+
   * Adithya Abraham Philip
   * Ash Hughes
   * 'mar-v-in'
-  * 'Thialfihar' (APG developer)
+  * 'Thialfihar' (APG kehittäjä)
   * Tim Bray
 
-## Occasional Contributors
+## Aijottain auttaneet
   * Art O Cathain
   * Brian C. Barnes
   * Bahtiar 'kalkin' Gadimov
@@ -51,7 +51,7 @@ License: GPLv3+
   * Sreeram Boyapati
   * 'steelman'
 
-[//]: # (NOTE: Alphabetic ordering)
+[//]: # (Huom.: Aakkosjärjestys)
 
 ## Libraries
   * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)

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

@@ -7,7 +7,7 @@
 
 ## 4.0
 
-  * Experimental support for Security Tokens over USB
+  * Supporto sperimentale dei Token USB
   * Allow password changing of stripped keys
 
 
@@ -15,19 +15,19 @@
 
   * Detection and handling of text data
   * Miglioramento delle prestazioni
-  * UI improvements for Security Token handling
+  * Miglioramento interfaccia di gestione dei Token
 
 
 ## 3.8
 
   * Redesigned key editing
-  * Choose remember time individually when entering passwords
+  Scegli il tempo di ricordo individualmente quando inserisci una password
   * Importazione delle password di Facebook
 
 
 ## 3.7
 
-  * Improved Android 6 support (permissions, integration into text selection)
+  Migliorato il supporto ad Android 6 (permessi, integrazione nella selezione del testo)
   * API: Versione 10
 
 
@@ -36,11 +36,11 @@
   * Copie di backup crittografate
   * Security fixes based on external security audit
   * YubiKey NEO key creation wizard
-  * Basic internal MIME support
+  * Supporto base a MIME
-  * Automatic key synchronization
+  * Sincronizzazione automatica delle chiavi
   * Experimental feature: link keys to Github, Twitter accounts
   * Experimental feature: key confirmation via phrases
-  * Experimental feature: dark theme
+  * Caratteristica sperimentale: Tema scuro
   * API: Versione 9
 
 
@@ -55,7 +55,7 @@
 ## 3.4
 
   * Anonymous key download over Tor
-  * Proxy support
+  * Supporto proxy
   * Better YubiKey error handling
 
 
@@ -63,18 +63,18 @@
 
   * New decryption screen
   * Decryption of multiple files at once
-  * Better handling of YubiKey errors
+  * Migliore gestione errori di YubiKey
 
 
 ## 3.2
 
   * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,...
   * Material design
-  * Integration of QR Code Scanning (New permissions required)
+  * Integrazione della Scasione codici QR (Nuovi permessi richiesti)
-  * Improved key creation wizard
+  * Migliorato wizard della creazione di chiavi
-  * Fix missing contacts after sync
+  * Corretto contatti persi dopo sincronizzazione
   * Richiede Android 4
-  * Redesigned key screen
+  * Schermata chiavi riprogettata
   * Simplify crypto preferences, better selection of secure ciphers
   * API: Detached signatures, free selection of signing key,...
   * Fix: Some valid keys were shown revoked or expired
@@ -85,19 +85,19 @@
 
 ## 3.1.2
 
-  * Fix key export to files (now for real)
+  * Corretta esportazione chiavi su file (davvero questa volta)
 
 
 ## 3.1.1
 
-  * Fix key export to files (they were written partially)
+  * Corretta esportazione chiavi su file (la scrittura era parziale)
   * Risolto un crash in Android 2.3
 
 
 ## 3.1
 
   * Corretto crash su Android 5
-  * New certify screen
+  * Nuova schermata di certificazione
   * Secure Exchange directly from key list (SafeSlinger library)
   * New QR Code program flow
   * Redesigned decrypt screen
@@ -108,8 +108,8 @@
 
 ## 3.0.1
 
-  * Better handling of large key imports
+  * Gestione migliorata dell'importazioni di chiavi di grandi dimensioni
-  * Improved subkey selection
+  * Migliorata la selezione delle sottochiavi
 
 
 ## 3.0
@@ -136,18 +136,18 @@
   * Split encrypt screen into two
   * Fix key flags handling (now supporting Mailvelope 0.7 keys)
   * Gestione delle password migliorata
-  * Key sharing via SafeSlinger
+  * Condivisione chiavi 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
+  * SHA256 predefinito per compatibilità
   * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
   * OpenPGP API now handles revoked/expired keys and returns all user ids
 
 
 ## 2.9
 
-  * Fixing crashes introduced in v2.8
+   * Correzione crash introdotti nella versione 2.8
-  * Experimental ECC support
+  * Supporto sperimentale ad ECC
   * Experimental YubiKey support: Only signing with imported keys
 
 
@@ -156,13 +156,13 @@
   * So many bugs have been fixed in this release that we focus on the main new features
   * Key edit: awesome new design, key revocation
   * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
-  * New first time screen
+  * Nuova schermata di introduzione
   * New key creation screen: autocompletion of name and email based on your personal Android accounts
   * File encryption: awesome new design, support for encrypting multiple files
   * New icons to show status of key (by Brennan Novak)
   * Important bug fix: Importing of large key collections from a file is now possible
   * Notification showing cached passphrases
-  * Keys are connected to Android's contacts
+  * Le chiavi sono collegate ai contatti di Android
 
 This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
@@ -170,7 +170,7 @@ This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2
 
   * Purple! (Dominik, Vincent)
   * New key view design (Dominik, Vincent)
-  * New flat Android buttons (Dominik, Vincent)
+  * Nuovi pulsanti piatti su Android (Dominik, Vincent)
   * Diverse correzioni alle API (Dominik)
   * Keybase.io import (Tim Bray)
 
@@ -185,7 +185,7 @@ This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2
   * Key certifications (thanks to Vincent Breitmoser)
   * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
   * New design for signature verification
-  * Custom key length (thanks to Greg Witczak)
+  * Lunghezza personalizzata chiave (grazie a Greg Witczak)
   * Fix share-functionality from other apps
 
 
@@ -194,7 +194,7 @@ This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2
   * Fix decryption of symmetric OpenPGP messages/files
   * Refactored key edit screen (thanks to Ash Hughes)
   * New modern design for encrypt/decrypt screens
-  * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)
+  * API OpenPGP versione 3 (account api multipli, correzioni interne, ricerca chiavi)
 
 
 ## 2.4
@@ -211,8 +211,8 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Keyserver query based on machine-readable output
   * Lock navigation drawer on tablets
   * Suggestions for emails on creation of keys
-  * Search in public key lists
+  * Ricerca nelle liste di chiavi pubbliche
-  * And much more improvements and fixes…
+  * E molti altri miglioramenti e correzioni...
 
 
 ## 2.3.1
@@ -238,11 +238,11 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * New design with navigation drawer
   * New public key list design
   * New public key view
-  * Bug fixes for importing of keys
+  * Correzione bug importazione chiavi
   * Key cross-certification (thanks to Ash Hughes)
-  * Handle UTF-8 passwords properly (thanks to Ash Hughes)
+  * Gestione corretta password UTF-8 (grazie ad Ash Hughes)
-  * First version with new languages (thanks to the contributors on Transifex)
+  * Prima versione multilingua (grazie ai collaboratori su Transifex)
-  * Sharing of keys via QR Codes fixed and improved
+  * Condivisione di chiavi attraverso Codici QR corretta e migliorata
   * Package signature verification for API
 
 
@@ -262,8 +262,8 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
   * Complete redesign
   * Share public keys via QR codes, NFC beam
-  * Sign keys
+  * Firma chiavi
-  * Upload keys to server
+  * Caricamento chiavi su server
   * Fixes import issues
   * New AIDL API
 
@@ -299,9 +299,9 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
   * Traduzione in Italiano e Tedesco
   * Much smaller package, due to reduced BC sources
-  * New preferences GUI
+  * Nuove preferenze per GUI
   * Layout adjustment for localization
-  * Signature bugfix
+  * Correzione bug firma
 
 
 ## 1.0.4
@@ -316,7 +316,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 1.0.2
 
-  * Filterable key lists
+  * Liste chiavi filtrabili
   * Smarter pre-selection of encryption keys
   * New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
   * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
@@ -329,9 +329,9 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 1.0.0
 
-  * K-9 Mail integration, APG supporting beta build of K-9 Mail
+  * Integrazione K-9 Mail, APG supporta build beta di K-9 Mail
-  * Support of more file managers (including ASTRO)
+  * Supporto per altri file manager (incluso ASTRO)
   * Traduzione in Sloveno
-  * New database, much faster, less memory usage
+  * Nuovo database, più veloce, con utilizzo di memoria ridotto
   * Defined Intents and content provider for other apps
   * Correzione di bug

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

@@ -1,9 +1,9 @@
-[//]: # (NOTA: coloque cada frase em sua própria linha, Transifex coloca cada linha em seu próprio campo de tradução!)
+[//]: # (NOTA: coloque cada frase em sua própria linha, o Transifex coloca cada linha em seu próprio campo de tradução!)
 
-Configuração avançada de tela permite que você
+A tela Avançado permite a você
-compartilhar a chave de formas não recomendadas
+* compartilhar chaves de formas não recomendadas
 * editar identidades
 * editar sub-chaves
-* examine certificados em detalhes
+* examinar certificados em detalhes
 
 Só prossiga se você sabe o que está fazendo!

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

@@ -1,14 +1,14 @@
-[//]: # (NOTA: coloque cada frase em sua própria linha, Transifex coloca cada linha em seu próprio campo de tradução!)
+[//]: # (NOTA: coloque cada frase em sua própria linha, o Transifex coloca cada linha em seu próprio campo de tradução!)
 
 ## 4.1
 
-  * Better detection of emails and other content when opened
+  * Melhor detecção de emails e outros conteúdos quando aberto
 
 
 ## 4.0
 
-  * Experimental support for Security Tokens over USB
+  * Suporte experimental a Tokens de Segurança por USB
-  * Allow password changing of stripped keys
+  * Permissão de mudança de senha de chaves estirpadas
 
 
 ## 3.9
@@ -27,83 +27,83 @@
 
 ## 3.7
 
-  * Improved Android 6 support (permissions, integration into text selection)
+  * Melhoria no suporte ao Android 6 (permissões, integração na seleção de texto)
-  * API: Version 10
+  * API: Versão 10
 
 
 ## 3.6
 
-  * Encrypted backups
+  * Cópias de Segurança encriptadas
-  * Security fixes based on external security audit
+  * Correções de segurança baseadas em auditoria de segurança externa
-  * YubiKey NEO key creation wizard
+  * Assistente de criação de chave YubiKey NEO
-  * Basic internal MIME support
+  * Suporte interno básico a MIME
-  * Automatic key synchronization
+  * Sincronização automática de chaves
-  * Experimental feature: link keys to Github, Twitter accounts
+  * Funcionalidades experimentais: associar chaves a contas do GitHub, Twitter
-  * Experimental feature: key confirmation via phrases
+  * Funcionalidade experimental: confirmação de chaves via frases
-  * Experimental feature: dark theme
+  * Funcionalidade experimental: tema escuro
-  * API: Version 9
+  * API: Versão 9
 
 
 ## 3.5
 
-  * Key revocation on key deletion
+  * Revogação de chave na exclusão
-  * Improved checks for insecure cryptography
+  * Melhoria das checagens de criptografia insegura
-  * Fix: Don't close OpenKeychain after first time wizard succeeds
+  * Correção: Não feche o OpenKeychain após o sucesso do assistente inicial
-  * API: Version 8
+  * API: Versão 8
 
 
 ## 3.4
 
-  * Anonymous key download over Tor
+  * Download anônimo de chaves por Tor
-  * Proxy support
+  * Suporte a proxy
-  * Better YubiKey error handling
+  * Melhor tratamento de erros do YubiKey
 
 
 ## 3.3
 
-  * New decryption screen
+  * Nova tela de decriptação
-  * Decryption of multiple files at once
+  * Decriptação de múltiplos arquivos de uma só vez
-  * Better handling of YubiKey errors
+  * Melhor tratamento de erros do YubiKey
 
 
 ## 3.2
 
-  * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,...
+  * Primeira versão com suporte total ao YubiKey disponíveis pela interface do usuário: Editar chaves, vincular YubiKey a chaves, etc....
   * Material design
-  * Integration of QR Code Scanning (New permissions required)
+  * Integração com leitura por QR Code (Novas permissões requeridas)
-  * Improved key creation wizard
+  * Melhoria no assistente de criação de chaves
-  * Fix missing contacts after sync
+  * Corrigidos contatos desaparecidos após sincronismo
-  * Requires Android 4
+  * Requer Android 4
-  * Redesigned key screen
+  * Tela de chaves redesenhada
-  * Simplify crypto preferences, better selection of secure ciphers
+  * Simplificação de preferências criptográficas, melhor seleção de cifras seguras
-  * API: Detached signatures, free selection of signing key,...
+  * API: Assinaturas destacáveis, seleção livre de chave para assinatura, etc...
-  * Fix: Some valid keys were shown revoked or expired
+  * Correção: algumas chaves válidas se mostravam como revogadas ou expiradas
-  * Don't accept signatures by expired or revoked subkeys
+  * Não aceitar assinaturar por subchaves expiradas ou revogadas
-  * Keybase.io support in advanced view
+  * Suporte ao Keybase.io na vista avançada
-  * Method to update all keys at once
+  * Método para atualizar todas as chaves de uma só vez
 
 
 ## 3.1.2
 
-  * Fix key export to files (now for real)
+  * Correção na exportação de chaves para arquivos (agora vai)
 
 
 ## 3.1.1
 
-  * Fix key export to files (they were written partially)
+  * Correção na exportação de chaves para arquivos (eram gravadas parcialmente)
-  * Fix crash on Android 2.3
+  * Corrigido um crash no Android 2.3
 
 
 ## 3.1
 
-  * Fix crash on Android 5
+  * Corrigido um crash no Android 5
-  * New certify screen
+  * Nova tela de certificado
-  * Secure Exchange directly from key list (SafeSlinger library)
+  * Troca Segura diretamente da lista de chaves (biblioteca SafeSlinger)
-  * New QR Code program flow
+  * Novo fluxo de programa para QR Code
-  * Redesigned decrypt screen
+  * Tela de decriptação redesenhada
-  * New icon usage and colors
+  * Uso de novos ícones e cores
-  * Fix import of secret keys from Symantec Encryption Desktop
+  * Corrigida a importação de chaves secretas do Symantec Encryption Desktop
-  * Experimental YubiKey support: Subkey IDs are now checked correctly
+  * Suporte experimental a YubiKey: ID's de subchaves agora são verificadas corretamente
 
 
 ## 3.0.1

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

@@ -0,0 +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-ro/help_about.md

@@ -0,0 +1,72 @@
+[//]: # (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](https://www.openkeychain.org) is an OpenPGP implementation for Android.
+
+License: GPLv3+
+
+[//]: # (NOTE: Alphabetic ordering)
+
+## Main Developers
+  * Dominik Schürmann (Maintainer)
+  * Vincent Breitmoser
+
+## Top Contributors
+  * Adithya Abraham Philip
+  * Ash Hughes
+  * 'mar-v-in'
+  * 'Thialfihar' (APG developer)
+  * Tim Bray
+
+## Occasional Contributors
+  * Art O Cathain
+  * Brian C. Barnes
+  * Bahtiar 'kalkin' Gadimov
+  * Daniel Albert
+  * Daniel Hammann
+  * Daniel Haß
+  * Daniel Nelz
+  * Daniel Ramos
+  * Greg Witczak
+  * 'iseki'
+  * Ishan Khanna
+  * 'jellysheep'
+  * 'Jesperbk'
+  * 'jkolo'
+  * Joey Castillo
+  * Kai Jiang
+  * Kartik Arora
+  * 'Kent'
+  * 'ligi'
+  * Lukas Zorich
+  * Manoj Khanna
+  * Markus Doits
+  * Miroojin Bakshi
+  * Morgan Gangwere
+  * Nikhil Peter Raj
+  * Paul Sarbinowski
+  * 'Senecaso'
+  * Signe Rüsch
+  * Sreeram Boyapati
+  * 'steelman'
+
+[//]: # (NOTE: Alphabetic ordering)
+
+## Libraries
+  * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
+  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
+  * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2)
+  * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache License v2)
+  * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2)
+  * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2)
+  * [MiniDNS](https://github.com/rtreffer/minidns) (Apache License v2)
+  * [OkHttp](https://square.github.io/okhttp/) (Apache License v2)
+  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2)
+  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
+  * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
+  * [BouncyCastle](https://github.com/open-keychain/bouncycastle) (MIT X11 License)
+  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
+  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2)
+  * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
+  * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2)

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

@@ -0,0 +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 to use 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.  
+<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."
+
+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.

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

@@ -0,0 +1,337 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
+## 4.0
+
+  * Experimental support for Security Tokens over USB
+  * Allow password changing of stripped keys
+
+
+## 3.9
+
+  * Detection and handling of text data
+  * Performance improvements
+  * UI improvements for Security Token handling
+
+
+## 3.8
+
+  * Redesigned key editing
+  * Choose remember time individually when entering passwords
+  * Facebook key import
+
+
+## 3.7
+
+  * Improved Android 6 support (permissions, integration into text selection)
+  * API: Version 10
+
+
+## 3.6
+
+  * Encrypted backups
+  * Security fixes based on external security audit
+  * YubiKey NEO key creation wizard
+  * Basic internal MIME support
+  * Automatic key synchronization
+  * Experimental feature: link keys to Github, Twitter accounts
+  * Experimental feature: key confirmation via phrases
+  * Experimental feature: dark theme
+  * API: Version 9
+
+
+## 3.5
+
+  * Key revocation on key deletion
+  * Improved checks for insecure cryptography
+  * Fix: Don't close OpenKeychain after first time wizard succeeds
+  * API: Version 8
+
+
+## 3.4
+
+  * Anonymous key download over Tor
+  * Proxy support
+  * Better YubiKey error handling
+
+
+## 3.3
+
+  * New decryption screen
+  * Decryption of multiple files at once
+  * Better handling of YubiKey errors
+
+
+## 3.2
+
+  * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,...
+  * Material design
+  * Integration of QR Code Scanning (New permissions required)
+  * Improved key creation wizard
+  * Fix missing contacts after sync
+  * Requires Android 4
+  * Redesigned key screen
+  * Simplify crypto preferences, better selection of secure ciphers
+  * API: Detached signatures, free selection of signing key,...
+  * Fix: Some valid keys were shown revoked or expired
+  * Don't accept signatures by expired or revoked subkeys
+  * Keybase.io support in advanced view
+  * Method to update all keys at once
+
+
+## 3.1.2
+
+  * Fix key export to files (now for real)
+
+
+## 3.1.1
+
+  * Fix key export to files (they were written partially)
+  * Fix crash on Android 2.3
+
+
+## 3.1
+
+  * Fix crash on Android 5
+  * New certify screen
+  * Secure Exchange directly from key list (SafeSlinger library)
+  * New QR Code program flow
+  * Redesigned decrypt screen
+  * New icon usage and colors
+  * Fix import of secret keys from Symantec Encryption Desktop
+  * Experimental YubiKey support: Subkey IDs are now checked correctly
+
+
+## 3.0.1
+
+  * Better handling of large key imports
+  * Improved subkey selection
+
+
+## 3.0
+
+  * Propose installable compatible apps in apps list
+  * New design for decryption screens
+  * Many fixes for key import, also fixes stripped keys
+  * Honor and display key authenticate flags
+  * User interface to generate custom keys
+  * Fixing user id revocation certificates
+  * New cloud search (searches over traditional keyservers and keybase.io)
+  * Support for stripping keys inside OpenKeychain
+  * Experimental YubiKey support: Support for signature generation and decryption
+
+
+## 2.9.2
+
+  * Fix keys broken in 2.9.1
+  * Experimental YubiKey support: Decryption now working via API
+
+
+## 2.9.1
+
+  * Split encrypt screen into two
+  * 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
+  * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
+  * OpenPGP API now handles revoked/expired keys and returns all user ids
+
+
+## 2.9
+
+  * Fixing crashes introduced in v2.8
+  * Experimental ECC support
+  * Experimental YubiKey support: Only signing with imported keys
+
+
+## 2.8
+
+  * So many bugs have been fixed in this release that we focus on the main new features
+  * Key edit: awesome new design, key revocation
+  * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
+  * New first time screen
+  * New key creation screen: autocompletion of name and email based on your personal Android accounts
+  * File encryption: awesome new design, support for encrypting multiple files
+  * New icons to show status of key (by Brennan Novak)
+  * Important bug fix: Importing of large key collections from a file is now possible
+  * Notification showing cached passphrases
+  * Keys are connected to Android's contacts
+
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
+
+## 2.7
+
+  * Purple! (Dominik, Vincent)
+  * New key view design (Dominik, Vincent)
+  * New flat Android buttons (Dominik, Vincent)
+  * API fixes (Dominik)
+  * Keybase.io import (Tim Bray)
+
+
+## 2.6.1
+
+  * Some fixes for regression bugs
+
+
+## 2.6
+
+  * Key certifications (thanks to Vincent Breitmoser)
+  * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
+  * New design for signature verification
+  * Custom key length (thanks to Greg Witczak)
+  * Fix share-functionality from other apps
+
+
+## 2.5
+
+  * Fix decryption of symmetric OpenPGP messages/files
+  * Refactored key edit screen (thanks to Ash Hughes)
+  * New modern design for encrypt/decrypt screens
+  * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)
+
+
+## 2.4
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
+
+  * New unified key list
+  * Colorized key fingerprint
+  * Support for keyserver ports
+  * Deactivate possibility to generate weak keys
+  * Much more internal work on the API
+  * Certify user ids
+  * Keyserver query based on machine-readable output
+  * Lock navigation drawer on tablets
+  * Suggestions for emails on creation of keys
+  * Search in public key lists
+  * And much more improvements and fixes…
+
+
+## 2.3.1
+
+  * Hotfix for crash when upgrading from old versions
+
+
+## 2.3
+
+  * Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
+  * Fix setting expiry dates on keys (thanks to Ash Hughes)
+  * More internal fixes when editing keys (thanks to Ash Hughes)
+  * Querying keyservers directly from the import screen
+  * Fix layout and dialog style on Android 2.2-3.0
+  * Fix crash on keys with empty user ids
+  * Fix crash and empty lists when coming back from signing screen
+  * Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source
+  * Fix upload of key from signing screen
+
+
+## 2.2
+
+  * New design with navigation drawer
+  * New public key list design
+  * New public key view
+  * Bug fixes for importing of keys
+  * Key cross-certification (thanks to Ash Hughes)
+  * Handle UTF-8 passwords properly (thanks to Ash Hughes)
+  * First version with new languages (thanks to the contributors on Transifex)
+  * Sharing of keys via QR Codes fixed and improved
+  * Package signature verification for API
+
+
+## 2.1.1
+
+  * API Updates, preparation for K-9 Mail integration
+
+
+## 2.1
+
+  * Lots of bug fixes
+  * New API for developers
+  * PRNG bug fix by Google
+
+
+## 2.0
+
+  * Complete redesign
+  * Share public keys via QR codes, NFC beam
+  * Sign keys
+  * Upload keys to server
+  * Fixes import issues
+  * New AIDL API
+
+
+## 1.0.8
+
+  * Basic keyserver support
+  * App2sd
+  * More choices for passphrase cache: 1, 2, 4, 8, hours
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Bugfixes
+  * Optimizations
+
+
+## 1.0.7
+
+  * Fixed problem with signature verification of texts with trailing newline
+  * More options for passphrase cache time to live (20, 40, 60 mins)
+
+
+## 1.0.6
+
+  * Account adding crash on Froyo fixed
+  * Secure file deletion
+  * Option to delete key file after import
+  * Stream encryption/decryption (gallery, etc.)
+  * New options (language, force v3 signatures)
+  * Interface changes
+  * Bugfixes
+
+
+## 1.0.5
+
+  * German and Italian translation
+  * Much smaller package, due to reduced BC sources
+  * New preferences GUI
+  * Layout adjustment for localization
+  * Signature bugfix
+
+
+## 1.0.4
+
+  * Fixed another crash caused by some SDK bug with query builder
+
+
+## 1.0.3
+
+  * Fixed crashes during encryption/signing and possibly key export
+
+
+## 1.0.2
+
+  * 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
+  * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
+
+
+## 1.0.1
+
+  * GMail account listing was broken in 1.0.0, fixed again
+
+
+## 1.0.0
+
+  * K-9 Mail integration, APG supporting beta build of K-9 Mail
+  * Support of more file managers (including ASTRO)
+  * Slovenian translation
+  * New database, much faster, less memory usage
+  * Defined Intents and content provider for other apps
+  * Bugfixes

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

@@ -0,0 +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.
+
+## I found a bug in OpenKeychain!
+Please report the bug using the [issue tracker of OpenKeychain](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).
+
+## Translations
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).

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

@@ -2,13 +2,13 @@
 
 ## 4.1
 
-  * Better detection of emails and other content when opened
+  * Улучшено определение писем и другого контента при открытии
 
 
 ## 4.0
 
   * Эксперементальная поддержка для токена безопасности через USB
-  * Allow password changing of stripped keys
+  * Добавлена возможность изменения пароля отделённых ключей
 
 
 ## 3.9
@@ -20,7 +20,7 @@
 
 ## 3.8
 
-  * Redesigned key editing
+  * Изменение дизайна окна редактирования ключей
   * Choose remember time individually when entering passwords
   * Импорт ключа с Facebook
 
@@ -34,21 +34,21 @@
 ## 3.6
 
   * Зашифрованные резервные копии
-  * Security fixes based on external security audit
+  * Исправление ошибок, выявленных внешним аудитом безопасности
-  * YubiKey NEO key creation wizard
+  * Диалог создания ключа YubiKey NEO 
-  * Basic internal MIME support
+  * Основная поддержка MIME
   * Автоматическая синхронизация ключа
   * Experimental feature: link keys to Github, Twitter accounts
   * Experimental feature: key confirmation via phrases
   * Экспериментальная функция: тёмная тема
-  * API: Version 9
+  * API: Версия 9
 
 
 ## 3.5
 
-  * Key revocation on key deletion
+  * Аннулирование ключа при его удалении
   * Улучшенная проверка небезопасной криптографии
-  * Fix: Don't close OpenKeychain after first time wizard succeeds
+  * Исправлено: Не закрывался диалог первичной настройки
   API: Версия 8
 
 
@@ -61,20 +61,20 @@
 
 ## 3.3
 
-  * New decryption screen
+  * Новое окно расшифровки
-  * Decryption of multiple files at once
+  * Расшифровка нескольких файлов одновременно
-  * Better handling of YubiKey errors
+  * Улучшена обработка ошибок YubiKey
 
 
 ## 3.2
 
-  * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,...
+  * Первая версия с поддержкой YubiKey в программе: Изменение ключа, привязка ключа к брелоку,...
   * Материальный дизайн
-  * Integration of QR Code Scanning (New permissions required)
+  * Интеграция сканера кодов QR (Требуются новые полномочия)
-  * Improved key creation wizard
+  * Улучшение мастера создания ключей
-  * Fix missing contacts after sync
+  * Исправлено пропадание контактов после синхронизации
   * Требуется Android 4
-  * Redesigned key screen
+  * Изменение дизайна окна ключей
   * Simplify crypto preferences, better selection of secure ciphers
   * API: Detached signatures, free selection of signing key,...
   * Fix: Some valid keys were shown revoked or expired
@@ -100,7 +100,7 @@
   Новое окно подтверждения
   * Secure Exchange directly from key list (SafeSlinger library)
   * New QR Code program flow
-  * Redesigned decrypt screen
+  * Изменение дизайна диалога расшифровки
   Использование новых иконок и цевтов
   * Fix import of secret keys from Symantec Encryption Desktop
   * Experimental YubiKey support: Subkey IDs are now checked correctly
@@ -119,7 +119,7 @@
   * Many fixes for key import, also fixes stripped keys
   * Honor and display key authenticate flags
   Пользовательский интерфейс для генерации пользовательских ключей
-  * Fixing user id revocation certificates
+  * Исправление сертификатов отзыва
   Новый облачный поиск (по традиционным серверам ключей и по keybase.io)
   * Support for stripping keys inside OpenKeychain
   Экспериментальная поддержка YubiKey: Поддержка генерации и расшифровка подписей
@@ -127,8 +127,8 @@
 
 ## 2.9.2
 
-  * Fix keys broken in 2.9.1
+  * Исправление ключей, сломанных в 2.9.1
-  * Experimental YubiKey support: Decryption now working via API
+  * Экспериментальная поддержка Yubikey: Расшифровка теперь работает через API
 
 
 ## 2.9.1
@@ -139,7 +139,7 @@
   * 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
+  SHA256 по умолчанию для совместимости
   * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
   * OpenPGP API now handles revoked/expired keys and returns all user ids
 
@@ -211,7 +211,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Keyserver query based on machine-readable output
   * Lock navigation drawer on tablets
   * Suggestions for emails on creation of keys
-  * Search in public key lists
+  * Поиск в списках публичных ключей
   * And much more improvements and fixes…
 
 
@@ -236,46 +236,46 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 ## 2.2
 
   * New design with navigation drawer
-  * New public key list design
+  * Новый дизайн списка публичных ключей
-  * New public key view
+  * Новый вид просмотра публичного ключа
   * Bug fixes for importing of keys
-  * Key cross-certification (thanks to Ash Hughes)
+  * Кросс-сертификация ключей (спасибо Ash Hughes)
   * Handle UTF-8 passwords properly (thanks to Ash Hughes)
-  * First version with new languages (thanks to the contributors on Transifex)
+  * Первая версия с новыми языками (спасибо переводчикам на Transifex)
-  * Sharing of keys via QR Codes fixed and improved
+  * Передача ключей через QR коды исправлена и улучшена 
-  * Package signature verification for API
+  * Проверка подписи пакета для API
 
 
 ## 2.1.1
 
-  * API Updates, preparation for K-9 Mail integration
+  * Обновление API, подготовка к интеграции с K-9 Mail
 
 
 ## 2.1
 
-  * Lots of bug fixes
+  * Множество исправлений ошибок
-  * New API for developers
+  * Новый API для разработчиков
   * PRNG bug fix by Google
 
 
 ## 2.0
 
-  * Complete redesign
+  * Переработка дизайна
-  * Share public keys via QR codes, NFC beam
+  * Передачи публичных ключей через QR коды и NFC
-  * Sign keys
+  * Подпись ключей
-  * Upload keys to server
+  * Загрузка ключей на сервер
-  * Fixes import issues
+  * Исправление проблем импорта
   * New AIDL API
 
 
 ## 1.0.8
 
-  * Basic keyserver support
+  * Основная поддержка сервера ключей
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
   * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
-  * Bugfixes
+  * Исправления ошибок
-  * Optimizations
+  * Оптимизации
 
 
 ## 1.0.7
@@ -287,12 +287,12 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 ## 1.0.6
 
   * Account adding crash on Froyo fixed
-  * Secure file deletion
+  * Безопасное удаление файла
   * Option to delete key file after import
   * Stream encryption/decryption (gallery, etc.)
   * New options (language, force v3 signatures)
-  * Interface changes
+  * Изменения интерфейса
-  * Bugfixes
+  * Исправления ошибок
 
 
 ## 1.0.5
@@ -334,4 +334,4 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Словенский перевод
   Новая база данных, намного быстрее и компактнее
   * Defined Intents and content provider for other apps
-  * Bugfixes
+  * Исправления ошибок

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

@@ -18,11 +18,11 @@ Utgången: Den här nyckeln är inte längre giltig. Endast ägaren kan förlän
 
 ## Avancerad information
 En "nyckelbekräftelse" i OpenKeychain genomförs genom att skapa en certifiering enligt OpenPGP-standard.
-This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) described in the standard by:
+Denna certifiering är en ["generisk certifiering (0x10)"] (http://tools.ietf.org/html/rfc4880#section-5.2.1) beskrivs i standarden av:
 "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."
 
 Traditionellt, certifieringar (även med högre certifieringsnivåer, såsom "positiva certifieringar" (0x13)) är organiserade i OpenPGP:s Web of Trust.
 Vår modell av nyckelbekräftelse är ett mycket enklare koncept för att undvika vanliga användbarhetsproblem i samband med Web of Trust.
 Vi antar att nycklar verifieras endast till en viss grad som fortfarande är användbar nog att exekveras "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.
+Dessutom kommer nycklar som innehåller åtminstone en användar-ID certifierad av en betrodd nyckel markeras som "bekräftade" i nyckel listor.

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

@@ -2,7 +2,7 @@
 
 ## 4.1
 
-  * Better detection of emails and other content when opened
+  * Bättre detektering av e-post och annat innehåll när den öppnas
 
 
 ## 4.0
@@ -47,7 +47,7 @@
 ## 3.5
 
   * Nyckelåterkallelse vid nyckelradering
-  * Improved checks for insecure cryptography
+  * Förbättrade kontroller för osäker kryptografi
   * Fix: Don't close OpenKeychain after first time wizard succeeds
   * API: Version 8
 
@@ -120,7 +120,7 @@
   * Honor and display key authenticate flags
   * User interface to generate custom keys
   * Fixing user id revocation certificates
-  * New cloud search (searches over traditional keyservers and keybase.io)
+  * Ny moln sökning (sökningar över traditionella nyckelservrar och keybase.io)
   * Support for stripping keys inside OpenKeychain
   * Experimental YubiKey support: Support for signature generation and decryption
 
@@ -211,7 +211,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Keyserver query based on machine-readable output
   * Lock navigation drawer on tablets
   * Suggestions for emails on creation of keys
-  * Search in public key lists
+  * Sök i offentliga nyckellistor
   * And much more improvements and fixes…
 
 

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

@@ -1,8 +1,8 @@
 [//]: # (注意：请把每个句子放在单独一行中， Transifex 将把每一行放置在独立的翻译表单内！)
 
 您可以在高级选项界面进行以下操作
-以其他方式分享密钥（不推荐）
+* 以其他方式分享密钥（不推荐）
-* 编辑身份
+* 编辑用户标识
 * 编辑子密钥
 * 查看证书详情
 

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

@@ -19,10 +19,10 @@
 ## 高级信息
 OpenKeychain 中的“密钥确认”行为，是根据 OpenPGP 标准规定，通过创建认证实现的。
 这个认证是一个 [“一般认证（0x10）”](http://tools.ietf.org/html/rfc4880#section-5.2.1) ，标准中的描述是：
-“对于密钥持有者与密钥所示身份之间的关联，认证签发者不对其可靠性做出任何表态。”
+“对于密钥持有者与密钥所示标识之间的关联，认证签发者不对其可靠性做出任何表态。”
 
 习惯上，这些认证（也包括较高的信任等级，例如“正向认证” (0x13) ）是以 OpenPGP 的信任网络的形式存在的。
 为了消除信任网络的可用性问题，我们的密钥确认模型采用一套相对简单的概念。
 我们相信密钥的确认过程应该在不妨碍日常使用的情况下尽量可靠。
 我们也不实现像 GnuPG 那样的（可传递）信任签名或信任数据库。
-此外，当某密钥含有至少一个被信任密钥所认证过的使用者身份时，它将在密钥列表中被标记为“已确认”。
+此外，当某密钥含有至少一个被信任密钥所认证过的用户标识时，它将在密钥列表中被标记为“已确认”。

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

@@ -319,7 +319,7 @@
   <string name="error_integrity_check_failed">selhala kontrola integrity! Data byla pozměněna!</string>
   <string name="error_wrong_passphrase">chybné heslo.</string>
   <string name="error_could_not_extract_private_key">nebylo možné extrahovat privátní klíč</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Musíte mít Android 4.1 abyste mohli používat Androidí NFC Beam technologii!</string>
   <string name="error_nfc_needed">NFC musí být zapnuté!</string>
   <string name="error_beam_needed">Beam musí být zapnutý!</string>

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

@@ -0,0 +1,87 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--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-->
+  <!--section-->
+  <!--button-->
+  <!--Content Description-->
+  <!--menu-->
+  <!--label-->
+  <!--label shown in Android settings under the OpenKeychain account-->
+  <!--Proxy Preferences-->
+  <!--proxy type choices and values-->
+  <!--OrbotHelper strings-->
+  <!--InstallDialogFragment strings-->
+  <!--StartOrbotDialogFragment strings-->
+  <!--choice-->
+  <!--sentences-->
+  <!--errors
+         no punctuation, all lowercase,
+         they will be put after "error_message", e.g. "Error: file not found"-->
+  <!--errors without preceeding Error:-->
+  <!--results shown after decryption/verification-->
+  <!--Add keys-->
+  <!--progress dialogs, usually ending in '…'-->
+  <!--action strings-->
+  <!--key bit length selections-->
+  <!--elliptic curve names-->
+  <!--not in for now, see SaveKeyringParcel
+    <string name="key_curve_bp_p256">"Brainpool P-256"</string>
+    <string name="key_curve_bp_p384">"Brainpool P-384"</string>
+    <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
+  <!--compression-->
+  <!--Help-->
+  <!--Import-->
+  <!--Import from URL-->
+  <!--Generic result toast-->
+  <!--Import result toast-->
+  <!--Delete result toast-->
+  <!--Revoke result toast (snackbar)-->
+  <!--Certify result toast-->
+  <!--Intent labels-->
+  <!--Remote API-->
+  <!--Share-->
+  <!--retry upload dialog-->
+  <!--Delete or revoke private key dialog-->
+  <!--Delete Or Revoke Dialog spinner-->
+  <!--Key list-->
+  <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
+  <!--Add/Edit keyserver-->
+  <!--Navigation Drawer-->
+  <!--hints-->
+  <!--certs-->
+  <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <!--Import Public log entries-->
+  <!--Import Secret log entries-->
+  <!--Keyring Canonicalization log entries-->
+  <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
+  <!--modifySecretKeyRing-->
+  <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
+  <!--Other messages used in OperationLogs-->
+  <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
+  <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
+  <!--Linked Identity verification-->
+  <!--Messages for Keybase Verification operation-->
+  <!--Messages for Mime parsing operation-->
+  <!--PassphraseCache-->
+  <!--Keyserver sync-->
+  <!--First Time-->
+  <!--unsorted-->
+  <!--Android Account-->
+  <!--Passphrase wizard-->
+  <!--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>-->
+  <!--Other Linked Identity strings-->
+</resources>

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

@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">Integritätscheck fehlgeschlagen! Die Daten wurden verändert!</string>
   <string name="error_wrong_passphrase">falsches Passwort</string>
   <string name="error_could_not_extract_private_key">Privater Schlüssel konnte nicht extrahiert werden</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Android 4.1 wird benötigt um Androids NFC-Beam nutzen zu können!</string>
   <string name="error_nfc_needed">NFC muss aktiviert sein!</string>
   <string name="error_beam_needed">Beam muss aktiviert sein!</string>

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

@@ -220,7 +220,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

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

@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">¡ha fallado la comprobación de integridad! ¡Los datos han sido modificados!</string>
   <string name="error_wrong_passphrase">contraseña incorrecta</string>
   <string name="error_could_not_extract_private_key">no se puede extraer la clave privada</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">¡Necesita Android 4.1 para usar la característica NFC Beam de Android!</string>
   <string name="error_nfc_needed">¡NFC debe estar habilitado!</string>
   <string name="error_beam_needed">¡Beam debe estar habilitado!</string>

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

@@ -338,7 +338,7 @@
   <string name="error_integrity_check_failed">osotasun egiaztapen hutsegitea! Datuak aldatuak izan dira!</string>
   <string name="error_wrong_passphrase">sarhitz okerra</string>
   <string name="error_could_not_extract_private_key">ezin da giltza pribatua atera</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Android 4.1 behar duzu Android-ren NFC Beam ezaugarria erabiltzeko!</string>
   <string name="error_nfc_needed">NFC gaitua izan behar da!</string>
   <string name="error_beam_needed">Beam gaitua izan behar da!</string>

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

@@ -171,7 +171,7 @@
   <string name="error_no_signature_key">کلیدی برای امضاء کردن داده نشد</string>
   <string name="error_wrong_passphrase">رمزعبور اشتباه است</string>
   <string name="error_could_not_extract_private_key">نمی‌توان کلید شخصی را خارج کرد</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">امضاء نشده</string>
   <string name="decrypt_result_invalid_signature">امضاء معتبر نیست!</string>

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

@@ -188,7 +188,7 @@
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
   <string name="error_wrong_passphrase">väärä salasana</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_encrypted">Salattu</string>
   <string name="decrypt_result_not_encrypted">Ei salattu</string>

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

@@ -22,7 +22,7 @@
   <string name="title_share_message">Partager le texte avec...</string>
   <string name="title_encrypt_to_file">Chiffrer vers un fichier</string>
   <string name="title_decrypt_to_file">Déchiffrer vers un fichier</string>
-  <string name="title_import_keys">importer des clés</string>
+  <string name="title_import_keys">Importer des clés</string>
   <string name="title_export_key">Sauvegarder la clé</string>
   <string name="title_export_keys">Sauvegarder les clés</string>
   <string name="title_key_not_found">clé introuvable</string>
@@ -38,7 +38,7 @@
   <string name="title_manage_my_keys">Gérer mes clés</string>
   <string name="title_alert_strip">Dépouiller cette sous-clé</string>
   <!--section-->
-  <string name="section_user_ids">identités</string>
+  <string name="section_user_ids">Identités</string>
   <string name="section_security_token">Jeton de sécurité</string>
   <string name="section_linked_system_contact">Contact système relié</string>
   <string name="section_keybase_proofs">Preuves keybase.io</string>
@@ -57,7 +57,7 @@
   <string name="section_experimental_features">Fonctions expérimentales</string>
   <string name="section_certify">Confirmer</string>
   <string name="section_actions">Actions</string>
-  <string name="section_share_key">clé</string>
+  <string name="section_share_key">Clé</string>
   <string name="section_key_server">Serveur de clés</string>
   <string name="section_fingerprint">Empreinte</string>
   <string name="section_phrases">Phrases</string>
@@ -166,7 +166,7 @@
   <string name="label_name">Nom</string>
   <string name="label_comment">Commentaire</string>
   <string name="label_email">Courriel</string>
-  <string name="label_send_key">Synchroniser par l\'Internet</string>
+  <string name="label_send_key">Synchroniser avec Internet</string>
   <string name="label_fingerprint">Empreinte</string>
   <string name="expiry_date_dialog_title">Définir une date d\'expiration</string>
   <string name="label_keyservers_title">Serveurs de clés </string>
@@ -240,9 +240,9 @@
   </plurals>
   <plurals name="n_keyservers">
     <item quantity="one">%d serveur de clés</item>
-    <item quantity="other">%d serveur de clés</item>
+    <item quantity="other">%d serveurs de clés</item>
   </plurals>
-  <string name="secret_key">clé secrète :</string>
+  <string name="secret_key">Clé secrète :</string>
   <!--choice-->
   <string name="choice_none">Aucune</string>
   <string name="choice_15secs">15 s</string>
@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">la vérification de l\'intégrité a échoué ! Les données ont été modifiées !</string>
   <string name="error_wrong_passphrase">mot de passe erroné</string>
   <string name="error_could_not_extract_private_key">impossible d\'extraire la clé privée</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Il vous faut Android 4.1 pour utiliser la fonction Beam NFC d\'Android !</string>
   <string name="error_nfc_needed">La NFC doit être activée !</string>
   <string name="error_beam_needed">Beam doit être activé !</string>
@@ -633,7 +633,7 @@
   <string name="user_id_info_invalid_title">Invalide</string>
   <string name="user_id_info_invalid_text">Quelque chose ne va pas avec cette identité !</string>
   <!--Key trust-->
-  <string name="key_trust_no_cloud_evidence">Aucune preuve en provenance de l\'Internet sur la fiabilité de cette clé.</string>
+  <string name="key_trust_no_cloud_evidence">Aucune preuve en provenance d\'Internet sur la fiabilité de cette clé.</string>
   <string name="key_trust_start_cloud_search">Lancer la recherche</string>
   <string name="key_trust_results_prefix">Keybase.io offre des « preuves » affirmant que le propriétaire de cette clé : </string>
   <!--keybase proof stuff-->
@@ -693,7 +693,7 @@
   <string name="edit_key_error_bad_security_token_size">La taille de clé n\'est pas prise en charge par le jeton de sécurité !</string>
   <string name="edit_key_error_bad_security_token_stripped">Impossible de déplacer la clé vers le jeton de sécurité (soit elle a été dépouillée ou « déviée-vers-la-carte ») !</string>
   <!--Create key-->
-  <string name="create_key_upload">Synchroniser avec l\'Internet</string>
+  <string name="create_key_upload">Synchroniser avec Internet</string>
   <string name="create_key_empty">Ce champ est exigé</string>
   <string name="create_key_passphrases_not_equal">Les mots de passe ne correspondent pas</string>
   <string name="create_key_final_text">Vous avez saisie l\'identité suivante :</string>
@@ -1402,7 +1402,7 @@
   <!--Android Account-->
   <string name="account_no_manual_account_creation">Vous ne pouvez pas créer de compte OpenKeychain manuellement..</string>
   <string name="account_privacy_title">Confidentialité</string>
-  <string name="account_privacy_text">OpenKeychain ne synchronise pas vos contacts avec l\'Internet. Il ne fait que relier les contacts aux clés d\'après les noms et les adresses courriel. Il le fait hors ligne sur votre appareil.</string>
+  <string name="account_privacy_text">OpenKeychain ne synchronise pas vos contacts avec Internet. Il ne fait que relier les contacts aux clés d\'après les noms et les adresses courriel. Il le fait hors ligne sur votre appareil.</string>
   <string name="sync_notification_permission_required_title">Accès aux contacts exigé</string>
   <string name="sync_notification_permission_required_text">Toucher pour configurer la liaison aux contacts</string>
   <!--Passphrase wizard-->
@@ -1427,7 +1427,7 @@
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
   <string name="nfc_wrong_tag">Mauvaise balise. Veuillez ressayer.</string>
   <string name="enable_nfc">Veuillez activer la NFC dans vos paramètres</string>
-  <string name="no_nfc_support">Cet appareil ne prends pas en charge la NFC</string>
+  <string name="no_nfc_support">Cet appareil ne prend pas en charge la NFC</string>
   <string name="nfc_write_successful">Écrit avec succès sur la balise NFC</string>
   <string name="unlocked">Déverrouillé</string>
   <string name="nfc_settings">Paramètres</string>

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

@@ -31,7 +31,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

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

@@ -43,7 +43,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

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

@@ -35,7 +35,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

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

@@ -341,7 +341,7 @@
   <string name="error_integrity_check_failed">Controllo di integrita\' fallito! I dati sono stati modificati!</string>
   <string name="error_wrong_passphrase">Password errata</string>
   <string name="error_could_not_extract_private_key">impossibile estrarre la chiave privata</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Devi avere Android 4.1 per usare Android NFC Beam!</string>
   <string name="error_nfc_needed">NFC deve essere abilitato!</string>
   <string name="error_nothing_import">Nessuna chiave trovata!</string>
@@ -966,9 +966,11 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_dc_clear_signature_check">Verifica dati firma</string>
   <string name="msg_dc_clear_signature_ok">Controllo firma OK</string>
   <string name="msg_dc_error_corrupt_data">Dati danneggiati!</string>
+  <string name="msg_dc_error_extract_key">Errore sconosciuto durante apertura chiave!</string>
   <string name="msg_dc_error_integrity_check">Errore di controllo di integrità!</string>
   <string name="msg_dc_error_no_signature">Manca la firma!</string>
   <string name="msg_dc_integrity_check_ok">Controllo integrità OK!</string>
+  <string name="msg_dc_pass_cached">Utilizzo della password dalla cache</string>
   <string name="msg_dc">Inizio operazione di decodifica...</string>
   <string name="msg_dc_sym_skip">Dati simmetrici non permessi, proseguo...</string>
   <string name="msg_dc_unlocking">Sblocco chiave segreta</string>
@@ -979,28 +981,54 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_vl_clear_meta_mime">Tipo MIME: %s</string>
   <string name="msg_vl_clear_meta_time">Ultima modifica: %s</string>
   <string name="msg_vl_clear_meta_size">Dimesione file: %s</string>
+  <string name="msg_vl_clear_signature_check">Verifica dati firma</string>
   <string name="msg_vl_error_integrity_check">Errore di controllo d\'integrità!</string>
   <string name="msg_vl_ok">OK</string>
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_compressing">Preparazione compressione</string>
   <string name="msg_pse_encrypting">Codifica dati in corso</string>
   <string name="msg_pse_error_bad_passphrase">Password errata!</string>
+  <string name="msg_pse_error_nfc">Errore dati NFC!</string>
+  <string name="msg_pse_error_pgp">Errore interno di PGP!</string>
   <string name="msg_crt_error_nothing">Nessuna chiave certificata!</string>
+  <string name="msg_crt_saving">Salvataggio portachiavi in corso</string>
   <string name="msg_crt_success">Identità certificata correttamente</string>
   <string name="msg_crt_warn_not_found">Chiave non trovata!</string>
+  <string name="msg_crt_warn_cert_failed">Generazione del certificato fallita!</string>
   <string name="msg_crt_upload_success">Chiave caricata con successo sul server</string>
+  <plurals name="msg_import">
+    <item quantity="one">Importazione della chiave</item>
+    <item quantity="other">Importazione di %d chiavi</item>
+  </plurals>
   <string name="msg_backup_error_db">Errore banca dati!</string>
   <string name="msg_backup_error_io">Errore di input/output!</string>
   <string name="msg_upload_server">Server: %s</string>
+  <string name="msg_upload_key">ID chiave: %s</string>
   <string name="msg_upload_error_not_found">Chiave non trovata!</string>
   <string name="msg_del_error_empty">Niente da cancellare!</string>
+  <plurals name="msg_del">
+    <item quantity="one">Cancellazione di una chiave</item>
+    <item quantity="other">Cancellazione di %d chiavi</item>
+  </plurals>
+  <string name="msg_del_key">Cancellazione chiave %s</string>
+  <string name="msg_del_key_fail">Cancellazione chiave %s fallita!</string>
+  <string name="msg_revoke_error_empty">Non c\'è niente da revocare!</string>
+  <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_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_data_mime_filename">Nome file: \'%s\'</string>
   <string name="msg_data_mime_charset">Il set di caratteri è \'%s\'</string>
   <string name="msg_data_mime_charset_unknown">Il set di caratteri è sconosciuto, oppure i dati non sono testo.</string>
   <string name="msg_acc_saved">Account salvato</string>
+  <string name="msg_get_success">Scaricamento completato!</string>
   <!--Messages for Keybase Verification operation-->
   <string name="msg_keybase_error_specific">%s</string>
   <!--Messages for Mime parsing operation-->
@@ -1012,9 +1040,14 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="keyserver_sync_orbot_notif_start">Avvia Orbot</string>
   <!--First Time-->
   <string name="first_time_text1">Riappropriati della tua privacy con OpenKeychain!</string>
+  <string name="first_time_create_key">Crea mia chiave</string>
+  <string name="first_time_import_key">Importa chiave da file</string>
+  <string name="first_time_security_token">Usa Token</string>
   <string name="first_time_security_token_subtitle">(Fidesmo, YubiKey NEO, SIGILANCE, …)</string>
   <string name="first_time_skip">Salta Installazione</string>
+  <string name="first_time_blank_security_token_yes">Utilizza questo Token</string>
   <string name="backup_section">Backup</string>
+  <string name="restore_section">Ripristina</string>
   <!--unsorted-->
   <string name="section_certifier_id">Certificatore</string>
   <string name="section_cert">Dettagli Certificato</string>
@@ -1035,6 +1068,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="error_no_encrypt_subkey">Nessuna sottochiave di codifica disponibile!</string>
   <string name="contact_show_key">Mostra chiave (%s)</string>
   <string name="error_no_file_selected">Seleziona almeno un file da codificare!</string>
+  <string name="error_empty_text">Digitare del testo da codificare!</string>
   <string name="key_colon">Chiave:</string>
   <string name="user_id_none"><![CDATA[<none>]]></string>
   <!--Android Account-->
@@ -1053,34 +1087,80 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="set_passphrase">Imposta password</string>
   <string name="nfc_title">NFC</string>
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+  <string name="unlocked">Sbloccata</string>
   <string name="nfc_settings">Impostazioni</string>
   <string name="snack_security_token_import">Importa</string>
+  <string name="security_token_serial_no">N° seriale: %s</string>
   <string name="security_token_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
   <string name="btn_import">Importa</string>
+  <string name="btn_reset">Reset</string>
   <string name="security_token_import_radio">Importa chiave</string>
   <string name="security_token_error">Errore: %s</string>
+  <plurals name="security_token_error_pin">
+    <item quantity="one">PIN errato!\n%d tentativo rimasto.</item>
+    <item quantity="other">PIN errato!\n%d tentativi rimasti.</item>
+  </plurals>
   <string name="security_token_error_unknown">Errore sconosciuto</string>
   <string name="security_token_error_try_again">Riprovare</string>
   <string name="btn_delete_original">Cancella file originale</string>
+  <string name="snack_armor_on">Output codificato come testo.</string>
+  <string name="snack_armor_off">Output codificato come dati binari.</string>
+  <string name="snack_compression_on">Compressione <b>attivata</b>.</string>
+  <string name="snack_compression_off">Compressione <b>disattivata</b>.</string>
+  <string name="label_clip_title">Dati crittografati</string>
   <string name="progress_processing">Elaborazione in corso...</string>
   <string name="error_saving_file">Errore durante il salvataggio del file!</string>
   <string name="file_saved">File salvato!</string>
   <string name="file_delete_ok">Il file originale è stato cancellato.</string>
+  <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_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>
+  <string name="btn_code_wrotedown">Ok, l\'ho scritto!</string>
+  <string name="btn_backup_share">Condividi il backup</string>
+  <string name="btn_backup_save">Salva backup</string>
+  <string name="snack_backup_error_saving">Errore durante il salvataggio del backup!</string>
+  <string name="snack_backup_saved">Backup salvato</string>
+  <string name="snack_backup_exists">Il backup esiste già!</string>
+  <string name="snack_backup_saved_dir">Salvato nella cartella di OpenKeychain</string>
+  <string name="btn_backup_back">Torna indietro a controllare</string>
+  <string name="snack_text_too_long">Il testo è troppo lungo per essere mostrato per intero!</string>
+  <string name="share_log_dialog_title">Vuoi condividere i log?</string>
+  <string name="share_log_dialog_share_button">Condividi</string>
   <string name="share_log_dialog_cancel_button">Cancella</string>
   <string name="menu_uids_save">Salva</string>
+  <string name="title_edit_identities">Modifica Identità</string>
+  <string name="title_edit_subkeys">Modifica Sottochiavi</string>
+  <string name="cache_ttl_lock_screen">fino allo spegnimento dello schermo</string>
   <string name="cache_ttl_ten_minutes">per dieci minuti</string>
   <string name="cache_ttl_thirty_minutes">per mezz\'ora</string>
   <string name="cache_ttl_one_hour">per un\'ora</string>
@@ -1088,10 +1168,15 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="cache_ttl_one_day">per una giornata</string>
   <string name="cache_ttl_three_days">per tre giorni</string>
   <string name="cache_ttl_forever">per sempre</string>
+  <string name="settings_cache_ttl_at_least_one">Almeno un elemento deve essere selezionato!</string>
+  <string name="settings_cache_ttl_max_three">Non puoi selezionare più di tre elementi!</string>
+  <string name="security_token_error_pgp_app_not_installed">Nessuna app PGP è stata trovata sul token di sicurezza</string>
   <string name="prompt_fidesmo_pgp_install_title">Installare PGP?</string>
+  <string name="prompt_fidesmo_pgp_install_message">Non c\'era nessuna app PGP disponibile sul tuo dispositivo Fidesmo.</string>
   <string name="prompt_fidesmo_pgp_install_button_positive">Installa</string>
   <string name="prompt_fidesmo_pgp_install_button_negative">Annulla</string>
   <string name="prompt_fidesmo_app_install_title">Installare Fidesmo?</string>
+  <string name="prompt_fidesmo_app_install_message">Per installare PGP hai bisogno dell\'applicazione Fidesmo per Android</string>
   <string name="prompt_fidesmo_app_install_button_positive">Installa</string>
   <string name="prompt_fidesmo_app_install_button_negative">Annulla</string>
   <string name="help_donation_paypal_item">Donazione ad OpenKeychain</string>

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

@@ -348,7 +348,7 @@
   <string name="error_integrity_check_failed">完全性チェックが失敗しました! データに変更があります!</string>
   <string name="error_wrong_passphrase">正しくないパスワードです</string>
   <string name="error_could_not_extract_private_key">秘密鍵を取り出すことができません</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1  が必要です!</string>
   <string name="error_nfc_needed">NFCを有効にしてください!</string>
   <string name="error_beam_needed">Beamを有効にしてください!</string>

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

@@ -19,7 +19,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

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

@@ -290,7 +290,7 @@
   <string name="error_integrity_check_failed">무결성 체크 실패! 데이터가 수정되었습니다!</string>
   <string name="error_wrong_passphrase">암호 오류</string>
   <string name="error_could_not_extract_private_key">개인키를 추출할 수 없음</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">NFC 빔 기능을 쓰기 위해선 안드로이드 4.1 이상이 필요합니다!</string>
   <string name="error_nfc_needed">NFC가 활성화 되어 있어야 합니다!</string>
   <string name="error_beam_needed">빔이 활성화 되어 있어야 합니다!</string>

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

@@ -19,7 +19,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

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

@@ -278,7 +278,7 @@
   <string name="error_no_signature_key">ingen signaturnøkkel oppgitt</string>
   <string name="error_wrong_passphrase">feil passord</string>
   <string name="error_could_not_extract_private_key">kunne ikke pakke ut privat nøkkel</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Du trenger Android 4.1 for å bruke Androids NFC-strålingsfunksjon!</string>
   <string name="error_nfc_needed">NFC må være påslått!</string>
   <string name="error_beam_needed">Stråling må være påslått!</string>
@@ -329,6 +329,8 @@
     <string name="key_curve_bp_p384">"Brainpool P-384"</string>
     <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
   <!--compression-->
+  <string name="compression_fast">rask</string>
+  <string name="compression_very_slow">veldig treg</string>
   <!--Help-->
   <string name="help_tab_start">Start</string>
   <string name="help_tab_faq">O-S-S</string>
@@ -358,6 +360,8 @@
   <!--Certify result toast-->
   <!--Intent labels-->
   <!--Remote API-->
+  <string name="api_settings_show_info">Vis avansert informasjon</string>
+  <string name="api_settings_hide_info">Skjul avansert informasjon</string>
   <string name="api_settings_no_key">Ingen nøkkel valgt</string>
   <string name="api_settings_select_key">Velg nøkkel</string>
   <string name="api_settings_create_key">Opprett ny nøkkel</string>
@@ -427,6 +431,7 @@
   <!--Key trust-->
   <!--keybase proof stuff-->
   <string name="keybase_narrative_unknown">Ukjent bevistype %s</string>
+  <string name="keybase_web_site_proof">Ei tekstfil</string>
   <string name="keybase_verify">Bekreft</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Endre passord</string>
@@ -492,6 +497,12 @@
   <string name="msg_pse_error_no_passphrase">Inget passord oppgitt!</string>
   <string name="msg_pse_error_pgp">Intern OpenPGP-feil!</string>
   <string name="msg_pse_key_unknown">Manglende nøkkel for kryptering: %s</string>
+  <string name="msg_import_keyserver">Bruker nøkkeltjener %s</string>
+  <plurals name="msg_backup">
+    <item quantity="one">Sikkerhetskopi med én nøkkel</item>
+    <item quantity="other">Sikkerhetskopi med %d nøkler</item>
+  </plurals>
+  <string name="msg_backup_all">Sikkerhetskopi med alle nøkler</string>
   <string name="msg_upload_proxy">Bruker melltomtjener: %s</string>
   <string name="msg_upload_server">Tjener: %s</string>
   <string name="msg_upload_key">Nøkkel-ID: %s</string>
@@ -564,4 +575,20 @@
   <string name="security_token_error_try_again">Prøv igjen</string>
   <string name="btn_delete_original">Slett orginalfil</string>
   <!--Other Linked Identity strings-->
+  <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_error_network">Nettverksfeil!</string>
+  <string name="snack_btn_overwrite">Overskriv</string>
+  <string name="backup_code_ok">Kode godtatt!</string>
+  <string name="snack_backup_saved">Sikkerhetskopi lagret</string>
+  <string name="share_log_dialog_share_button">Del</string>
+  <string name="share_log_dialog_cancel_button">Avbryt</string>
+  <string name="menu_uids_save">Lagre</string>
+  <string name="remember">Husk</string>
+  <string name="prompt_fidesmo_pgp_install_button_positive">Installer</string>
+  <string name="prompt_fidesmo_pgp_install_button_negative">Avbryt</string>
+  <string name="prompt_fidesmo_app_install_button_positive">Installer</string>
+  <string name="prompt_fidesmo_app_install_button_negative">Avbryt</string>
 </resources>

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

@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">integriteitcheck niet geslaagd! Data is bewerkt!</string>
   <string name="error_wrong_passphrase">wachtwoord verkeerd</string>
   <string name="error_could_not_extract_private_key">kan privésleutel niet uitpakken</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">U heeft minstens Android 4.1 nodig om Androids NFC Beam eigenschap te gebruiken!</string>
   <string name="error_nfc_needed">NFC moet aangezet zijn!</string>
   <string name="error_beam_needed">Beam moet aangezet zijn!</string>

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

@@ -149,11 +149,13 @@
   <plurals name="n_keys">
     <item quantity="one">1 klucz</item>
     <item quantity="few">%d klucze</item>
+    <item quantity="many">%d kluczy</item>
     <item quantity="other">%d kluczy</item>
   </plurals>
   <plurals name="n_keyservers">
     <item quantity="one">%d serwer kluczy</item>
     <item quantity="few">%d serwery kluczy</item>
+    <item quantity="many">%d serwerów kluczy</item>
     <item quantity="other">%d serwerów kluczy</item>
   </plurals>
   <string name="secret_key">Klucz prywatny:</string>
@@ -203,6 +205,7 @@
   <plurals name="bad_keys_encountered">
     <item quantity="one">zignorowano %d zły tajnych klucz. Prawdopodobnie wyeksportowałeś go przy użyciu opcji\n --export-secret-subkeys\nUpewnij się, że wyeksportujesz go z opcją\n --export-secret-keys</item>
     <item quantity="few">zignorowano %d złych tajnych kluczy. Prawdopodobnie wyeksportowałeś je przy użyciu opcji\n --export-secret-subkeys\nUpewnij się, że wyeksportujesz je z opcją\n --export-secret-keys</item>
+    <item quantity="many">zignorowano %d złych tajnych kluczy. Prawdopodobnie wyeksportowałeś je przy użyciu opcji\n --export-secret-subkeys\nUpewnij się, że wyeksportujesz je z opcją\n --export-secret-keys</item>
     <item quantity="other">zignorowano %d złych tajnych kluczy. Prawdopodobnie wyeksportowałeś je przy użyciu opcji\n --export-secret-subkeys\nUpewnij się, że wyeksportujesz je z opcją\n --export-secret-keys</item>
   </plurals>
   <string name="list_empty">Lista jest pusta!</string>
@@ -223,7 +226,7 @@
   <string name="error_invalid_data">Brak treści szyfrowanej lub podpisanej OpenPGP!</string>
   <string name="error_integrity_check_failed">Sprawdzanie spójności zakończone niepowodzeniem! Dane były modyfikowane!</string>
   <string name="error_could_not_extract_private_key">nie można wyodrębnić klucza prywatnego</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Potrzebujesz Androida 4.1 aby korzystać z Android NFC Beam</string>
   <string name="error_nothing_import">Nie znaleziono kluczy!</string>
   <string name="error_contacts_key_id_missing">Pobieranie ID klucza z kontaktów nie powiodło się!</string>
@@ -265,6 +268,7 @@
   <plurals name="progress_exporting_key">
     <item quantity="one">eksportowanie klucza...</item>
     <item quantity="few">eksportowanie kluczy...</item>
+    <item quantity="many">eksportowanie kluczy...</item>
     <item quantity="other">eksportowanie kluczy...</item>
   </plurals>
   <string name="progress_extracting_signature_key">wyodrębnianie klucza podpisu...</string>
@@ -328,21 +332,25 @@
   <plurals name="import_keys_added">
     <item quantity="one">Pomyślnie zaimportowano klucz%2$s.</item>
     <item quantity="few">Pomyślnie zaimportowano %1$d kluczy%2$s.</item>
+    <item quantity="many">Pomyślnie zaimportowano %1$d kluczy%2$s.</item>
     <item quantity="other">Pomyślnie zaimportowano %1$d kluczy%2$s.</item>
   </plurals>
   <plurals name="import_keys_updated">
     <item quantity="one">Pomyślnie zaktualizowano klucz%2$s.</item>
     <item quantity="few">Pomyślnie zaktualizowano %1$d kluczy%2$s.</item>
+    <item quantity="many">Pomyślnie zaktualizowano %1$d kluczy%2$s.</item>
     <item quantity="other">Pomyślnie zaktualizowano %1$d kluczy%2$s.</item>
   </plurals>
   <plurals name="import_keys_with_errors">
     <item quantity="one">Nie udało się zaimportować jednego klucza!</item>
     <item quantity="few">Nie udało się zaimportować %d kluczy!</item>
+    <item quantity="many">Nie udało się zaimportować %d kluczy!</item>
     <item quantity="other">Nie udało się zaimportować %d kluczy!</item>
   </plurals>
   <plurals name="import_error">
     <item quantity="one">Nieudany import!</item>
     <item quantity="few">Import %d kluczy nie udał się!</item>
+    <item quantity="many">Import %d kluczy nie udał się!</item>
     <item quantity="other">Import %d kluczy nie udał się!</item>
   </plurals>
   <string name="import_error_nothing">Nie ma nic do importowania.</string>
@@ -351,21 +359,25 @@
   <plurals name="delete_ok_but_fail_1">
     <item quantity="one">Pomyślnie usunięto jeden klucz</item>
     <item quantity="few">Pomyślnie usunięto %1$d kluczy</item>
+    <item quantity="many">Pomyślnie usunięto %1$d kluczy</item>
     <item quantity="other">Pomyślnie usunięto %1$d kluczy</item>
   </plurals>
   <plurals name="delete_ok_but_fail_2">
     <item quantity="one">, ale nie udało się usunąć jednego klucza%2$s.</item>
     <item quantity="few">, ale nie udało się usunąć %1$d kluczy%2$s.</item>
+    <item quantity="many">, ale nie udało się usunąć %1$d kluczy%2$s.</item>
     <item quantity="other">, ale nie udało się usunąć %1$d kluczy%2$s.</item>
   </plurals>
   <plurals name="delete_ok">
     <item quantity="one">Pomyślnie usunięto klucz%2$s.</item>
     <item quantity="few">Pomyślnie usunięto %1$d kluczy%2$s.</item>
+    <item quantity="many">Pomyślnie usunięto %1$d kluczy%2$s.</item>
     <item quantity="other">Pomyślnie usunięto %1$d kluczy%2$s.</item>
   </plurals>
   <plurals name="delete_fail">
     <item quantity="one">Błąd usuwania jednego klucza%2$s.</item>
     <item quantity="few">Błąd usuwania %1$d kluczy.</item>
+    <item quantity="many">Błąd usuwania %1$d kluczy.</item>
     <item quantity="other">Błąd usuwania %1$d kluczy.</item>
   </plurals>
   <string name="delete_nothing">Nie ma nic do usunięcia.</string>
@@ -375,11 +387,13 @@
   <plurals name="certify_keys_with_errors">
     <item quantity="one">Certyfikacja nie powiodła się!</item>
     <item quantity="few">Nie udana certyfikacja dla %d kluczy!</item>
+    <item quantity="many">Nie udana certyfikacja dla %d kluczy!</item>
     <item quantity="other">Nie udana certyfikacja dla %d kluczy!</item>
   </plurals>
   <plurals name="certify_error">
     <item quantity="one">Certyfikacja nie powiodła się!</item>
     <item quantity="few">Certyfikacja %d kluczy nie powiodła się!</item>
+    <item quantity="many">Certyfikacja %d kluczy nie powiodła się!</item>
     <item quantity="other">Certyfikacja %d kluczy nie powiodła się!</item>
   </plurals>
   <!--Intent labels-->
@@ -421,6 +435,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <plurals name="key_list_selected_keys">
     <item quantity="one">1 klucz wybrany.</item>
     <item quantity="few">%d kluczy wybranych.</item>
+    <item quantity="many">%d kluczy wybranych.</item>
     <item quantity="other">%d kluczy wybranych.</item>
   </plurals>
   <string name="key_list_empty_text1">Nie znaleziono kluczy!</string>
@@ -547,6 +562,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <plurals name="msg_import">
     <item quantity="one">Importowanie klucza</item>
     <item quantity="few">Importowanie %d kluczy</item>
+    <item quantity="many">Importowanie %d kluczy</item>
     <item quantity="other">Importowanie %d kluczy</item>
   </plurals>
   <string name="msg_import_error">Operacja importowania nie udała się!</string>
@@ -555,6 +571,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <plurals name="msg_del">
     <item quantity="one">Usuwanie jednego klucza</item>
     <item quantity="few">Usuwanie %d kluczy</item>
+    <item quantity="many">Usuwanie %d kluczy</item>
     <item quantity="other">Usuwanie %d kluczy</item>
   </plurals>
   <string name="msg_del_key">Usuwanie klucza %s</string>
@@ -562,11 +579,13 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <plurals name="msg_del_ok">
     <item quantity="one">Pomyślnie usunięto klucz</item>
     <item quantity="few">Pomyślnie usunięto %d kluczy</item>
+    <item quantity="many">Pomyślnie usunięto %d kluczy</item>
     <item quantity="other">Pomyślnie usunięto %d kluczy</item>
   </plurals>
   <plurals name="msg_del_fail">
     <item quantity="one">Nie udało się usunąć jednego klucza</item>
     <item quantity="few">Nie udało się usunąć %d kluczy</item>
+    <item quantity="many">Nie udało się usunąć %d kluczy</item>
     <item quantity="other">Nie udało się usunąć %d kluczy</item>
   </plurals>
   <!--Linked Identity verification-->

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

@@ -80,8 +80,8 @@
   <string name="btn_next">Proximo</string>
   <string name="btn_back">Voltar</string>
   <string name="btn_no">Não</string>
-  <string name="btn_match">Impressões digitais não conferem</string>
+  <string name="btn_match">Impressões digitais conferem</string>
-  <string name="btn_match_phrases">Senhas não conferem</string>
+  <string name="btn_match_phrases">Senhas conferem</string>
   <string name="btn_share_encrypted_signed">Encriptar/Assinar e compartilhar texto</string>
   <string name="btn_copy_encrypted_signed">Encriptar/Assinar e copiar texto</string>
   <string name="btn_paste_encrypted_signed">Encriptar/Assinar e colar texto</string>
@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">a verificação de integridade falhou! Os dados foram modificados!</string>
   <string name="error_wrong_passphrase">senha incorreta</string>
   <string name="error_could_not_extract_private_key">não foi possível extrair a chave privada</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Você precisa do Android 4.1 para usar a funcionalidade Android NFC Beam!</string>
   <string name="error_nfc_needed">O NFC precisa estar habilitado!</string>
   <string name="error_beam_needed">O Beam precisa estar habilitado!</string>
@@ -695,7 +695,7 @@
   <!--Create key-->
   <string name="create_key_upload">Sincronizar com a Internet</string>
   <string name="create_key_empty">Este campo é requerido</string>
-  <string name="create_key_passphrases_not_equal">As senhas não coincidem</string>
+  <string name="create_key_passphrases_not_equal">As senhas não conferem</string>
   <string name="create_key_final_text">Você inseriu a seguinte identidade:</string>
   <string name="create_key_final_robot_text">Criar a chave pode demorar um pouco, tome um cafezinho até lá...</string>
   <string name="create_key_rsa">(3 sub-chaves, RSA, 4096 bit)</string>
@@ -977,7 +977,7 @@
   <string name="msg_mf_error_divert_newsub">A criação de novas sub-chaves não é suportada para chaves primárias \'desviar-para-cartão\'!</string>
   <string name="msg_mf_error_divert_serial">O número de série de uma chave \'desviar-para-cartão\' precisa ter 16 bytes! Isto é um erro programático, por favor, envie um relatório de erro!</string>
   <string name="msg_mf_error_encode">Exceção ao codificar!</string>
-  <string name="msg_mf_error_fingerprint">A impressão digital atual da chave não coincide com o esperado!</string>
+  <string name="msg_mf_error_fingerprint">A impressão digital atual da chave não confere com o esperado!</string>
   <string name="msg_mf_error_keyid">Nenhum ID de usuário. Isto é um erro interno, por favor, envie um relatório de erro!</string>
   <string name="msg_mf_error_integrity">Erro interno, a verificação de integridade falhou!</string>
   <string name="msg_mf_error_master_none">Nenhum certificado mestre encontrado para operar! (Todos revogados?)</string>
@@ -1371,7 +1371,7 @@
   <string name="empty_certs">Nao há certificados para esta chave</string>
   <string name="certs_text">Apenas auto-certificados validados e certificados válidos criados com suas chaves são exibidos aqui.</string>
   <string name="section_uids_to_certify">Identidades para</string>
-  <string name="certify_text">As chaves que você está inportando contém \"identidades\": nomes e endereços de email. Selecione exatamente aqueles que coincidem com o que você espera para confirmação.</string>
+  <string name="certify_text">As chaves que você está importando contém \"identidades\": nomes e endereços de email. Selecione exatamente aqueles que coincidem com o que você espera para confirmação.</string>
   <string name="certify_fingerprint_text">Compare a impressão digital, caractere por caractere, com aquele exibido no dispositivo de seu parceiro.</string>
   <string name="certify_fingerprint_text_phrases">Compare estas frases com aquelas exibidas no dispositivo do seu parceiro.</string>
   <string name="label_revocation">Razão da revogação</string>
@@ -1413,7 +1413,7 @@
   <string name="passphrase">Senha</string>
   <string name="noPassphrase">Nenhuma senha</string>
   <string name="no_passphrase_set">Nenhuma senha configurada</string>
-  <string name="passphrases_match">As senhas não coincidem</string>
+  <string name="passphrases_match">As senhas coincidem</string>
   <string name="passphrase_saved">Senha salva</string>
   <string name="passphrase_invalid">Senha inválida</string>
   <string name="missing_passphrase">Falta a senha</string>

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

@@ -0,0 +1,369 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--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").-->
+  <string name="app_name">OpenKeychain</string>
+  <!--title-->
+  <string name="title_encrypt_text">Criptează</string>
+  <string name="title_encrypt_files">Criptează</string>
+  <string name="title_decrypt">Decriptează</string>
+  <string name="title_edit_key">Editează cheia</string>
+  <string name="title_preferences">Setări</string>
+  <string name="title_api_registered_apps">Aplicații</string>
+  <string name="title_change_passphrase">Schimbă parola</string>
+  <string name="title_share_key">Partajează cheia cu...</string>
+  <string name="title_share_file">Partajează fișierul cu...</string>
+  <string name="title_share_message">Partajează textul cu...</string>
+  <string name="title_import_keys">Importă chei</string>
+  <string name="title_certify_key">Confirmă cheia</string>
+  <string name="title_key_details">Detalii cheie</string>
+  <string name="title_help">Ajutor</string>
+  <string name="title_log_display">Jurnal</string>
+  <string name="title_exchange_keys">Schimbă chei</string>
+  <string name="title_advanced_key_info">Avansat</string>
+  <string name="title_manage_my_keys">Gestionează cheile mele</string>
+  <!--section-->
+  <string name="section_user_ids">Identități</string>
+  <string name="section_cloud_search">Căutare chei</string>
+  <string name="section_passphrase_cache">Parole și PIN-uri</string>
+  <string name="section_proxy_settings">Anonimitate Rețea</string>
+  <string name="section_sync_settings">Sincronizare</string>
+  <string name="section_experimental_features">Funcționalități experimentale</string>
+  <string name="section_certify">Confirmă</string>
+  <string name="section_actions">Acțiuni</string>
+  <string name="section_share_key">Cheie</string>
+  <string name="section_fingerprint">Amprentă</string>
+  <string name="section_encrypt">Criptează</string>
+  <string name="section_decrypt">Decriptează / Verifică</string>
+  <!--button-->
+  <string name="btn_save_file">Salvează fișierul</string>
+  <string name="btn_save">Salvează</string>
+  <string name="btn_view_log">Vezi jurnalul</string>
+  <string name="btn_do_not_save">Anulare</string>
+  <string name="btn_delete">Șterge</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_next">Înainte</string>
+  <string name="btn_back">Înapoi</string>
+  <string name="btn_no">Nu</string>
+  <string name="btn_create_key">Creează cheia</string>
+  <string name="btn_add_files">Adaugă fișier(e)</string>
+  <string name="btn_share_decrypted_text">Partajează</string>
+  <string name="btn_open_with">Deschide cu...</string>
+  <string name="btn_copy_decrypted_text">Copiază în clipboard</string>
+  <string name="btn_decrypt_clipboard">Citește din clipboard</string>
+  <string name="btn_decrypt_files">Selectează un fișier de intrare</string>
+  <string name="btn_encrypt_files">Criptează fișiere</string>
+  <string name="btn_encrypt_text">Criptează text</string>
+  <string name="btn_add_email">Adaugă o adresă de email adițională</string>
+  <string name="btn_unlock">Deblochează</string>
+  <string name="btn_add_keyserver">Adaugă</string>
+  <string name="btn_saved">Salvat!</string>
+  <!--Content Description-->
+  <string name="cd_encrypt_files">Criptează fișiere</string>
+  <string name="cd_exchange_keys">Schimbă chei</string>
+  <string name="cd_encrypt_text">Criptează text</string>
+  <!--menu-->
+  <string name="menu_preferences">Setări</string>
+  <string name="menu_help">Ajutor</string>
+  <string name="menu_delete_key">Șterge cheia</string>
+  <string name="menu_manage_keys">Gestionează cheile mele</string>
+  <string name="menu_search">Caută</string>
+  <string name="menu_nfc_preferences">Setări NFC</string>
+  <string name="menu_select_all">Selectează tot</string>
+  <string name="menu_update_all_keys">Actualizează toate cheile</string>
+  <string name="menu_advanced">Avansat</string>
+  <string name="menu_change_password">Schimbă parola</string>
+  <string name="menu_keyserver_add">Adaugă</string>
+  <!--label-->
+  <string name="label_message">Text</string>
+  <string name="label_file">Fișier</string>
+  <string name="label_files">Fișier(e)</string>
+  <string name="label_file_colon">Fișier:</string>
+  <string name="label_no_passphrase">Nici o parolă</string>
+  <string name="label_passphrase">Parolă</string>
+  <string name="label_pin">PIN</string>
+  <string name="label_passphrase_again">Repetă parola</string>
+  <string name="label_show_passphrase">Arată parola</string>
+  <string name="label_algorithm">Algoritm</string>
+  <string name="label_asymmetric_from">Semnează cu:</string>
+  <string name="label_symmetric">Criptează cu parolă</string>
+  <string name="label_key_id">ID cheie</string>
+  <string name="label_key_created">Cheie creată %s</string>
+  <string name="label_key_type">Tip</string>
+  <string name="label_key_size">Mărime cheie</string>
+  <string name="label_ecc_curve">Curbă eliptică</string>
+  <string name="label_name">Nume</string>
+  <string name="label_comment">Comentariu</string>
+  <string name="label_email">Email</string>
+  <string name="label_send_key">Sincronizează pe Internet</string>
+  <string name="label_fingerprint">Amprentă</string>
+  <string name="label_enter_keyserver_url">URL</string>
+  <string name="label_theme">Temă</string>
+  <string name="pref_keybase">keybase.io</string>
+  <string name="pref_keybase_summary">Caută chei pe keybase.io</string>
+  <string name="pref_facebook">Facebook</string>
+  <!--label shown in Android settings under the OpenKeychain account-->
+  <!--Proxy Preferences-->
+  <string name="pref_proxy_tor_title">Activează Tor</string>
+  <string name="pref_proxy_host_title">Gazdă proxy</string>
+  <string name="pref_proxy_port_title">Port proxy</string>
+  <string name="pref_proxy_type_title">Tip proxy</string>
+  <!--proxy type choices and values-->
+  <string name="pref_proxy_type_choice_http">HTTP</string>
+  <string name="pref_proxy_type_choice_socks">SOCKS</string>
+  <!--OrbotHelper strings-->
+  <string name="orbot_ignore_tor">Nu folosi Tor</string>
+  <!--InstallDialogFragment strings-->
+  <string name="orbot_install_dialog_title">Instalez Orbot pentru a utiliza Tor?</string>
+  <string name="orbot_install_dialog_install">Instalează</string>
+  <string name="orbot_install_dialog_cancel">Anulare</string>
+  <string name="orbot_install_dialog_ignore_tor">Nu folosi Tor</string>
+  <!--StartOrbotDialogFragment strings-->
+  <string name="orbot_start_dialog_cancel">Anulare</string>
+  <string name="orbot_start_dialog_ignore_tor">Nu folosi Tor</string>
+  <plurals name="n_keys">
+    <item quantity="one">1 cheie</item>
+    <item quantity="few">%d chei</item>
+    <item quantity="other">%d chei</item>
+  </plurals>
+  <!--choice-->
+  <string name="choice_15secs">15 sec</string>
+  <string name="choice_1min">1 min</string>
+  <string name="choice_3mins">3 min</string>
+  <string name="choice_5mins">5 min</string>
+  <string name="choice_10mins">10 min</string>
+  <string name="choice_20mins">20 min</string>
+  <string name="choice_40mins">40 min</string>
+  <string name="choice_1hour">1 oră</string>
+  <string name="choice_2hours">2 ore</string>
+  <string name="choice_4hours">4 ore</string>
+  <string name="choice_8hours">8 ore</string>
+  <string name="filemanager_title_open">Deschide...</string>
+  <string name="rsa_2048">RSA 2048</string>
+  <string name="rsa_3072">RSA 3072</string>
+  <string name="rsa_4096">RSA 4096</string>
+  <string name="ecc_p256">ECC P-256</string>
+  <string name="ecc_p521">ECC P-521</string>
+  <string name="usage_sign">Semnează</string>
+  <string name="usage_encrypt">Criptează</string>
+  <string name="usage_sign_and_encrypt">Semnează și Criptează</string>
+  <string name="error">Eroare</string>
+  <string name="theme_dark">Închisă</string>
+  <string name="theme_light">Deschisă</string>
+  <!--sentences-->
+  <string name="wrong_passphrase">Parolă greșită.</string>
+  <string name="passphrases_do_not_match">Parolele nu se potrivesc.</string>
+  <string name="passphrase_must_not_be_empty">Te rog introdu o parolă.</string>
+  <string name="passphrase_for_symmetric_encryption">Introdu parola</string>
+  <string name="passphrase_for">Introdu parola pentru \'%s\'</string>
+  <!--errors
+         no punctuation, all lowercase,
+         they will be put after "error_message", e.g. "Error: file not found"-->
+  <string name="error_wrong_passphrase">parolă greșită</string>
+  <!--errors without preceeding Error:-->
+  <!--results shown after decryption/verification-->
+  <string name="decrypt_result_encrypted">Criptat</string>
+  <string name="decrypt_result_action_show">Arată</string>
+  <!--Add keys-->
+  <string name="add_keys_my_key">Cheia mea:</string>
+  <!--progress dialogs, usually ending in '…'-->
+  <string name="progress_done">Gata.</string>
+  <string name="progress_cancel">Anulare</string>
+  <string name="progress_generating_rsa">se generează o nouă cheie RSA...</string>
+  <string name="progress_generating_dsa">se generează o nouă cheie DSA...</string>
+  <string name="progress_generating_elgamal">se generează o nouă cheie ElGamal...</string>
+  <string name="progress_generating_ecdsa">se generează o nouă cheie ECDSA...</string>
+  <string name="progress_generating_ecdh">se generează o nouă cheie ECDH...</string>
+  <string name="progress_modify_passphrase">se schimbă parola...</string>
+  <string name="progress_generating_signature">se generează semnătura...</string>
+  <!--action strings-->
+  <!--key bit length selections-->
+  <string name="key_size_2048">2048</string>
+  <string name="key_size_3072">3072</string>
+  <string name="key_size_4096">4096</string>
+  <string name="key_size_8192">8192</string>
+  <!--elliptic curve names-->
+  <string name="key_curve_nist_p256">NIST P-256</string>
+  <string name="key_curve_nist_p384">NIST P-384</string>
+  <string name="key_curve_nist_p521">NIST P-521</string>
+  <!--not in for now, see SaveKeyringParcel
+    <string name="key_curve_bp_p256">"Brainpool P-256"</string>
+    <string name="key_curve_bp_p384">"Brainpool P-384"</string>
+    <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
+  <!--compression-->
+  <string name="compression_fast">rapid</string>
+  <string name="compression_very_slow">foarte încet</string>
+  <!--Help-->
+  <string name="help_tab_start">Start</string>
+  <string name="help_tab_faq">FAQ</string>
+  <string name="help_tab_about">Despre</string>
+  <string name="help_about_version">Versiune:</string>
+  <string name="help_tab_donations">Donează</string>
+  <!--Import-->
+  <string name="import_tab_cloud">Căutare chei</string>
+  <string name="import_qr_code_button">Scanează cod QR</string>
+  <!--Import from URL-->
+  <!--Generic result toast-->
+  <string name="snackbar_details">Detalii</string>
+  <!--Import result toast-->
+  <!--Delete result toast-->
+  <string name="delete_nothing">Nimic de șters.</string>
+  <!--Revoke result toast (snackbar)-->
+  <!--Certify result toast-->
+  <!--Intent labels-->
+  <!--Remote API-->
+  <string name="api_settings_create_key">Creează o cheie nouă</string>
+  <string name="api_settings_save">Salvează</string>
+  <string name="api_settings_cancel">Anulare</string>
+  <string name="api_settings_start">Pornește aplicația</string>
+  <string name="api_settings_delete_account">Șterge contul</string>
+  <string name="api_settings_advanced">Avansat</string>
+  <string name="api_settings_settings">Setări</string>
+  <!--Share-->
+  <string name="share_qr_code_dialog_title">Partajează prin cod QR</string>
+  <string name="share_nfc_dialog">Partajează prin NFC</string>
+  <!--retry upload dialog-->
+  <!--Delete or revoke private key dialog-->
+  <!--Delete Or Revoke Dialog spinner-->
+  <!--Key list-->
+  <string name="key_list_fab_search">Căutare chei</string>
+  <string name="key_list_fab_import">Importă dintr-un fișier</string>
+  <!--Key view-->
+  <string name="key_view_action_edit">Editează</string>
+  <string name="key_view_action_encrypt">Criptează text</string>
+  <string name="key_view_action_encrypt_files">fișiere</string>
+  <string name="key_view_action_share_with">Partajează cu...</string>
+  <string name="key_view_tab_start">Start</string>
+  <string name="key_view_tab_share">Partajează</string>
+  <string name="key_view_tab_certs">Certificate</string>
+  <string name="key_view_tab_keybase">Keybase.io</string>
+  <string name="user_id_info_revoked_title">Revocat</string>
+  <string name="user_id_info_certified_title">Confirmat</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
+  <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">Schimbă parola</string>
+  <!--Create key-->
+  <string name="create_key_upload">Sincronizează pe Internet</string>
+  <string name="create_key_final_text">Ai introdus următoarea identitate:</string>
+  <string name="create_key_final_robot_text">Crearea cheii o să dureze ceva timp, servește o cafea între timp...</string>
+  <string name="create_key_name_text">Alege un nume asociat cu această cheie. Acesta poate fi un nume complet, ex., \'John Doe\', sau o poreclă, ex., \'Johnny\'</string>
+  <string name="create_key_email_text">Introdu adresă ta principală de email folosită pentru comunicare în siguranță.</string>
+  <string name="create_key_passphrase_text">Alege o parolă puternică. Îți va proteja cheia ta dacă dispozitivul tău este furat.</string>
+  <string name="create_key_hint_full_name">Nume complet sau poreclă</string>
+  <string name="create_key_edit">Schimbă configurația cheii</string>
+  <string name="create_key_add_email">Adaugă adresă de email</string>
+  <string name="create_key_yubi_key_pin">PIN</string>
+  <!--View key-->
+  <string name="view_key_my_key">Cheia mea</string>
+  <!--Add/Edit keyserver-->
+  <string name="add_keyserver_invalid_url">URL invalid!</string>
+  <!--Navigation Drawer-->
+  <string name="nav_keys">Chei</string>
+  <string name="nav_encrypt_decrypt">Criptare/Decriptare</string>
+  <string name="nav_apps">Aplicații</string>
+  <string name="my_keys">Cheile mele</string>
+  <string name="nav_backup">Backup/Restaurare</string>
+  <!--hints-->
+  <!--certs-->
+  <string name="cert_default">implicit</string>
+  <string name="cert_verify_ok">OK</string>
+  <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <string name="msg_internal_error">Eroare internă!</string>
+  <!--Import Public log entries-->
+  <!--Import Secret log entries-->
+  <string name="msg_is_db_exception">Eroare bază de date!</string>
+  <!--Keyring Canonicalization log entries-->
+  <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
+  <!--modifySecretKeyRing-->
+  <string name="msg_mf_error_noop">Nimic de făcut!</string>
+  <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
+  <!--Other messages used in OperationLogs-->
+  <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_error_corrupt_data">Datele sunt corupte!</string>
+  <!--Messages for VerifySignedLiteralData operation-->
+  <string name="msg_vl_ok">OK</string>
+  <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_error_bad_passphrase">Parolă greșită!</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-->
+  <string name="msg_acc_saved">Cont salvat</string>
+  <!--Messages for Keybase Verification operation-->
+  <!--Messages for Mime parsing operation-->
+  <!--PassphraseCache-->
+  <string name="passp_cache_notif_pwd">Parolă</string>
+  <!--Keyserver sync-->
+  <!--First Time-->
+  <string name="first_time_create_key">Creează cheia mea</string>
+  <string name="first_time_import_key">Importă o cheie dintr-un fișier</string>
+  <string name="first_time_security_token">Folosește un Token de Securitate</string>
+  <string name="first_time_skip">Sari peste configurare</string>
+  <string name="backup_text">Backup-urile care includ cheile proprii nu trebuiesc partajate niciodată cu alte persoane!</string>
+  <string name="backup_all">Toate cheile + cheile proprii</string>
+  <string name="backup_public_keys">Toate cheile</string>
+  <!--unsorted-->
+  <string name="label_user_id">Identitate</string>
+  <string name="label_cert_type">Tip</string>
+  <string name="key_no_passphrase">nici o parolă</string>
+  <string name="key_colon">Cheie:</string>
+  <string name="btn_start_exchange">Pornește schimbul</string>
+  <!--Android Account-->
+  <string name="account_privacy_title">Confidențialitate</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
+  <string name="enter_passphrase">Introdu parola</string>
+  <string name="passphrase">Parolă</string>
+  <string name="noPassphrase">Nici o parolă</string>
+  <string name="no_passphrase_set">Nu este setată nici o parolă</string>
+  <string name="passphrases_match">Parolele se potrivesc</string>
+  <string name="passphrase_saved">Parolă salvată</string>
+  <string name="passphrase_invalid">Parolă invalidă</string>
+  <string name="missing_passphrase">Lipsește parola</string>
+  <string name="set_passphrase">Setează parola</string>
+  <string name="nfc_title">NFC</string>
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+  <string name="nfc_settings">Setări</string>
+  <string name="snack_security_token_import">Importă</string>
+  <string name="btn_import">Importă</string>
+  <string name="security_token_import_radio">Importă o cheie</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="linked_title_github">GitHub</string>
+  <string name="linked_title_twitter">Twitter</string>
+  <string name="linked_button_verify">Verifică</string>
+  <string name="linked_button_confirm">Confirmă</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_cancel_button">Anulare</string>
+  <string name="menu_uids_save">Salvează</string>
+  <string name="prompt_fidesmo_pgp_install_title">Instalez PGP?</string>
+  <string name="prompt_fidesmo_pgp_install_button_positive">Instalează</string>
+  <string name="prompt_fidesmo_pgp_install_button_negative">Anulare</string>
+  <string name="prompt_fidesmo_app_install_button_positive">Instalează</string>
+  <string name="prompt_fidesmo_app_install_button_negative">Anulare</string>
+  <string name="help_donation_paypal_item">Donație OpenKeychain</string>
+  <string-array name="help_donation_google_catalog_values">
+    <item>1 EURO</item>
+    <item>2 EURO</item>
+    <item>3 EURO</item>
+    <item>5 EURO</item>
+    <item>10 EURO</item>
+    <item>50 EURO</item>
+    <item>100 EURO</item>
+  </string-array>
+</resources>

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

@@ -354,7 +354,7 @@
   <string name="error_integrity_check_failed">Проверка целостности не удалась! Данные изменились!</string>
   <string name="error_wrong_passphrase">неправильный пароль</string>
   <string name="error_could_not_extract_private_key">не удалось извлечь личный ключ</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Для использования NFC Beam требуется Android 4.1+ !</string>
   <string name="error_nfc_needed">Необходимо включить NFC!</string>
   <string name="error_beam_needed">Необходимо включить Beam!</string>
@@ -514,6 +514,12 @@
     <item quantity="many">Успешно обновлено %1$d ключей%2$s.</item>
     <item quantity="other">Успешно обновлено %1$d ключей%2$s.</item>
   </plurals>
+  <plurals name="import_keys_with_errors">
+    <item quantity="one">Ошибка импорта ключа!</item>
+    <item quantity="few">Ошибка импорта %d ключей!</item>
+    <item quantity="many">Ошибка импорта %d ключей!</item>
+    <item quantity="other">Ошибка импорта %d ключей!</item>
+  </plurals>
   <plurals name="import_error">
     <item quantity="one">Импортирование ключа завершилось неудачно!</item>
     <item quantity="few">Импортирование %d ключей завершилось неудачно!</item>
@@ -523,6 +529,12 @@
   <string name="import_error_nothing">Нет данных для импорта.</string>
   <string name="import_error_nothing_cancelled">Импорт отменен.</string>
   <!--Delete result toast-->
+  <plurals name="delete_ok_but_fail_1">
+    <item quantity="one">Ключ успешно удален</item>
+    <item quantity="few"> Успешно удалено %1$d ключей</item>
+    <item quantity="many"> Успешно удалено %1$d ключей</item>
+    <item quantity="other">Успешно удалено %1$d ключей</item>
+  </plurals>
   <plurals name="delete_ok_but_fail_2">
     <item quantity="one">, но не удалось удалить ключ%2$s.</item>
     <item quantity="few">, но не удалось удалить %1$d ключа%2$s.</item>
@@ -716,6 +728,7 @@
   <string name="edit_key_error_add_subkey">Добавьте хотя бы один доп. ключ!</string>
   <string name="edit_key_error_bad_security_token_algo">Алгоритм не поддерживается токеном безопасности!</string>
   <string name="edit_key_error_bad_security_token_size">Размер ключа не поддерживается токеном безопасности!</string>
+  <string name="edit_key_error_bad_security_token_stripped">Нельзя перенести ключ на Брелок (отделенный или \'переносимый на карту\')!</string>
   <!--Create key-->
   <string name="create_key_upload">Синхронизация с интернетом</string>
   <string name="create_key_empty">Это обязательне поле</string>
@@ -898,6 +911,7 @@
   <string name="msg_is_subkey_empty">Секретный доп. ключ %s отмечен как доступный, с пустым паролем</string>
   <string name="msg_is_subkey_pin">Секретный доп. ключ %s отмечен как доступный, с PIN</string>
   <string name="msg_is_subkey_stripped">Секретный доп. ключ %s отмечен как отделённый</string>
+  <string name="msg_is_subkey_divert">Секретный доп.ключ %s отмечен как \'переносимый на карту\'</string>
   <string name="msg_is_success_identical">Связка ключей не содержит новых данных, нечего делать</string>
   <string name="msg_is_success">Успешно добавлена связка секретных ключей</string>
   <!--Keyring Canonicalization log entries-->
@@ -1007,6 +1021,8 @@
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Изменение связки %s</string>
   <string name="msg_mf_divert">Будет отвлекать на токен безопасности для криптографических операций</string>
+  <string name="msg_mf_error_divert_newsub">Создание новых доп.ключей не поддерживается для \'переносимых на карту\' ключей!</string>
+  <string name="msg_mf_error_divert_serial">Сериный номер \'переносимого на карту\' ключа должна быть 16 байт! Это ошибка в программе, сообщите разработчику!</string>
   <string name="msg_mf_error_encode">Ошибка кодирования!</string>
   <string name="msg_mf_error_fingerprint">Отпечаток ключа не совпадает с представленным!</string>
   <string name="msg_mf_error_keyid">Нет ID ключа. Это программная ошибка. Пожалуйста, сообщите об этом!</string>

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

@@ -189,7 +189,7 @@
   <string name="error_invalid_data">Ne najdem nobene vsebine šifrirane ali podpisane z OpenPGP!</string>
   <string name="error_integrity_check_failed">Preverba neokrnjenosti ni bila uspešna! Podatki so bili spremenjeni!</string>
   <string name="error_could_not_extract_private_key">ne morem izvleči zasebnega ključa</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Za uporabo storitve NFC Beam potrebujete najmanj Android 4.1!</string>
   <string name="error_nfc_needed">Vključen mora biti NFC!</string>
   <string name="error_beam_needed">Vključen mora biti Beam!</string>

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

@@ -339,7 +339,7 @@
   <string name="error_integrity_check_failed">провера интегритета није успела! Подаци су измењени!</string>
   <string name="error_wrong_passphrase">погрешна лозинка</string>
   <string name="error_could_not_extract_private_key">не могох да извучем лични кључ</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Потребан вам је Андроид 4.1 да бисте користили Андроидову могућност НФЦ Снопа!</string>
   <string name="error_nfc_needed">НФЦ мора бити укључен!</string>
   <string name="error_beam_needed">Бим мора бити укључен</string>

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

@@ -189,18 +189,24 @@
   <string name="label_sync_settings_keyserver_summary_off">Nycklar uppdateras inte automatiskt</string>
   <string name="label_sync_settings_wifi_title">Synkronisera bara på Wifi</string>
   <string name="label_sync_settings_contacts_title">Länka nycklar till kontakter</string>
+  <string name="label_sync_settings_contacts_summary_on">Länka nycklar till kontakter baserade på namn och e-postadresser. Detta sker helt offline på enheten.</string>
+  <string name="label_sync_settings_contacts_summary_off">Nya nycklar kommer inte att kopplas till kontakter</string>
   <!--label shown in Android settings under the OpenKeychain account-->
   <string name="keyserver_sync_settings_title">Automatiska nyckel uppdateringar</string>
   <string name="label_experimental_settings_desc_title">Varning</string>
+  <string name="label_experimental_settings_desc_summary">Dessa funktioner är ännu inte klar eller resultat användarupplevelse/säkerhetsforskning. Således, lita inte på deras säkerhet och vänligen rapporterar inte problem som du påträffar!</string>
+  <string name="label_experimental_settings_word_confirm_title">Bekräftelse med fraser</string>
+  <string name="label_experimental_settings_word_confirm_summary">Bekräfta nycklar med fraser istället för hexadecimala fingeravtryck</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-bevis</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">Aktivera Tor</string>
-  <string name="pref_proxy_tor_summary">Kräver att Orbot är installerat</string>
+  <string name="pref_proxy_tor_summary">Kräver att Orbot är installerad</string>
   <string name="pref_proxy_normal_title">Aktivera annan proxy</string>
-  <string name="pref_proxy_host_title">Proxy värd</string>
+  <string name="pref_proxy_host_title">Proxyvärd</string>
-  <string name="pref_proxy_host_err_invalid">Proxy värd kan inte vara tom</string>
+  <string name="pref_proxy_host_err_invalid">Proxyvärd kan inte vara tom</string>
-  <string name="pref_proxy_port_title">Proxy port</string>
+  <string name="pref_proxy_port_title">Proxyport</string>
   <string name="pref_proxy_type_title">Proxytyp</string>
   <!--proxy type choices and values-->
   <string name="pref_proxy_type_choice_http">HTTP</string>
@@ -214,8 +220,8 @@
   <string name="orbot_install_dialog_ignore_tor">Använd inte Tor</string>
   <!--StartOrbotDialogFragment strings-->
   <string name="orbot_start_dialog_title">Starta Orbot?</string>
-  <string name="orbot_start_btn">Starta Orbot?</string>
+  <string name="orbot_start_btn">Starta Orbot</string>
-  <string name="orbot_start_dialog_start">Starta Orbot?</string>
+  <string name="orbot_start_dialog_start">Starta Orbot</string>
   <string name="orbot_start_dialog_cancel">Avbryt</string>
   <string name="orbot_start_dialog_ignore_tor">Använd inte Tor</string>
   <plurals name="n_keys">
@@ -269,6 +275,8 @@
   <string name="pin_for">Ange PIN för \'%s\'</string>
   <string name="security_token_pin_for">Ange PIN-kod för att få tillgång till säkerhetstoken för \'%s\'</string>
   <string name="security_token_nfc_text">Håll Säkerhetstoken mot NFC markören på baksidan av enheten.</string>
+  <string name="security_token_nfc_wait">Håll säkerhetstoken mot baksidan!</string>
+  <string name="security_token_nfc_finished">Ta bort säkerhetstoken nu.</string>
   <string name="file_delete_confirmation_title">Radera orginalfiler?</string>
   <string name="file_delete_confirmation">Följande filer kommer raderas:%s</string>
   <string name="file_delete_successful">%1$d av %2$d filer har raderats.%3$s</string>
@@ -320,7 +328,7 @@
   <string name="error_integrity_check_failed">integritetskontroll misslyckades! Data har modifierats!</string>
   <string name="error_wrong_passphrase">fel lösenord</string>
   <string name="error_could_not_extract_private_key">kunde inte extrahera privat nyckel</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Du behöver Android 4.1 för att använda Androids NFC Beam-funktion!</string>
   <string name="error_nfc_needed">NFC måste vara aktiverat!</string>
   <string name="error_beam_needed">Beam måste vara aktiverat!</string>
@@ -328,6 +336,7 @@
   <string name="error_nothing_import_selected">Inga nycklar valda för import!</string>
   <string name="error_contacts_key_id_missing">Det gick inte att hämta nyckel-ID:t från kontakter!</string>
   <string name="error_generic_report_bug">Ett generiskt fel inträffade, skapa en ny buggrapport för OpenKeychain.</string>
+  <string name="error_denied_storage_permission">Kan inte läsa filer från lagring eftersom åtkomst har nekats!</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">Inte signerat</string>
   <string name="decrypt_result_invalid_signature">Ogiltig signatur!</string>
@@ -439,6 +448,7 @@
   <string name="import_qr_code_button">Skanna QR-kod</string>
   <string name="import_qr_code_text">Håll din kamera över QR-koden!</string>
   <!--Import from URL-->
+  <string name="import_url_warn_no_search_parameter">Ingen sökfråga definierad. Du kan fortfarande söka manuellt på denna nyckelserver .</string>
   <!--Generic result toast-->
   <string name="snackbar_details">Detaljer</string>
   <string name="with_warnings">, med varningar</string>
@@ -483,7 +493,12 @@
   <string name="delete_cancelled">Raderingsoperation avbruten.</string>
   <!--Revoke result toast (snackbar)-->
   <string name="revoke_ok">Återkallat nyckel.</string>
+  <string name="revoke_nothing">Inget att återkalla.</string>
   <!--Certify result toast-->
+  <plurals name="certify_keys_ok">
+    <item quantity="one">Framgångsrikt bekräftade key%2$s.</item>
+    <item quantity="other">Framgångsrikt bekräftade %1$d keys%2$s.</item>
+  </plurals>
   <plurals name="certify_keys_with_errors">
     <item quantity="one">Certifiering misslyckades!</item>
     <item quantity="other">Certifiering misslyckades för %d nycklar!</item>
@@ -520,6 +535,8 @@
   <string name="api_register_allow">Tillåt åtkomst</string>
   <string name="api_register_disallow">Tillåt inte åtkomst</string>
   <string name="api_register_error_select_key">Välj en nyckel!</string>
+  <string name="api_select_pub_keys_missing_text">Inga nycklar hittades för dessa e-postadresser:</string>
+  <string name="api_select_pub_keys_dublicates_text">Mer än en nyckel existerar för dessa e-postadresser:</string>
   <string name="api_select_pub_keys_text">Se över listan med mottagare!</string>
   <string name="api_select_pub_keys_text_no_user_ids">Välj mottagare!</string>
   <string name="api_error_wrong_signature">Signaturkontroll misslyckades! Har du installerat appen från en annan källa? Om du är säker på att det här inte är en attack, återkalla den här appens registrering i OpenKeychain och registrera sen om appen igen.</string>
@@ -538,6 +555,7 @@
   </plurals>
   <string name="key_list_empty_text1">Inga nycklar hittades!</string>
   <string name="key_list_filter_show_all">Visa alla nycklar</string>
+  <string name="key_list_filter_show_certified">Visa bekräftade nycklar endast</string>
   <string name="key_list_fab_qr_code">Skanna QR-kod</string>
   <string name="key_list_fab_search">Nyckelsökning</string>
   <string name="key_list_fab_import">Importera från fil</string>
@@ -561,6 +579,7 @@
   <string name="user_id_info_certified_title">Bekräftad</string>
   <string name="user_id_info_certified_text">Denna identitet har bekräftats av dig.</string>
   <string name="user_id_info_uncertified_title">Inte bekräftad</string>
+  <string name="user_id_info_uncertified_text">Denna identitet har inte bekräftats ännu. Du kan inte vara säker på om identiteten verkligen motsvarar en viss person.</string>
   <string name="user_id_info_invalid_title">Ogiltig</string>
   <string name="user_id_info_invalid_text">Något är fel med den här identiteten!</string>
   <!--Key trust-->
@@ -802,6 +821,7 @@
   <string name="msg_mf_error_keyid">Inget nyckel-ID. Det här är ett internt fel, skicka en buggrapport!</string>
   <string name="msg_mf_error_noexist_primary">Dåligt primärt användar-ID angivet!</string>
   <string name="msg_mf_error_revoked_primary">Återkallade användar-ID:n kan inte vara primära!</string>
+  <string name="msg_mf_error_noop">Inget att göra!</string>
   <string name="msg_mf_error_pgp">Internt OpenPGP-fel!</string>
   <string name="msg_mf_passphrase_key">Återkrypterar undernyckel %s med nytt lösenord</string>
   <string name="msg_mf_primary_replace_old">Ersätter certifikat för tidigare primärt användar-ID</string>
@@ -945,11 +965,17 @@
     <item quantity="one">Misslyckades med att radera en nyckel</item>
     <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_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_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_acc_saved">Konto sparat</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>
+  <string name="msg_download_query_failed">Ett fel uppstod vid sökning efter nycklar.</string>
   <!--Messages for Keybase Verification operation-->
   <!--Messages for Mime parsing operation-->
   <!--PassphraseCache-->
@@ -964,7 +990,9 @@
   <string name="first_time_text1">Ta tillbaka din integritet med OpenKeychain!</string>
   <string name="first_time_create_key">Skapa min nyckel</string>
   <string name="first_time_import_key">Importera nyckel från fil</string>
+  <string name="first_time_security_token">Använd säkerhetstoken</string>
   <string name="first_time_skip">Hoppa över inställning</string>
+  <string name="first_time_blank_security_token_yes">Använd denna säkerhetstoken</string>
   <string name="backup_text">Säkerhetskopior som innehåller dina egna nycklar får aldrig delas med andra människor!</string>
   <string name="backup_all">Alla nycklar + dina egna nycklar</string>
   <string name="backup_public_keys">Alla nycklar</string>
@@ -974,13 +1002,16 @@
   <string name="section_cert">Certifikatinformation</string>
   <string name="label_user_id">Identitet</string>
   <string name="empty_certs">Inga certifikat för den här nyckeln</string>
+  <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_phrases">Jämför dessa fraser med de 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_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>
   <string name="title_view_cert">Visa certifikatinformation</string>
@@ -999,17 +1030,21 @@
   <!--Android Account-->
   <string name="account_privacy_title">Integritet</string>
   <string name="account_privacy_text">OpenKeychain synkroniserar inte dina kontakter med Internet. Den länkar bara kontakter med nycklar baserade på namn och e-postadresser. Detta sker offline på enheten.</string>
+  <string name="sync_notification_permission_required_text">Tryck för att konfigurera länkning till kontakter</string>
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
   <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
   <string name="enter_passphrase">Skriv lösenord</string>
   <string name="passphrase">Lösenord</string>
   <string name="noPassphrase">Inget lösenord</string>
+  <string name="no_passphrase_set">Inget lösenord angivet</string>
   <string name="passphrase_saved">Lösenord sparat</string>
+  <string name="passphrase_invalid">Lösenord ogiltigt</string>
   <string name="passphrase_again">Igen</string>
   <string name="lockpattern">Låsmönster</string>
   <string name="lockpatternNFC">NFC + Låsmönster</string>
   <string name="unlock_method">Upplåsningmetod</string>
+  <string name="set_passphrase">Ange lösenord</string>
   <string name="draw_lockpattern">Dra låsmönster</string>
   <string name="nfc_title">NFC</string>
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
@@ -1018,45 +1053,86 @@
   <string name="no_nfc_support">Denna enhet stöder inte NFC</string>
   <string name="unlocked">Upplåst</string>
   <string name="nfc_settings">Inställningar</string>
+  <string name="snack_security_token_view">Visa</string>
+  <string name="snack_security_token_import">Importera</string>
+  <string name="security_token_create">Håll säkerhetstoken mot baksidan av din enhet.</string>
   <string name="btn_import">Importera</string>
+  <string name="btn_reset">Återställ</string>
   <string name="security_token_import_radio">Importera nyckel</string>
+  <string name="security_token_error">Fel: %s</string>
+  <string name="security_token_error_try_again">Försök igen</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="error_empty_log">(fel, tom logg)</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="label_clip_title">Krypterad data</string>
+  <string name="error_saving_file">Fil vid sparande av fil!</string>
+  <string name="file_saved">Fil sparad!</string>
   <string name="error_clipboard_empty">Urklipp är tomt!</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_verify">Verifiera</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>
   <!--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_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="btn_code_wrotedown">OK, jag skrev ner det!</string>
   <string name="btn_backup_share">Dela säkerhetskopia</string>
   <string name="btn_backup_save">Spara säkerhetskopia</string>
+  <string name="snack_backup_error_saving">Fel vid sparande av säkerhetskopia!</string>
   <string name="snack_backup_saved">Säkerhetskopia sparad</string>
   <string name="snack_backup_exists">Säkerhetskopia existerar redan!</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="menu_uids_save">Spara</string>
+  <string name="title_edit_identities">Redigera identiteter</string>
+  <string name="title_edit_subkeys">Redigera undernycklar </string>
+  <string name="btn_search_for_query">Sök efter\n\'%s\'</string>
+  <string name="cache_ttl_lock_screen">till skärmen stängs</string>
+  <string name="cache_ttl_ten_minutes">för tio minuter</string>
+  <string name="cache_ttl_thirty_minutes">för trettio minuter</string>
+  <string name="cache_ttl_one_hour">för en timme</string>
+  <string name="cache_ttl_three_hours">för tre veckor</string>
+  <string name="cache_ttl_one_day">för en dag</string>
+  <string name="cache_ttl_three_days">för tre dagar</string>
   <string name="cache_ttl_forever">för alltid</string>
   <string name="remember">Kom ihåg</string>
+  <string name="security_token_error_pgp_app_not_installed">Ingen PGP-app hittades på säkerhetstoken</string>
   <string name="prompt_fidesmo_pgp_install_title">Installera PGP?</string>
+  <string name="prompt_fidesmo_pgp_install_message">Det fanns inget PGP-app tillgängligt på din Fidesmo-enhet.</string>
   <string name="prompt_fidesmo_pgp_install_button_positive">Installera</string>
   <string name="prompt_fidesmo_pgp_install_button_negative">Avbryt</string>
   <string name="prompt_fidesmo_app_install_title">Installera Fidesmo?</string>
+  <string name="prompt_fidesmo_app_install_message">För att installera PGP behöver du Fidesmo Android-appen.</string>
   <string name="prompt_fidesmo_app_install_button_positive">Installera</string>
   <string name="prompt_fidesmo_app_install_button_negative">Avbryt</string>
   <string name="help_donation_paypal_item">OpenKeychain donation</string>

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

@@ -143,7 +143,7 @@
   <string name="error_invalid_data">Geçerli olan şifrelenmiş ya da imzalanmış OpenPGP içeriği yok!</string>
   <string name="error_integrity_check_failed">Bütünlük kontrolü başarısız! Veri değiştirilmiş!</string>
   <string name="error_could_not_extract_private_key">özel anahtar çıkarılamadı</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Android\'in NFC Beam özelliğini kullanabilmek için Android 4.1 kullanmalısınız!</string>
   <string name="error_nothing_import">Anahtar bulunamadı!</string>
   <string name="error_contacts_key_id_missing">Kişilerden anahtar ID getirme işlemi başarısız!</string>

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

@@ -4,22 +4,37 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
+  <string name="title_encrypt_text">Зашифрувати текст</string>
+  <string name="title_encrypt_files">Зашифрувати файл</string>
   <string name="title_decrypt">Розшифрувати</string>
   <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_change_passphrase">Змінити пароль</string>
   <string name="title_share_fingerprint_with">Поділитися відбитком із…</string>
   <string name="title_share_key">Поділитися ключем з…</string>
   <string name="title_share_file">Поширити файл з…</string>
+  <string name="title_share_message">Поділитися текстом через...</string>
   <string name="title_encrypt_to_file">Зашифрувати до файлу</string>
   <string name="title_decrypt_to_file">Розшифрувати до файлу</string>
   <string name="title_import_keys">Імпортувати ключі</string>
+  <string name="title_export_key">Резервний ключ</string>
+  <string name="title_export_keys">Резервні ключі</string>
   <string name="title_key_not_found">Ключ не знайдено</string>
   <string name="title_send_key">Завантажити на сервер ключів</string>
+  <string name="title_backup">Резервування ключа</string>
   <string name="title_key_details">Подробиці про ключ</string>
   <string name="title_help">Довідка</string>
   <string name="title_log_display">Журнал</string>
   <string name="title_exchange_keys">Обміняти ключі</string>
+  <string name="title_advanced_key_info">Додаткове</string>
+  <string name="title_delete_secret_key">Вилучити ВАШ ключ «%s»?</string>
+  <string name="title_manage_my_keys">Управління моїми ключами</string>
+  <string name="title_alert_strip">Відділити цей підключ</string>
   <!--section-->
   <string name="section_user_ids">Сутності</string>
   <string name="section_keys">Підключі</string>
@@ -30,6 +45,9 @@
   <!--button-->
   <string name="btn_decrypt_verify_file">Розшифрувати, перевірити та зберегти файл</string>
   <string name="btn_encrypt_share_file">Зашифрувати та поширити файл</string>
+  <string name="btn_save_file">Зберегти файл</string>
+  <string name="btn_save">Зберегти</string>
+  <string name="btn_view_log">Переглянути журнал</string>
   <string name="btn_do_not_save">Скасувати</string>
   <string name="btn_delete">Вилучити</string>
   <string name="btn_no_date">Необмежено</string>
@@ -37,24 +55,40 @@
   <string name="btn_export_to_server">Завантажити на сервер ключів</string>
   <string name="btn_next">Далі</string>
   <string name="btn_back">Назад</string>
+  <string name="btn_no">Ні</string>
   <string name="btn_view_cert_key">Переглянути ключ сертифікації</string>
   <string name="btn_create_key">Створити ключ</string>
   <string name="btn_add_files">Додати файл(и)</string>
+  <string name="btn_open_with">Відкрити через...</string>
+  <string name="btn_copy_decrypted_text">Копіювати у буфер обміну</string>
+  <string name="btn_decrypt_clipboard">Отримати з буфера обміну</string>
+  <string name="btn_decrypt_files">Вибрати вхідний файл</string>
+  <string name="btn_add_keyserver">Додати</string>
   <!--Content Description-->
   <!--menu-->
   <string name="menu_preferences">Параметри</string>
   <string name="menu_help">Довідка</string>
   <string name="menu_delete_key">Вилучити ключ</string>
   <string name="menu_search">Пошук</string>
+  <string name="menu_nfc_preferences">Налаштування NFC</string>
   <string name="menu_beam_preferences">Налаштування променя</string>
   <string name="menu_encrypt_to">Зашифрувати…</string>
   <string name="menu_select_all">Вибрати усе</string>
   <string name="menu_export_all_keys">Експортувати усі ключі</string>
+  <string name="menu_update_all_keys">Оновити всі ключі</string>
+  <string name="menu_change_password">Змінити пароль</string>
+  <string name="menu_keyserver_add">Додати</string>
   <!--label-->
+  <string name="label_message">Текст</string>
   <string name="label_file">Файл</string>
   <string name="label_files">Файл(и)</string>
   <string name="label_file_colon">Файл:</string>
+  <string name="label_no_passphrase">Без пароля</string>
+  <string name="label_passphrase">Пароль</string>
+  <string name="label_pin">PIN</string>
   <string name="label_unlock">Розблоковується…</string>
+  <string name="label_passphrase_again">Повторити пароль</string>
+  <string name="label_show_passphrase">Показати пароль</string>
   <string name="label_algorithm">Алгоритм</string>
   <string name="label_ascii_armor">Файл ASCII Armor</string>
   <string name="label_file_ascii_armor">Увімкнути ASCII Armor</string>
@@ -63,8 +97,11 @@
   <string name="label_delete_after_decryption">Вилучити після розшифрування</string>
   <string name="label_encryption_algorithm">Алгоритм шифрування</string>
   <string name="label_hash_algorithm">Хеш алгоритм</string>
+  <string name="label_message_compression">Стиснення тексту</string>
   <string name="label_file_compression">Стиснення файлу</string>
   <string name="label_key_id">ІД ключа</string>
+  <string name="label_key_created">Ключ створено %s</string>
+  <string name="label_key_type">Тип</string>
   <string name="label_creation">Створення</string>
   <string name="label_expiry">Закінчення</string>
   <string name="label_usage">Використання</string>
@@ -74,15 +111,30 @@
   <string name="label_name">Назва</string>
   <string name="label_comment">Коментар</string>
   <string name="label_email">Ел. пошта</string>
+  <string name="label_send_key">Синхронізувати з інтернетом</string>
   <string name="label_fingerprint">Відбиток</string>
   <string name="expiry_date_dialog_title">Задати термін дії</string>
   <string name="label_preferred">бажаний</string>
+  <string name="label_enter_keyserver_url">URL</string>
+  <string name="label_theme">Тема</string>
+  <string name="pref_facebook">Facebook</string>
+  <string name="pref_facebook_summary">Шукати ключі в Facebook по імені користувача</string>
   <!--label shown in Android settings under the OpenKeychain account-->
+  <string name="label_experimental_settings_desc_title">Попередження</string>
   <!--Proxy Preferences-->
   <!--proxy type choices and values-->
+  <string name="pref_proxy_type_choice_http">HTTP</string>
+  <string name="pref_proxy_type_choice_socks">SOCKS</string>
   <!--OrbotHelper strings-->
+  <string name="orbot_ignore_tor">Не використовувати Tor</string>
   <!--InstallDialogFragment strings-->
+  <string name="orbot_install_dialog_install">Встановити</string>
+  <string name="orbot_install_dialog_cancel">Скасувати</string>
   <!--StartOrbotDialogFragment strings-->
+  <string name="orbot_start_dialog_cancel">Скасувати</string>
+  <string name="orbot_start_dialog_ignore_tor">Не використовувати Tor</string>
+  <string name="user_id_no_name"><![CDATA[<no name>]]></string>
+  <string name="none"><![CDATA[<none>]]></string>
   <plurals name="n_keys">
     <item quantity="one">1 ключ</item>
     <item quantity="few">%d ключі</item>
@@ -108,9 +160,17 @@
   <string name="choice_4hours">4 години</string>
   <string name="choice_8hours">8 годин</string>
   <string name="choice_forever">назавжди</string>
+  <string name="choice_select_cert">Вибрати ключ</string>
   <string name="filemanager_title_open">Відкрити…</string>
+  <string name="rsa_2048">RSA 2048</string>
+  <string name="rsa_3072">RSA 3072</string>
+  <string name="rsa_4096">RSA 4096</string>
+  <string name="ecc_p256">ECC P-256</string>
+  <string name="ecc_p521">ECC P-521</string>
   <string name="error">Помилка</string>
   <string name="error_message">Помилка: %s</string>
+  <string name="theme_dark">Темна</string>
+  <string name="theme_light">Світла</string>
   <!--sentences-->
   <string name="no_filemanager_installed">Нема встановленого сумісного менеджера файлів.</string>
   <string name="encrypt_sign_successful">Успішно підписано та/або перевірено.</string>
@@ -147,7 +207,7 @@
   <string name="error_no_signature_key">не подано ключ підпису</string>
   <string name="error_integrity_check_failed">Невдала перевірка цілісності! Дані вже змінено!</string>
   <string name="error_could_not_extract_private_key">не можна витягти секретний ключ</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Вам потрібний Android 4.1 для використання функції Androids NFC промінь!</string>
   <string name="error_nothing_import">Ключ не знайдено!</string>
   <string name="error_generic_report_bug">Трапилася загальна помилка, будь ласка, створіть новий звіт про помилку для OpenKeychain.</string>
@@ -163,6 +223,7 @@
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Готово.</string>
   <string name="progress_cancel">Скасувати</string>
+  <string name="progress_cancelling">скасування...</string>
   <string name="progress_saving">збереження…</string>
   <string name="progress_importing">імпортується…</string>
   <string name="progress_exporting">експортується…</string>
@@ -268,6 +329,7 @@
   <!--Remote API-->
   <string name="api_settings_no_key">Не вибрано ключа</string>
   <string name="api_settings_select_key">Вибрати ключ</string>
+  <string name="api_settings_create_key">Створити новий ключ</string>
   <string name="api_settings_save">Зберегти</string>
   <string name="api_settings_cancel">Скасувати</string>
   <string name="api_settings_revoke">Відкликати доступ</string>

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

@@ -215,7 +215,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

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

@@ -13,6 +13,7 @@
   <string name="title_preferences">設定</string>
   <string name="title_api_registered_apps">應用程式</string>
   <string name="title_key_server_preference">OpenPGP金鑰伺服器</string>
+  <string name="title_cache_ttl_preference">自訂\"記住時間\"選項</string>
   <string name="title_change_passphrase">修改金鑰密碼</string>
   <string name="title_share_fingerprint_with">分享指紋…</string>
   <string name="title_share_key">分享金鑰…</string>
@@ -34,10 +35,12 @@
   <string name="title_advanced_key_info">進階</string>
   <string name="title_delete_secret_key">刪除您的金鑰 \'%s\'？</string>
   <string name="title_manage_my_keys">管理我的金鑰</string>
+  <string name="title_alert_strip">分離這個子金鑰</string>
   <!--section-->
   <string name="section_user_ids">身份</string>
   <string name="section_security_token">安全口令</string>
   <string name="section_linked_system_contact">已關聯帳戶</string>
+  <string name="section_keybase_proofs">Keybase.io 證明</string>
   <string name="section_should_you_trust">您信任這把金鑰嗎？</string>
   <string name="section_keys">子金鑰</string>
   <string name="section_cloud_search">金鑰搜尋</string>
@@ -52,6 +55,7 @@
   <string name="section_share_key">金鑰</string>
   <string name="section_key_server">金鑰伺服器</string>
   <string name="section_fingerprint">指紋</string>
+  <string name="section_phrases">密語</string>
   <string name="section_encrypt">加密</string>
   <string name="section_decrypt">解密/驗證</string>
   <string name="section_current_expiry">目前有效期限</string>
@@ -73,6 +77,8 @@
   <string name="btn_no">不</string>
   <string name="btn_match">指紋相符</string>
   <string name="btn_match_phrases">口令相符</string>
+  <string name="btn_share_encrypted_signed">加密/簽名文字後分享</string>
+  <string name="btn_copy_encrypted_signed">加密/簽名文字後複製到剪貼簿</string>
   <string name="btn_view_cert_key">檢視簽署的金鑰</string>
   <string name="btn_create_key">建立金鑰</string>
   <string name="btn_add_files">加入檔案</string>
@@ -88,7 +94,7 @@
   <string name="btn_add_keyserver">加入新伺服器</string>
   <string name="btn_save_default">設為預設值</string>
   <string name="btn_saved">已儲存</string>
-  <string name="btn_not_matching">ㄅ</string>
+  <string name="btn_not_matching">不符合</string>
   <!--Content Description-->
   <string name="cd_encrypt_files">加密檔案</string>
   <string name="cd_exchange_keys">交換金鑰</string>
@@ -108,6 +114,8 @@
   <string name="menu_export_all_keys">匯出所有金鑰</string>
   <string name="menu_update_all_keys">更新所有金鑰</string>
   <string name="menu_advanced">進階</string>
+  <string name="menu_certify_fingerprint">透過指紋確認</string>
+  <string name="menu_certify_fingerprint_phrases">透過密語確認</string>
   <string name="menu_share_log">分享紀錄</string>
   <string name="menu_change_password">修改密碼</string>
   <string name="menu_keyserver_add">新增</string>
@@ -134,6 +142,7 @@
   <string name="label_encryption_algorithm">加密演算法</string>
   <string name="label_hash_algorithm">雜湊演算法</string>
   <string name="label_symmetric">透過密碼加密</string>
+  <string name="label_passphrase_cache_ttl">自訂\"記憶時間\"選項</string>
   <string name="label_message_compression">文字壓縮</string>
   <string name="label_file_compression">檔案壓縮</string>
   <string name="label_keyservers">選擇OpenPGP金鑰伺服器</string>
@@ -168,6 +177,7 @@
   <string name="pref_keybase_summary">在keybase.io上搜尋金鑰</string>
   <string name="pref_facebook">Facebook</string>
   <string name="pref_facebook_summary">在 Facebook 上以使用者名稱搜尋金鑰</string>
+  <string name="label_sync_settings_keyserver_title">自動更新金鑰</string>
   <string name="label_sync_settings_keyserver_summary_off">金鑰不會自動更新</string>
   <string name="label_sync_settings_wifi_title">只以 Wi-Fi 同步</string>
   <!--label shown in Android settings under the OpenKeychain account-->
@@ -288,7 +298,7 @@
   <string name="error_integrity_check_failed">完整性檢查失敗！資料已被修改！</string>
   <string name="error_wrong_passphrase">密碼錯誤</string>
   <string name="error_could_not_extract_private_key">無法抽取私鑰</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">需要Android 4.1以上才能使用NFC Beam功能！</string>
   <string name="error_nfc_needed">NFC 必須開啓 !</string>
   <string name="error_beam_needed">Bean 必須開啓 !</string>
@@ -627,6 +637,7 @@
   <string name="msg_ip_error_op_exc">操作失敗，因為資料庫錯誤</string>
   <string name="msg_ip_error_remote_ex">操作失敗，因為內部錯誤</string>
   <string name="msg_ip">匯入公鑰鑰匙圈 %s</string>
+  <string name="msg_ip_fingerprint_ok">指紋檢查正確</string>
   <string name="msg_ip_insert_keys">正在解析金鑰</string>
   <string name="msg_ip_prepare">正在準備資料庫</string>
   <string name="msg_ip_master_flags_unspecified">主要標記：未指定(全用途)</string>

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

@@ -10,7 +10,7 @@
   <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_linked_create">创建一个关联用户标识</string>
   <string name="title_preferences">设置</string>
   <string name="title_api_registered_apps">已注册应用</string>
   <string name="title_key_server_preference">OpenPGP 密钥服务器</string>
@@ -38,7 +38,7 @@
   <string name="title_manage_my_keys">管理我的密钥</string>
   <string name="title_alert_strip">剥离子密钥</string>
   <!--section-->
-  <string name="section_user_ids">用户名</string>
+  <string name="section_user_ids">用户标识</string>
   <string name="section_security_token">安全令牌</string>
   <string name="section_linked_system_contact">关联系统联系人</string>
   <string name="section_keybase_proofs">Keybase.io 证书</string>
@@ -200,7 +200,7 @@
   <string name="label_experimental_settings_desc_summary">这些功能目前尚未完成或者缺少用户经验性/安全性的研究结果。所以，不保证他们是安全的，请不要对我们发牢骚！</string>
   <string name="label_experimental_settings_word_confirm_title">通过短语确认密钥</string>
   <string name="label_experimental_settings_word_confirm_summary">使用短语代替 16 进制指纹，完成密钥确认</string>
-  <string name="label_experimental_settings_linked_identities_title">关联身份</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>
@@ -344,7 +344,7 @@
   <string name="error_integrity_check_failed">完整性检查失败! 数据已被篡改!</string>
   <string name="error_wrong_passphrase">密码错误</string>
   <string name="error_could_not_extract_private_key">不能提取私钥</string>
-  <!--errors without preceding Error:-->
+  <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">只有 Android 4.1 及以上才支持 Android\'s NFC Beam 功能</string>
   <string name="error_nfc_needed">必须开启 NFC!</string>
   <string name="error_beam_needed">必须开启 Beam!</string>
@@ -617,7 +617,7 @@
   <!--Key trust-->
   <string name="key_trust_no_cloud_evidence">网上没有关于此密钥可信度的证明</string>
   <string name="key_trust_start_cloud_search">开始搜索</string>
-  <string name="key_trust_results_prefix">Keybase.io提供的用来断定该密钥所有者身份的证明</string>
+  <string name="key_trust_results_prefix">Keybase.io 提供用以确定该密钥所有者的证明：</string>
   <!--keybase proof stuff-->
   <string name="keybase_narrative_twitter">能发送推文到 %s </string>
   <string name="keybase_narrative_github">在GitHub上的用户名是 %s</string>
@@ -632,6 +632,7 @@
   <string name="keybase_problem_fetching_evidence">证明有问题</string>
   <string name="keybase_key_mismatch">证明内容与该密钥指纹不匹配</string>
   <string name="keybase_dns_query_failure">取回 DNS 的 TXT 记录失败</string>
+  <string name="keybase_no_prover_found">没有找到证明检查</string>
   <string name="keybase_message_payload_mismatch">加密证明内容不匹配</string>
   <string name="keybase_message_fetching_data">正在获取证明</string>
   <string name="keybase_proof_succeeded">该证明已被检验</string>
@@ -644,6 +645,7 @@
   <string name="keybase_web_site_proof">一个文本文件</string>
   <string name="keybase_github_proof">一个gist</string>
   <string name="keybase_reddit_proof">一个JSON文件</string>
+  <string name="keybase_reddit_attribution">归到 Reddit </string>
   <string name="keybase_verify">校验</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">变更密码</string>
@@ -740,7 +742,7 @@
   <string name="msg_cancelled">操作已取消</string>
   <!--Import Public log entries-->
   <string name="msg_ip_apply_batch">开始批量导入</string>
-  <string name="msg_ip_bad_type_secret">已将私钥导入为公钥，这是一个BUG，请提交报告！</string>
+  <string name="msg_ip_bad_type_secret">尝试将私钥环导入为公钥。这是一个BUG，请提交报告！</string>
   <string name="msg_ip_delete_old_fail">没有旧密钥被删除（创建一个新密钥？）</string>
   <string name="msg_ip_delete_old_ok">已从数据库中删除旧的密钥</string>
   <string name="msg_ip_encode_fail">由于编码错误，操作失败</string>
@@ -914,11 +916,17 @@
   <string name="msg_kc_uat_bad_time">正在移除带有未来时间戳的用户属性</string>
   <string name="msg_kc_uat_bad_type">正在移除未知类型 (%s) 的用户属性</string>
   <string name="msg_kc_uat_bad">正在移除用户属性的无效自签名</string>
+  <string name="msg_kc_uat_cert_dup">正在移除用户属性中过期的无效自签名</string>
+  <string name="msg_kc_uat_dup">移除重复的用户属性。密钥环中包含两份相同属性。这可能导入认证丢失！</string>
+  <string name="msg_kc_uat_foreign">移除外部用户属性，该属性认证为</string>
   <string name="msg_kc_uat_revoke_dup">正在移除重复的用户属性吊销证书</string>
   <string name="msg_kc_uat_revoke_old">正在移除过期的用户属性吊销证书</string>
+  <string name="msg_kc_uat_no_cert">没有找到有效的自认证，从密钥环中移除用户属性</string>
   <string name="msg_kc_uat_remove">移除无效的用用户标识</string>
   <string name="msg_kc_uat_warn_encoding">用户标识不是有效的 UTF-8 字符串!</string>
   <!--Keyring merging log entries-->
+  <string name="msg_mg_error_secret_dummy">找到新的公钥子密钥，但不支持私钥子密钥虚拟生成！</string>
+  <string name="msg_mg_error_heterogeneous">尝试合并具有不同指纹的密钥环！</string>
   <string name="msg_mg_error_encode">解码信号时发生错误！</string>
   <string name="msg_mg_public">正在并入公钥密钥环 %s</string>
   <string name="msg_mg_secret">正在并入私钥密钥环 %s</string>
@@ -965,12 +973,15 @@
   <string name="msg_mf_error_duplicate_keytocard_for_slot">智能卡仅支持每存储位一密钥的规格。</string>
   <string name="msg_mf_error_invalid_flags_for_keytocard">安全令牌密钥的标签不正确。</string>
   <string name="msg_mf_master">正在修改主密钥认证</string>
+  <string name="msg_mf_notation_empty">添加空的注释数据包</string>
+  <string name="msg_mf_notation_pin">添加PIN注释数据包</string>
   <string name="msg_mf_passphrase">正在更改密钥环密码</string>
   <string name="msg_mf_pin">正在变更安全令牌PIN码</string>
   <string name="msg_mf_admin_pin">正在变更安全令牌管理员PIN码</string>
   <string name="msg_mf_passphrase_key">用新密码重新加密子密钥%s</string>
   <string name="msg_mf_passphrase_empty_retry">设置新密码失败，正在尝试旧的空密钥</string>
   <string name="msg_mf_passphrase_fail">无法更改子密钥的密码！(其密码与其他密钥不一致吗？)</string>
+  <string name="msg_mf_primary_replace_old">替换先前主用户标识的认证</string>
   <string name="msg_mf_primary_new">正在为新的主用户标识表示生成新的证书</string>
   <string name="msg_mf_restricted_mode">正在切换到受限操作模式</string>
   <string name="msg_mf_subkey_change">正在修改子密钥 %s</string>
@@ -1001,6 +1012,8 @@
   <string name="msg_con_save_public">正在保存公钥密钥环</string>
   <string name="msg_con_db_clear">正在清空数据库</string>
   <string name="msg_con_success">成功整理数据库</string>
+  <string name="msg_con_critical_in">进入关键阶段</string>
+  <string name="msg_con_critical_out">离开关键阶段</string>
   <string name="msg_con_delete_public">正在删除公钥密钥环缓存</string>
   <string name="msg_con_delete_secret">正在删除私钥密钥环缓存</string>
   <string name="msg_con_error_db">打开数据库时出错！</string>
@@ -1009,6 +1022,8 @@
   <string name="msg_con_error_public">重新导入公共密钥时出错</string>
   <string name="msg_con_error_secret">重新导入私有密钥时出错</string>
   <string name="msg_con_recover">正在恢复合并</string>
+  <string name="msg_con_recursive">跳过递归合并</string>
+  <string name="msg_con_recover_unknown">从未知状态恢复合并过程</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="other">正在重新导入 %d 个公钥</item>
   </plurals>
@@ -1028,15 +1043,21 @@
   <string name="msg_ed_fetching">正在提取待修改的密钥（%s）</string>
   <string name="msg_ed_success">密钥操作成功</string>
   <!--Promote key-->
+  <string name="msg_pr">将公钥提升为私钥</string>
   <string name="msg_pr_all">升级所有的子密钥</string>
   <string name="msg_pr_error_key_not_found">未找到密钥</string>
   <string name="msg_pr_fetching">正在提取待修改的密钥（%s）</string>
   <string name="msg_pr_subkey_match">升级密钥：%s</string>
+  <string name="msg_pr_subkey_nomatch">子密钥不在安全令牌中: %s</string>
   <string name="msg_pr_success">密钥成功升级</string>
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_dummy">主密钥已剥离时无法编辑密钥环！</string>
   <string name="msg_ek_error_not_found">未找到密钥</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_askip_bad_flags">不是加密密钥，跳过...</string>
+  <string name="msg_dc_askip_unavailable">密钥不可用，跳过...</string>
+  <string name="msg_dc_askip_no_key">数据加密密钥未知，跳过…</string>
+  <string name="msg_dc_askip_not_allowed">数据使用不被允许的密钥加密，跳过...</string>
   <string name="msg_dc_asym">找到用 %s 密钥非对称加密的数据</string>
   <string name="msg_dc_charset">找到 charset 头部：\'%s\'</string>
   <string name="msg_dc_backup_version">找到 backupVersion 头部：\'%s\'</string>
@@ -1050,6 +1071,7 @@
   <string name="msg_dc_clear_signature_bad">指纹检验异常！</string>
   <string name="msg_dc_clear_signature_check">正在检验签名数据</string>
   <string name="msg_dc_clear_signature_ok">签名检验正常</string>
+  <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>
@@ -1071,12 +1093,23 @@
   <string name="msg_dc_pending_passphrase">需要密码，请求用户输入…</string>
   <string name="msg_dc_prep_streams">正在准备解密用的数据流</string>
   <string name="msg_dc">正在开始解密操作...</string>
+  <string name="msg_dc_sym_skip">不允许对称数据，跳过...</string>
   <string name="msg_dc_sym">找到对称加密的数据</string>
+  <string name="msg_dc_trail_asym">找到由密钥 %s 后切非对称加密的数据</string>
+  <string name="msg_dc_trail_sym">找到后切对称加密数据</string>
+  <string name="msg_dc_trail_unknown">找到未知类型的后切数据</string>
   <string name="msg_dc_unlocking">正在解密私钥</string>
+  <string name="msg_dc_insecure_encryption_key">使用了不安全的加密密钥！这可能由于密钥过旧，或源自一次攻击。</string>
+  <string name="msg_dc_insecure_symmetric_encryption_algo">使用了不安全的加密算法！这可能由于使用了过时的程序，或源自一次攻击。</string>
+  <string name="msg_dc_insecure_hash_algo">使用了不安全的哈希算法！这可能由于使用了过时的程序，或源自一次攻击。</string>
+  <string name="msg_dc_insecure_mdc_missing">丢失篡改检测码(MDC)数据！这可能由于使用的加密程序过时，或源自一次降级攻击。</string>
+  <string name="msg_dc_insecure_key">不安全的密钥：RSA/DSA/ElGamal 长度过短或ECC曲线/算法不安全！这可能由于使用了过时的程序，或源自一次攻击。</string>
   <!--Messages for VerifySignedLiteralData operation-->
   <string name="msg_vl">开始签名检查</string>
+  <string name="msg_vl_error_no_siglist">签名字面数据中没有签名列表！</string>
   <string name="msg_vl_error_wrong_key">消息没有用预期的密钥签名！</string>
   <string name="msg_vl_error_no_signature">缺失签名数据！</string>
+  <string name="msg_vl_error_missing_literal">签名字面数据中没有有效内容</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>
@@ -1110,14 +1143,28 @@
   <string name="msg_pse_key_unknown">没有找到加密的密钥：%s</string>
   <string name="msg_pse_key_warn">不可用于加密的密钥：%s</string>
   <string name="msg_pse_ok">签名/加密操作成功！</string>
+  <string name="msg_pse_pending_nfc">需要 NFC 令牌，请求用户输入…</string>
+  <string name="msg_pse_pending_passphrase">需要密码，请求用户输入…</string>
+  <string name="msg_pse_signing">数据签名中 (不加密)</string>
+  <string name="msg_pse_signing_cleartext">正在创建明文签名</string>
+  <string name="msg_pse_signing_detached">创建分离签名</string>
+  <string name="msg_pse_sigcrypting">加密并签名数据</string>
   <string name="msg_pse">开始签名/加密操作</string>
   <string name="msg_pse_symmetric">正在准备对称加密</string>
   <string name="msg_crt_certifying">正在生成证书</string>
+  <plurals name="msg_crt_certify_uids">
+    <item quantity="other">正在认证密钥 %2$s 的 %1$d 个用户标识。</item>
+  </plurals>
+  <plurals name="msg_crt_certify_uats">
+    <item quantity="other">正在认证密钥 %2$s 的 %1$d 个用户属性。</item>
+  </plurals>
+  <string name="msg_crt_error_self">无法发出这样的自认证！</string>
   <string name="msg_crt_error_master_not_found">未找到主密钥！</string>
   <string name="msg_crt_error_nothing">没有密钥被签名</string>
   <string name="msg_crt_error_unlock">解锁主密钥时出错！</string>
   <string name="msg_crt">正在为密钥环签名...</string>
   <string name="msg_crt_master_fetch">正在获取认证方的主密钥</string>
+  <string name="msg_crt_nfc_return">返回到 NFC 屏幕</string>
   <string name="msg_crt_save">正在保存验证后的密钥 %s</string>
   <string name="msg_crt_saving">保存密钥环中....</string>
   <string name="msg_crt_unlock">正在解锁主密钥</string>
@@ -1130,6 +1177,7 @@
   <plurals name="msg_import">
     <item quantity="other">正在导入 %d 个密钥</item>
   </plurals>
+  <string name="msg_import_fetch_error_decode">取回的密钥环解码错误！</string>
   <string name="msg_import_fetch_error">无法获取密钥！（网络问题？）</string>
   <string name="msg_import_fetch_error_keyserver">无法从密钥服务器下载密钥：%s</string>
   <string name="msg_import_fetch_error_keyserver_secret">无法从密钥服务器导入私钥！</string>
@@ -1158,6 +1206,7 @@
   <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_key">处理密钥数据时出错！</string>
   <string name="msg_upload_error_not_found">未找到密钥</string>
@@ -1168,7 +1217,9 @@
   <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>
+  <string name="msg_del_consolidate">删除私钥后合并数据库</string>
   <plurals name="msg_del_ok">
     <item quantity="other">成功删除 %d 个密钥</item>
   </plurals>
@@ -1176,24 +1227,73 @@
     <item quantity="other">不能成功删除%d个密钥 </item>
   </plurals>
   <string name="msg_revoke_error_empty">无物可吊销！</string>
+  <string name="msg_revoke_error_not_found">找不到可以吊销的密钥！</string>
+  <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>
+  <string name="msg_bench_dec_time">解密时间: %ss</string>
+  <string name="msg_bench_dec_time_avg">5MB 解密平均时间: %ss</string>
+  <string name="msg_bench_s2k_100ms_its">100ms S2K迭代次数: %s</string>
+  <string name="msg_bench_s2k_for_it">%1$s 次 SHA1 S2K 操作耗时: %2$sms</string>
+  <string name="msg_bench_success">性能测试完成！</string>
   <string name="msg_data">正在输入数据</string>
+  <string name="msg_data_openpgp">正在尝试处理 OpenPGP 数据</string>
+  <string name="msg_data_detached">发现分离的签名</string>
+  <string name="msg_data_detached_clear">清除早前未签名的数据！</string>
+  <string name="msg_data_detached_sig">处理分离签名</string>
+  <string name="msg_data_detached_raw">处理签名数据</string>
+  <string name="msg_data_detached_nested">跳过嵌套的签名数据！</string>
+  <string name="msg_data_detached_trailing">跳过签名部分之后的后切数据！</string>
+  <string name="msg_data_detached_unsupported">分享签名的类型不被支持！</string>
+  <string name="msg_data_error_io">读取输入数据时出错！</string>
   <string name="msg_data_mime_bad">无法作为 MIME 数据解析</string>
   <string name="msg_data_mime_filename">Filename: \'%s\'</string>
   <string name="msg_data_mime_from_extension">从扩展名猜测 MIME 类型</string>
   <string name="msg_data_mime_length">Content-Length: %s</string>
+  <string name="msg_data_mime_charset">字符集: \'%s\'</string>
+  <string name="msg_data_mime_charset_faulty">字符集 \'%s\' 解码失败！</string>
+  <string name="msg_data_mime_charset_guess">字符集似乎是 \'%s\'</string>
+  <string name="msg_data_mime_charset_unknown">字符集未知，或数据不是文本。</string>
   <string name="msg_data_mime">解析 MIME 数据结构</string>
+  <string name="msg_data_mime_ok">已完成解析</string>
   <string name="msg_data_mime_none">没有找到 MIME 结构</string>
   <string name="msg_data_mime_part">正在处理 MIME 部分</string>
+  <string name="msg_data_mime_type">Content-Type: %s</string>
   <string name="msg_data_ok">数据处理成功</string>
   <string name="msg_data_skip_mime">跳过 MIME 解析</string>
+  <string name="msg_acc_saved">帐户已保存</string>
   <string name="msg_get_success">下载成功！</string>
+  <string name="msg_get_file_not_found">没有找到输入文件！</string>
+  <string name="msg_get_no_valid_keys">文件/剪贴板里没有密钥！</string>
+  <string name="msg_get_too_many_responses">密钥搜索返回太多符合条件的结果。请优化您的关键词！</string>
+  <string name="msg_get_query_too_short">搜索条件过短。请优化您的关键词！</string>
+  <string name="msg_get_query_too_short_or_too_many_responses">没有找到或找到过多结果。请优化您的关键词！</string>
+  <string name="msg_download_query_failed">搜索密钥时出错。</string>
   <!--Messages for Keybase Verification operation-->
+  <string name="msg_keybase_verification">尝试使用 keybase 验证密钥 %s</string>
+  <string name="msg_keybase_error_no_prover">没有找到 %s 的证明检查</string>
   <string name="msg_keybase_error_fetching_evidence">获取证明出现问题</string>
   <string name="msg_keybase_error_key_mismatch">证明内容与该密钥指纹不匹配</string>
   <string name="msg_keybase_error_dns_fail">取回 DNS 的 TXT 记录失败</string>
@@ -1212,7 +1312,10 @@
   <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-->
   <string name="first_time_text1">用OpenKeychain重新找回您的隐私！</string>
   <string name="first_time_create_key">创建密钥</string>
@@ -1231,8 +1334,13 @@
   <string name="section_certifier_id">认证人</string>
   <string name="section_cert">认证详情</string>
   <string name="label_user_id">用户标识</string>
+  <string name="unknown_uid"><![CDATA[<unknown>]]></string>
   <string name="empty_certs">该密钥的证书不存在</string>
   <string name="certs_text">此处仅显示自认证及被您的密钥所验证的凭证。</string>
+  <string name="section_uids_to_certify">用户标识</string>
+  <string name="certify_text">您正在导入的密钥包含了“用户标识”：姓名和邮件地址。选择那些完全符合您预期的以确认这些信息。</string>
+  <string name="certify_fingerprint_text">请逐字比对这里的短语和同伴设备上显示的的指纹。</string>
+  <string name="certify_fingerprint_text_phrases">请比对这里的短语和同伴设备上显示的的短语。</string>
   <string name="label_revocation">吊销原因</string>
   <string name="label_cert_type">输入</string>
   <string name="error_key_not_found">未找到密钥</string>
@@ -1245,15 +1353,25 @@
   <string name="title_view_cert">查看认证详情</string>
   <string name="unknown_algorithm">未知</string>
   <string name="can_sign_not">无法签署</string>
+  <string name="error_no_encrypt_subkey">没有加密子密钥！</string>
   <string name="contact_show_key">显示密钥 (%s)</string>
   <string name="swipe_to_update">向下滑动从密钥服务器更新</string>
   <string name="error_no_file_selected">至少选择一个待加密的文件！</string>
+  <string name="error_multi_files">由于 Android 系统限制，不支持保存多个文件。</string>
+  <string name="error_multi_clipboard">不支持加密多个文件到剪贴板。</string>
+  <string name="error_detached_signature">不支持对二进制文件只签名而不加密，请至少选择一个加密密钥。</string>
   <string name="error_empty_text">输入待加密文本!</string>
+  <string name="error_log_share_internal">初始化日志时发生内部错误！</string>
   <string name="key_colon">密钥：</string>
   <string name="exchange_description">在开始密钥交换之前，在右侧指定参与者的数量，然后点击“开始交换”按钮。\n\n您将被要求回答两个问题以确认由正确的参与者参与交换过程，并且他们的指纹是正确的。</string>
   <string name="btn_start_exchange">开始交换</string>
   <string name="user_id_none"><![CDATA[<none>]]></string>
   <!--Android Account-->
+  <string name="account_no_manual_account_creation">不能手动创建 OpenKeychain 账户。</string>
+  <string name="account_privacy_title">隐私</string>
+  <string name="account_privacy_text">OpenKeychain 并不与互联网同步您的联系人数据。它仅通过姓名和邮件地址的匹配关联联系人和密钥。这是线下完成的。</string>
+  <string name="sync_notification_permission_required_title">需要访问联系人的权限</string>
+  <string name="sync_notification_permission_required_text">点击以配置关联到联系人</string>
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
   <string name="title_unlock_method">选择一个解锁方法</string>
@@ -1266,9 +1384,15 @@
   <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">NFC 标签不匹配，请重试。</string>
   <string name="enable_nfc">请在设置中激活 NFC</string>
   <string name="no_nfc_support">该设备不支持 NFC</string>
   <string name="nfc_write_successful">已成功写入 NFC 标签</string>
@@ -1279,6 +1403,7 @@
   <string name="button_bind_key">绑定密钥</string>
   <string name="security_token_serial_no">序列号： %s</string>
   <string name="security_token_key_holder">密钥持有人： %s</string>
+  <string name="security_token_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
   <string name="security_token_status_bound">安全信息匹配并且已绑定到密钥</string>
   <string name="security_token_status_unbound">安全信息匹配并且可绑定到密钥</string>
   <string name="security_token_status_partly">安全信息匹配并且已部分绑定到密钥</string>
@@ -1297,9 +1422,12 @@
   <string name="security_token_error_terminated">安全令牌处于停用状态。</string>
   <string name="security_token_error_wrong_length">输入的PIN码过短。至少6位长度。</string>
   <string name="security_token_error_conditions_not_satisfied">使用条件不满足。</string>
+  <string name="security_token_error_security_not_satisfied">安全状态不满足。</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>
   <string name="security_token_error_bad_data">安全令牌报告了无效的数据。</string>
+  <string name="security_token_error_chaining_error">安全令牌在等待最后一个命令。</string>
   <string name="security_token_error_header">安全令牌报告了无效的 %s 字节。</string>
   <string name="security_token_error_tag_lost">安全信息被过早移除了。保持安全令牌在背面直到操作完成。</string>
   <string name="security_token_error_iso_dep_not_supported">标签不支持 ISO-DEP (ISO 14443-4)</string>
@@ -1315,6 +1443,7 @@
   <string name="error_empty_log">(错误，空日志)</string>
   <string name="error_reading_text">解密时无法读取输入！</string>
   <string name="error_reading_aosp">读取数据失败，这是 Android 邮件客户端的一个错误 !（错误 #290）</string>
+  <string name="error_reading_k9">收到不完整数据，尝试在 K-9 Mail 中点击 “下载完整消息”！</string>
   <string name="filename_unknown">未知文件名(触摸打开)</string>
   <string name="filename_unknown_text">文本(触摸显示)</string>
   <string name="filename_keys">密钥备份(触摸导出)</string>
@@ -1331,27 +1460,51 @@
   <string name="file_delete_exception">无法删除原始文件！</string>
   <string name="error_clipboard_empty">剪贴板为空！</string>
   <string name="error_clipboard_copy">复制到剪贴板时出现错误！</string>
+  <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_3">一旦以 &lt;b&gt;@%s&lt;/b&gt; 身份完成发布，点击验证按钮开始在您的时间线中查找这条消息。</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_id_github_text">此 Gist 确认了我的 OpenPGP 密钥的关联用户标识，并将其连接到该 GitHub 账号。\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="section_linked_identities">关联用户标识</string>
   <string name="btn_finish">完成</string>
   <string name="linked_title_https">网站 (HTTPS)</string>
   <string name="linked_title_dns">域名(DNS)</string>
@@ -1402,7 +1555,7 @@
   <string name="toast_wrong_mimetype">错误的数据类型，文本是预设值</string>
   <string name="toast_no_text">分享数据中没有文本！</string>
   <string name="menu_uids_save">保存</string>
-  <string name="title_edit_identities">编辑身份</string>
+  <string name="title_edit_identities">编辑用户标识</string>
   <string name="title_edit_subkeys">编辑子密钥</string>
   <string name="btn_search_for_query">查找\n\'%s\'</string>
   <string name="cache_ttl_lock_screen">直到锁屏</string>