From 8b663add04335d4b31837b0ac6fc4b999d1a3beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 24 Sep 2014 15:41:00 +0200
Subject: [PATCH] Pull from transifex

---
 .../src/main/res/raw-cs/help_changelog.html   |   2 +-
 .../src/main/res/raw-de/help_about.html       |   2 +-
 .../src/main/res/raw-de/help_changelog.html   |  30 +-
 .../src/main/res/raw-es/help_changelog.html   |   2 +-
 .../src/main/res/raw-et/help_changelog.html   |   2 +-
 .../src/main/res/raw-fi/help_changelog.html   |   2 +-
 .../src/main/res/raw-fr/help_changelog.html   |   2 +-
 .../src/main/res/raw-is/help_changelog.html   |   2 +-
 .../src/main/res/raw-it/help_changelog.html   |   2 +-
 .../src/main/res/raw-ja/help_changelog.html   |   2 +-
 .../src/main/res/raw-nl/help_changelog.html   |   2 +-
 .../src/main/res/raw-pl/help_changelog.html   |   2 +-
 .../src/main/res/raw-pt/help_changelog.html   |   2 +-
 .../src/main/res/raw-ru/help_changelog.html   |   2 +-
 .../src/main/res/raw-sl/help_changelog.html   |   2 +-
 .../src/main/res/raw-sr/help_about.html       |  57 ++++
 .../src/main/res/raw-sr/help_changelog.html   | 194 +++++++++++++
 .../src/main/res/raw-sr/help_nfc_beam.html    |  12 +
 .../src/main/res/raw-sr/help_start.html       |  22 ++
 .../src/main/res/raw-sr/help_wot.html         |  17 ++
 .../src/main/res/raw-sr/nfc_beam_share.html   |  11 +
 .../src/main/res/raw-tr/help_changelog.html   |   2 +-
 .../src/main/res/raw-uk/help_changelog.html   |   2 +-
 .../src/main/res/raw-zh/help_changelog.html   |   2 +-
 .../src/main/res/values-cs/strings.xml        |  10 +-
 .../src/main/res/values-de/strings.xml        | 264 ++++++++++++++++--
 .../src/main/res/values-es/strings.xml        |  74 +++--
 .../src/main/res/values-fr/strings.xml        | 140 ++++++++--
 .../src/main/res/values-it/strings.xml        |  26 --
 .../src/main/res/values-ja/strings.xml        | 165 +++++++++--
 .../src/main/res/values-nl/strings.xml        |   2 -
 .../src/main/res/values-pl/strings.xml        |   2 -
 .../src/main/res/values-ru/strings.xml        |   5 -
 .../src/main/res/values-sl/strings.xml        |  14 -
 .../src/main/res/values-sr/strings.xml        |  55 ++++
 .../src/main/res/values-tr/strings.xml        |   1 -
 .../src/main/res/values-uk/strings.xml        |  25 --
 .../src/main/res/values-zh/strings.xml        |   1 -
 38 files changed, 948 insertions(+), 213 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/raw-sr/help_about.html
 create mode 100644 OpenKeychain/src/main/res/raw-sr/help_changelog.html
 create mode 100644 OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html
 create mode 100644 OpenKeychain/src/main/res/raw-sr/help_start.html
 create mode 100644 OpenKeychain/src/main/res/raw-sr/help_wot.html
 create mode 100644 OpenKeychain/src/main/res/raw-sr/nfc_beam_share.html
 create mode 100644 OpenKeychain/src/main/res/values-sr/strings.xml

diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.html b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
index 96c32c8fb..437aff638 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Podepsat klíče</li>
 <li>Nahrát klíče na server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-de/help_about.html b/OpenKeychain/src/main/res/raw-de/help_about.html
index 18b959d9f..880e5673f 100644
--- a/OpenKeychain/src/main/res/raw-de/help_about.html
+++ b/OpenKeychain/src/main/res/raw-de/help_about.html
@@ -5,7 +5,7 @@
 <p><a href="http://www.openkeychain.org">OpenKeychain</a> ist eine OpenPGP-Implementierung für Android.</p>
 <p>Lizenz: GPLv3+</p>
 
-<h2>Engwickler</h2>
+<h2>Entwickler</h2>
 <ul>
 <li>Dominik Schürmann (Leitender Entwickler)</li>
 <li>Art O Cathain</li>
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index e0b3610f4..abff5a6a4 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
@@ -3,26 +3,26 @@
 <body>
 <h2>2.9.2</h2>
 <ul>
-<li>Fix keys broken in 2.9.1</li>
-<li>Yubikey decryption now working via API</li>
+<li>Defekte Schlüssel aus 2.9.1 behoben</li>
+<li>Yubikey Entschlüsselung funktioniert nun durch die API</li>
 </ul>
 <h2>2.9.1</h2>
 <ul>
-<li>Split encrypt screen into two</li>
-<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
-<li>Improved passphrase handling</li>
-<li>Key sharing via SafeSlinger</li>
-<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
-<li>Fix usage of stripped keys</li>
-<li>SHA256 as default for compatibility</li>
-<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+<li>Verschlüsselungsbildschirm auf zwei aufgeteilt</li>
+<li>Handhabung von Schlüsselflags ausgebessert (Unterstützt nun Mailvelope 0.7 Schlüssel)</li>
+<li>Handhabung von Passphrasen verbessert</li>
+<li>Schlüsselaustausch mit SafeSlinger</li>
+<li>Yubikey: Einstellung für andere PINs, zur Zeit funktioniert das Signieren nur mit der OpenPGP API, nicht innerhalb von OpenKeychain</li>
+<li>Verwendung von gekürzten Schlüsseln behoben</li>
+<li>Standardmäßig SHA256 aufgrund von Kompatibilität</li>
+<li>Änderungen an der Intent API, siehe https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>Das OpenPGP API kann nun mit widerrufenen/abgelaufenen Schlüsseln umgehen und liefert alle User IDs zurück</li>
 </ul>
 <h2>2.9</h2>
 <ul>
-<li>Fixing crashes introduced in v2.8</li>
-<li>Experimental ECC support</li>
-<li>Experimental Yubikey support (signing-only with imported keys)</li>
+<li>Abstürze, welche mit v2.8 eingeführt wurden, behoben</li>
+<li>Experimentelle ECC Unterstützung</li>
+<li>Experimentelle Yubikey Unterstützung (Nur Signieren mit importierten Schlüsseln)</li>
 </ul>
 <h2>2.8</h2>
 <ul>
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
index 411aeed27..94e4c0fa8 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Rediseño completo</li>
-<li>Comparte claves públicas mediante códigos qr, rayo NFC</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Firmar claves</li>
 <li>Subir claves al servidor</li>
 <li>Repara problemas con la importación</li>
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.html b/OpenKeychain/src/main/res/raw-fi/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
index 73edbb642..562edde13 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Conception complètement repensée</li>
-<li>Partage de clefs publiques par codes QR, faisceau NFC</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Signer les clefs</li>
 <li>Téléverser les clefs vers le serveur</li>
 <li>Corrige des problèmes d'importation</li>
diff --git a/OpenKeychain/src/main/res/raw-is/help_changelog.html b/OpenKeychain/src/main/res/raw-is/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-is/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-is/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.html b/OpenKeychain/src/main/res/raw-it/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-it/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-it/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index 51c21d8fc..baf609a85 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>再デザイン完了</li>
-<li>QRコード、NFCビームでの公開鍵共有</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>鍵への署名</li>
 <li>鍵サーバへアップロード</li>
 <li>インポート問題修正</li>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.html b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_changelog.html b/OpenKeychain/src/main/res/raw-pt/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pt/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.html b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
index 7328172cd..3a62c43bf 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Kompletna prenova izgleda</li>
-<li>Deljenje javnih ključev preko kod QR in 'NFC Beam-a'</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Podpisovanje ključev</li>
 <li>Nalaganje ključev na strežnik</li>
 <li>Popravki problemov z uvozom</li>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_about.html b/OpenKeychain/src/main/res/raw-sr/help_about.html
new file mode 100644
index 000000000..ad86cb703
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-sr/help_about.html
@@ -0,0 +1,57 @@
+<html>
+<head></head>
+<body>
+<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p>
+<p><a href="http://www.openkeychain.org">OpenKeychain</a> је ОпенПГП имплементација за Андроид.</p>
+<p>Лиценца: ГПЛв3+</p>
+
+<h2>Програмери</h2>
+<ul>
+<li>Dominik Schürmann (главни програмер)</li>
+<li>Art O Cathain</li>
+<li>Ash Hughes</li>
+<li>Brian C. Barnes</li>
+<li>Bahtiar 'kalkin' Gadimov</li>
+<li>Daniel Albert</li>
+<li>Daniel Hammann</li>
+<li>Daniel Haß</li>
+<li>Greg Witczak</li>
+<li>'mar-v-in'</li>
+<li>Markus Doits</li>
+<li>Miroojin Bakshi</li>
+<li>Nikhil Peter Raj</li>
+<li>Paul Sarbinowski</li>
+<li>'Senecaso'</li>
+<li>Signe Rüsch</li>
+<li>Sreeram Boyapati</li>
+<li>Thialfihar (APG 1.x)</li>
+<li>Tim Bray</li>
+<li>Vincent Breitmoser</li>
+</ul>
+<h2>Библиотеке</h2>
+<ul>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Апачи лиценца в2)</li>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Апачи лиценца в2)</li>
+<li>
+<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Апачи лиценца в2)</li>
+<li>
+<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Апачи лиценца в2)</li>
+<li>
+<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Апачи лиценца в2)</li>
+<li>
+<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Апачи лиценца в2)</li>
+<li>
+<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Апачи лиценца в2)</li>
+<li>
+<a href="http://code.google.com/p/zxing/">ZXing</a> (Апачи лиценца в2)</li>
+<li>
+<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (МИТ Икс11 лиценца)</li>
+<li>
+<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Апачи лиценца в2)</li>
+<li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (МИТ лиценца)</li>
+</ul>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_changelog.html b/OpenKeychain/src/main/res/raw-sr/help_changelog.html
new file mode 100644
index 000000000..acea5d0f7
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-sr/help_changelog.html
@@ -0,0 +1,194 @@
+<html>
+<head></head>
+<body>
+<h2>2.9.2</h2>
+<ul>
+<li>Fix keys broken in 2.9.1</li>
+<li>Yubikey decryption now working via API</li>
+</ul>
+<h2>2.9.1</h2>
+<ul>
+<li>Split encrypt screen into two</li>
+<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
+<li>Improved passphrase handling</li>
+<li>Key sharing via SafeSlinger</li>
+<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
+<li>Fix usage of stripped keys</li>
+<li>SHA256 as default for compatibility</li>
+<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+</ul>
+<h2>2.9</h2>
+<ul>
+<li>Fixing crashes introduced in v2.8</li>
+<li>Experimental ECC support</li>
+<li>Experimental Yubikey support (signing-only with imported keys)</li>
+</ul>
+<h2>2.8</h2>
+<ul>
+<li>So many bugs have been fixed in this release that we focus on the main new features</li>
+<li>Key edit: awesome new design, key revocation</li>
+<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
+<li>New first time screen</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>File encryption: awesome new design, support for encrypting multiple files</li>
+<li>New icons to show status of key (by Brennan Novak)</li>
+<li>Important bug fix: Importing of large key collections from a file is now possible</li>
+<li>Notification showing cached passphrases</li>
+<li>Keys are connected to Android's contacts</li>
+</ul>
+<p>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</p>
+
+<h2>2.7</h2>
+<ul>
+<li>Purple! (Dominik, Vincent)</li>
+<li>New key view design (Dominik, Vincent)</li>
+<li>New flat Android buttons (Dominik, Vincent)</li>
+<li>API fixes (Dominik)</li>
+<li>Keybase.io import (Tim Bray)</li>
+</ul>
+<h2>2.6.1</h2>
+<ul>
+<li>Some fixes for regression bugs</li>
+</ul>
+<h2>2.6</h2>
+<ul>
+<li>Key certifications (thanks to Vincent Breitmoser)</li>
+<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>New design for signature verification</li>
+<li>Custom key length (thanks to Greg Witczak)</li>
+<li>Fix share-functionality from other apps</li>
+</ul>
+<h2>2.5</h2>
+<ul>
+<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Refactored key edit screen (thanks to Ash Hughes)</li>
+<li>New modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
+</ul>
+<h2>2.4</h2>
+<p>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.</p>
+<ul>
+<li>New unified key list</li>
+<li>Colorized key fingerprint</li>
+<li>Support for keyserver ports</li>
+<li>Deactivate possibility to generate weak keys</li>
+<li>Much more internal work on the API</li>
+<li>Certify user ids</li>
+<li>Keyserver query based on machine-readable output</li>
+<li>Lock navigation drawer on tablets</li>
+<li>Suggestions for emails on creation of keys</li>
+<li>Search in public key lists</li>
+<li>And much more improvements and fixes…</li>
+</ul>
+<h2>2.3.1</h2>
+<ul>
+<li>Hotfix for crash when upgrading from old versions</li>
+</ul>
+<h2>2.3</h2>
+<ul>
+<li>Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
+<li>Fix setting expiry dates on keys (thanks to Ash Hughes)</li>
+<li>More internal fixes when editing keys (thanks to Ash Hughes)</li>
+<li>Querying keyservers directly from the import screen</li>
+<li>Fix layout and dialog style on Android 2.2-3.0</li>
+<li>Fix crash on keys with empty user ids</li>
+<li>Fix crash and empty lists when coming back from signing screen</li>
+<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
+<li>Fix upload of key from signing screen</li>
+</ul>
+<h2>2.2</h2>
+<ul>
+<li>New design with navigation drawer</li>
+<li>New public key list design</li>
+<li>New public key view</li>
+<li>Bug fixes for importing of keys</li>
+<li>Key cross-certification (thanks to Ash Hughes)</li>
+<li>Handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
+<li>First version with new languages (thanks to the contributors on Transifex)</li>
+<li>Sharing of keys via QR Codes fixed and improved</li>
+<li>Package signature verification for API</li>
+</ul>
+<h2>2.1.1</h2>
+<ul>
+<li>API Updates, preparation for K-9 Mail integration</li>
+</ul>
+<h2>2.1</h2>
+<ul>
+<li>Lots of bug fixes</li>
+<li>New API for developers</li>
+<li>PRNG bug fix by Google</li>
+</ul>
+<h2>2.0</h2>
+<ul>
+<li>Complete redesign</li>
+<li>Share public keys via QR codes, NFC beam</li>
+<li>Sign keys</li>
+<li>Upload keys to server</li>
+<li>Fixes import issues</li>
+<li>New AIDL API</li>
+</ul>
+<h2>1.0.8</h2>
+<ul>
+<li>Basic keyserver support</li>
+<li>App2sd</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
+<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
+<li>Bugfixes</li>
+<li>Optimizations</li>
+</ul>
+<h2>1.0.7</h2>
+<ul>
+<li>Fixed problem with signature verification of texts with trailing newline</li>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
+</ul>
+<h2>1.0.6</h2>
+<ul>
+<li>Account adding crash on Froyo fixed</li>
+<li>Secure file deletion</li>
+<li>Option to delete key file after import</li>
+<li>Stream encryption/decryption (gallery, etc.)</li>
+<li>New options (language, force v3 signatures)</li>
+<li>Interface changes</li>
+<li>Bugfixes</li>
+</ul>
+<h2>1.0.5</h2>
+<ul>
+<li>German and Italian translation</li>
+<li>Much smaller package, due to reduced BC sources</li>
+<li>New preferences GUI</li>
+<li>Layout adjustment for localization</li>
+<li>Signature bugfix</li>
+</ul>
+<h2>1.0.4</h2>
+<ul>
+<li>Fixed another crash caused by some SDK bug with query builder</li>
+</ul>
+<h2>1.0.3</h2>
+<ul>
+<li>Fixed crashes during encryption/signing and possibly key export</li>
+</ul>
+<h2>1.0.2</h2>
+<ul>
+<li>Filterable key lists</li>
+<li>Smarter pre-selection of encryption keys</li>
+<li>New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
+<li>Fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
+</ul>
+<h2>1.0.1</h2>
+<ul>
+<li>GMail account listing was broken in 1.0.0, fixed again</li>
+</ul>
+<h2>1.0.0</h2>
+<ul>
+<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
+<li>Support of more file managers (including ASTRO)</li>
+<li>Slovenian translation</li>
+<li>New database, much faster, less memory usage</li>
+<li>Defined Intents and content provider for other apps</li>
+<li>Bugfixes</li>
+</ul>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html
new file mode 100644
index 000000000..88492731c
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html
@@ -0,0 +1,12 @@
+<html>
+<head></head>
+<body>
+<h2>How to receive keys</h2>
+<ol>
+<li>Go to your partners contacts and open the contact you want to share.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
+<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the your device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_start.html b/OpenKeychain/src/main/res/raw-sr/help_start.html
new file mode 100644
index 000000000..51a76c01e
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-sr/help_start.html
@@ -0,0 +1,22 @@
+<html>
+<head></head>
+<body>
+<h2>Getting started</h2>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+
+<h2>I found a bug in OpenKeychain!</h2>
+<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+
+<h2>Contribute</h2>
+<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+
+<h2>Translations</h2>
+<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_wot.html b/OpenKeychain/src/main/res/raw-sr/help_wot.html
new file mode 100644
index 000000000..29790139b
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-sr/help_wot.html
@@ -0,0 +1,17 @@
+<html>
+<head></head>
+<body>
+<h2>Web of Trust</h2>
+<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+
+<h2>Support in OpenKeychain</h2>
+<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
+
+<h2>Trust Model</h2>
+<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
+
+<h2>Certifying keys</h2>
+<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-sr/nfc_beam_share.html
new file mode 100644
index 000000000..083e055c7
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-sr/nfc_beam_share.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<ol>
+<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
+<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the other person’s device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index 65842f6cc..acea5d0f7 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -124,7 +124,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index bceaf69d1..7076d2b83 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -206,7 +206,6 @@
   <string name="error_key_needs_a_user_id">potřebuji alespoň jednu identitu</string>
   <string name="error_no_signature_passphrase">nebylo poskytnuto heslo</string>
   <string name="error_no_signature_key">nebyl poskytnut podpisový klíč</string>
-  <string name="error_invalid_data">kryptovaná data nejsou správná</string>
   <string name="error_integrity_check_failed">selhala kontrola integrity! Data byla pozměněna!</string>
   <string name="error_wrong_passphrase">špatné heslo</string>
   <string name="error_could_not_extract_private_key">nebylo možné extrahovat privátní klíč</string>
