Pull from Transifex

2017-08-28 17:12:11 +02:00 · 2017-08-28 17:12:11 +02:00 · c418f7d899
parent 7070678d2e
commit c418f7d899
21 changed files with 684 additions and 80 deletions
--- a/OpenKeychain/src/main/res/raw-ar/advanced.md
+++ b/OpenKeychain/src/main/res/raw-ar/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!
--- a/OpenKeychain/src/main/res/raw-ar/help_about.md
+++ b/OpenKeychain/src/main/res/raw-ar/help_about.md
@ -0,0 +1,80 @@
+[//]: # (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
+  * Andrea Torlaschi
+  * Arnaud Fontaine
+  * Ash Hughes
+  * 'mar-v-in'
+  * Nikita Mikhailov
+  * 'Thialfihar' (APG developer)
+  * Tim Bray
+  * Tobias Erthal
+
+## Occasional Contributors
+  * Alex Fong Jie Wen
+  * Andrea Torlaschi
+  * 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
+  * Michal Kepkowski
+  * Miroojin Bakshi
+  * Morgan Gangwere
+  * Nikhil Peter Raj
+  * Paul Sarbinowski
+  * Petter Arvidsson
+  * '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)
--- a/OpenKeychain/src/main/res/raw-ar/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-ar/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 using the key exchange method available for your keys.
+
+## Key Status
+
+<img src="status_signature_verified_cutout_24dp"/>  
+Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.  
+<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.
--- a/OpenKeychain/src/main/res/raw-ar/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ar/help_changelog.md
@ -0,0 +1,360 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+
+## 4.5
+  * Detailed description for security problems
+  * Display keyserver status per key
+  * Support for EdDSA
+  * Fix pgp.mit.edu (new certificate)
+
+## 4.4
+  * New key status displays detailed information why a key is considered insecure or defective
+
+
+## 4.3
+  * Better support for large keys
+  * Fix import of Gpg4win files with broken encodings
+
+
+## 4.2
+
+  * Experimental support for Elliptic Curve Encryption with Security Tokens
+  * Redesigned key import screen
+  * Design improvements to key lists
+  * Support for keyserver onion addresses
+
+
+## 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
--- a/OpenKeychain/src/main/res/raw-ar/help_start.md
+++ b/OpenKeychain/src/main/res/raw-ar/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/).
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.md
@ -1,9 +1,9 @@
 [//]: # (Beachte: Bitte schreibe jeden Satz in eine eigene Zeile, Transifex wird jede Zeile in ein eigenes Übesetzungsfeld setzen!)

 ## 4.5
-  * Detailed description for security problems
+  * Detaillierte Beschreibung von Sicherheits-Problemen
  * Display keyserver status per key
-  * Support for EdDSA
+  * Unterstützung von EdDSA
  * Fix pgp.mit.edu (new certificate)

 ## 4.4
@ -11,7 +11,7 @@


 ## 4.3
-  * Better support for large keys
+  * Bessere Unterstützung von längeren Schlüsseln
  * Fix import of Gpg4win files with broken encodings


--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.md
@ -1,10 +1,10 @@
 [//]: # (NOTE : veuillez mettre chaque phrase sur sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)

 ## 4.5
-  * Detailed description for security problems
-  * Display keyserver status per key
-  * Support for EdDSA
-  * Fix pgp.mit.edu (new certificate)
+  * Description détaillée des problèmes de sécurité
+  * Affiche l'état du serveur de clés par clé
+  * Prise en charge d'EdDSA
+  * Correctif - pgp.mit.edu (nouveau certificat)

 ## 4.4
  *  Le nouvel état des clé affiche en détail pourquoi une clef est considérée comme non fiable ou défectueuse
@ -71,7 +71,7 @@

  * révocation de la clé lors de la suppression de la clé
  * Vérifications améliorées à la recherche d'une cryptographie non fiable
-  * Correctif : ne pas fermer OpenKeychain après une réussite de l'assistant de première utilisation
+  * Correctif - Ne pas fermer OpenKeychain après une réussite de l'assistant de première utilisation
  * API : version 8


--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
@ -1,10 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)

 ## 4.5
-  * Detailed description for security problems
-  * Display keyserver status per key
-  * Support for EdDSA
-  * Fix pgp.mit.edu (new certificate)
+  * セキュリティ問題の詳細な説明
+  * 鍵ごとに鍵サーバの状態を表示
+  * EdDSA のサポート
+  * pgp.mit.edu の修正 (新しい証明書)

 ## 4.4
  * 新しい鍵ステータスに、キーが安全でないとみなされる理由の詳細情報を表示
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.md
@ -1,10 +1,10 @@
 [//]: # (Ter info: Zet iedere zin op een eigen regel, Transifex zet iedere regel in zijn eigen vertalingsveld!)

 ## 4.5
-  * Detailed description for security problems
-  * Display keyserver status per key
-  * Support for EdDSA
-  * Fix pgp.mit.edu (new certificate)
+  * Gedetailleerde beschrijving voor beveiligingsproblemen
+  * Weergeven van sleutelstatus per sleutel
+  * Ondersteuning voor EdDSA
+  * Oplossing voor pgp.mit.edu (nieuw certificaat)

 ## 4.4
  * Nieuw overzicht met gedetailleerde informatie over sleutelstatus, waarom een sleutel beschouwd wordt als onveilig of defect
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.md
@ -1,10 +1,10 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)

 ## 4.5
-  * Detailed description for security problems
-  * Display keyserver status per key
-  * Support for EdDSA
-  * Fix pgp.mit.edu (new certificate)
+  * Детальное описание проблем безопасности
+  * Отображение статуса сервера для каждого ключа
+  * Поддержка EdDSA
+  * Исправлен pgp.mit.edu (новый сертификат)

 ## 4.4
  * Новый статус ключа отображает подробную информацию о том, почему ключ признан небезопасным или дефектным
--- a/OpenKeychain/src/main/res/raw-sv/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sv/help_changelog.md
@ -3,7 +3,7 @@
 ## 4.5
  * Detailed description for security problems
  * Display keyserver status per key
-  * Support for EdDSA
+  * Stöd för EdDSA
  * Fix pgp.mit.edu (new certificate)

 ## 4.4
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.md
@ -1,10 +1,10 @@
 [//]: # (Увага: Будь ласка розміщуйте кожне речення у окремому рядку, Transifex розмістить кожен рядок у відповідному полі для перекладу!)

 ## 4.5
-  * Detailed description for security problems
-  * Display keyserver status per key
-  * Support for EdDSA
-  * Fix pgp.mit.edu (new certificate)
+  * Детальний опис для проблем безпеки
+  * Відображення стану сервера ключів за ключами
+  * Підтримка для EdDSA
+  * Виправлено pgp.mit.edu (новий сертифікат)

 ## 4.4
  * Новий статус ключа відображає інформацію, чому ключ вважається незахищеним чи дефектним
--- a/OpenKeychain/src/main/res/values-ar/strings.xml
+++ b/OpenKeychain/src/main/res/values-ar/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 preceding 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-->
+  <!--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-->
+  <!--Add/Edit SmartPGP authority-->
+  <!--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>
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@ -524,6 +524,7 @@
    <item quantity="one">Import eines Schlüssels fehlgeschlagen!</item>
    <item quantity="other">Import von %d Schlüsseln fehlgeschlagen!</item>
  </plurals>
+  <string name="import_warn_missing">Schlüssel auf Schlüsselserver nicht gefunden.</string>
  <string name="import_error_nothing">Nichts zu importieren.</string>
  <string name="import_error_nothing_cancelled">Import wurde abgebrochen.</string>
  <!--Delete result toast-->
@ -583,7 +584,6 @@
  <string name="api_settings_allowed_keys">Erlaubte Schlüssel</string>
  <string name="api_settings_settings">Einstellungen</string>
  <string name="api_register_title">Zugriff auf OpenKeyChain erlauben?</string>
-  <string name="api_register_text">%s erbittet OpenKeychain als Krypto-Anbieter zu verwenden. Sie werden immer noch um die Erlaubnis gebeten, bevor die App einen beliebigen Schlüssel zur Entschlüsselung verwenden kann. \ N \ nSie können den Zugriff später im Bildschirm \"Apps\" widerrufen.</string>
  <string name="api_register_allow">Zugriff erlauben</string>
  <string name="api_register_disallow">Zugriff verbieten</string>
  <string name="api_register_error_select_key">Bitte einen Schlüssel auswählen!</string>
@ -1107,6 +1107,7 @@
  <string name="msg_dc_clear_meta_file">Dateiname: %s</string>
  <string name="msg_dc_clear_meta_mime">MIME-Typ: %s</string>
  <string name="msg_dc_clear_meta_size">Dateigröße: %s</string>
+  <string name="msg_dc_clear_meta_size_unknown">Dateigröße: unbekannt</string>
  <string name="msg_dc_clear_meta_time">Änderungszeit: %s</string>
  <string name="msg_dc_clear_signature_bad">Signaturprüfung NICHT in Ordnung!</string>
  <string name="msg_dc_clear_signature_check">Signaturdaten werden verifiziert</string>
@ -1221,6 +1222,7 @@
  </plurals>
  <string name="msg_import_fetch_error_decode">Fehler beim Dekodieren des abgerufenen Schlüsselbundes!</string>
  <string name="msg_import_fetch_error">Schlüssel konnte nicht abgerufen werden! (Netzwerkprobleme?)</string>
+  <string name="msg_import_fetch_error_not_found">Schlüssel nicht gefunden!</string>
  <string name="msg_import_fetch_error_keyserver">Schlüssel konnte nicht vom Schlüsselserver abgerufen werden: %s</string>
  <string name="msg_import_fetch_error_keyserver_secret">Konnte Schlüssel nicht von Keyserver importieren!</string>
  <string name="msg_import_fetch_keybase">Von Keybase.io wird abgerufen: %s</string>
@ -1635,4 +1637,12 @@
    <item>50 Euro</item>
    <item>100 Euro</item>
  </string-array>
+  <string name="cap_title_confirm">Andere Schlüssel bestätigen</string>
+  <string name="cap_cert_ok">Dieser Schlüssel kann andere Schlüssel bestätigen.</string>
+  <string name="cap_title_decrypt">Nachrichten entschlüsseln</string>
+  <string name="key_health_expired_title">Abgelaufen</string>
+  <string name="key_health_insecure_title">Unsicher</string>
+  <string name="keyserver_title_unknown">Schlüsselserver Status: unbekannt</string>
+  <string name="keyserver_last_updated">Zuletzt geprüft: %s</string>
+  <string name="keyserver_last_updated_never">Zuletzt geprüft: Nie</string>
 </resources>
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@ -595,7 +595,6 @@
  <string name="api_settings_allowed_keys">Claves permitidas</string>
  <string name="api_settings_settings">Configuración</string>
  <string name="api_register_title">¿Permitir el acceso a OpenKeychain?</string>
-  <string name="api_register_text">%s solicita usar OpenKeychain como proveedor de criptografía. Todavía se le pedirá permiso antes de que la aplicación pueda usar cualquiera de sus claves para descifrado.\n\nMás tarde puede revocar el acceso en la pantalla \'Aplicaciones\'.</string>
  <string name="api_register_allow">Permitir el acceso</string>
  <string name="api_register_disallow">Denegar el acceso</string>
  <string name="api_register_error_select_key">¡Por favor, selecciona una clave!</string>
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@ -595,7 +595,6 @@
  <string name="api_settings_allowed_keys">clés autorisées</string>
  <string name="api_settings_settings">Paramètres</string>
  <string name="api_register_title">Autoriser l\'accès à OpenKeychain ?</string>
-  <string name="api_register_text">%s demande d\'utiliser OpenKeychain comme fournisseur de cryptographie. Une autorisation vous sera encore demandée avant que l\'appli puisse utiliser l\'une de vos clés pour le déchiffrement.\n\nVous pourrez révoquer l\'accès ultérieurement dans l\'écran « Applis ».</string>
  <string name="api_register_allow">Autoriser l\'accès</string>
  <string name="api_register_disallow">Refuser l\'accès</string>
  <string name="api_register_error_select_key">Veuillez choisir une clé !</string>
@ -1709,6 +1708,11 @@
  <string name="key_health_stripped_subtitle">Cliquer pour plus de détails</string>
  <string name="key_health_partial_stripped_title">Saine (partiellement dépouillée)</string>
  <string name="key_health_partial_stripped_subtitle">Cliquer pour plus de détails</string>
+  <string name="keyserver_title_published">Publiée</string>
+  <string name="keyserver_title_not_published">Non publiée</string>
+  <string name="keyserver_title_unknown">État du serveur de clés : inconnu</string>
+  <string name="keyserver_last_updated">Dernière vérification : %s</string>
+  <string name="keyserver_last_updated_never">Dernière vérification : jamais</string>
  <string name="key_insecure_bitstrength_2048_problem">Cette clé utilise l\'algorithme <b>%1$s</b> avec une robustesse de <b>%2$s bits</b>. Une clé sécurisée devrait avoir une robustesse de 2048 bits.</string>
  <string name="key_insecure_bitstrength_2048_solution">Cette clé ne peut pas être mise à niveau. Pour des communications sécurisées, le propriétaire doit générer une nouvelle clé.</string>
  <string name="key_insecure_unknown_curve_problem">Cette clé utilise l\'algorithme <b>%1$s</b> qui ne fait pas partie de la liste blanche.</string>
@ -1740,4 +1744,5 @@
  <string name="dialog_insecure_button_undo">Rétablir</string>
  <string name="dialog_insecure_button_view_key">Visualiser la clé</string>
  <string name="dialog_insecure_button_ok">Compris</string>
+  <string name="identity_context_forget">Oublier</string>
 </resources>
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@ -581,7 +581,7 @@
  <string name="api_settings_allowed_keys">受け入れる鍵</string>
  <string name="api_settings_settings">設定</string>
  <string name="api_register_title">OpenKeychainへのアクセスを許可しますか?</string>
-  <string name="api_register_text">%s が暗号化プロバイダーとしてOpenKeyChainの使用を要求しています。また、復号化のカギを使用する前にもアクセス許可を尋ねられます。\n\n後で\'アプリ\'画面でアクセスを取り消すことができます。</string>
+  <string name="api_register_text">%s が暗号化プロバイダーとしてOpenKeyChainの使用を要求しています。また、復号化のカギを使用する前にもアクセス許可を尋ねられます。\n\n後でOpenKeychainの\'アプリ\'画面からアクセスを取り消すことができます。</string>
  <string name="api_register_allow">許可されたアクセス</string>
  <string name="api_register_disallow">許可されないアクセス</string>
  <string name="api_register_error_select_key">鍵を選択してください!</string>
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@ -595,7 +595,6 @@
  <string name="api_settings_allowed_keys">Toegestane sleutels</string>
  <string name="api_settings_settings">Instellingen</string>
  <string name="api_register_title">Toegang tot OpenKeychain toestaan?</string>
-  <string name="api_register_text">%s vraagt om OpenKeychain als versleutelingsprovider te gebruiken. Je zal nog steeds toestemming gevraagd worden vooraleer de app je sleutels kan gebruiken voor ontsleuteling.\n\nJe kan later de toestemming weer intrekken via het scherm \'Apps\'.</string>
  <string name="api_register_allow">Toegang toestaan</string>
  <string name="api_register_disallow">Toegang weigeren</string>
  <string name="api_register_error_select_key">Selecteert u a.u.b. een sleutel</string>
@ -1745,4 +1744,5 @@
  <string name="dialog_insecure_button_undo">Onderdrukking opheffen</string>
  <string name="dialog_insecure_button_view_key">Sleutel bekijken</string>
  <string name="dialog_insecure_button_ok">Begrepen</string>
+  <string name="identity_context_forget">Vergeten</string>
 </resources>
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@ -103,9 +103,9 @@
  <string name="btn_saved">Сохранено!</string>
  <string name="btn_not_matching">Не совпадают</string>
  <!--Content Description-->
-  <string name="cd_encrypt_files">Шифровать файлы</string>
+  <string name="cd_encrypt_files">Зашифровать файлы</string>
  <string name="cd_exchange_keys">Обмен ключами</string>
-  <string name="cd_encrypt_text">Шифровать текст</string>
+  <string name="cd_encrypt_text">Зашифровать текст</string>
  <string name="cd_share_nfc">Отправить через NFC</string>
  <!--menu-->
  <string name="menu_preferences">Настройки</string>
@ -297,7 +297,7 @@
  <string name="ecc_eddsa_description_html">маленький размер файла, считается безопасным и после 2040 года &lt;br/&gt; &lt;u&gt;экспериментально и поддерживается не всеми реализациями&lt;/u&gt;</string>
  <string name="usage_none">Нет (только привязка доп. ключа)</string>
  <string name="usage_sign">Подписать</string>
-  <string name="usage_encrypt">Шифровать</string>
+  <string name="usage_encrypt">Зашифровать</string>
  <string name="usage_sign_and_encrypt">Подписать и зашифровать</string>
  <string name="error">Ошибка</string>
  <string name="error_message">Ошибка: %s</string>
@ -330,7 +330,7 @@
  <string name="select_encryption_key">Укажите хотя бы один ключ.</string>
  <string name="error_no_encryption_or_signature_key">Выберите хотя бы один ключ для шифрования или подписи.</string>
  <string name="specify_file_to_encrypt_to">Пожалуйста, укажите, в какой файл произвести шифрование.\nВНИМАНИЕ: Файл будет перезаписан, если он уже существует!</string>
-  <string name="specify_file_to_decrypt_to">Пожалуйста, укажите, в какой файл произвести расшифровку.\nВНИМАНИЕ: Файл будет перезаписан, если он уже существует!</string>
+  <string name="specify_file_to_decrypt_to">Пожалуйста, укажите, в какой файл произвести расшифрование.\nВНИМАНИЕ: Файл будет перезаписан, если он уже существует!</string>
  <string name="specify_backup_dest">Будет произведено резервное копирование без ваших ключей , просьба указать файл назначения.\nВНИМАНИЕ! Файл будет перезаписан, если он существует!</string>
  <string name="specify_backup_dest_single">Этот ключ будет опубликован, пожалуйста, укажите файл назначения.\nВНИМАНИЕ! Файл будет переписан, если он существует!</string>
  <string name="specify_backup_dest_secret_single">Будет произведено полное резервное копирование ваших ключей, просьба указать файл назначения.\nВНИМАНИЕ! Файл будет переписан, если он существует!</string>
@ -451,7 +451,7 @@
  <string name="progress_extracting_key">извлечение ключа...</string>
  <string name="progress_preparing_streams">подготовка к передаче...</string>
  <string name="progress_encrypting">шифрование данных...</string>
-  <string name="progress_prepare_decryption">Начало расшифровки...</string>
+  <string name="progress_prepare_decryption">Начало расшифрования..</string>
  <string name="progress_decrypting">Расшифровка данных...</string>
  <string name="progress_preparing_signature">подготовка подписи...</string>
  <string name="progress_processing_signature">обработка подписи...</string>
@ -632,7 +632,6 @@
  <string name="api_settings_allowed_keys">Разрешённые ключи</string>
  <string name="api_settings_settings">Настройки</string>
  <string name="api_register_title">Разрешить доступ к OpenKeychain?</string>
-  <string name="api_register_text">%s запрашивает доступ к OpenKeychain в качестве криптопровайдера. Вы будете получать запрос на разрешение, прежде чем приложение сможет использовать ваши ключи для расшифровки.\n\nВы сможете отменить доступ позже в меню \'Приложения\'.</string>
  <string name="api_register_allow">Разрешить доступ</string>
  <string name="api_register_disallow">Запретить доступ</string>
  <string name="api_register_error_select_key">Пожалуйста, выберите ключ!</string>
@ -1113,7 +1112,7 @@
  <string name="msg_con_save_secret">Сохранение секретной связки ключей</string>
  <string name="msg_con_save_public">Сохранение публичной связки ключей</string>
  <string name="msg_con_db_clear">Очистка базы данных</string>
-  <string name="msg_con_success">Успешно консолидированная база данных</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>
@ -1252,7 +1251,7 @@
  <string name="msg_pse_key_ok">Шифрование для ключа: %s</string>
  <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_ok">Подпись/шифрование успешно произведены!</string>
  <string name="msg_pse_pending_nfc">Требуется NFC-токен, жду действий пользователя...</string>
  <string name="msg_pse_pending_passphrase">Требуется пароль, жду действий пользователя...</string>
  <string name="msg_pse_signing">Подписывание данных (без шифрования)</string>
@ -1383,10 +1382,10 @@
  <string name="msg_lv_fetch_error_format">Ошибка формата!</string>
  <string name="msg_lv_fetch_error_nothing">Ресурс не найден!</string>
  <string name="msg_bench">Анализ быстродействия некоторых операций…</string>
-  <string name="msg_bench_enc_time">Время шифрования: %ss</string>
-  <string name="msg_bench_enc_time_avg">Среднее время шифрования 5МБ: %ss</string>
-  <string name="msg_bench_dec_time">Время расшифрования: %ss</string>
-  <string name="msg_bench_dec_time_avg">Среднее время расшифрования 5МБ: %ss</string>
+  <string name="msg_bench_enc_time">Время шифрования: %s сек.</string>
+  <string name="msg_bench_enc_time_avg">Среднее время шифрования 5 Мб: %s сек.</string>
+  <string name="msg_bench_dec_time">Время расшифрования: %s сек.</string>
+  <string name="msg_bench_dec_time_avg">Среднее время расшифрования 5 Мб: %s сек.</string>
  <string name="msg_bench_s2k_100ms_its">Количество итераций S2K за 100 мс: %s</string>
  <string name="msg_bench_s2k_for_it">Время для %1$s SHA1 S2K итераций: %2$sms</string>
  <string name="msg_bench_success">Анализ быстродействия завершён!</string>
@ -1585,8 +1584,8 @@
  <string name="filename_unknown">Неизвестное имя файла (нажмите для открытия)</string>
  <string name="filename_unknown_text">Текст (нажмите для просмотра)</string>
  <string name="filename_keys">Резервный ключ (нажмите для импортирования)</string>
-  <string name="intent_show">Показать Подписанное/Зашифрованное содержимое</string>
-  <string name="intent_share">Отправить Подписанное/Зашифрованное содержимое</string>
+  <string name="intent_show">Показать подписанное/зашифрованное содержимое</string>
+  <string name="intent_share">Отправить подписанное/зашифрованное содержимое</string>
  <string name="view_internal">Смотреть в OpenKeychain</string>
  <string name="error_preparing_data">Ошибка подготовки данных!</string>
  <string name="label_clip_title">Зашифрованные данные</string>
@ -1782,6 +1781,11 @@
  <string name="key_health_stripped_subtitle">Щёлкните, чтобы узнать подробности</string>
  <string name="key_health_partial_stripped_title">Безопасный (частично отделённый)</string>
  <string name="key_health_partial_stripped_subtitle">Щёлкните, чтобы узнать подробности</string>
+  <string name="keyserver_title_published">Опубликован</string>
+  <string name="keyserver_title_not_published">Не опубликован</string>
+  <string name="keyserver_title_unknown">Статус сервера ключа: неизвестно</string>
+  <string name="keyserver_last_updated">Дата и время последней проверки: %s</string>
+  <string name="keyserver_last_updated_never">Дата и время последней проверки: никогда</string>
  <string name="key_insecure_bitstrength_2048_problem">Этот ключ использует алгоритм <b>%1$s</b> со стойкостью <b>%2$s бит</b>. Безопасный ключ должен иметь стойкость 2048 бит.</string>
  <string name="key_insecure_bitstrength_2048_solution">Этот ключ не может быть обновлён. Для безопасной связи владелец должен сгенерировтаь новый ключ.</string>
  <string name="key_insecure_unknown_curve_problem">Этот ключ использует алгоритм <b>%1$s</b>, которого нет в белом списке.</string>
@ -1813,4 +1817,5 @@
  <string name="dialog_insecure_button_undo">Раскрыть</string>
  <string name="dialog_insecure_button_view_key">Просмотреть ключ</string>
  <string name="dialog_insecure_button_ok">Понятно</string>
+  <string name="identity_context_forget">Забыть</string>
 </resources>
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@ -8,7 +8,7 @@
  <string name="title_encrypt_files">Kryptera</string>
  <string name="title_decrypt">Dekryptera</string>
  <string name="title_add_subkey">Lägg till undernyckel</string>
-  <string name="title_change_master_key">Ändra masternyckel</string>
+  <string name="title_change_master_key">Ändra huvudnyckel</string>
  <string name="title_edit_key">Redigera nyckel</string>
  <string name="title_linked_create">Skapa en länkad identitet</string>
  <string name="title_preferences">Inställningar</string>
@ -172,7 +172,7 @@
  <string name="label_verify_keyserver_connection">Pröva anslutning</string>
  <string name="label_only_trusted_keyserver">Endast betrodd nyckelserver</string>
  <string name="label_enter_keyserver_url">URL</string>
-  <string name="label_keyserver_dialog_delete">Radera nyckelserver</string>
+  <string name="label_keyserver_dialog_delete">Ta bort nyckelserver</string>
  <string name="label_theme">Tema</string>
  <string name="pref_keyserver">OpenPGP-nyckelservrar</string>
  <string name="pref_keyserver_summary">Sök nycklar på valda OpenPGP-nyckelservrar (HKP-protokollet)</string>
@ -183,7 +183,7 @@
  <string name="label_sync_settings_keyserver_title">Automatiska nyckel uppdateringar</string>
  <string name="label_sync_settings_keyserver_summary_on">Var tredje dag, uppdateras nycklar från den föredragna nyckelserver </string>
  <string name="label_sync_settings_keyserver_summary_off">Nycklar uppdateras inte automatiskt</string>
-  <string name="label_sync_settings_wifi_title">Synkronisera endast på Wifi</string>
+  <string name="label_sync_settings_wifi_title">Synkronisera endast över Wi-Fi</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>
@ -302,8 +302,8 @@
  <string name="key_creation_el_gamal_info">Obs: endast undernycklar har stöd för ElGamal.</string>
  <string name="key_not_found">Kunde inte hitta nyckeln %08X.</string>
  <plurals name="bad_keys_encountered">
-    <item quantity="one">%d dålig privat nyckel hoppades över. Du kanske exporterade med alternativet \n --export-secret-subkeys\nSe till att du exporterar med\n --export-secret-keys\nistället.\"</item>
-    <item quantity="other">%d dåliga privata nycklar hoppades över. Du kanske exporterade med alternativet \n --export-secret-subkeys\nSe till att du exporterar med\n --export-secret-keys\nistället.\"</item>
+    <item quantity="one">%d dålig hemlig nyckel hoppades över. Du kanske exporterade med alternativet \n --export-secret-subkeys\nSe till att du exporterar med\n --export-secret-keys\nistället.\"</item>
+    <item quantity="other">%d dåliga hemliga nycklar hoppades över. Du kanske exporterade med alternativet \n --export-secret-subkeys\nSe till att du exporterar med\n --export-secret-keys\nistället.\"</item>
  </plurals>
  <string name="list_empty">Den här listan är tom!</string>
  <string name="nfc_successful">Skickade nyckel med NFC Beam!</string>
@ -317,7 +317,7 @@
  <string name="error_file_delete_failed">har inte raderats. Radera dem manuellt!</string>
  <string name="error_file_added_already">%s har redan lagts till.</string>
  <string name="error_file_not_found">fil hittades inte</string>
-  <string name="error_no_secret_key_found">ingen passande privat nyckel hittades</string>
+  <string name="error_no_secret_key_found">ingen passande hemlig nyckel hittades</string>
  <string name="error_external_storage_not_ready">extern lagring inte redo</string>
  <string name="error_key_size_minimum512bit">nyckelstorlek måste vara åtminstone 512bit</string>
  <string name="error_unknown_algorithm_choice">okänt val av algoritm</string>
@ -328,7 +328,7 @@
  <string name="error_invalid_data">Inget giltigt krypterat eller signerat OpenPGP-innehåll!</string>
  <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>
+  <string name="error_could_not_extract_private_key">kunde inte extrahera hemlig nyckel</string>
  <!--errors without preceding 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>
@ -655,12 +655,12 @@
  <string name="msg_internal_error">Intern fel!</string>
  <string name="msg_cancelled">Operation avbruten.</string>
  <!--Import Public log entries-->
-  <string name="msg_ip_bad_type_secret">Försökte att importera privat nyckelring som publik. Detta är en bugg, skicka en felrapport!</string>
+  <string name="msg_ip_bad_type_secret">Försökte att importera hemlig nyckelring som öppen. Detta är en bugg, skicka en felrapport!</string>
  <string name="msg_ip_delete_old_fail">Ingen gammal nyckel raderad (skapa en ny?)</string>
  <string name="msg_ip_delete_old_ok">Raderade gammal nyckel från databas</string>
  <string name="msg_ip_error_op_exc">Operationen misslyckades på grund av ett databasfel</string>
  <string name="msg_ip_error_remote_ex">Operationen misslyckades på grund av ett internt fel</string>
-  <string name="msg_ip">Importerar publik nyckelring %s</string>
+  <string name="msg_ip">Importerar öppen nyckelring %s</string>
  <string name="msg_ip_insert_keyring">Kodar nyckelringens data</string>
  <string name="msg_ip_insert_keys">Läser nycklar</string>
  <string name="msg_ip_prepare">Förebereder databasoperationer</string>
@ -684,7 +684,7 @@
  <string name="msg_ip_master_flags_xxsx">Huvudflaggor: signera</string>
  <string name="msg_ip_master_flags_xxxa">Huvudflaggor: autentisera</string>
  <string name="msg_ip_master_flags_xxxx">Huvudflaggor: ingen</string>
-  <string name="msg_ip_merge_public">Slår ihop importerade data med befintlig publik nyckelring</string>
+  <string name="msg_ip_merge_public">Slår ihop importerade data med befintlig öppen nyckelring</string>
  <string name="msg_ip_subkey">Bearbetar undernyckel %s</string>
  <string name="msg_ip_subkey_expired">Undernyckel gick ut %s</string>
  <string name="msg_ip_subkey_expires">Undernyckel går ut %s</string>
@ -705,9 +705,9 @@
  <string name="msg_ip_subkey_flags_xxsx">Flaggor för undernyckel: signera</string>
  <string name="msg_ip_subkey_flags_xxxa">Flaggor för undernyckel: autentisera</string>
  <string name="msg_ip_subkey_flags_xxxx">Flaggor för undernyckel: ingen</string>
-  <string name="msg_ip_success">Importade publik nyckelring</string>
+  <string name="msg_ip_success">Importerade öppen nyckelring</string>
  <string name="msg_ip_success_identical">Nyckelringen innehåller ingen ny information, inget att göra</string>
-  <string name="msg_ip_reinsert_secret">Sätter in privat nyckel på nytt</string>
+  <string name="msg_ip_reinsert_secret">Sätter in hemlig nyckel på nytt</string>
  <string name="msg_ip_uid_cert_bad">Stötte på ett dåligt certifikat!</string>
  <string name="msg_ip_uid_cert_error">Fel vid bearbetning av certifikat!</string>
  <string name="msg_ip_uid_cert_nonrevoke">Har redan ett icke-återkalleligt certifikat, hoppar över.</string>
@ -717,7 +717,7 @@
  <string name="msg_ip_uid_cert_good_revoke">Hittade bra certifikatåterkallning från %1$s</string>
  <plurals name="msg_ip_uid_certs_unknown">
    <item quantity="one">Hoppar över ett certifikat utfärdat av okända publika nycklar</item>
-    <item quantity="other">Hoppar över %s certifikat utfärdade av okända publika nycklar</item>
+    <item quantity="other">Hoppar över %s certifikat utfärdade av okända öppna nycklar</item>
  </plurals>
  <string name="msg_ip_uid_classifying_zero">Klassificerar användar-ID:n (inga tillförlitliga nycklar tillgängliga)</string>
  <plurals name="msg_ip_uid_classifying">
@ -738,17 +738,17 @@
  <string name="msg_ip_uat_cert_good_revoke">Hittade bra certifikatåterkallning från %1$s</string>
  <plurals name="msg_ip_uat_certs_unknown">
    <item quantity="one">Hoppar över ett certifikat utfärdat av en okänd publik nyckel</item>
-    <item quantity="other">Hoppar över %s certifikat utfärdade av okända publika nycklar</item>
+    <item quantity="other">Hoppar över %s certifikat utfärdade av okända öppna nycklar</item>
  </plurals>
  <string name="msg_ip_uat_classifying">Klassificerar användarattribut</string>
  <string name="msg_ip_uat_revoked">Användarattribut är återkallat</string>
-  <string name="msg_is_bad_type_public">Försökte att importera publik nyckelring som privat. Detta är en bugg, skicka en felrapport!</string>
+  <string name="msg_is_bad_type_public">Försökte att importera öppen nyckelring som hemlig. Detta är en bugg, skicka en felrapport!</string>
  <!--Import Secret log entries-->
-  <string name="msg_is">Importerar privat nyckel %s</string>
+  <string name="msg_is">Importerar hemlig nyckel %s</string>
  <string name="msg_is_db_exception">Databasfel!</string>
-  <string name="msg_is_importing_subkeys">Bearbetar privata undernycklar</string>
+  <string name="msg_is_importing_subkeys">Bearbetar hemliga undernycklar</string>
  <string name="msg_is_error_io_exc">Fel vid kodning av nyckelring</string>
-  <string name="msg_is_merge_public">Slår ihop importerade data med befintlig publik nyckelring</string>
+  <string name="msg_is_merge_public">Slår ihop importerade data med befintlig öppen nyckelring</string>
  <string name="msg_is_pubring_generate">Genererar publik nyckelring från privat nyckelring</string>
  <string name="msg_is_subkey_nonexistent">Undernyckel %s inte tillgänglig i privat nyckelring</string>
  <string name="msg_is_success_identical">Nyckelringen innehåller ingen ny information, inget att göra</string>
@ -781,8 +781,8 @@
  <!--Keyring merging log entries-->
  <string name="msg_mg_error_heterogeneous">Försökte att slå ihop nyckelringar med olika fingeravtryck!</string>
  <string name="msg_mg_error_encode">Allvarligt fel vid kodning av signatur!</string>
-  <string name="msg_mg_public">Slår ihop till publik nyckelring %s</string>
-  <string name="msg_mg_secret">Slår ihop till privat nyckelring %s</string>
+  <string name="msg_mg_public">Slår ihop till öppen nyckelring %s</string>
+  <string name="msg_mg_secret">Slår ihop till hemlig nyckelring %s</string>
  <string name="msg_mg_new_subkey">Lägger till ny undernyckel %s</string>
  <string name="msg_mg_found_new">Hittade %s nya certifikat i nyckelring</string>
  <string name="msg_mg_unchanged">Inget att slå ihop</string>
@ -821,25 +821,25 @@
  <!--Consolidate-->
  <string name="msg_con">Konsoliderar databas</string>
  <string name="msg_con_error_bad_state">Konsolidering startade medan ingen databas var cachad! Detta är förmodligen ett programmeringsfel, skicka en buggrapport.</string>
-  <string name="msg_con_save_secret">Sparar privata nyckelringar</string>
-  <string name="msg_con_save_public">Sparar publika nyckelringar</string>
+  <string name="msg_con_save_secret">Sparar hemliga nyckelringar</string>
+  <string name="msg_con_save_public">Sparar öppen nyckelringar</string>
  <string name="msg_con_db_clear">Rensar databas</string>
  <string name="msg_con_success">Konsoliderade databas</string>
-  <string name="msg_con_delete_public">Raderar cache-fil för publik nyckelring</string>
-  <string name="msg_con_delete_secret">Raderar cache-fil för privat nyckelring</string>
+  <string name="msg_con_delete_public">Raderar cache-fil för öppen nyckelring</string>
+  <string name="msg_con_delete_secret">Tar bort cache-fil för hemlig nyckelring</string>
  <string name="msg_con_error_db">Fel när databas skulle öppnas!</string>
-  <string name="msg_con_error_public">Fel när publika nycklar skulle återimporteras!</string>
-  <string name="msg_con_error_secret">Fel när privata nycklar skulle återimporteras!</string>
+  <string name="msg_con_error_public">Fel när öppen nycklar skulle återimporteras!</string>
+  <string name="msg_con_error_secret">Fel när hemliga nycklar skulle återimporteras!</string>
  <plurals name="msg_con_reimport_public">
    <item quantity="one">Återimporterar en publik nyckel</item>
-    <item quantity="other">Återimporterar %d publika nycklar</item>
+    <item quantity="other">Återimporterar %d öppna nycklar</item>
  </plurals>
-  <string name="msg_con_reimport_public_skip">Inga publika nycklar att återimportera, hoppar över…</string>
+  <string name="msg_con_reimport_public_skip">Inga öppna nycklar att återimportera, hoppar över…</string>
  <plurals name="msg_con_reimport_secret">
-    <item quantity="one">Återimporterar en privat nyckel</item>
-    <item quantity="other">Återimporterar %d privata nycklar</item>
+    <item quantity="one">Återimporterar en hemlig nyckel</item>
+    <item quantity="other">Återimporterar %d hemliga nycklar</item>
  </plurals>
-  <string name="msg_con_reimport_secret_skip">Inga privata nycklar att återimportera, hoppar över…</string>
+  <string name="msg_con_reimport_secret_skip">Inga hemliga nycklar att återimportera, hoppar över…</string>
  <!--Edit Key (higher level than modify)-->
  <string name="msg_ed">Utför nyckeloperation</string>
  <string name="msg_ed_caching_new">Cachelagra nytt lösenord</string>
@ -874,7 +874,7 @@
  <string name="msg_dc">Startar dekrypteringsoperation…</string>
  <string name="msg_dc_sym_skip">Symmetrisk data inte tillåten, hoppar över…</string>
  <string name="msg_dc_sym">Hittade block med symmetriskt krypterad data</string>
-  <string name="msg_dc_unlocking">Låser upp privat nyckel</string>
+  <string name="msg_dc_unlocking">Låser upp hemlig nyckel</string>
  <!--Messages for VerifySignedLiteralData operation-->
  <string name="msg_vl_clear_meta_file">Filnamn: %s</string>
  <string name="msg_vl_clear_meta_mime">MIME-typ: %s</string>
@ -885,7 +885,7 @@
  <string name="msg_se">Startar signerings/krypterings procedur</string>
  <string name="msg_se_success">Signering/kryptering lyckades!</string>
  <!--Messages for PgpSignEncrypt operation-->
-  <string name="msg_pse_asymmetric">Förbereder publika nycklar för kryptering</string>
+  <string name="msg_pse_asymmetric">Förbereder öppna nycklar för kryptering</string>
  <string name="msg_pse_compressing">Förbereder komprimering</string>
  <string name="msg_pse_encrypting">Krypterar data</string>
  <string name="msg_pse_error_nfc">NFC datafel!</string>
@ -924,14 +924,14 @@
    <item quantity="other">Säkerhetskopiering med %d nycklar</item>
  </plurals>
  <string name="msg_backup_all">Säkerhetskopiering med alla nycklar</string>
-  <string name="msg_backup_public">Skapa säkerhetskopia av publik nyckel %s</string>
+  <string name="msg_backup_public">Skapa säkerhetskopia av öppen nyckel %s</string>
  <string name="msg_backup_secret">Skapa säkerhetskopia av hemlig nyckel %s</string>
  <string name="msg_backup_success">Säkerhetskopieringen lyckades</string>
  <string name="msg_upload_proxy_direct">Använder proxy: Ingen</string>
  <string name="msg_upload_proxy_tor">Använder proxy: TOR</string>
  <string name="msg_upload_proxy">Använder proxy: %s</string>
  <string name="msg_del_error_empty">Inget att radera!</string>
-  <string name="msg_del_error_multi_secret">Privata nycklar kan bara raderas var för sig!</string>
+  <string name="msg_del_error_multi_secret">Hemliga nycklar kan bara raderas var för sig!</string>
  <plurals name="msg_del">
    <item quantity="one">Raderar en nyckel</item>
    <item quantity="other">Raderar %d nycklar</item>
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@ -616,7 +616,6 @@
  <string name="api_settings_allowed_keys">Дозволені ключі</string>
  <string name="api_settings_settings">Параметри</string>
  <string name="api_register_title">Дозволити доступ до OpenKeychain?</string>
-  <string name="api_register_text">%s запитує доступ використання OpenKeychain як провайдера шифрування. Ви будете отримувати запити перед використанням додатку чи ключів для дешифрування.\n\nВи можете відкликати дозвіл на екрані \'Додатки\'.</string>
  <string name="api_register_allow">Дозволити доступ</string>
  <string name="api_register_disallow">Не дозволити доступ</string>
  <string name="api_register_error_select_key">Будь ласка, виберіть ключ!</string>
@ -1748,6 +1747,11 @@
  <string name="key_health_stripped_subtitle">Клацніть для подробиць</string>
  <string name="key_health_partial_stripped_title">Придатний (Частково відділений)</string>
  <string name="key_health_partial_stripped_subtitle">Клацніть для подробиць</string>
+  <string name="keyserver_title_published">Опубліковано</string>
+  <string name="keyserver_title_not_published">Не опубліковано</string>
+  <string name="keyserver_title_unknown">Стан сервера ключів: невідомий</string>
+  <string name="keyserver_last_updated">Остання перевірка: %s</string>
+  <string name="keyserver_last_updated_never">Остання перевірка: ніколи</string>
  <string name="key_insecure_bitstrength_2048_problem">Ключ використовує <b>%1$s</b> алгоритм стійкістю <b>%2$s біт</b>. Ключ безпеки повинен мати як мінімум 2048 біт.</string>
  <string name="key_insecure_bitstrength_2048_solution">Цей ключ не може бути модернізованим. Для безпечної комунікації власник має згенерувати новий ключ.</string>
  <string name="key_insecure_unknown_curve_problem">Цей ключ використовує <b>%1$s</b> алгоритм, який не в білому списку.</string>
@ -1779,4 +1783,5 @@
  <string name="dialog_insecure_button_undo">Не забороняти</string>
  <string name="dialog_insecure_button_view_key">Дивитись ключ</string>
  <string name="dialog_insecure_button_ok">Отримано</string>
+  <string name="identity_context_forget">Забути</string>
 </resources>