@@ -322,7 +321,6 @@
   <string name="view_log">Zobrazit log</string>
   <string name="import_error_nothing">Nic k importu</string>
   <string name="import_error_nothing_cancelled">Import zrušen.</string>
-  <string name="import_error">Chyba importu klíčů!</string>
   <string name="import_with_warnings">, s varováními</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Dešifrovat soubor pomocí OpenKeychain</string>
@@ -405,7 +403,6 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Tato identity byla zneplatněna. Toto není možné vzít zpět.</string>
   <string name="edit_key_edit_subkey_title">Vyberte akci!</string>
-  <string name="edit_key_new_subkey">nový</string>
   <!--Create key-->
   <string name="create_key_upload">Aktualizovat klíč na keyserver</string>
   <string name="create_key_empty">Toto pole je vyžadováno</string>
@@ -427,7 +424,6 @@
   <string name="my_keys">Moje Klíče</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Napsat text</string>
-  <string name="decrypt_content_edit_text_hint">Vložte zašifrovaný text pro jeho rozšifrování a/nebo ověření...</string>
   <!--certs-->
   <string name="cert_default">výchozí</string>
   <string name="cert_none">žádný</string>
@@ -443,9 +439,6 @@
   <string name="msg_cancelled">Operace ukončena.</string>
   <!--Import Public log entries-->
   <string name="msg_ip_encode_fail">Operace selhala kvůli chybě kódování</string>
-  <string name="msg_ip_fail_io_exc">Operace selhala kvůli chybě vstupu/výstupu</string>
-  <string name="msg_ip_fail_op_exc">Operace selhala kvůli chybě databáze</string>
-  <string name="msg_ip_fail_remote_ex">Operace selhala kvůli interní chybě </string>
   <string name="msg_ip">Importuje se veřejná klíčenka %s</string>
   <string name="msg_ip_uid_revoked">Uživatelské ID je zneplatněné</string>
   <!--Import Secret log entries-->
@@ -466,7 +459,9 @@
   <string name="msg_ek_error_not_found">Klíč nenalezen!</string>
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
+  <string name="msg_acc_saved">Účet uložen</string>
   <!--PassphraseCache-->
+  <string name="passp_cache_notif_click_to_clear">Kliknout pro vymazání načtených hesel</string>
   <string name="passp_cache_notif_clear">Smazat cache</string>
   <string name="passp_cache_notif_pwd">Heslo</string>
   <!--unsorted-->
@@ -487,6 +482,7 @@
   <string name="can_sign_not">nelze podepsat</string>
   <string name="error_no_encrypt_subkey">Není dostupný šifrovací podklíč!</string>
   <string name="contact_show_key">Zobrazit klíč (%s)</string>
+  <string name="swipe_to_update">Potáhnout dolů pro aktualizaci z keyserveru</string>
   <!--First Time-->
   <string name="first_time_text1">Převezměte opět kontrolu nad svým soukromím s OpenKeychain!</string>
   <string name="first_time_create_key">Vytvořit vlastní klíč</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index ba374320d..8a5e392cc 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -12,6 +12,7 @@
   <string name="title_add_subkey">Unterschlüssel hinzufügen</string>
   <string name="title_edit_key">Schlüssel bearbeiten</string>
   <string name="title_preferences">Einstellungen</string>
+  <string name="title_cloud_search_preferences">Einstellungen Cloudsuche</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Schlüsselserver</string>
   <string name="title_change_passphrase">Passwort ändern</string>
@@ -34,6 +35,7 @@
   <!--section-->
   <string name="section_user_ids">Identitäten</string>
   <string name="section_keys">Unterschlüssel</string>
+  <string name="section_cloud_search">Cloudsuche</string>
   <string name="section_general">Allgemein</string>
   <string name="section_defaults">Standardwerte</string>
   <string name="section_advanced">Fortgeschrittene Einstellungen</string>
@@ -44,6 +46,8 @@
   <string name="section_key_server">Schlüsselserver</string>
   <string name="section_fingerprint">Fingerabdruck</string>
   <string name="section_key_to_certify">Zu beglaubigender Schlüssel</string>
+  <string name="section_decrypt_files">Dateien</string>
+  <string name="section_decrypt_text">Text</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Datei entschlüsseln, verifizieren und speichern</string>
   <string name="btn_decrypt_verify_message">Entschlüsseln und verifizieren</string>
@@ -62,6 +66,10 @@
   <string name="btn_view_cert_key">Beglaubigungsschlüssel anzeigen</string>
   <string name="btn_create_key">Schlüssel erzeugen</string>
   <string name="btn_add_files">Datei(en) hinzufügen</string>
+  <string name="btn_add_share_decrypted_text">Entschlüsselten Text teilen</string>
+  <string name="btn_decrypt_clipboard">Aus Zwischenablage entschlüsseln</string>
+  <string name="btn_decrypt_and_verify">und Signaturen überprüfen</string>
+  <string name="btn_decrypt_files">Dateien entschlüsseln</string>
   <!--menu-->
   <string name="menu_preferences">Einstellungen</string>
   <string name="menu_help">Hilfe</string>
@@ -117,6 +125,8 @@
   <string name="label_send_key">Schlüssel nach Beglaubigung auf ausgewählten Schlüsselserver hochladen</string>
   <string name="label_fingerprint">Fingerabdruck</string>
   <string name="expiry_date_dialog_title">Ablaufdatum festsetzen</string>
+  <string name="label_first_keyserver_is_used">(Oberster Schlüsselserver wird bevorzugt)</string>
+  <string name="label_preferred">bevorzugt</string>
   <string name="user_id_no_name">&lt;kein Name&gt;</string>
   <string name="none">&lt;keine&gt;</string>
   <string name="no_key">&lt;kein Schlüssel&gt;</string>
@@ -202,6 +212,7 @@
   <string name="fingerprint_copied_to_clipboard">Fingerabdruck wurde in die Zwischenablage kopiert!</string>
   <string name="select_key_to_certify">Bitte wähle einen Schlüssel um zu Beglaubigen!</string>
   <string name="key_too_big_for_sharing">Schlüssel ist zu groß um so geteilt zu werden!</string>
+  <string name="text_copied_to_clipboard">Text wurde in Zwischenablage kopiert!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
@@ -215,7 +226,7 @@
   <string name="error_key_needs_a_user_id">Mindestens eine Identität wird benötigt</string>
   <string name="error_no_signature_passphrase">kein Passwort angegeben</string>
   <string name="error_no_signature_key">kein Signaturschlüssel angegeben</string>
-  <string name="error_invalid_data">Verschlüsselte Daten nicht gültig</string>
+  <string name="error_invalid_data">Kein gültiger verschlüsselter / signierter OpenPGP Inhalt!</string>
   <string name="error_integrity_check_failed">Integritätscheck fehlgeschlagen! Die Daten wurden modifiziert!</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>
@@ -264,6 +275,7 @@
   <string name="progress_modify_primaryuid">Primäre User-ID wird geändert...</string>
   <string name="progress_modify_subkeychange">Unterschlüssel werden verändert...</string>
   <string name="progress_modify_subkeyrevoke">Unterschlüssel wird widerrufen...</string>
+  <string name="progress_modify_subkeystrip">Kürze Unterschlüssel...</string>
   <string name="progress_modify_subkeyadd">Unterschlüssel wird hinzugefügt...</string>
   <string name="progress_modify_passphrase">Passwort wird geändert...</string>
   <plurals name="progress_exporting_key">
@@ -287,8 +299,11 @@
   <string name="progress_verifying_integrity">Integrität wird überprüft…</string>
   <string name="progress_deleting_securely">\'%s\' wird sicher gelöscht…</string>
   <string name="progress_deleting">Lösche Schlüssel</string>
+  <string name="progress_con_saving">Zusammenführung: Speiche in Cache...</string>
+  <string name="progress_con_reimport">Zusammenfühung: Am wieder importieren...</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">Name/Email/Schlüssel ID...</string>
+  <string name="hint_cloud_search_hint">Name/Email/Nachweis/Schlüssel...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -323,6 +338,7 @@
   <string name="help_about_version">Version:</string>
   <!--Import-->
   <string name="import_tab_keyserver">Schlüsselserver</string>
+  <string name="import_tab_cloud">Cloud durchsuchen</string>
   <string name="import_tab_direct">Datei/Zwischenablage</string>
   <string name="import_tab_qr_code">QR-Code/NFC</string>
   <string name="import_import">Ausgewählte Schlüssel importieren</string>
@@ -349,7 +365,6 @@
   <string name="view_log">Log ansehen</string>
   <string name="import_error_nothing">Nichts zu importieren.</string>
   <string name="import_error_nothing_cancelled">Import abgebrochen.</string>
-  <string name="import_error">Fehler bei der Verarbeitung der Schlüssel!</string>
   <string name="import_with_warnings">, mit Warnungen</string>
   <string name="import_with_cancelled">. bis abgebrochen wurde</string>
   <!--Intent labels-->
@@ -400,7 +415,7 @@
   <string name="key_list_empty_text2">Du kannst anfangen OpenKeychain zu benutzen indem du</string>
   <string name="key_list_empty_text3">oder</string>
   <string name="key_list_empty_button_create">deinen eigenen Schlüssel erstellst</string>
-  <string name="key_list_empty_button_import">Importiere einen existierenden Schlüssel.</string>
+  <string name="key_list_empty_button_import">einen existierenden Schlüssel importierts.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Schlüssel bearbeiten</string>
   <string name="key_view_action_encrypt">Text Verschlüsseln</string>
@@ -431,18 +446,31 @@
     <item>Als primäre Identität definieren</item>
     <item>Identität widerrufen</item>
   </string-array>
+  <string-array name="edit_key_edit_user_id_revert_revocation">
+    <item>Widerruf widerrufen</item>
+  </string-array>
   <string name="edit_key_edit_user_id_revoked">Diese Identität wurde widerrufen. Dies kann nicht rückgängig gemacht werden.</string>
   <string name="edit_key_edit_subkey_title">Aktion auswählen!</string>
-  <string name="edit_key_new_subkey">neu</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Ablaufdatum ändern</item>
+    <item>Unterschlüssel widerrufen</item>
+    <item>Unterschlüssel kürzen</item>
+  </string-array>
+  <string name="edit_key_new_subkey">neuer Unterschlüssel</string>
   <string name="edit_key_select_flag">Mindestens ein Attribut wählen!</string>
+  <string name="edit_key_error_add_identity">Füge mindestens eine Identität hinzu!</string>
+  <string name="edit_key_error_add_subkey">Fügen Sie mindestens einen Unterschlüssel hinzu!</string>
   <!--Create key-->
   <string name="create_key_upload">Schlüssel auf Schlüsselserver hochladen</string>
   <string name="create_key_empty">Dieses Feld wird benötigt</string>
   <string name="create_key_passphrases_not_equal">Passwörter stimmen nicht überein</string>
   <string name="create_key_final_text">Du hast folgende Identität eingegeben:</string>
-  <string name="create_key_final_robot_text">Einen Schlüssel zu erzeugen braucht eine Weile, trink in der Zeit einen Kaffee...\n(3 Unterschlüssel, RSA 4096 bit)</string>
+  <string name="create_key_final_robot_text">Einen Schlüssel zu erzeugen braucht eine Weile, trink in der Zeit einen Kaffee...</string>
+  <string name="create_key_rsa">(3 Unterschlüssel, RSA, 4096 Bit)</string>
+  <string name="create_key_custom">(Benutzerdefinierte Schlüsseleinstellung)</string>
   <string name="create_key_text">Vollen Namen und Emailadresse angeben und Passwort wählen.</string>
   <string name="create_key_hint_full_name">Vollständiger Name, z.B. Max Mustermann</string>
+  <string name="create_key_edit">Schlüsselkonfiguration ändern</string>
   <!--View key-->
   <string name="view_key_revoked">Dieser Schlüssel wurde widerrufen!</string>
   <string name="view_key_expired">Dieser Schlüssel ist nicht mehr gültig!</string>
@@ -457,7 +485,6 @@
   <string name="my_keys">Meine Schlüssel</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Text eingeben</string>
-  <string name="decrypt_content_edit_text_hint">Hier die verschlüsselte Nachricht eingeben um sie zu entschlüsseln und/oder zu verifizieren…</string>
   <!--certs-->
   <string name="cert_default">normal</string>
   <string name="cert_none">kein</string>
@@ -475,10 +502,10 @@
   <string name="msg_ip_bad_type_secret">Es wurde versucht einen geheimen Schlüsselbund als Öffentlich zu importieren. Das ist ein Fehler, bitte reiche einen Bericht ein.</string>
   <string name="msg_ip_delete_old_fail">Kein alter Schlüssel gelöscht (Einen neuen erzeugen?)</string>
   <string name="msg_ip_delete_old_ok">Alte Schlüssel aus der Datenbank löschen</string>
-  <string name="msg_ip_encode_fail">Die Anwendung ist wegen Kodierungsfehler fehlgeschlagen</string>
-  <string name="msg_ip_error_io_exc">Die Anwendung ist wegen eines Eingabe/Ausgabe-Fehlers fehlgeschlagen</string>
-  <string name="msg_ip_error_op_exc">Vorgang ist wegen eines Datenbankfehlers fehlgeschlagen</string>
-  <string name="msg_ip_error_remote_ex">Die Anwendung ist wegen internen Fehler fehlgeschlagen</string>
+  <string name="msg_ip_encode_fail">Vorgang aufgrund Kodierungsfehler fehlgeschlagen</string>
+  <string name="msg_ip_error_io_exc">Vorgang augrund Eingabe/Ausgabe-Fehler fehlgeschlagen</string>
+  <string name="msg_ip_error_op_exc">Vorgang aufgrund eines Datenbankfehlers fehlgeschlagen</string>
+  <string name="msg_ip_error_remote_ex">Vorgang augrund internem Fehler fehlgeschlagen</string>
   <string name="msg_ip">Importiere öffentlichen Schlüsselbund %s</string>
   <string name="msg_ip_insert_keyring">Schlüsselbund-daten werden kodiert</string>
   <string name="msg_ip_insert_keys">Analysiere Schlüssel</string>
@@ -486,47 +513,102 @@
   <string name="msg_ip_master">Hauptschlüssel %s wird verarbeitet</string>
   <string name="msg_ip_master_expired">Schlüsselbund abgelaufen am %s</string>
   <string name="msg_ip_master_expires">Schlüsselbund läuft ab am %s</string>
-  <string name="msg_ip_master_flags_ces">Hauptschlüssel Attribute: beglaubigen, verschlüsseln, signieren</string>
-  <string name="msg_ip_master_flags_cex">Hauptschlüssel Attribute: beglaubigen, verschlüsseln</string>
-  <string name="msg_ip_master_flags_cxs">Hauptschlüssel Attribute: beglaubigen, signieren</string>
-  <string name="msg_ip_master_flags_xes">Hauptschlüssel Attribute: verschlüsseln, signieren</string>
-  <string name="msg_ip_master_flags_cxx">Hauptschlüssel Attribute: beglaubigen</string>
-  <string name="msg_ip_master_flags_xex">Hauptschlüssel Attribute: verschlüsseln</string>
-  <string name="msg_ip_master_flags_xxs">Hauptschlüssel Attribute: signieren</string>
-  <string name="msg_ip_master_flags_xxx">Hauptschlüssel Attribute: Keine</string>
   <string name="msg_ip_subkey">Unterschlüssel %s wird bearbeitet</string>
-  <string name="msg_ip_subkey_flags_ces">Unterschlüssel Attribute: beglaubigen, verschlüsseln, signieren</string>
-  <string name="msg_ip_subkey_flags_cex">Unterschlüssel Attribute: beglaubigen, verschlüsseln</string>
-  <string name="msg_ip_subkey_flags_cxs">Unterschlüssel Attribute: beglaubigen, signieren</string>
-  <string name="msg_ip_subkey_flags_xes">Unterschlüssel Attribute: verschlüsseln, signieren</string>
-  <string name="msg_ip_subkey_flags_cxx">Unterschlüssel Attribute: beglaubigen</string>
-  <string name="msg_ip_subkey_flags_xex">Unterschlüssel Attribute: verschlüsseln</string>
-  <string name="msg_ip_subkey_flags_xxs">Unterschlüssel Attribute: signieren</string>
-  <string name="msg_ip_subkey_flags_xxx">Unterschlüssel Attribute: Keine</string>
+  <string name="msg_ip_subkey_expired">Unterschlüssel am %s abgelaufen</string>
+  <string name="msg_ip_subkey_expires">Unterschlüssel läuft am %s ab</string>
   <string name="msg_ip_success">Öffentlicher Schlüsselbund erfolgreich importiert</string>
   <string name="msg_ip_success_identical">Schlüsselbund enthält keine neuen Daten, es gibt nichts zu tun.</string>
+  <string name="msg_ip_reinsert_secret">Geheimen Schlüssel wiedereinfügen</string>
   <string name="msg_ip_uid_cert_bad">Fehlerhafte Beglaubigung aufgetreten!</string>
   <string name="msg_ip_uid_cert_error">Fehler beim Verarbeiten der Beglaubigung!</string>
+  <string name="msg_ip_uid_cert_nonrevoke">Besitzt bereits eine nicht widerrufbare Beglaubigung, überspringe.</string>
+  <string name="msg_ip_uid_cert_old">Beglaubgigung ist älter als Vorherige, überspringe.</string>
+  <string name="msg_ip_uid_cert_new">Beglaubigung ist aktueller, ersetze Vorherhige.</string>
+  <string name="msg_ip_uid_cert_good">Korrekte Beglaubigung von %1$s gefunden</string>
+  <string name="msg_ip_uid_cert_good_revoke">Korrekten Zertifikatswiderruf von %1$s gefunden</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="one">Ignoriere eine Beglaubigung, ausgestellt von unbekanntm öffentlichen Schlüssel</item>
     <item quantity="other">Ignoriere %s Beglaubigungen, ausgestellt von unbekannten öffentlichen Schlüsseln</item>
   </plurals>
+  <string name="msg_ip_uid_classifying_zero">Klassifiziere Benutzerkennungen (Keine vertrauenswürdigen Schlüssel verfügbar)</string>
+  <plurals name="msg_ip_uid_classifying">
+    <item quantity="one">Klassifiziere Benutzerkennungen (verwende einen vertrauenswürdigen Schlüssel)</item>
+    <item quantity="other">Klassifiziere Benutzerkennungen (verwende %s vertrauenswürdige Schlüssel)</item>
+  </plurals>
+  <string name="msg_ip_uid_reorder">Benutzerkennungen neu ordnen</string>
+  <string name="msg_ip_uid_processing">Verarbeite Benutzerkennung %s</string>
   <string name="msg_ip_uid_revoked">Benutzerkennung wurde widerrufen</string>
   <string name="msg_is_bad_type_public">Es wurde versucht einen öffentlichen Schlüsselbund als Geheim zu importieren. Das ist ein Fehler, bitte reiche einen Bericht ein.</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Importiere geheimen Schlüssel %s</string>
   <string name="msg_is_db_exception">Datenbankfehler!</string>
   <string name="msg_is_importing_subkeys">Geheime Unterschlüssel werden bearbeitet</string>
-  <string name="msg_is_io_exc">Kodierungsfehler Schlüsselbund</string>
+  <string name="msg_is_error_io_exc">Fehler bei Kordierung des Schlüsselbunds</string>
   <string name="msg_is_pubring_generate">Generiere öffentlichen Schlüsselbund aus geheimem Schlüsselbund</string>
+  <string name="msg_is_subkey_nonexistent">Unterschlüssel %s in privatem Schlüssel nicht verfügbar.</string>
+  <string name="msg_is_subkey_ok">Geheimen Unterschlüssel %s als verfügbar markiert</string>
+  <string name="msg_is_subkey_empty">Geheimen Unterschlüssel %s als verfügbar markiert, ohne Passphrase</string>
+  <string name="msg_is_subkey_stripped">Privater Unterschlüssel %s als gekürzt markiert</string>
+  <string name="msg_is_subkey_divert">Privater Unterschlüssel %s als \'Umleiten zu Smartcard/NFC\' markiert</string>
   <string name="msg_is_success_identical">Schlüsselbund enthält keine neuen Daten, es gibt nichts zu tun.</string>
   <string name="msg_is_success">Geheimer Schlüsselbund erfolgreich importiert</string>
   <!--Keyring Canonicalization log entries-->
+  <string name="msg_kc_error_v3">Dies ist ein OpenPGP Schlüssel der Version 3, welche hinfällig sind und nicht weiter unterstützt werden!</string>
+  <string name="msg_kc_error_no_uid">Schlüsselbund hat keine gültigen Benutzerkennungen!</string>
+  <string name="msg_kc_error_master_algo">Der Hauptschlüssel verwendet einen unbekannten (%s) Algorithmus!</string>
+  <string name="msg_kc_master">Verarbeite Hauptschlüssel</string>
   <string name="msg_kc_revoke_bad_err">Entferne fehlerhaftes Schlüsselbund Widerrufszertifikat</string>
+  <string name="msg_kc_revoke_bad_local">Entferne Schlüsselbund Widerrufszertifikat mit \"Lokal\" Attribut</string>
+  <string name="msg_kc_revoke_bad_time">Entferne Schlüsselbund Widerrufszertifikat mit zukünftigem Zeitstempel</string>
+  <string name="msg_kc_revoke_bad_type">Entferne Hauptschlüsselbeglaubigung unbekannter Art (%s)</string>
+  <string name="msg_kc_revoke_bad_type_uid">Entferne Benutzerkennungsbeglaubigung an falscher Position</string>
+  <string name="msg_kc_revoke_bad">Entferne fehlerhaftes Schlüsselbund Widerrufszertifikat</string>
+  <string name="msg_kc_revoke_dup">Entferne redundantes Schlüsselbund Widerrufszertifikat</string>
   <string name="msg_kc_sub">Verarbeite Unterschlüssel %s</string>
+  <string name="msg_kc_sub_bad">Entferne ungültige Unterschlüssel Zwischenbeglaubigung</string>
+  <string name="msg_kc_sub_bad_err">Entferne fehlerhafte Unterschlüssel Zwischenbeglaubigung</string>
+  <string name="msg_kc_sub_bad_local">Entferne Unterschlüssel Zwischenzertifikat mit \"Lokal\" Attribut</string>
+  <string name="msg_kc_sub_bad_keyid">Ungleiche Zwischenausstellerkennung beim Unterschlüssels</string>
+  <string name="msg_kc_sub_bad_time">Entferne Unterschlüssel Zwischenbeglaubigung mit zukünftigem Zeitstempel</string>
+  <string name="msg_kc_sub_bad_type">Unbekannte Unterschlüsselbeglaubigungart: %s</string>
+  <string name="msg_kc_sub_dup">Entferne redundate Unterschlüssel Zwischenwischenbeglaubigung</string>
+  <string name="msg_kc_sub_primary_bad">Entferne Unterschlüssel Zwischenbeglaubigung aufgrund ungültiger primärer Zwischenbeglaubigung</string>
+  <string name="msg_kc_sub_primary_bad_err">Entferne Unterschlüssel Zwischenbeglaubigung aufgrund fehlerhafter primärer Zwischenbeglaubigung</string>
+  <string name="msg_kc_sub_primary_none">Entferne Unterschlüssel Zwischenbeglaubigung aufgrund fehlender primärer Zwischenbeglaubigung</string>
+  <string name="msg_kc_sub_no_cert">Keine gültige Beglaubigung für %s gefunden, entferne vom Ring</string>
+  <string name="msg_kc_sub_revoke_bad_err">Entferne fehlerhaftes Unterschlüssel Widerrufszertifikat</string>
+  <string name="msg_kc_sub_revoke_bad">Entferne fehlerhaftes Unterschlüssel Widerrufszertifikat</string>
+  <string name="msg_kc_sub_revoke_dup">Entferne redundantes Unterschlüssel Widerrufszertifikat</string>
+  <string name="msg_kc_sub_unknown_algo">Unterschlüssel verwendet unbekannten Algorithmus, wird nicht importiert...</string>
+  <string name="msg_kc_uid_bad_err">Entferne fehlerhafte Eigenbeglaubigung für Benutzerkennung \'%s\'</string>
+  <string name="msg_kc_uid_bad_local">Entferne Benutzerkennungsbeglaubigung mit \'Lokal\' Attribut</string>
+  <string name="msg_kc_uid_bad_time">Entferne Benutzerkennung mit zukünftigem Zeitstempel</string>
+  <string name="msg_kc_uid_bad_type">Entferne Benutzerkennungsbeglaubigung unbekannter Art (%s)</string>
+  <string name="msg_kc_uid_bad">Entferne fehlerhafte Eigenbeglaubigung für Benutzerkennung \'%s\'</string>
+  <string name="msg_kc_uid_cert_dup">Entferne abgelaufene Eigenbeglaubigung für Benutzerkennung \'%s\'</string>
+  <string name="msg_kc_uid_foreign">Entferne fremde Benutzerkennungsbeglaubigung von \'%s\'</string>
+  <string name="msg_kc_uid_revoke_dup">Entferne redundantes Widerrufszertifikat für Benutzerkennung \'%s\'</string>
+  <string name="msg_kc_uid_revoke_old">Entferne abgelaufenes Widerrufszertifikat für Benutzerkennung \'%s\'</string>
+  <string name="msg_kc_uid_no_cert">Keine gültige Eigenbeglaubigung für Benutzerkennung \'%s\' gefunden, entferne vom Ring</string>
+  <string name="msg_kc_uid_remove">Ungültige Benutzerkennung \'%s\' wird entfernt</string>
+  <string name="msg_kc_uid_dup">Entferne doppelte Benutzerkennung \'%s\'. Der geheime Schlüssel enthielt zwei davon. Hieraus könnten fehlende Beglaubigungen resultieren!</string>
+  <string name="msg_kc_uid_warn_encoding">Benutzerkennung nicht als UTF-8 bestätigt!</string>
   <!--Keyring merging log entries-->
+  <string name="msg_mg_error_secret_dummy">Neuer öffentlicher Unterschlüssel gefunden, aber Erstellung von geheimen Unterschlüsseldummys wird nicht unterstützt!</string>
+  <string name="msg_mg_error_heterogeneous">Versucht Schlüsselbunde mit unterschiedlichen Fingerabdrücken zusammenzufügen!</string>
+  <string name="msg_mg_error_encode">Schwerer Fehler bei Kodierung der Signatur!</string>
+  <string name="msg_mg_public">Vereine in öffentlichen Schlüsselbund %s </string>
+  <string name="msg_mg_secret">Vereine in geheimen Schlüsselring %s</string>
+  <string name="msg_mg_new_subkey">Neuer Unterschlüssel %s wird hinzugefügt</string>
+  <string name="msg_mg_found_new">%s neue Beglaubigungen in Schlüsselbund gefunden</string>
+  <string name="msg_mg_unchanged">Keine neuen Zertifikate</string>
   <!--createSecretKeyRing-->
+  <string name="msg_cr">Neuer Masterschlüssel wird erzeugt</string>
+  <string name="msg_cr_error_no_master">Keine Hauptschlüsseloptionen definiert!</string>
+  <string name="msg_cr_error_no_user_id">Schlüsselbund muss mit mindestens einer Benutzerkennung erstellt werden!</string>
   <string name="msg_cr_error_no_certify">Hauptschlüssel benötigt das Attribut beglaubigen!</string>
+  <string name="msg_cr_error_null_expiry">Ablaufdatum kann bei Schlüsselerstellung nicht \'gleiche wie vorher\' sein. Das ist ein Programmierfehler, bitte reiche einen Fehlerbericht ein.</string>
+  <string name="msg_cr_error_keysize_512">Schlüsselgröße muss größer/gleich 512 sein!</string>
   <string name="msg_cr_error_no_curve">Keine Schlüsselgröße angegeben. Das ist ein Progammierfehler, bitte reiche einen Fehlerbericht ein!</string>
   <string name="msg_cr_error_no_keysize">Keine Elliptische Kurve angegeben. Das ist ein Progammierfehler, bitte reiche einen Fehlerbericht ein!</string>
   <string name="msg_cr_error_internal_pgp">Interner PGP Fehler!</string>
@@ -536,20 +618,144 @@
   <string name="msg_cr_error_flags_ecdsa">Falsche Schlüsselattribute gewählt, ECDSA kann nicht zum verschlüsseln verwendet werden!</string>
   <string name="msg_cr_error_flags_ecdh">Falsche Schlüsselattribute gewählt, ECDH kann nicht zum signieren verwendet werden!</string>
   <!--modifySecretKeyRing-->
+  <string name="msg_mr">Verändere Schlüsselbund %s</string>
+  <string name="msg_mf_error_encode">Kodierungsfehler!</string>
+  <string name="msg_mf_error_fingerprint">Tatsächlicher Fingerabdruck des Schlüssels entspricht nicht dem Erwarteten!</string>
   <string name="msg_mf_error_keyid">Keine Schlüssel ID. Dies ist ein interner Fehler, bitte reiche einen Fehlerbericht ein.</string>
+  <string name="msg_mf_error_integrity">Interner Fehler, Integritätsprüfung fehlgeschlagen!</string>
+  <string name="msg_mf_error_master_none">Keine Hauptbeglaubigung zum arbeiten gefunden! (Alle widerrufen?)</string>
   <string name="msg_mf_error_noexist_primary">Falsche primäre User-ID definiert!</string>
   <string name="msg_mf_error_noexist_revoke">Falsche User-ID für Widerruf definiert!</string>
+  <string name="msg_mf_error_revoked_primary">Widerrufene Benutzerkennungen können keine Primäre sein!</string>
+  <string name="msg_mf_error_null_expiry">Ablaufdatum kann bei Unterschlüsselerstellung nicht \'gleiche wie vorher\' sein. Das ist ein Programmierfehler, bitte reiche einen Fehlerbericht ein.</string>
+  <string name="msg_mf_error_passphrase_master">Schwerer Fehler beim Entschlüsseln des Hauptschlüssels! Dies ist wahrscheinlich ein Programmierfehler, bitte reiche einen Fehlerbericht ein.</string>
+  <string name="msg_mf_error_pgp">Interner PGP-Fehler!</string>
+  <string name="msg_mf_error_sig">Signaturfehler!</string>
+  <string name="msg_mf_master">Verändere Hauptbeglaubigungen</string>
+  <string name="msg_mf_passphrase">Speichere Passwort für Schlüsselbund zwischen...</string>
+  <string name="msg_mf_passphrase_key">Erneute Verschlüsselung des Unterschlüssels %s mit neuem Passwort</string>
+  <string name="msg_mf_passphrase_empty_retry">Setzen des neuen Passworts fehlgeschlagen, versuche es nochmal mit leerem altem Passwort</string>
+  <string name="msg_mf_passphrase_fail">Passwort für Unterschlüssel konnte nicht geändert werden! (Hat er ein anderes als die anderen Schlüssel?)</string>
+  <string name="msg_mf_primary_replace_old">Ersetze Beglaubigungen von vorheriger primärer Benutzerkennung</string>
+  <string name="msg_mf_primary_new">Erzeuge neue Beglaubigung für neue primäre Benutzerkennung</string>
+  <string name="msg_mf_subkey_change">Unterschlüssel %s wird geändert</string>
+  <string name="msg_mf_error_subkey_missing">Versuch mit fehlendem Unterschlüssel %s zu arbeiten!</string>
+  <string name="msg_mf_subkey_new">Füge neuen Unterschlüssel vom Typ %s hinzu</string>
+  <string name="msg_mf_subkey_new_id">Neue Unterschlüsselkennung: %s</string>
+  <string name="msg_mf_error_past_expiry">Ablaufdatum kann nicht in der Vergangenheit liegen!</string>
+  <string name="msg_mf_subkey_revoke">Widerrufe Unterschlüssel %s</string>
+  <string name="msg_mf_subkey_strip">Kürze Unterschlüssel %s</string>
+  <string name="msg_mf_success">Schlüsselbund erfolgreich verändert</string>
+  <string name="msg_mf_uid_add">Benutzerkennung %s wird hinzugefügt</string>
   <string name="msg_mf_uid_primary">Ändere primäre Benutzerkenung auf %s</string>
   <string name="msg_mf_uid_revoke">Widerrufe Benutzerkennung %s</string>
   <string name="msg_mf_uid_error_empty">Benutzerkennung darf nicht leer sein!</string>
   <string name="msg_mf_unlock_error">Fehler beim entsperren des Schlüsselbunds</string>
   <string name="msg_mf_unlock">Schlüsselbund wird entsperrt</string>
   <!--Consolidate-->
+  <string name="msg_con">Führe Datenbank zusammen</string>
+  <string name="msg_con_error_bad_state">Zusammenführung wurde gestartet, während keine Datenbank zwischengespeichert war! Dies ist wahrscheinlich ein Programmierfehler, bitte reiche einen Fehlerbericht ein!</string>
+  <string name="msg_con_error_concurrent">Zusammenführung abgebrochen, läuft bereits in einem anderen Prozess!</string>
+  <string name="msg_con_save_secret">Geheime Schlüsselringe werden gespeichert</string>
+  <string name="msg_con_save_public">Öffentliche Schlüsselringe werden gespeichert</string>
+  <string name="msg_con_db_clear">Datenbank wird geleert</string>
+  <string name="msg_con_success">Datenbank erfolgreich zusammengeführt!</string>
+  <string name="msg_con_critical_in">Beginne kritische Phase!</string>
+  <string name="msg_con_critical_out">Verlasse kritische Phase</string>
+  <string name="msg_con_delete_public">Lösche Cache-Datei des öffentlichen Schlüsselbundes</string>
+  <string name="msg_con_delete_secret">Lösche Cache-Datei des geheimen Schlüsselbundes</string>
+  <string name="msg_con_error_db">Fehler bei der Öffnung der Datenbank!</string>
+  <string name="msg_con_error_io_public">Ein-/Ausgabefehler beim Schreiben von öffentlichen Schlüsseln in den Cache!</string>
+  <string name="msg_con_error_io_secret">Ein-/Ausgabefehler beim Schreiben von geheimen Schlüsseln in den Cache!</string>
+  <string name="msg_con_error_public">Fehler beim wieder importieren der öffentlichen Schlüssel!</string>
+  <string name="msg_con_error_secret">Fehler beim wieder importieren der geheimen Schlüssel!</string>
+  <plurals name="msg_con_recover">
+    <item quantity="one">Wiederherstellung der Zusammenführung mit %1$d geheimen und %2$d öffentlichen Schlüssel</item>
+    <item quantity="other">Wiederherstellung der Zusammenführung mit %1$d geheimen und %2$d öffentlichen Schlüsseln</item>
+  </plurals>
+  <string name="msg_con_recover_unknown">Wiederherstellung aus unbekanntem Zustand</string>
+  <plurals name="msg_con_reimport_public">
+    <item quantity="one">Wiederimport eines öffentlichen Schlüssels </item>
+    <item quantity="other">Wiederimport von %d öffentlichen Schlüsseln</item>
+  </plurals>
+  <string name="msg_con_reimport_public_skip">Keine öffentlichen Schlüssel für wiederimport, überspringe...</string>
+  <plurals name="msg_con_reimport_secret">
+    <item quantity="one">Wiederimport eines geheimen Schlüssels</item>
+    <item quantity="other">Wiederimport von %d geheimen Schlüsseln</item>
+  </plurals>
+  <string name="msg_con_reimport_secret_skip">Keine geheimen Schlüssel für Wiederimport, überspringe...</string>
+  <string name="msg_con_warn_delete_public">Fehler beim Löschen der Öffentlichen Cache-Datei</string>
+  <string name="msg_con_warn_delete_secret">Fehler beim Löschen der Geheimen Cache-Datei</string>
   <!--Other messages used in OperationLogs-->
+  <string name="msg_ek_error_divert">Bearbeiten von NFC Schlüsseln wird (noch) nicht unterstützt!</string>
+  <string name="msg_ek_error_dummy">Kann Schlüsselbund nicht mit gekürztem Hauptschlüssel bearbeiten!</string>
   <string name="msg_ek_error_not_found">Schlüssel nicht gefunden!</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_askip_no_key">Daten mit unbekanntem Schlüssel verschlüsselt, überspringe...</string>
+  <string name="msg_dc_askip_not_allowed">Daten mit nicht zugelassenem Schlüssel verschlüsselt, überspringe...</string>
+  <string name="msg_dc_asym">Block asymmetrisch verschlüsselter Daten für Schlüssel %s gefunden</string>
+  <string name="msg_dc_clear_data">Verarbeite Klartextdaten</string>
+  <string name="msg_dc_clear_decompress">Entpacke komprimierte Daten</string>
+  <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_time">Änderungszeit: %s</string>
+  <string name="msg_dc_clear_signature_bad">Signaturprüfung NICHT OK!</string>
+  <string name="msg_dc_clear_signature_check">Überprüfe Signaturdaten</string>
+  <string name="msg_dc_clear_signature_ok">Signaturprüfung OK</string>
+  <string name="msg_dc_clear_signature">Speichere Signatur für später</string>
+  <string name="msg_dc_clear">Verarbeite Klartextdaten</string>
+  <string name="msg_dc_error_bad_passphrase">Fehler bei Schlüsselentsperrung, falsches Passwort!</string>
+  <string name="msg_dc_error_extract_key">Unbekannter Fehler bei Schlüsselentsperrung!</string>
+  <string name="msg_dc_error_integrity_check">Integritätsprüfungsfehler!</string>
+  <string name="msg_dc_error_invalid_siglist">Keine gültigen Signaturdaten gefunden!</string>
+  <string name="msg_dc_error_io">Ein-/Ausgabefehler während Vorgang aufgetreten!</string>
+  <string name="msg_dc_error_no_data">Keine verschlüsselten Daten in Datenstrom gefunden!</string>
+  <string name="msg_dc_error_no_key">Keine verschlüsselten Daten mit bekanntem geheimen Schlüssel in Datenstrom gefunden!</string>
+  <string name="msg_dc_error_pgp_exception">PGP Ausnahme während des Vorgangs aufgetreten!</string>
+  <string name="msg_dc_integrity_check_ok">Integritätsprüfung OK!</string>
+  <string name="msg_dc_ok_meta_only">Es wurden nur Metadaten angefragt, überspringe Entschlüsselung</string>
+  <string name="msg_dc_ok">OK</string>
+  <string name="msg_dc_pass_cached">Verwende Passwort aus Zwischenspeicher</string>
+  <string name="msg_dc_pending_nfc">NFC Token benötigt, verlange Benutzereingabe...</string>
+  <string name="msg_dc_pending_passphrase">Passwort benötigt, verlange Benutezreingabe...</string>
+  <string name="msg_dc_prep_streams">Bereite Datenkette </string>
+  <string name="msg_dc">Starte Entschlüsselungsvorgang...</string>
+  <string name="msg_dc_sym_skip">Symmetrische Daten nicht erlaubt, überspringe...</string>
+  <string name="msg_dc_sym">Block symmetrisch verschlüsselter Daten gefunden</string>
+  <string name="msg_dc_unlocking">Geheimer Schlüssel wird entsperrt</string>
   <!--Messages for SignEncrypt operation-->
+  <string name="msg_se_asymmetric">Bereite öffentliche Schlüssel für Verschlüsselung vor</string>
+  <string name="msg_se_clearsign_only">Signieren von Klartexteingaben wird nicht Unterstützt!</string>
+  <string name="msg_se_compressing">Bereite Kompression vor</string>
+  <string name="msg_se_encrypting">Daten werden verschlüsselt</string>
+  <string name="msg_se_error_bad_passphrase">Falsches Passwort!</string>
+  <string name="msg_se_error_io">Ein-/Ausgabefehler während Vorgang aufgetreten!</string>
+  <string name="msg_se_error_key_sign">Gewählter Signaturschlüssel kann keine Daten signieren!</string>
+  <string name="msg_se_error_sign_key">Fehler bei Abruf des Signaturschlüssels!</string>
+  <string name="msg_se_error_nfc">NFC-Datenfehler!</string>
+  <string name="msg_se_error_no_passphrase">Kein Passwort bereitgestellt!</string>
+  <string name="msg_se_error_pgp">Interner PGP-Fehler!</string>
+  <string name="msg_se_error_sig">PGP Signaturausnahme aufgetreten!</string>
+  <string name="msg_se_error_unlock">Unbekannter Fehler bei Schlüsselentsperrung!</string>
+  <string name="msg_se_key_ok">Verschlüssele für Schlüssel: %s</string>
+  <string name="msg_se_key_unknown">Fehlender Schlüssel für Verschlüsselung: %s</string>
+  <string name="msg_se_key_warn">Falscher Schlüssel für Verschlüsselung: %s</string>
+  <string name="msg_se_ok">Signierungs-/Verschlüsselungsvorgang erfolgreich!</string>
+  <string name="msg_se_pending_nfc">NFC Token benötigt, verlange Benutzereingabe...</string>
+  <string name="msg_se_pending_passphrase">Passwort benötigt, verlange Benutezreingabe...</string>
+  <string name="msg_se_signing">Signiere Daten (ohne Verschlüsselung)</string>
+  <string name="msg_se_sigcrypting">Verschlüssele Daten mit Signatur</string>
+  <string name="msg_se">Starte Signier- und/oder Verschlüsselungsvorgang</string>
+  <string name="msg_se_symmetric">Bereite symmetrische Verschlüsselung vor</string>
+  <string name="msg_crt_upload_success">Schlüssel wurde erfolgreich hochgeladen</string>
+  <string name="msg_crt_success">Identitäten erfolgreich beglaubigt</string>
+  <string name="msg_acc_saved">Konto gespeichert</string>
   <!--PassphraseCache-->
+  <string name="passp_cache_notif_click_to_clear">Klicken um Passworte aus Zwischenspeicher zu leeren</string>
+  <string name="passp_cache_notif_n_keys">OpenKeychain hat %d Passworte zwischengespeichert</string>
+  <string name="passp_cache_notif_keys">Zwischengespeicherte Passworte:</string>
+  <string name="passp_cache_notif_clear">Cache löschen</string>
   <string name="passp_cache_notif_pwd">Passwort</string>
   <!--unsorted-->
   <string name="section_certifier_id">Beglaubiger</string>
@@ -557,6 +763,7 @@
   <string name="label_user_id">Identität</string>
   <string name="unknown_uid">&lt;unbekannt&gt;</string>
   <string name="empty_certs">Keine Beglaubigungen für diesen Schlüssel</string>
+  <string name="certs_text">Nur geprüfte Eigenbeglaubigungen und geprüfte Beglaubigungen welche mit deinen Schlüsseln erstellt wurden werden hier angezeigt.</string>
   <string name="section_uids_to_certify">Zu beglaubigende Identitäten</string>
   <string name="label_revocation">Widerrufsgrund</string>
   <string name="label_verify_status">Verifikationsstatus</string>
@@ -564,6 +771,7 @@
   <string name="error_key_not_found">Schlüssel nicht gefunden!</string>
   <string name="error_key_processing">Fehler bei der Verarbeitung des Schlüssels!</string>
   <string name="key_stripped">nicht verfügbar</string>
+  <string name="key_divert">Übergebe an SmartCard/NFC</string>
   <string name="key_no_passphrase">Kein Passwort</string>
   <string name="key_unavailable">nicht verfügbar</string>
   <string name="secret_cannot_multiple">Deine eigenen Schlüssel können nur einzeln gelöscht werden!</string>
@@ -573,7 +781,9 @@
   <string name="error_no_encrypt_subkey">Kein Unterschlüssel zum Verschlüsseln verfügbar!</string>
   <string name="info_no_manual_account_creation">Erstelle keine OpenKeychain-Accounts manuell.\n Für mehr Informationen sieh in die Hilfe.</string>
   <string name="contact_show_key">Schlüssel anzeigen (%s)</string>
+  <string name="swipe_to_update">Nach unten wischen um von Schlüsselserver zu aktualisieren</string>
   <!--First Time-->
+  <string name="first_time_text1">Hol dir deine Privatsphäre mit OpenKeychain zurück!</string>
   <string name="first_time_create_key">Erzeuge meinen Schlüssel</string>
   <string name="first_time_import_key">Importiere existierenden Schlüssel</string>
   <string name="first_time_skip">Setup überspringen</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index a7485bb92..6d55bace7 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -219,7 +219,6 @@
   <string name="error_key_needs_a_user_id">necesita al menos una identidad</string>
   <string name="error_no_signature_passphrase">no has proporcionado una frase de contraseña</string>
   <string name="error_no_signature_key">no has proporcionado una clave de firma</string>
-  <string name="error_invalid_data">cifrado de datos no válido</string>
   <string name="error_integrity_check_failed">¡ha fallado la comprobación de integridad! ¡Los datos han sido modificados!</string>
   <string name="error_wrong_passphrase">frase de contraseña incorrecta</string>
   <string name="error_could_not_extract_private_key">no se puede extraer la clave privada</string>
@@ -358,7 +357,6 @@
   <string name="view_log">Ver registro (log)</string>
   <string name="import_error_nothing">No hay nada que importar.</string>
   <string name="import_error_nothing_cancelled">Importación cancelada.</string>
-  <string name="import_error">¡Error importando claves!</string>
   <string name="import_with_warnings">, con advertencias</string>
   <string name="import_with_cancelled">, hasta que este cancelada</string>
   <!--Intent labels-->
@@ -450,16 +448,21 @@
     <item>Revocar subclave</item>
     <item>Desnudar subclave</item>
   </string-array>
-  <string name="edit_key_new_subkey">nueva</string>
+  <string name="edit_key_new_subkey">nueva subclave</string>
   <string name="edit_key_select_flag">¡Por favor, seleccione al menos un indicador!</string>
+  <string name="edit_key_error_add_identity">¡Añadir al menos una identidad!</string>
+  <string name="edit_key_error_add_subkey">¡Añadir al menos una subclave!</string>
   <!--Create key-->
   <string name="create_key_upload">Subir clave al servidor de claves</string>
   <string name="create_key_empty">Este campo es obligatorio</string>
   <string name="create_key_passphrases_not_equal">Las frases-contraseña no coinciden</string>
   <string name="create_key_final_text">Ha introducido la siguiente identidad:</string>
-  <string name="create_key_final_robot_text">Crear una clave puede llevar un rato, tómese una taza de café entre tanto...\n(3 subclaves, RSA, 4096 bits)</string>
+  <string name="create_key_final_robot_text">Crear una clave puede llevar un tiempo, tómese una taza de café entre tanto...</string>
+  <string name="create_key_rsa">(3 subclaves, RSA, 4096 bits)</string>
+  <string name="create_key_custom">(configuración de clave personalizada)</string>
   <string name="create_key_text">Introduzca su nombre completo, dirección de correo electrónico, y elija una frase contraseña.</string>
   <string name="create_key_hint_full_name">Nombre completo, ej. Max Mustermann</string>
+  <string name="create_key_edit">Cambiar configuración de clave</string>
   <!--View key-->
   <string name="view_key_revoked">¡Esta clave ha sido revocada!</string>
   <string name="view_key_expired">¡Esta clave ha expirado!</string>
@@ -474,7 +477,6 @@
   <string name="my_keys">Mis claves</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Escriba el texto</string>
-  <string name="decrypt_content_edit_text_hint">Introduce aquí el texto cifrado para descifrarlo y/o verificarlo...</string>
   <!--certs-->
   <string name="cert_default">predeterminado</string>
   <string name="cert_none">ninguno</string>
@@ -504,31 +506,51 @@
   <string name="msg_ip_master">Procesando clave maestra %s</string>
   <string name="msg_ip_master_expired">El juego de claves expiró el %s</string>
   <string name="msg_ip_master_expires">El juego de claves expira el %s</string>
-  <string name="msg_ip_master_flags_ces">Distintivos de clave maestra: certificar, cifrar, firmar</string>
-  <string name="msg_ip_master_flags_cex">Distintivos de clave maestra: certificar, cifrar</string>
-  <string name="msg_ip_master_flags_cxs">Distintivos de clave maestra: certificar, firmar</string>
-  <string name="msg_ip_master_flags_xes">Distintivos de clave maestra: cifrar, firmar</string>
-  <string name="msg_ip_master_flags_cxx">Distintivos de clave maestra: certificar</string>
-  <string name="msg_ip_master_flags_xex">Distintivos de clave maestra: cifrar</string>
-  <string name="msg_ip_master_flags_xxs">Distintivos de clave maestra: firmar</string>
-  <string name="msg_ip_master_flags_xxx">Distintivos de clave maestra: ninguno</string>
+  <string name="msg_ip_master_flags_unspecified">Indicativos maestros: no especificados (se asumen todos)</string>
+  <string name="msg_ip_master_flags_cesa">Indicativos maestros: certificar, cifrar, firmar, autentificar</string>
+  <string name="msg_ip_master_flags_cesx">Indicativos maestros: certificar, cifrar, firmar</string>
+  <string name="msg_ip_master_flags_cexa">Indicativos maestros: certificar, cifrar, autentificar</string>
+  <string name="msg_ip_master_flags_cexx">Indicativos maestros: certificar, cifrar</string>
+  <string name="msg_ip_master_flags_cxsa">Indicativos maestros: certificar, firmar, autentificar</string>
+  <string name="msg_ip_master_flags_cxsx">Indicativos maestros: certificar, firmar</string>
+  <string name="msg_ip_master_flags_cxxx">Indicativos maestros: certificar</string>
+  <string name="msg_ip_master_flags_xesa">Indicativos maestros: cifrar, firmar, autentificar</string>
+  <string name="msg_ip_master_flags_xesx">Indicativos maestros: cifrar, firmar</string>
+  <string name="msg_ip_master_flags_xexa">Indicativos maestros: cifrar, autentificar</string>
+  <string name="msg_ip_master_flags_xexx">Indicativos maestros: cifrar</string>
+  <string name="msg_ip_master_flags_xxsa">Indicativos maestros: firmar, autentificar</string>
+  <string name="msg_ip_master_flags_xxsx">Indicativos maestros: firmar</string>
+  <string name="msg_ip_master_flags_xxxa">Indicativos maestros: autentificar</string>
+  <string name="msg_ip_master_flags_xxxx">Indicativos maestros: ninguno</string>
   <string name="msg_ip_subkey">Procesando subclave %s</string>
   <string name="msg_ip_subkey_expired">La subclave expiró el %s</string>
   <string name="msg_ip_subkey_expires">La subclave expira el %s</string>
-  <string name="msg_ip_subkey_flags_ces">Distintivos de subclave: certificar, cifrar, firmar</string>
-  <string name="msg_ip_subkey_flags_cex">Distintivos de subclave: certificar, cifrar</string>
-  <string name="msg_ip_subkey_flags_cxs">Distintivos de subclave: certificar, firmar</string>
-  <string name="msg_ip_subkey_flags_xes">Distintivos de subclave: cifrar, firmar</string>
-  <string name="msg_ip_subkey_flags_cxx">Distintivos de subclave: certificar</string>
-  <string name="msg_ip_subkey_flags_xex">Distintivos de subclave: cifrar</string>
-  <string name="msg_ip_subkey_flags_xxs">Distintivos de subclave: firmar</string>
-  <string name="msg_ip_subkey_flags_xxx">Distintivos de subclave: ninguno</string>
+  <string name="msg_ip_subkey_flags_unspecified">Indicativos de subclave: no especificados (se asumen todos)</string>
+  <string name="msg_ip_subkey_flags_cesa">Indicativos de subclave: certificar, cifrar, firmar, autentificar</string>
+  <string name="msg_ip_subkey_flags_cesx">Indicativos de subclave: certificar, cifrar, firmar</string>
+  <string name="msg_ip_subkey_flags_cexa">Indicativos de subclave: certificar, cifrar, autentificar</string>
+  <string name="msg_ip_subkey_flags_cexx">Indicativos de subclave: certificar, cifrar</string>
+  <string name="msg_ip_subkey_flags_cxsa">Indicativos de subclave: certificar, firmar, autentificar</string>
+  <string name="msg_ip_subkey_flags_cxsx">Indicativos de subclave: certificar, firmar</string>
+  <string name="msg_ip_subkey_flags_cxxx">Indicativos de subclave: certificar</string>
+  <string name="msg_ip_subkey_flags_xesa">Indicativos de subclave: cifrar, firmar, autentificar</string>
+  <string name="msg_ip_subkey_flags_xesx">Indicativos de subclave: cifrar, firmar</string>
+  <string name="msg_ip_subkey_flags_xexa">Indicativos de subclave: cifrar, autentificar</string>
+  <string name="msg_ip_subkey_flags_xexx">Indicativos de subclave: cifrar</string>
+  <string name="msg_ip_subkey_flags_xxsa">Indicativos de subclave: firmar, autentificar</string>
+  <string name="msg_ip_subkey_flags_xxsx">Indicativos de subclave: firmar</string>
+  <string name="msg_ip_subkey_flags_xxxa">Indicativos de subclave: autentificar</string>
+  <string name="msg_ip_subkey_flags_xxxx">Indicativos de subclave: ninguno</string>
   <string name="msg_ip_success">Juego de claves públicas importado con éxito</string>
   <string name="msg_ip_success_identical">El juego de claves no contiene nuevos datos, no hay nada que hacer</string>
   <string name="msg_ip_reinsert_secret">Re-insertando clave secreta</string>
   <string name="msg_ip_uid_cert_bad">¡Se encontró un certificado defectuoso!</string>
   <string name="msg_ip_uid_cert_error">¡Error procesando certificado!</string>
-  <string name="msg_ip_uid_cert_good">La identidad del usuario está certificada por %1$s</string>
+  <string name="msg_ip_uid_cert_nonrevoke">Ya tiene un certificado no-revocable, omitiendo.</string>
+  <string name="msg_ip_uid_cert_old">El certificado es más antiguo que el anterior, omitiendo.</string>
+  <string name="msg_ip_uid_cert_new">El certificado es más reciente, reemplazando el anterior.</string>
+  <string name="msg_ip_uid_cert_good">Se encontró un certificado correcto por %1$s</string>
+  <string name="msg_ip_uid_cert_good_revoke">Se encontró un certificado de revocación correcto por %1$s</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="one">Ignorando un certificado publicado por una clave pública desconocida</item>
     <item quantity="other">Ignorando %s certificados publicados por claves públicas desconocidas</item>
@@ -547,7 +569,7 @@
   <string name="msg_is">Importando clave secreta (privada) %s</string>
   <string name="msg_is_db_exception">¡Error de base de datos!</string>
   <string name="msg_is_importing_subkeys">Procesando subclaves secretas</string>
-  <string name="msg_is_error_io_exc">Error codificando el juego de claves</string>
+  <string name="msg_is_error_io_exc">Error codificando el juego de claves (keyring)</string>
   <string name="msg_is_pubring_generate">Generando un juego de claves públicas desde el juego de claves secretas (privadas)</string>
   <string name="msg_is_subkey_nonexistent">La subclave %s no está disponible en la clave secreta (privada)</string>
   <string name="msg_is_subkey_ok">Subclave secreta (privada) %s marcada como disponible</string>
@@ -562,6 +584,7 @@
   <string name="msg_kc_error_v3">¡Esta es una clave OpenPGP versión 3, que ha sido desechada y ya no está soportada!</string>
   <string name="msg_kc_error_no_uid">¡El juego de claves no tiene identidades de usuario válidas!</string>
   <string name="msg_kc_error_master_algo">¡La clave maestra usa un algoritmo (%s) desconocido!</string>
+  <string name="msg_kc_error_dup_key">La subclave %s aparece dos veces en el juego de claves (keyring). El juego de claves está mal formado, ¡no se va a importar!</string>
   <string name="msg_kc_master">Procesando clave maestra</string>
   <string name="msg_kc_revoke_bad_err">Eliminando certificado defectuoso de revocación de juego de claves</string>
   <string name="msg_kc_revoke_bad_local">Eliminando certificado de revocación de juego de claves, con distintivo \"local\"</string>
@@ -729,7 +752,7 @@
   <string name="msg_dc_error_no_data">¡No se encontraron datos cifrados en el flujo de datos (`stream`)!</string>
   <string name="msg_dc_error_no_key">¡No se encontraron datos cifrados con clave secreta (privada) conocida en el flujo de datos (`stream`)!</string>
   <string name="msg_dc_error_pgp_exception">¡Se encontró una Excepción PGP durante la operación!</string>
-  <string name="msg_dc_integrity_check_ok">¡Comprobación de integridad correcta!</string>
+  <string name="msg_dc_integrity_check_ok">¡Comprobación de integridad CORRECTA!</string>
   <string name="msg_dc_ok_meta_only">Sólo fueron solicitados los metadatos, omitiendo descifrado</string>
   <string name="msg_dc_ok">CORRECTO</string>
   <string name="msg_dc_pass_cached">Usando frase-contraseña desde caché</string>
@@ -762,6 +785,7 @@
   <string name="msg_se_key_warn">Clave para cifrado errónea: %s</string>
   <string name="msg_se_ok">¡Operación de firmado/cifrado completada!</string>
   <string name="msg_se_pending_nfc">Se requiere credencial NFC, solicitando su introducción por el usuario...</string>
+  <string name="msg_se_pending_passphrase">Se requiere frase-contraseña, solicitando que el usuario la introduzca...</string>
   <string name="msg_se_signing">Firmando datos (sin cifrado)</string>
   <string name="msg_se_sigcrypting">Cifrando datos con firma</string>
   <string name="msg_se">Iniciando operación de firmado y/o cifrado</string>
@@ -781,7 +805,7 @@
   <string name="label_user_id">Identidad</string>
   <string name="unknown_uid">&lt;desconocido&gt;</string>
   <string name="empty_certs">No hay certificados para esta clave</string>
-  <string name="certs_text">Sólo los auto-certificados y los certificados creados con las claves de usted se muestran aquí.</string>
+  <string name="certs_text">Aquí sólo se muestran auto-certificados validados y certificados validados creados con sus claves.</string>
   <string name="section_uids_to_certify">Identidades a certificar</string>
   <string name="label_revocation">Razón de la revocación</string>
   <string name="label_verify_status">Estado de la verificación</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 4fabb0978..dfdd35f2a 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -12,6 +12,7 @@
   <string name="title_add_subkey">Ajouter une sous-clef</string>
   <string name="title_edit_key">Modifier une clef</string>
   <string name="title_preferences">Préférences</string>
+  <string name="title_cloud_search_preferences">Préférences de recherche nuagique</string>
   <string name="title_api_registered_apps">Applis</string>
   <string name="title_key_server_preference">Préférences du serveur de clefs</string>
   <string name="title_change_passphrase">Modifier la phrase de passe</string>
@@ -34,6 +35,7 @@
   <!--section-->
   <string name="section_user_ids">identités</string>
   <string name="section_keys">Sous-clefs</string>
+  <string name="section_cloud_search">Recherche nuagique</string>
   <string name="section_general">Général</string>
   <string name="section_defaults">Valeurs par défaut</string>
   <string name="section_advanced">Avancé</string>
@@ -117,6 +119,8 @@
   <string name="label_send_key">Téléverser la clef vers le serveur de clefs choisi après certification</string>
   <string name="label_fingerprint">Empreinte</string>
   <string name="expiry_date_dialog_title">Définir une date d\'expiration</string>
+  <string name="label_first_keyserver_is_used">(Le premier serveur de clefs listé est préféré)</string>
+  <string name="label_preferred">préféré</string>
   <string name="user_id_no_name">&lt;aucun nom&gt;</string>
   <string name="none">&lt;aucune&gt;</string>
   <string name="no_key">&lt;pas de clef&gt;</string>
@@ -215,7 +219,6 @@
   <string name="error_key_needs_a_user_id">au moins une identité est nécessaire</string>
   <string name="error_no_signature_passphrase">aucune phrase de passe n\'a été donnée</string>
   <string name="error_no_signature_key">aucune clef de signature n\'a été donnée</string>
-  <string name="error_invalid_data">aucune donnée de chiffrement valide</string>
   <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">phrase de passe erronnée</string>
   <string name="error_could_not_extract_private_key">impossible d\'extraire la clef privée</string>
@@ -292,6 +295,7 @@
   <string name="progress_con_reimport">consolider : réimportation...</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">Nom/courriel/ID de clef...</string>
+  <string name="hint_cloud_search_hint">Nom/Courriel/Preuve/Clef...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -326,6 +330,7 @@
   <string name="help_about_version">Version :</string>
   <!--Import-->
   <string name="import_tab_keyserver">Serveur de clefs</string>
+  <string name="import_tab_cloud">Rechercher dans le nuage</string>
   <string name="import_tab_direct">Fichier/presse-papiers</string>
   <string name="import_tab_qr_code">Code QR/NFC</string>
   <string name="import_import">Importer les clefs choisies</string>
@@ -352,7 +357,6 @@
   <string name="view_log">Consulter le journal</string>
   <string name="import_error_nothing">Rien à importer.</string>
   <string name="import_error_nothing_cancelled">Importation annulée.</string>
-  <string name="import_error">Erreur lors de l\'importation des clefs !</string>
   <string name="import_with_warnings">, avec des avertissements</string>
   <string name="import_with_cancelled">, jusqu\'à l\'annulation</string>
   <!--Intent labels-->
@@ -444,16 +448,21 @@
     <item>Révoquer la sous-clef</item>
     <item>Dépouiller la sous-clef</item>
   </string-array>
-  <string name="edit_key_new_subkey">nouvelle</string>
+  <string name="edit_key_new_subkey">nouvelle sous-clef</string>
   <string name="edit_key_select_flag">Veuillez sélectionner au moins un drapeau !</string>
+  <string name="edit_key_error_add_identity">Ajouter au moins une identité !</string>
+  <string name="edit_key_error_add_subkey">Ajouter au moins une sous-clef !</string>
   <!--Create key-->
   <string name="create_key_upload">Téléverser la clef vers le serveur de clefs</string>
   <string name="create_key_empty">Ce champ est exigé</string>
   <string name="create_key_passphrases_not_equal">Les phrases de passe ne correspondent pas</string>
   <string name="create_key_final_text">Vous avez saisie l\'identité suivante :</string>
-  <string name="create_key_final_robot_text">Créer une clef peut prendre du temps, prenez donc un café en attendant...\n(3 sous-clefs, RSA 4096 bits)</string>
+  <string name="create_key_final_robot_text">Créer une clef peut prendre du temps, prenez donc un café en attendant...</string>
+  <string name="create_key_rsa">(3 sous-clefs, RSA, 4096 bits)</string>
+  <string name="create_key_custom">(configuration personnalisée de la clef)</string>
   <string name="create_key_text">Saisissez votre nom complet, votre adresse courriel et choisissez votre phrase de passe.</string>
   <string name="create_key_hint_full_name">Nom complet, p. ex. Marc-Olivier Lagacé</string>
+  <string name="create_key_edit">Changer la configuration de la clef</string>
   <!--View key-->
   <string name="view_key_revoked">Cette clef a été révoquée !</string>
   <string name="view_key_expired">Cette clef est expirée !</string>
@@ -468,7 +477,6 @@
   <string name="my_keys">Mes clefs</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Taper le texte</string>
-  <string name="decrypt_content_edit_text_hint">Saisir le cryptogramme à déchiffrer et/ou à vérifier ici...</string>
   <!--certs-->
   <string name="cert_default">valeur par défaut</string>
   <string name="cert_none">aucun</string>
@@ -498,31 +506,51 @@
   <string name="msg_ip_master">Traitement de la clef maîtresse %s</string>
   <string name="msg_ip_master_expired">Trousseau expiré le %s</string>
   <string name="msg_ip_master_expires">Le trousseau expire le %s</string>
-  <string name="msg_ip_master_flags_ces">Drapeaux de la clef maîtresse : certifier, chiffrer, signer</string>
-  <string name="msg_ip_master_flags_cex">Drapeaux de la clef maîtresse : certifier, chiffrer</string>
-  <string name="msg_ip_master_flags_cxs">Drapeaux de la clef maîtresse : certifier, signer</string>
-  <string name="msg_ip_master_flags_xes">Drapeaux de la clef maîtresse : chiffrer, signer</string>
-  <string name="msg_ip_master_flags_cxx">Drapeaux de la clef maîtresse : certifier</string>
-  <string name="msg_ip_master_flags_xex">Drapeaux de la clef maîtresse : chiffrer</string>
-  <string name="msg_ip_master_flags_xxs">Drapeaux de la clef maîtresse : signer</string>
-  <string name="msg_ip_master_flags_xxx">Drapeaux de la clef maîtresse : aucun</string>
+  <string name="msg_ip_master_flags_unspecified">Drapeaux maîtres : non spécifiés (« tout » sera assumé)</string>
+  <string name="msg_ip_master_flags_cesa">Drapeaux maîtres : certifier, chiffrer, signer, authentifier</string>
+  <string name="msg_ip_master_flags_cesx">Drapeaux maîtres : certifier, chiffrer, signer</string>
+  <string name="msg_ip_master_flags_cexa">Drapeaux maîtres : certifier, chiffrer, authentifier</string>
+  <string name="msg_ip_master_flags_cexx">Drapeaux maîtres : certifier, chiffrer</string>
+  <string name="msg_ip_master_flags_cxsa">Drapeaux maîtres : certifier, signer, authentifier</string>
+  <string name="msg_ip_master_flags_cxsx">Drapeaux maîtres : certifier, signer</string>
+  <string name="msg_ip_master_flags_cxxx">Drapeaux maîtres : certifier</string>
+  <string name="msg_ip_master_flags_xesa">Drapeaux maîtres : chiffrer, signer, authentifier</string>
+  <string name="msg_ip_master_flags_xesx">Drapeaux maîtres : chiffrer, signer</string>
+  <string name="msg_ip_master_flags_xexa">Drapeaux maîtres : chiffrer, authentifier</string>
+  <string name="msg_ip_master_flags_xexx">Drapeaux maîtres : chiffrer</string>
+  <string name="msg_ip_master_flags_xxsa">Drapeaux maîtres : signer, authentifier</string>
+  <string name="msg_ip_master_flags_xxsx">Drapeaux maîtres : signer</string>
+  <string name="msg_ip_master_flags_xxxa">Drapeaux maîtres : authentifier</string>
+  <string name="msg_ip_master_flags_xxxx">Drapeaux maîtres : aucun</string>
   <string name="msg_ip_subkey">Traitement de la sous-clef %s</string>
   <string name="msg_ip_subkey_expired">La sous-clef a expiré le %s</string>
   <string name="msg_ip_subkey_expires">La sous-clef expire le %s</string>
-  <string name="msg_ip_subkey_flags_ces">Drapeaux de sous-clef : certifier, chiffrer, signer</string>
-  <string name="msg_ip_subkey_flags_cex">Drapeaux de sous-clef : certifier, chiffrer</string>
-  <string name="msg_ip_subkey_flags_cxs">Drapeaux de sous-clef : certifier, signer</string>
-  <string name="msg_ip_subkey_flags_xes">Drapeaux de sous-clef : chiffrer, signer</string>
-  <string name="msg_ip_subkey_flags_cxx">Drapeaux de sous-clef : certifier</string>
-  <string name="msg_ip_subkey_flags_xex">Drapeaux de sous-clef : chiffrer</string>
-  <string name="msg_ip_subkey_flags_xxs">Drapeaux de sous-clef : signer</string>
-  <string name="msg_ip_subkey_flags_xxx">Drapeaux de sous-clef : aucun</string>
+  <string name="msg_ip_subkey_flags_unspecified">Drapeaux de sous-clef : non spécifiés (« tout » sera assumé)</string>
+  <string name="msg_ip_subkey_flags_cesa">Drapeaux de sous-clef : certifier, chiffrer, signer, authentifier</string>
+  <string name="msg_ip_subkey_flags_cesx">Drapeaux de sous-clef : certifier, chiffrer, signer</string>
+  <string name="msg_ip_subkey_flags_cexa">Drapeaux de sous-clef : certifier, chiffrer, authentifier</string>
+  <string name="msg_ip_subkey_flags_cexx">Drapeaux de sous-clef : certifier, chiffrer</string>
+  <string name="msg_ip_subkey_flags_cxsa">Drapeaux de sous-clef : certifier, signer, authentifier</string>
+  <string name="msg_ip_subkey_flags_cxsx">Drapeaux de sous-clef : certifier, signer</string>
+  <string name="msg_ip_subkey_flags_cxxx">Drapeaux de sous-clef : certifier</string>
+  <string name="msg_ip_subkey_flags_xesa">Drapeaux de sous-clef : chiffrer, signer, authentifier</string>
+  <string name="msg_ip_subkey_flags_xesx">Drapeaux de sous-clef : chiffrer, signer</string>
+  <string name="msg_ip_subkey_flags_xexa">Drapeaux de sous-clef : chiffrer, authentifier</string>
+  <string name="msg_ip_subkey_flags_xexx">Drapeaux de sous-clef : chiffrer</string>
+  <string name="msg_ip_subkey_flags_xxsa">Drapeaux de sous-clef : signer, authentifier</string>
+  <string name="msg_ip_subkey_flags_xxsx">Drapeaux de sous-clef : signer</string>
+  <string name="msg_ip_subkey_flags_xxxa">Drapeaux de sous-clef : authentifier</string>
+  <string name="msg_ip_subkey_flags_xxxx">Drapeaux de sous-clef : aucun</string>
   <string name="msg_ip_success">Importation du trousseau public réussie</string>
   <string name="msg_ip_success_identical">Le trousseau ne contient pas de nouvelle donnée, rien à faire</string>
   <string name="msg_ip_reinsert_secret">Réinsertion de la clef secrète</string>
   <string name="msg_ip_uid_cert_bad">Un mauvais certificat a été rencontré !</string>
   <string name="msg_ip_uid_cert_error">Erreur lors du traitement du certificat !</string>
-  <string name="msg_ip_uid_cert_good">L\'ID d\'utilisateur est certifié par %1$s</string>
+  <string name="msg_ip_uid_cert_nonrevoke">Il y a déjà un certificat non-révocable, étape ignorée.</string>
+  <string name="msg_ip_uid_cert_old">Le certificat est plus ancien que le précédent, étape ignorée.</string>
+  <string name="msg_ip_uid_cert_new">Le certificat est plus récent, remplacement du précédent.</string>
+  <string name="msg_ip_uid_cert_good">Un bon certificat par %1$s a été trouvé</string>
+  <string name="msg_ip_uid_cert_good_revoke">Une bonne révocation de certificat par %1$s a été trouvée</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="one">Un certificat ignoré provenant d\'une clef publique inconnue</item>
     <item quantity="other">%s certificats ignorés provenant de clefs publiques inconnues</item>
@@ -556,6 +584,7 @@
   <string name="msg_kc_error_v3">Ceci est une clef OpenPGP version 3, qui a été déprécié et n\'est plus pris en charge !</string>
   <string name="msg_kc_error_no_uid">Le trousseau n\'a pas d\'ID d\'utilisateur valide !</string>
   <string name="msg_kc_error_master_algo">La clef maîtresse utilise un algorithme (%s) inconnu ! </string>
+  <string name="msg_kc_error_dup_key">La sous-clef %s se présente deux fois dans le trousseau. Le trousseau est mal formé, pas d\'importation ! </string>
   <string name="msg_kc_master">Traitement de la clef maîtresse</string>
   <string name="msg_kc_revoke_bad_err">Suppression du mauvais certificat de révocation du trousseau</string>
   <string name="msg_kc_revoke_bad_local">Suppression du certificat de révocation du trousseau ayant le drapeau « local »</string>
@@ -602,6 +631,7 @@
   <string name="msg_kc_uid_no_cert">Aucun auto-certificat valide trouvé pour l\'ID d\'utilisateur « %s », qui est maintenant enlevé du trousseau</string>
   <string name="msg_kc_uid_remove">Suppression de l\'ID d\'utilisateur invalide « %s »</string>
   <string name="msg_kc_uid_dup">Suppression de l\'ID d\'utilisateur en double « %s ». La clef secrète en contenait deux. Ceci pourrait entraîner des certificats manquants !</string>
+  <string name="msg_kc_uid_warn_encoding">L\'ID d\'utilisateur ne passe pas le test UTF-8 !</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_error_secret_dummy">Une nouvelle sous-clef publique a été trouvée, mais la génération de sous-clef secrète factice n\'est pas prise en charge !</string>
   <string name="msg_mg_error_heterogeneous">Il a été tenté de fusionner des trousseaux avec des empreintes différentes !</string>
@@ -638,6 +668,7 @@
   <string name="msg_mf_error_revoked_primary">Les ID d\'utilisateurs révoqués ne peuvent pas être principaux !</string>
   <string name="msg_mf_error_null_expiry">L\'expiration ne peut pas être « pareille qu\'avant » lors de la création de sous-clefs. Ceci est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
   <string name="msg_mf_error_passphrase_master">Erreur fatale lors du déchiffrement de la clef maîtresse ! Ceci est probablement une erreur de programmation, veuillez remplir un rapport de bogue !</string>
+  <string name="msg_mf_error_pgp">Erreur interne de PGP !</string>
   <string name="msg_mf_error_sig">Exception de signature !</string>
   <string name="msg_mf_master">Modification des certifications maîtresses</string>
   <string name="msg_mf_passphrase">Changement de la phrase de passe pour le trousseau...</string>
@@ -699,7 +730,69 @@
   <string name="msg_ek_error_dummy">Impossible de modifier un trousseau avec une clef maîtresse dépouillée !</string>
   <string name="msg_ek_error_not_found">Clef introuvable !</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_askip_no_key">Les données ne sont pas chiffrées avec un clef connue, étape ignorée...</string>
+  <string name="msg_dc_askip_not_allowed">Les données ne sont pas chiffrées avec un clef autorisée, étape ignorée...</string>
+  <string name="msg_dc_asym">Un bloc de données chiffrées asymétriquement a été trouvé pour la clef %s</string>
+  <string name="msg_dc_clear_data">Traitement des données littérales</string>
+  <string name="msg_dc_clear_decompress">Extraction des données compressées</string>
+  <string name="msg_dc_clear_meta_file">Nom de fichier : %s</string>
+  <string name="msg_dc_clear_meta_mime">Type MIME : %s</string>
+  <string name="msg_dc_clear_meta_size">Taille de fichier : %s</string>
+  <string name="msg_dc_clear_meta_time">Heure de modification : %s</string>
+  <string name="msg_dc_clear_signature_bad">La vérification de la signature n\'est PAS CORRECTE !</string>
+  <string name="msg_dc_clear_signature_check">Vérification des données de signature</string>
+  <string name="msg_dc_clear_signature_ok">La vérification de la signature OK</string>
+  <string name="msg_dc_clear_signature">Enregistrement des données de signature pour plus tard</string>
+  <string name="msg_dc_clear">Traitement des données de texte en clair</string>
+  <string name="msg_dc_error_bad_passphrase">Erreur lors du déverrouillage de la clef, phrase de passe erronée !</string>
+  <string name="msg_dc_error_extract_key">Erreur inconnue lors du déverrouillage de la clef !</string>
+  <string name="msg_dc_error_integrity_check">Erreur de vérification de l\'intégrité !</string>
+  <string name="msg_dc_error_invalid_siglist">Aucune donnée de signature valide trouvée !</string>
+  <string name="msg_dc_error_io">Une exception E/S a été rencontrée durant l\'opération !</string>
+  <string name="msg_dc_error_no_data">Aucune donnée chiffrée n\'a été trouvée dans le flux !</string>
+  <string name="msg_dc_error_no_key">Aucune donnée chiffrée avec une clef secrète connue n\'a été trouvée dans le flux !</string>
+  <string name="msg_dc_error_pgp_exception">Une exception PGP a été rencontrée durant l\'opération !</string>
+  <string name="msg_dc_integrity_check_ok">Vérification de l\'intégrité OK !</string>
+  <string name="msg_dc_ok_meta_only">Seules les métadonnées ont été demandées, déchiffrement ignoré</string>
+  <string name="msg_dc_ok">OK</string>
+  <string name="msg_dc_pass_cached">Utilisation de la phrase de passe du cache</string>
+  <string name="msg_dc_pending_nfc">Jeton NFC exigé, demande de saisie à l\'utilisateur...</string>
+  <string name="msg_dc_pending_passphrase">Phrase de passe exigée, demande de saisie à l\'utilisateur...</string>
+  <string name="msg_dc_prep_streams">Préparation des flux pour le déchiffrement</string>
+  <string name="msg_dc">Début de l\'opération de déchiffrement...</string>
+  <string name="msg_dc_sym_skip">Données symétriques non autorisées, étape ignorée...</string>
+  <string name="msg_dc_sym">Bloc de données chiffrées symétriquement trouvé</string>
+  <string name="msg_dc_trail_asym">Des données traînantes chiffrées asymétriquement ont été rencontrées pour la clef %s</string>
+  <string name="msg_dc_trail_sym">Des données traînantes chiffrées symétriquement ont été rencontrées</string>
+  <string name="msg_dc_trail_unknown">Des données traînantes de type inconnu ont été rencontrées</string>
+  <string name="msg_dc_unlocking">Déverrouillage de la clef secrète</string>
   <!--Messages for SignEncrypt operation-->
+  <string name="msg_se_asymmetric">Préparation de la clef secrète pour le chiffrement</string>
+  <string name="msg_se_clearsign_only">La signature d\'entrée de texte en clair n\'est pas prise en charge !</string>
+  <string name="msg_se_compressing">Préparation de la compression</string>
+  <string name="msg_se_encrypting">Chiffrement des données</string>
+  <string name="msg_se_error_bad_passphrase">Phrase de passe erronée !</string>
+  <string name="msg_se_error_io">Exception E/S rencontrée durant l\'opération !</string>
+  <string name="msg_se_error_key_sign">La clef de signature choisie ne peut pas signer les données !</string>
+  <string name="msg_se_error_sign_key">Erreur lors de la récupération de la clef de signature !</string>
+  <string name="msg_se_error_nfc">Erreur de données NFC !</string>
+  <string name="msg_se_error_no_passphrase">Aucune phrase de passe fournie !</string>
+  <string name="msg_se_error_pgp">Erreur interne PGP !</string>
+  <string name="msg_se_error_sig">Une exception de signature PGP a été rencontrée !</string>
+  <string name="msg_se_error_unlock">Erreur inconnue lors du déverrouillage de la clef !</string>
+  <string name="msg_se_key_ok">Chiffrement pour la clef : %s</string>
+  <string name="msg_se_key_unknown">Clef manquante pour le chiffrement : %s</string>
+  <string name="msg_se_key_warn">Clef erronée pour le chiffrement : %s</string>
+  <string name="msg_se_ok">Opération de signature/chiffrement réussie !</string>
+  <string name="msg_se_pending_nfc">Jeton NFC exigé, demande de saisie à l\'utilisateur...</string>
+  <string name="msg_se_pending_passphrase">Phrase de passe exigée, demande de saisie à l\'utilisateur...</string>
+  <string name="msg_se_signing">Signature des données (sans chiffrement)</string>
+  <string name="msg_se_sigcrypting">Chiffrement des données avec signature</string>
+  <string name="msg_se">Début de l\'opération de signature et/ou de chiffrement</string>
+  <string name="msg_se_symmetric">Préparation du chiffrement symétrique</string>
+  <string name="msg_crt_upload_success">Clef téléversée vers le serveur avec succès</string>
+  <string name="msg_crt_success">Identités certifiées avec succès</string>
+  <string name="msg_acc_saved">Compte enregistré</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_click_to_clear">Cliquer ici pour effacer les phrases de passe mises en cache</string>
   <string name="passp_cache_notif_n_keys">OpenKeychain a mis en cache %d phrases de passe</string>
@@ -712,7 +805,7 @@
   <string name="label_user_id">identité</string>
   <string name="unknown_uid">&lt;inconnu&gt;</string>
   <string name="empty_certs">Aucun certificat pour cette clef</string>
-  <string name="certs_text">Seuls les auto-certificats et les certificats créés avec vos clefs sont affichés ici.</string>
+  <string name="certs_text">Seuls les auto-certificats et les certificats validés créés avec vos clefs sont affichés ici.</string>
   <string name="section_uids_to_certify">Identités à certifier</string>
   <string name="label_revocation">Raison de la révocation</string>
   <string name="label_verify_status">État de vérification</string>
@@ -730,6 +823,7 @@
   <string name="error_no_encrypt_subkey">Aucune sous-clef de chiffrement n\'est disponible !</string>
   <string name="info_no_manual_account_creation">Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'Aide.</string>
   <string name="contact_show_key">Montrer la clef (%s)</string>
+  <string name="swipe_to_update">Glisser vers le bas pour mettre à jour à partir du serveur de clefs</string>
   <!--First Time-->
   <string name="first_time_text1">Reprenez le contrôle de votre confidentialité avec OpenKeychain |</string>
   <string name="first_time_create_key">Créer ma clef</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 5f2940748..9d7c65d9a 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -183,7 +183,6 @@
   <string name="error_key_needs_a_user_id">neccessaria almeno una identità</string>
   <string name="error_no_signature_passphrase">nessuna frase di accesso inserita</string>
   <string name="error_no_signature_key">nessuna chiave di firma inserita</string>
-  <string name="error_invalid_data">dati di codifica non validi</string>
   <string name="error_integrity_check_failed">Controllo di integrita\' fallito! I dati sono stati modificati!</string>
   <string name="error_wrong_passphrase">frase di accesso errata</string>
   <string name="error_could_not_extract_private_key">impossibile estrarre la chiave privata</string>
@@ -315,7 +314,6 @@
   </plurals>
   <string name="view_log">Mostra registro</string>
   <string name="import_error_nothing">Niente da importare</string>
-  <string name="import_error">Errore di importazione chiavi!</string>
   <string name="import_with_warnings">, con avvisi</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Decodifica File con OpenKeychain</string>
@@ -384,7 +382,6 @@
   <string name="edit_key_edit_user_id_title">Seleziona un azione!</string>
   <string name="edit_key_edit_user_id_revoked">Questa identità è stata revocata. Ciò non può essere annullato.</string>
   <string name="edit_key_edit_subkey_title">Seleziona un azione!</string>
-  <string name="edit_key_new_subkey">nuovo</string>
   <string name="edit_key_select_flag">Per favore seleziona almeno una spunta!</string>
   <!--Create key-->
   <string name="create_key_upload">Carica chiave nel server delle chiavi</string>
@@ -403,7 +400,6 @@
   <string name="drawer_close">Chiudi drawer di navigazione</string>
   <string name="my_keys">Le Mie Chiavi</string>
   <!--hints-->
-  <string name="decrypt_content_edit_text_hint">Inserisci il testo cifrato qui per la decodifica e/o verifica...</string>
   <!--certs-->
   <string name="cert_default">predefiniti</string>
   <string name="cert_none">nessuno</string>
@@ -421,9 +417,6 @@
   <string name="msg_ip_delete_old_fail">Nessuna vecchia chiave cancellata (stai creando una nuova?)</string>
   <string name="msg_ip_delete_old_ok">Cancellate vecchie chiavi dal database</string>
   <string name="msg_ip_encode_fail">Operazione fallita a causa di un errore di codifica</string>
-  <string name="msg_ip_error_io_exc">Operazione fallita a causa di un errore di i/o</string>
-  <string name="msg_ip_error_op_exc">Operazione fallita a causa di un errore della banca dati</string>
-  <string name="msg_ip_error_remote_ex">Operazione fallita a causa di un errore interno</string>
   <string name="msg_ip">Importazione portachiavi pubblico %s</string>
   <string name="msg_ip_insert_keyring">Codifica dati del portachiavi</string>
   <string name="msg_ip_insert_keys">Elaborazione chiavi</string>
@@ -431,31 +424,14 @@
   <string name="msg_ip_master">Elaborazione chiave principale %s</string>
   <string name="msg_ip_master_expired">Portachiavi scaduto il %s</string>
   <string name="msg_ip_master_expires">Il portachiavi scade il %s</string>
-  <string name="msg_ip_master_flags_ces">Caratteristiche chiave principale: certifica, codifica, firma</string>
-  <string name="msg_ip_master_flags_cex">Caratteristiche chiave principale: certifica, codifica</string>
-  <string name="msg_ip_master_flags_cxs">Caratteristiche chiave principale: certifica, firma</string>
-  <string name="msg_ip_master_flags_xes">Caratteristiche chiave principale: codifica, firma</string>
-  <string name="msg_ip_master_flags_cxx">Caratteristiche chiave principale: certifica</string>
-  <string name="msg_ip_master_flags_xex">Caratteristiche chiave principale: codifica</string>
-  <string name="msg_ip_master_flags_xxs">Caratteristiche chiave principale: firma</string>
-  <string name="msg_ip_master_flags_xxx">Caratteristiche chiave principale: nessuna</string>
   <string name="msg_ip_subkey">Elaborazione sottochiave %s</string>
   <string name="msg_ip_subkey_expired">Sottochiave scaduta il %s</string>
   <string name="msg_ip_subkey_expires">La sottochiave scade il %s</string>
-  <string name="msg_ip_subkey_flags_ces">Caratteristiche sottochiave: certifica, codifica, firma</string>
-  <string name="msg_ip_subkey_flags_cex">Caratteristiche sottochiave: certifica, codifica</string>
-  <string name="msg_ip_subkey_flags_cxs">Caratteristiche sottochiave: certifica, firma</string>
-  <string name="msg_ip_subkey_flags_xes">Caratteristiche sottochiave: codifica, firma</string>
-  <string name="msg_ip_subkey_flags_cxx">Caratteristiche sottochiave: certifica</string>
-  <string name="msg_ip_subkey_flags_xex">Caratteristiche sottochiave: codifica</string>
-  <string name="msg_ip_subkey_flags_xxs">Caratteristiche sottochiave: firma</string>
-  <string name="msg_ip_subkey_flags_xxx">Caratteristiche sottochiave: nessuna</string>
   <string name="msg_ip_success">Portachiavi pubblico importato con successo</string>
   <string name="msg_ip_success_identical">Il portachiavi non contiene nuovi dati, nulla da eseguire</string>
   <string name="msg_ip_reinsert_secret">Reinserimento chiave segreta</string>
   <string name="msg_ip_uid_cert_bad">Riscontrato certificato sbagliato!</string>
   <string name="msg_ip_uid_cert_error">Errore elaborazione certificato!</string>
-  <string name="msg_ip_uid_cert_good">ID utente certificato da %1$s</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="one">Ignoro un certificato rilasciato da chiavi pubbliche sconosciute</item>
     <item quantity="other">Ignoro %s certificati rilasciati da chiavi pubbliche sconosciute</item>
@@ -474,7 +450,6 @@
   <string name="msg_is">Importazione chiave segreta %s</string>
   <string name="msg_is_db_exception">Errore Banca Dati!</string>
   <string name="msg_is_importing_subkeys">Elaborazione sottochiavi segrete</string>
-  <string name="msg_is_error_io_exc">Errore codifica portachiavi</string>
   <string name="msg_is_pubring_generate">Generazione portachiavi pubblico da portachiavi privato</string>
   <string name="msg_is_success_identical">Il portachiavi non contiene nuovi dati, nulla da eseguire</string>
   <string name="msg_is_success">Portachiavi segreto importato con successo</string>
@@ -608,7 +583,6 @@
   <string name="label_user_id">Identit</string>
   <string name="unknown_uid">&lt;sconosciuto&gt;</string>
   <string name="empty_certs">Nessun certificato per questa chiave</string>
-  <string name="certs_text">Solo le autocertificazioni e i certificati creati con le tue chiavi vengono visualizzati qui.</string>
   <string name="section_uids_to_certify">Identità da certificare</string>
   <string name="label_revocation">Ragione della Revoca</string>
   <string name="label_verify_status">Stato Verifica</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 8e10d443e..d69d2b4a0 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -12,6 +12,7 @@
   <string name="title_add_subkey">副鍵の追加</string>
   <string name="title_edit_key">鍵の編集</string>
   <string name="title_preferences">設定</string>
+  <string name="title_cloud_search_preferences">クラウド検索設定</string>
   <string name="title_api_registered_apps">アプリ</string>
   <string name="title_key_server_preference">鍵サーバ設定</string>
   <string name="title_change_passphrase">パスフレーズの変更</string>
@@ -34,6 +35,7 @@
   <!--section-->
   <string name="section_user_ids">ユーザID</string>
   <string name="section_keys">副鍵</string>
+  <string name="section_cloud_search">クラウド検索</string>
   <string name="section_general">一般</string>
   <string name="section_defaults">デフォルト</string>
   <string name="section_advanced">拡張</string>
@@ -44,6 +46,8 @@
   <string name="section_key_server">鍵サーバ</string>
   <string name="section_fingerprint">指紋</string>
   <string name="section_key_to_certify">鍵は検証されています。</string>
+  <string name="section_decrypt_files">ファイル</string>
+  <string name="section_decrypt_text">テキスト</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">復号化と検証、そしてファイルの保存</string>
   <string name="btn_decrypt_verify_message">メッセージの復号化と検証</string>
@@ -62,6 +66,10 @@
   <string name="btn_view_cert_key">検証した鍵を見る</string>
   <string name="btn_create_key">鍵の生成</string>
   <string name="btn_add_files">ファイルの追加</string>
+  <string name="btn_add_share_decrypted_text">復号化したテキストの共有</string>
+  <string name="btn_decrypt_clipboard">クリップボードから復号化</string>
+  <string name="btn_decrypt_and_verify">と署名の検証</string>
+  <string name="btn_decrypt_files">ファイルの復号化</string>
   <!--menu-->
   <string name="menu_preferences">設定</string>
   <string name="menu_help">ヘルプ</string>
@@ -101,6 +109,7 @@
   <string name="label_hash_algorithm">ハッシュアルゴリズム</string>
   <string name="label_symmetric">パスフレーズで暗号化</string>
   <string name="label_passphrase_cache_ttl">パスフレーズキャッシュ</string>
+  <string name="label_passphrase_cache_subs">副鍵のパスフレーズをキャッシュ</string>
   <string name="label_message_compression">メッセージの圧縮</string>
   <string name="label_file_compression">ファイルの圧縮</string>
   <string name="label_keyservers">鍵サーバ</string>
@@ -117,6 +126,8 @@
   <string name="label_send_key">証明後選択した鍵サーバに鍵をアップロード</string>
   <string name="label_fingerprint">指紋</string>
   <string name="expiry_date_dialog_title">期限日時を設定</string>
+  <string name="label_first_keyserver_is_used">(リストの最初の鍵サーバが優先されます)</string>
+  <string name="label_preferred">優先</string>
   <string name="user_id_no_name">&lt;名前なし&gt;</string>
   <string name="none">&lt;無し&gt;</string>
   <string name="no_key">&lt;鍵無し&gt;</string>
@@ -210,6 +221,7 @@
   <string name="fingerprint_copied_to_clipboard">指紋はクリプボードにコピーされました!</string>
   <string name="select_key_to_certify">検証に使う鍵を選択して下さい!</string>
   <string name="key_too_big_for_sharing">この共有方法では鍵が大きすぎます!</string>
+  <string name="text_copied_to_clipboard">鍵はクリプボードにコピーされました!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
@@ -223,7 +235,7 @@
   <string name="error_key_needs_a_user_id">最低でも1つのユーザIDが必要です</string>
   <string name="error_no_signature_passphrase">パスフレーズが与えられていません</string>
   <string name="error_no_signature_key">署名鍵を与えられていません</string>
-  <string name="error_invalid_data">暗号化データが不正です</string>
+  <string name="error_invalid_data">暗号化もしくは署名の検証されてないOpenPGPの内容!</string>
   <string name="error_integrity_check_failed">完全性チェックが失敗しました! データに変更があります!</string>
   <string name="error_wrong_passphrase">正しくないパスフレーズです</string>
   <string name="error_could_not_extract_private_key">秘密鍵を取り出すことができません</string>
@@ -271,6 +283,7 @@
   <string name="progress_modify_primaryuid">主ユーザIDを変更中...</string>
   <string name="progress_modify_subkeychange">副鍵の変更中...</string>
   <string name="progress_modify_subkeyrevoke">副鍵の破棄中...</string>
+  <string name="progress_modify_subkeystrip">副鍵のストリップ中...</string>
   <string name="progress_modify_subkeyadd">副鍵を追加中...</string>
   <string name="progress_modify_passphrase">パスフレーズの変更中...</string>
   <plurals name="progress_exporting_key">
@@ -297,6 +310,7 @@
   <string name="progress_con_reimport">統合: 再インポート中…</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">名前/メール/鍵ID...</string>
+  <string name="hint_cloud_search_hint">名前/メール/証明/鍵...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -331,6 +345,7 @@
   <string name="help_about_version">バージョン:</string>
   <!--Import-->
   <string name="import_tab_keyserver">鍵サーバ</string>
+  <string name="import_tab_cloud">検索をクラウドで</string>
   <string name="import_tab_direct">ファイル/クリップボード</string>
   <string name="import_tab_qr_code">QRコード/NFC</string>
   <string name="import_import">選択した鍵のインポート</string>
@@ -350,12 +365,17 @@
   <plurals name="import_keys_updated">
     <item quantity="other">%1$d の鍵%2$sのアップデートに成功。</item>
   </plurals>
+  <plurals name="import_keys_with_errors">
+    <item quantity="other">%d 個の鍵でインポート失敗!</item>
+  </plurals>
   <string name="view_log">ログを見る</string>
   <string name="import_error_nothing">インポートするものがありません。</string>
   <string name="import_error_nothing_cancelled">インポートをキャンセルしました。</string>
-  <string name="import_error">鍵のインポートのエラー!</string>
   <string name="import_with_warnings">、とワーニング</string>
   <string name="import_with_cancelled">、キャンセルされるまで</string>
+  <plurals name="import_error">
+    <item quantity="other">%d 個の鍵のインポート失敗!</item>
+  </plurals>
   <!--Intent labels-->
   <string name="intent_decrypt_file">OpenKeychainでファイルを復号化</string>
   <string name="intent_import_key">OpenKeychainに鍵をインポート</string>
@@ -373,6 +393,7 @@
   <string name="api_settings_select_key">鍵の選択</string>
   <string name="api_settings_create_key">このアカウントで新しい鍵を生成</string>
   <string name="api_settings_save">保存</string>
+  <string name="api_settings_save_msg">アカウントが保存されました</string>
   <string name="api_settings_cancel">キャンセル</string>
   <string name="api_settings_revoke">破棄されたアクセス</string>
   <string name="api_settings_start">アプリケーションを開始</string>
@@ -446,16 +467,26 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">このIDは破棄されています。続けることができません。</string>
   <string name="edit_key_edit_subkey_title">アクションを選んでください!</string>
-  <string name="edit_key_new_subkey">新規</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>期限の変更</item>
+    <item>副鍵の破棄</item>
+    <item>副鍵のストリップ</item>
+  </string-array>
+  <string name="edit_key_new_subkey">新しい副鍵</string>
   <string name="edit_key_select_flag">最低1つフラグを選択してください!</string>
+  <string name="edit_key_error_add_identity">最低でも1つのユーザIDを追加!</string>
+  <string name="edit_key_error_add_subkey">最低でも1つの副鍵を追加!</string>
   <!--Create key-->
   <string name="create_key_upload">鍵サーバへアップロード</string>
   <string name="create_key_empty">このフィールドは必須です</string>
   <string name="create_key_passphrases_not_equal">パスフレーズが一致しない</string>
   <string name="create_key_final_text">あたなが入力したIDは以下です:</string>
-  <string name="create_key_final_robot_text">鍵生成にしばらくかかります、その間にお茶でも1杯どうぞ…\n(3副鍵、RSA、4096 bit)</string>
+  <string name="create_key_final_robot_text">しばらくの間鍵を生成しています、その間はコーヒーでもどうぞ....</string>
+  <string name="create_key_rsa">(3副鍵、RSA, 4096 bit)</string>
+  <string name="create_key_custom">(個別の鍵設定)</string>
   <string name="create_key_text">フルネーム、Eメールアドレスを入力そしてパスフレーズを選択してください。</string>
   <string name="create_key_hint_full_name">フルネーム、例えば Max Mustermann</string>
+  <string name="create_key_edit">鍵の設定変更</string>
   <!--View key-->
   <string name="view_key_revoked">この鍵は破棄されています!</string>
   <string name="view_key_expired">この鍵は期限切れです!</string>
@@ -470,7 +501,6 @@
   <string name="my_keys">自分の鍵</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">テキストを入力</string>
-  <string name="decrypt_content_edit_text_hint">ここに入力された暗号化テキストを復号化/検証...</string>
   <!--certs-->
   <string name="cert_default">デフォルト</string>
   <string name="cert_none">無し</string>
@@ -500,31 +530,53 @@
   <string name="msg_ip_master">主鍵処理中 %s</string>
   <string name="msg_ip_master_expired">%s が鍵輪の期限切れ</string>
   <string name="msg_ip_master_expires">%s に鍵輪が期限切れ</string>
-  <string name="msg_ip_master_flags_ces">主鍵のフラグ: 検証、暗号化、署名</string>
-  <string name="msg_ip_master_flags_cex">主鍵のフラグ: 検証、暗号化</string>
-  <string name="msg_ip_master_flags_cxs">主鍵のフラグ: 検証、署名</string>
-  <string name="msg_ip_master_flags_xes">主鍵のフラグ: 暗号化、署名</string>
-  <string name="msg_ip_master_flags_cxx">主鍵のフラグ: 検証</string>
-  <string name="msg_ip_master_flags_xex">主鍵のフラグ: 暗号化</string>
-  <string name="msg_ip_master_flags_xxs">主鍵のフラグ: 署名</string>
-  <string name="msg_ip_master_flags_xxx">主鍵のフラグ: なし</string>
+  <string name="msg_ip_master_flags_unspecified">主鍵のフラグ: 不特定 (すべてを仮定します)</string>
+  <string name="msg_ip_master_flags_cesa">主鍵のフラグ: 検証、暗号化、署名、認証</string>
+  <string name="msg_ip_master_flags_cesx">主鍵のフラグ: 検証、暗号化、署名</string>
+  <string name="msg_ip_master_flags_cexa">主鍵のフラグ: 検証、暗号化、認証</string>
+  <string name="msg_ip_master_flags_cexx">主鍵のフラグ: 検証、暗号化</string>
+  <string name="msg_ip_master_flags_cxsa">主鍵のフラグ: 検証、署名、認証</string>
+  <string name="msg_ip_master_flags_cxsx">主鍵のフラグ: 検証、署名</string>
+  <string name="msg_ip_master_flags_cxxa">主鍵のフラグ: 検証、認証</string>
+  <string name="msg_ip_master_flags_cxxx">主鍵のフラグ: 検証</string>
+  <string name="msg_ip_master_flags_xesa">主鍵のフラグ: 暗号化、署名、認証</string>
+  <string name="msg_ip_master_flags_xesx">主鍵のフラグ: 暗号化、署名</string>
+  <string name="msg_ip_master_flags_xexa">主鍵のフラグ: 暗号化、認証</string>
+  <string name="msg_ip_master_flags_xexx">主鍵のフラグ: 暗号化</string>
+  <string name="msg_ip_master_flags_xxsa">主鍵のフラグ: 署名、認証</string>
+  <string name="msg_ip_master_flags_xxsx">主鍵のフラグ: 署名</string>
+  <string name="msg_ip_master_flags_xxxa">主鍵のフラグ: 認証</string>
+  <string name="msg_ip_master_flags_xxxx">主鍵のフラグ: なし</string>
   <string name="msg_ip_subkey">副鍵 %s の処理中</string>
   <string name="msg_ip_subkey_expired">%s が副鍵の期限切れ</string>
   <string name="msg_ip_subkey_expires">%s に副鍵が期限切れ</string>
-  <string name="msg_ip_subkey_flags_ces">副鍵のフラグ: 検証、暗号化、署名</string>
-  <string name="msg_ip_subkey_flags_cex">副鍵のフラグ: 検証、暗号化</string>
-  <string name="msg_ip_subkey_flags_cxs">副鍵のフラグ: 検証、署名</string>
-  <string name="msg_ip_subkey_flags_xes">副鍵のフラグ: 暗号化、署名</string>
-  <string name="msg_ip_subkey_flags_cxx">副鍵のフラグ: 検証</string>
-  <string name="msg_ip_subkey_flags_xex">副鍵のフラグ: 暗号化</string>
-  <string name="msg_ip_subkey_flags_xxs">副鍵のフラグ: 署名</string>
-  <string name="msg_ip_subkey_flags_xxx">副鍵のフラグ: なし</string>
+  <string name="msg_ip_subkey_flags_unspecified">副鍵のフラグ: 不特定 (すべてを仮定します)</string>
+  <string name="msg_ip_subkey_flags_cesa">副鍵のフラグ: 検証、暗号化、署名、認証</string>
+  <string name="msg_ip_subkey_flags_cesx">副鍵のフラグ: 検証、暗号化、署名</string>
+  <string name="msg_ip_subkey_flags_cexa">副鍵のフラグ: 検証、暗号化、認証</string>
+  <string name="msg_ip_subkey_flags_cexx">副鍵のフラグ: 検証、暗号化</string>
+  <string name="msg_ip_subkey_flags_cxsa">副鍵のフラグ: 検証、署名、認証</string>
+  <string name="msg_ip_subkey_flags_cxsx">副鍵のフラグ: 検証、署名</string>
+  <string name="msg_ip_subkey_flags_cxxa">副鍵のフラグ: 検証、認証</string>
+  <string name="msg_ip_subkey_flags_cxxx">副鍵のフラグ: 検証</string>
+  <string name="msg_ip_subkey_flags_xesa">副鍵のフラグ: 暗号化、署名、認証</string>
+  <string name="msg_ip_subkey_flags_xesx">副鍵のフラグ: 暗号化、署名</string>
+  <string name="msg_ip_subkey_flags_xexa">副鍵のフラグ: 暗号化、署名</string>
+  <string name="msg_ip_subkey_flags_xexx">副鍵のフラグ: 暗号化</string>
+  <string name="msg_ip_subkey_flags_xxsa">副鍵のフラグ: 署名、認証</string>
+  <string name="msg_ip_subkey_flags_xxsx">副鍵のフラグ: 署名</string>
+  <string name="msg_ip_subkey_flags_xxxa">副鍵のフラグ: 認証</string>
+  <string name="msg_ip_subkey_flags_xxxx">副鍵のフラグ: なし</string>
   <string name="msg_ip_success">公開鍵の鍵輪のインポートに成功</string>
   <string name="msg_ip_success_identical">鍵輪にデータがないため、なにもしません</string>
   <string name="msg_ip_reinsert_secret">秘密鍵を再挿入中</string>
   <string name="msg_ip_uid_cert_bad">問題のある検証と遭遇しました!</string>
   <string name="msg_ip_uid_cert_error">検証の処理中にエラーしました!</string>
-  <string name="msg_ip_uid_cert_good">ユーザIDは %1$s によって検証されました</string>
+  <string name="msg_ip_uid_cert_nonrevoke">すでに破棄不能証明を持っています、スキップします。</string>
+  <string name="msg_ip_uid_cert_old">証明が以前のものより古いです、スキップします。</string>
+  <string name="msg_ip_uid_cert_new">証明がより新しいです、以前のものを置き換えます。</string>
+  <string name="msg_ip_uid_cert_good">%1$s にて良好な証明を見付けました</string>
+  <string name="msg_ip_uid_cert_good_revoke">%1$s にて良好な破棄証明を見付けました</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="other">不明な公開鍵から %s の検証を無視</item>
   </plurals>
@@ -556,6 +608,7 @@
   <string name="msg_kc_error_v3">これはOpenPGP バージョン3の鍵で、これは非推奨でもうサポートされなくなりました!</string>
   <string name="msg_kc_error_no_uid">鍵輪が正しいユーザIDを含んでいませんでした!</string>
   <string name="msg_kc_error_master_algo">主鍵で不明なアルゴリズム(%s)を利用しています!</string>
+  <string name="msg_kc_error_dup_key">鍵輪の中に副鍵 %s が2度出現しました。鍵輪が不整形となっており、インポートできあせん!</string>
   <string name="msg_kc_master">主鍵処理中</string>
   <string name="msg_kc_revoke_bad_err">問題のある鍵輪の破棄証明を破棄中</string>
   <string name="msg_kc_revoke_bad_local">鍵輪のローカルフラグ付き破棄証明を破棄中</string>
@@ -600,6 +653,7 @@
   <string name="msg_kc_uid_no_cert">ユーザID \'%s\' の正常な自己署名が見付かりませんでした、鍵輪から除去しました</string>
   <string name="msg_kc_uid_remove">正しくないユーザID \'%s\' を破棄中</string>
   <string name="msg_kc_uid_dup">重複したユーザID \'%s\' を削除中。秘密鍵を二つもっています。この結果は署名を失っているのかもしれません!</string>
+  <string name="msg_kc_uid_warn_encoding">ユーザIDがUTF-8で検証できませんでした!</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_error_secret_dummy">新しい公開鍵の副鍵を見付けました、しかしダミー生成の秘密鍵の副鍵でサポートされません。!</string>
   <string name="msg_mg_error_heterogeneous">指紋が異なる鍵輪をマージしようとしています!</string>
@@ -636,6 +690,7 @@
   <string name="msg_mf_error_revoked_primary">主ユーザIDの破棄はできません!</string>
   <string name="msg_mf_error_null_expiry">副鍵の生成時に期限を\"過去\"とすることはできません。これはプログラムエラーで、バグレポートとしてファイルを送ってください!</string>
   <string name="msg_mf_error_passphrase_master">主鍵の復号で致命的な失敗! これはプログラミングのエラーの場合がありますので、バグレポートの提出をお願いします!</string>
+  <string name="msg_mf_error_pgp">PGP内部エラー!</string>
   <string name="msg_mf_error_sig">署名例外!</string>
   <string name="msg_mf_master">マスター認証を変更</string>
   <string name="msg_mf_passphrase">鍵輪のパスフレーズの変更中...</string>
@@ -650,6 +705,7 @@
   <string name="msg_mf_subkey_new_id">新しい副鍵 ID: %s</string>
   <string name="msg_mf_error_past_expiry">期限切れ日を過去にはできません!</string>
   <string name="msg_mf_subkey_revoke">副鍵 %s を破棄中</string>
+  <string name="msg_mf_subkey_strip">副鍵 %s のストリップ中</string>
   <string name="msg_mf_success">鍵輪の変更に成功</string>
   <string name="msg_mf_uid_add">ユーザID %s を追加中</string>
   <string name="msg_mf_uid_primary">主UIDを %s に変更中</string>
@@ -693,7 +749,69 @@
   <string name="msg_ek_error_dummy">ストリップした主鍵では鍵輪を編集できません!</string>
   <string name="msg_ek_error_not_found">鍵が見当りません!</string>
   <!--Messages for DecryptVerify operation-->
+  <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_clear_data">固定データを処理中</string>
+  <string name="msg_dc_clear_decompress">圧縮データの展開中</string>
+  <string name="msg_dc_clear_meta_file">ファイル名: %s</string>
+  <string name="msg_dc_clear_meta_mime">MIME種別: %s</string>
+  <string name="msg_dc_clear_meta_size">ファイルサイズ: %s</string>
+  <string name="msg_dc_clear_meta_time">更新日時: %s</string>
+  <string name="msg_dc_clear_signature_bad">署名の確認がOKではありません!</string>
+  <string name="msg_dc_clear_signature_check">署名データの検証中</string>
+  <string name="msg_dc_clear_signature_ok">署名の確認は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_extract_key">鍵のロック解除で不明なエラー!</string>
+  <string name="msg_dc_error_integrity_check">完全性チェックエラー!</string>
+  <string name="msg_dc_error_invalid_siglist">正常な署名データが見付からなかった!</string>
+  <string name="msg_dc_error_io">操作中にIO例外に当たりました!</string>
+  <string name="msg_dc_error_no_data">ストリーム中に暗号化されたデータが見付からなかった!</string>
+  <string name="msg_dc_error_no_key">ストリーム中に既知の秘密鍵で暗号化されたデータが見付からなかった!</string>
+  <string name="msg_dc_error_pgp_exception">操作中にPGP例外に当たりました!</string>
+  <string name="msg_dc_integrity_check_ok">完全性チェックOK!</string>
+  <string name="msg_dc_ok_meta_only">メタデータだけが要求され、暗号化をスキップしました</string>
+  <string name="msg_dc_ok">OK</string>
+  <string name="msg_dc_pass_cached">キャッシュからパスフレーズを利用します。</string>
+  <string name="msg_dc_pending_nfc">NFCトークンが必要、ユーザー入力を要求中...</string>
+  <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>
   <!--Messages for SignEncrypt operation-->
+  <string name="msg_se_asymmetric">暗号化のための公開鍵の検証</string>
+  <string name="msg_se_clearsign_only">クリアテキスト署名の入力はサポートされていません!</string>
+  <string name="msg_se_compressing">圧縮の検証</string>
+  <string name="msg_se_encrypting">暗号化データ</string>
+  <string name="msg_se_error_bad_passphrase">駄目なパスフレーズ!</string>
+  <string name="msg_se_error_io">操作中にIO例外に当たりました!</string>
+  <string name="msg_se_error_key_sign">選択した署名鍵で署名データができません!</string>
+  <string name="msg_se_error_sign_key">署名鍵の取得エラー!</string>
+  <string name="msg_se_error_nfc">NFC データエラー!</string>
+  <string name="msg_se_error_no_passphrase">パスフレーズなしで提供!</string>
+  <string name="msg_se_error_pgp">PGP内部エラー!</string>
+  <string name="msg_se_error_sig">PGP署名例外に当たりました!</string>
+  <string name="msg_se_error_unlock">鍵のロック解除で不明なエラー!</string>
+  <string name="msg_se_key_ok">暗号化の鍵: %s</string>
+  <string name="msg_se_key_unknown">暗号化で鍵を紛失: %s</string>
+  <string name="msg_se_key_warn">暗号化に問題のある鍵: %s</string>
+  <string name="msg_se_ok">署名/暗号化操作に成功!</string>
+  <string name="msg_se_pending_nfc">NFCトークンが必要、ユーザー入力を要求中...</string>
+  <string name="msg_se_pending_passphrase">パスフレーズが必要、ユーザー入力を要求中...</string>
+  <string name="msg_se_signing">署名データ(暗号化していない)</string>
+  <string name="msg_se_sigcrypting">データを署名付きで暗号化中</string>
+  <string name="msg_se">署名/暗号化操作を開始します</string>
+  <string name="msg_se_symmetric">対称暗号の検証</string>
+  <string name="msg_crt_upload_success">鍵をサーバにアップロードしました</string>
+  <string name="msg_crt_success">ユーザIDの検証に成功</string>
+  <string name="msg_acc_saved">アカウント保存</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_click_to_clear">クリックしてパスフレーズのキャッシュをクリア</string>
   <string name="passp_cache_notif_n_keys">OpenKeychainは %d のパスフレーズをキャッシュしています</string>
@@ -706,7 +824,7 @@
   <string name="label_user_id">ユーザID</string>
   <string name="unknown_uid">&lt;不明&gt;</string>
   <string name="empty_certs">この鍵に証明がない</string>
-  <string name="certs_text">あなたの鍵でだけ生成された自己証明と証明がここに表示されます</string>
+  <string name="certs_text">あなたの検証された自己証明とあなたの鍵で生成された証明がここに表示されます</string>
   <string name="section_uids_to_certify">ユーザIDを検証</string>
   <string name="label_revocation">破棄の理由</string>
   <string name="label_verify_status">検証ステータス</string>
@@ -725,6 +843,7 @@
   <string name="info_no_manual_account_creation">OpenKeychainのアカウントを手動では生成できません.
 より詳細は、ヘルプを参照のこと。</string>
   <string name="contact_show_key">鍵 (%s) を表示</string>
+  <string name="swipe_to_update">下スワイプでキーサーバから更新します</string>
   <!--First Time-->
   <string name="first_time_text1">OpenKeychainであなたのプライバシーを取り戻しましょう!</string>
   <string name="first_time_create_key">自分の鍵の生成</string>
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index 865280060..c076bbde4 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -161,7 +161,6 @@
   <string name="error_key_needs_a_user_id">minstens een identiteit vereist</string>
   <string name="error_no_signature_passphrase">geen wachtwoord opgegeven</string>
   <string name="error_no_signature_key">geen ondertekeningssleutel opgegeven</string>
-  <string name="error_invalid_data">geen geldige versleutelingsgegevens</string>
   <string name="error_integrity_check_failed">integriteitcheck niet geslaagd! Data is bewerkt!</string>
   <string name="error_wrong_passphrase">wachtwoord verekerd</string>
   <string name="error_could_not_extract_private_key">kan privésleutel niet uitpakken</string>
@@ -298,7 +297,6 @@
   <string name="drawer_close">Sluit navigatiemenu</string>
   <string name="my_keys">Mijn Sleutels</string>
   <!--hints-->
-  <string name="decrypt_content_edit_text_hint">Voer cijfertekst hier in om te decoderen en/of verifiëren...</string>
   <!--certs-->
   <string name="cert_default">standaard</string>
   <string name="cert_none">geen</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 9d6a508d7..8effd7f98 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -147,7 +147,6 @@
   <string name="error_user_id_no_email">nie znaleziono adresu email</string>
   <string name="error_no_signature_passphrase">nie podano hasła</string>
   <string name="error_no_signature_key">nie podano klucza podpisu</string>
-  <string name="error_invalid_data">nieprawidłowe dane</string>
   <string name="error_integrity_check_failed">Sprawdzanie spójności zakończone niepowodzeniem! Dane były modyfikowane!</string>
   <string name="error_wrong_passphrase">nieprawidłowe hasło</string>
   <string name="error_could_not_extract_private_key">nie można wyodrębnić klucza prywatnego</string>
@@ -279,7 +278,6 @@
   <string name="drawer_close">Zamknij panel nawigacji</string>
   <string name="my_keys">Moje klucze</string>
   <!--hints-->
-  <string name="decrypt_content_edit_text_hint">Wpisz tutaj tekst do zaszyfrowania i/lub zweryfikowania...</string>
   <!--certs-->
   <string name="cert_default">domyślny</string>
   <string name="cert_none">żaden</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index d313070a3..5ce53a9f1 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -189,7 +189,6 @@
   <string name="error_key_needs_a_user_id">необходим хотя бы один идентификатор</string>
   <string name="error_no_signature_passphrase">пароль не задан</string>
   <string name="error_no_signature_key">ключ для подписи не задан</string>
-  <string name="error_invalid_data">некорректное шифрование</string>
   <string name="error_integrity_check_failed">Проверка целостности не удалась! Данные изменились!</string>
   <string name="error_wrong_passphrase">неправильный пароль</string>
   <string name="error_could_not_extract_private_key">не удалось извлечь личный ключ</string>
@@ -312,7 +311,6 @@
   </plurals>
   <string name="view_log">Смотреть журнал</string>
   <string name="import_error_nothing">Нет данных для импорта.</string>
-  <string name="import_error">Ошибка импорта ключей!</string>
   <string name="import_with_warnings">, с предупреждениями</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">OpenKeychain: Расшифровать файл</string>
@@ -390,7 +388,6 @@
   <string name="drawer_close">Закрыть панель навигации</string>
   <string name="my_keys">Мои ключи</string>
   <!--hints-->
-  <string name="decrypt_content_edit_text_hint">Введите сюда шифр для расшифровки и/или проверки...</string>
   <!--certs-->
   <string name="cert_default">по умолчанию</string>
   <string name="cert_none">нет</string>
@@ -406,8 +403,6 @@
   <string name="msg_ip_delete_old_fail">Старый ключ не удален (создать новый?)</string>
   <string name="msg_ip_delete_old_ok">Старый ключ удален из базы</string>
   <string name="msg_ip_encode_fail">Действие прервано из-за ошибки кодировки</string>
-  <string name="msg_ip_error_io_exc">Действие прервано из-за ошибки ввода/вывода</string>
-  <string name="msg_ip_error_remote_ex">Действие прервано из-за внутренней ошибки</string>
   <string name="msg_ip">Импорт связки публичных ключей %s</string>
   <string name="msg_ip_insert_keys">Разбор ключей</string>
   <string name="msg_ip_prepare">Подготовка операций</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index ac0364893..c7d5712ac 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -207,7 +207,6 @@
   <string name="error_key_needs_a_user_id">potrebujete vsaj eno identiteto</string>
   <string name="error_no_signature_passphrase">dano ni bilo nobeno geslo</string>
   <string name="error_no_signature_key">dan ni bil noben podpisni ključ</string>
-  <string name="error_invalid_data">neveljavni šifrirni podatki</string>
   <string name="error_integrity_check_failed">Preverba neokrnjenosti ni bila uspešna! Podatki so bili spremenjeni!</string>
   <string name="error_wrong_passphrase">napačno geslo</string>
   <string name="error_could_not_extract_private_key">ne morem izvleči zasebnega ključa</string>
@@ -318,7 +317,6 @@
   <string name="view_log">Poglej dnevnik</string>
   <string name="import_error_nothing">Nič za uvoziti.</string>
   <string name="import_error_nothing_cancelled">Uvoz preklican.</string>
-  <string name="import_error">Napaka pri uvozu ključev!</string>
   <string name="import_with_warnings">, z opozorilom</string>
   <string name="import_with_cancelled"> do preklica</string>
   <!--Intent labels-->
@@ -393,7 +391,6 @@
     <item>Revert revocation</item>
   </string-array>
   <string name="edit_key_edit_subkey_title">Izberite dejanje!</string>
-  <string name="edit_key_new_subkey">nov</string>
   <!--Create key-->
   <string name="create_key_upload">Naloži ključ na strežnik ključev</string>
   <string name="create_key_empty">To polje je obvezno</string>
@@ -412,7 +409,6 @@
   <string name="my_keys">Moji ključi</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Vpišite besedilo</string>
-  <string name="decrypt_content_edit_text_hint">Tu vnesite tajnopis za dešifriranje in/ali overbo...</string>
   <!--certs-->
   <string name="cert_default">privzeto</string>
   <string name="cert_none">brez</string>
@@ -431,8 +427,6 @@
   <string name="msg_ip_delete_old_fail">Noben star ključ ni bil izbrisan (ustvarim novega?)</string>
   <string name="msg_ip_delete_old_ok">Star ključ je bil izbrisan iz baze</string>
   <string name="msg_ip_encode_fail">Operacija ni uspela zaradi napake</string>
-  <string name="msg_ip_error_io_exc">Operacija ni uspela zaradi napake pri branju/pisanju</string>
-  <string name="msg_ip_error_remote_ex">Operacija ni uspela zaradi notranje napake</string>
   <string name="msg_ip">Uvažam javno zbirko ključev %s</string>
   <string name="msg_ip_insert_keyring">Šifriram podatke zbirke klučev</string>
   <string name="msg_ip_prepare">Pripravljam </string>
@@ -440,14 +434,6 @@
   <string name="msg_ip_subkey">Obdelujem podključ %s</string>
   <string name="msg_ip_subkey_expired">Podključ je potekel %s</string>
   <string name="msg_ip_subkey_expires">Podključ poteče %s</string>
-  <string name="msg_ip_subkey_flags_ces">Oznake podključa: overja, šifrira, podpisuje</string>
-  <string name="msg_ip_subkey_flags_cex">Oznake podključa: overja, šifrira</string>
-  <string name="msg_ip_subkey_flags_cxs">Oznake podključa: overja, podpisuje</string>
-  <string name="msg_ip_subkey_flags_xes">Oznake podključa: šifrira, podpisuje</string>
-  <string name="msg_ip_subkey_flags_cxx">Oznake podključa: overja</string>
-  <string name="msg_ip_subkey_flags_xex">Oznake podključa: šifrira</string>
-  <string name="msg_ip_subkey_flags_xxs">Oznake podključa: podpisuje</string>
-  <string name="msg_ip_subkey_flags_xxx">Oznake podključa: brez</string>
   <string name="msg_ip_success">Uspešno uvožena javna zbirka klučev </string>
   <string name="msg_ip_reinsert_secret">Ponovno vnašam zasebni ključ</string>
   <string name="msg_ip_uid_cert_bad">Naleteli ste na slab certifikat!</string>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
new file mode 100644
index 000000000..7e1ea2cfd
--- /dev/null
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -0,0 +1,55 @@
+<?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-->
+  <!--menu-->
+  <!--label-->
+  <!--choice-->
+  <!--key flags-->
+  <!--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-->
+  <!--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 result toast-->
+  <!--Intent labels-->
+  <!--Remote API-->
+  <!--Share-->
+  <!--Key list-->
+  <!--Key view-->
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
+  <!--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-->
+  <!--Other messages used in OperationLogs-->
+  <!--Messages for DecryptVerify operation-->
+  <!--Messages for SignEncrypt operation-->
+  <!--PassphraseCache-->
+  <!--unsorted-->
+  <!--First Time-->
+</resources>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 669c7b974..73b0be282 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -271,7 +271,6 @@
   <string name="edit_key_action_add_subkey">Alt anahtar Ekle</string>
   <string name="edit_key_edit_user_id_title">Bir eylem seç!</string>
   <string name="edit_key_edit_subkey_title">Bir eylem seç!</string>
-  <string name="edit_key_new_subkey">yeni</string>
   <string name="edit_key_select_flag">Lütfen en az bir bayrak seçiniz!</string>
   <!--Create key-->
   <string name="create_key_empty">Bu alan zorunludur</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index d113103b4..f38a542be 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -188,7 +188,6 @@
   <string name="error_key_needs_a_user_id">хоча б одна сутність</string>
   <string name="error_no_signature_passphrase">не подано парольної фрази</string>
   <string name="error_no_signature_key">не подано ключ підпису</string>
-  <string name="error_invalid_data">недійсні дані шифрування</string>
   <string name="error_integrity_check_failed">Невдала перевірка цілісності! Дані вже змінено!</string>
   <string name="error_wrong_passphrase">помилкова парольна фраза</string>
   <string name="error_could_not_extract_private_key">не можна витягти секретний ключ</string>
@@ -328,7 +327,6 @@
   </plurals>
   <string name="view_log">Переглянути журнал</string>
   <string name="import_error_nothing">Нема що імпортувати.</string>
-  <string name="import_error">Помилка імпорту ключів!</string>
   <string name="import_with_warnings">, із застереженнями</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Розшифрувати файл з OpenKeychain</string>
@@ -398,7 +396,6 @@
   <string name="edit_key_edit_user_id_title">Виберіть дію!</string>
   <string name="edit_key_edit_user_id_revoked">Ця сутність вже відкликана. Це не можна скасувати.</string>
   <string name="edit_key_edit_subkey_title">Виберіть дію!</string>
-  <string name="edit_key_new_subkey">новий</string>
   <string name="edit_key_select_flag">Будь ласка, виберіть хоча б один прапор!</string>
   <!--Create key-->
   <string name="create_key_upload">Відвантажити ключ на сервер ключів</string>
@@ -417,7 +414,6 @@
   <string name="drawer_close">Закрити панель навігації</string>
   <string name="my_keys">Мої ключі</string>
   <!--hints-->
-  <string name="decrypt_content_edit_text_hint">Уведіть зашифрований текст тут для його розшифрування та/або перевірки…</string>
   <!--certs-->
   <string name="cert_default">типово</string>
   <string name="cert_none">жоден</string>
@@ -435,9 +431,6 @@
   <string name="msg_ip_delete_old_fail">Нема вилученого старого ключа (створюється новий?)</string>
   <string name="msg_ip_delete_old_ok">Вилучений старий ключ з бази даних</string>
   <string name="msg_ip_encode_fail">Операція не вдалася через помилку кодування</string>
-  <string name="msg_ip_error_io_exc">Операція не вдалася через помилку вводу/виводу</string>
-  <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_insert_keyring">Шифруються дані із в\'язки</string>
   <string name="msg_ip_insert_keys">Аналізуються ключі</string>
@@ -445,31 +438,14 @@
   <string name="msg_ip_master">Обробляється основний ключа %s</string>
   <string name="msg_ip_master_expired">В\'язка закінчилася %s</string>
   <string name="msg_ip_master_expires">В\'язка закінчується %s</string>
-  <string name="msg_ip_master_flags_ces">Прапори основного ключа: certify, encrypt, sign</string>
-  <string name="msg_ip_master_flags_cex">Прапори основного ключа: certify, encrypt</string>
-  <string name="msg_ip_master_flags_cxs">Прапори основного ключа: certify, sign</string>
-  <string name="msg_ip_master_flags_xes">Прапори основного ключа: encrypt, sign</string>
-  <string name="msg_ip_master_flags_cxx">Прапори основного ключа: certify</string>
-  <string name="msg_ip_master_flags_xex">Прапори основного ключа: encrypt</string>
-  <string name="msg_ip_master_flags_xxs">Прапори основного ключа: sign</string>
-  <string name="msg_ip_master_flags_xxx">Прапори основного ключа: немає</string>
   <string name="msg_ip_subkey">Опрацьовується підключ %s</string>
   <string name="msg_ip_subkey_expired">Підключ закінчився %s</string>
   <string name="msg_ip_subkey_expires">Підключ закінчуєтья %s</string>
-  <string name="msg_ip_subkey_flags_ces">Прапори підключів: certify, encrypt, sign</string>
-  <string name="msg_ip_subkey_flags_cex">Прапори підключів: certify, encrypt</string>
-  <string name="msg_ip_subkey_flags_cxs">Прапори підключів: certify, sign</string>
-  <string name="msg_ip_subkey_flags_xes">Прапори підключів: encrypt, sign</string>
-  <string name="msg_ip_subkey_flags_cxx">Прапори підключів: certify</string>
-  <string name="msg_ip_subkey_flags_xex">Прапори підключів: encrypt</string>
-  <string name="msg_ip_subkey_flags_xxs">Прапори підключів: sign</string>
-  <string name="msg_ip_subkey_flags_xxx">Прапори підключів: жодний</string>
   <string name="msg_ip_success">Успішно імпортована публічна в\'язка</string>
   <string name="msg_ip_success_identical">В\'язка не містить нових даних. Нема що робити.</string>
   <string name="msg_ip_reinsert_secret">Повторне вставлення секретного ключа</string>
   <string name="msg_ip_uid_cert_bad">Виявлено поганий сертифікат!</string>
   <string name="msg_ip_uid_cert_error">Помилка опрацювання сертифікату!</string>
-  <string name="msg_ip_uid_cert_good">ІД користувача сертифіковано %1$s</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="one">Ігнорується один сертифікат виданий невідомим відкритим ключем</item>
     <item quantity="few">Ігнорується %s сертифікати, виданих невідомими відкритими ключами</item>
@@ -490,7 +466,6 @@
   <string name="msg_is">Імпортується секретний ключ %s</string>
   <string name="msg_is_db_exception">Помилка бази даних!</string>
   <string name="msg_is_importing_subkeys">Опрацьовуються секретні підключі</string>
-  <string name="msg_is_error_io_exc">Помилка шифрування в’язки</string>
   <string name="msg_is_pubring_generate">Генерується публічна в\'язка із секретної</string>
   <string name="msg_is_success_identical">В\'язка не містить нових даних. Нема що робити.</string>
   <string name="msg_is_success">Успішно імпортована секретна в\'язка</string>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 578c13ed8..3431cd7a9 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -82,7 +82,6 @@
   <string name="error_unknown_algorithm_choice">位置的算法选择</string>
   <string name="error_no_signature_passphrase">没有提供密语</string>
   <string name="error_no_signature_key">没有提供密钥</string>
-  <string name="error_invalid_data">不是有效的加密数据</string>
   <string name="error_wrong_passphrase">错误的密语</string>
   <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->