From 676262b052b12f1d72162acb9bf435a8630644a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 16 Apr 2014 19:00:06 +0200
Subject: Translations from transifex, fix some strings references

---
 .../keychain/pgp/PgpKeyOperation.java              |   2 +-
 .../keychain/remote/OpenPgpService.java            |   4 +-
 .../keychain/service/KeychainIntentService.java    |   2 +-
 .../src/main/res/raw-cs-rCZ/help_changelog.html    |   7 ++
 OpenKeychain/src/main/res/raw-de/help_about.html   |   2 +-
 .../src/main/res/raw-de/help_changelog.html        |   7 ++
 .../src/main/res/raw-el/help_changelog.html        |   7 ++
 .../src/main/res/raw-es-rCO/help_about.html        |  49 --------
 .../src/main/res/raw-es-rCO/help_changelog.html    | 136 ---------------------
 .../src/main/res/raw-es-rCO/help_nfc_beam.html     |  12 --
 .../src/main/res/raw-es-rCO/help_start.html        |  19 ---
 .../src/main/res/raw-es-rCO/nfc_beam_share.html    |  11 --
 .../src/main/res/raw-es/help_changelog.html        |   7 ++
 .../src/main/res/raw-et/help_changelog.html        |   7 ++
 .../src/main/res/raw-fa-rIR/help_changelog.html    |   7 ++
 .../src/main/res/raw-fr/help_changelog.html        |   7 ++
 .../src/main/res/raw-it-rIT/help_changelog.html    |   7 ++
 .../src/main/res/raw-ja/help_changelog.html        |   7 ++
 .../src/main/res/raw-nl-rNL/help_changelog.html    |   7 ++
 .../src/main/res/raw-pl/help_changelog.html        |   7 ++
 .../src/main/res/raw-pt-rBR/help_about.html        |  49 --------
 .../src/main/res/raw-pt-rBR/help_changelog.html    | 136 ---------------------
 .../src/main/res/raw-pt-rBR/help_nfc_beam.html     |  12 --
 .../src/main/res/raw-pt-rBR/help_start.html        |  19 ---
 .../src/main/res/raw-pt-rBR/nfc_beam_share.html    |  11 --
 .../src/main/res/raw-ru/help_changelog.html        |   7 ++
 .../src/main/res/raw-sl-rSI/help_about.html        |  49 --------
 .../src/main/res/raw-sl-rSI/help_changelog.html    | 136 ---------------------
 .../src/main/res/raw-sl-rSI/help_nfc_beam.html     |  12 --
 .../src/main/res/raw-sl-rSI/help_start.html        |  19 ---
 .../src/main/res/raw-sl-rSI/nfc_beam_share.html    |  11 --
 .../src/main/res/raw-tr/help_changelog.html        |   7 ++
 .../src/main/res/raw-uk/help_changelog.html        |   7 ++
 .../src/main/res/raw-zh-rTW/help_about.html        |  49 --------
 .../src/main/res/raw-zh-rTW/help_changelog.html    | 136 ---------------------
 .../src/main/res/raw-zh-rTW/help_nfc_beam.html     |  12 --
 .../src/main/res/raw-zh-rTW/help_start.html        |  19 ---
 .../src/main/res/raw-zh-rTW/nfc_beam_share.html    |  11 --
 .../src/main/res/raw-zh/help_changelog.html        |   7 ++
 .../src/main/res/values-cs-rCZ/strings.xml         |   2 +
 OpenKeychain/src/main/res/values-de/strings.xml    |  10 +-
 OpenKeychain/src/main/res/values-el/strings.xml    |   2 +
 .../src/main/res/values-es-rCO/strings.xml         |  98 ---------------
 OpenKeychain/src/main/res/values-es/strings.xml    |  12 +-
 OpenKeychain/src/main/res/values-et/strings.xml    |   2 +
 .../src/main/res/values-fa-rIR/strings.xml         |   2 +
 OpenKeychain/src/main/res/values-fr/strings.xml    |  22 +++-
 .../src/main/res/values-it-rIT/strings.xml         |  12 +-
 OpenKeychain/src/main/res/values-ja/strings.xml    |  14 ++-
 .../src/main/res/values-nl-rNL/strings.xml         |   3 +-
 OpenKeychain/src/main/res/values-pl/strings.xml    |  12 +-
 .../src/main/res/values-pt-rBR/strings.xml         |  29 -----
 OpenKeychain/src/main/res/values-ru/strings.xml    |  10 +-
 .../src/main/res/values-sl-rSI/strings.xml         |  29 -----
 OpenKeychain/src/main/res/values-tr/strings.xml    |   2 +
 OpenKeychain/src/main/res/values-uk/strings.xml    |  22 ++--
 .../src/main/res/values-zh-rTW/strings.xml         |  29 -----
 OpenKeychain/src/main/res/values-zh/strings.xml    |   3 +-
 58 files changed, 190 insertions(+), 1148 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/raw-es-rCO/help_about.html
 delete mode 100644 OpenKeychain/src/main/res/raw-es-rCO/help_changelog.html
 delete mode 100644 OpenKeychain/src/main/res/raw-es-rCO/help_nfc_beam.html
 delete mode 100644 OpenKeychain/src/main/res/raw-es-rCO/help_start.html
 delete mode 100644 OpenKeychain/src/main/res/raw-es-rCO/nfc_beam_share.html
 delete mode 100644 OpenKeychain/src/main/res/raw-pt-rBR/help_about.html
 delete mode 100644 OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.html
 delete mode 100644 OpenKeychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
 delete mode 100644 OpenKeychain/src/main/res/raw-pt-rBR/help_start.html
 delete mode 100644 OpenKeychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
 delete mode 100644 OpenKeychain/src/main/res/raw-sl-rSI/help_about.html
 delete mode 100644 OpenKeychain/src/main/res/raw-sl-rSI/help_changelog.html
 delete mode 100644 OpenKeychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
 delete mode 100644 OpenKeychain/src/main/res/raw-sl-rSI/help_start.html
 delete mode 100644 OpenKeychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
 delete mode 100644 OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
 delete mode 100644 OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
 delete mode 100644 OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html
 delete mode 100644 OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
 delete mode 100644 OpenKeychain/src/main/res/raw-zh-rTW/nfc_beam_share.html
 delete mode 100644 OpenKeychain/src/main/res/values-es-rCO/strings.xml
 delete mode 100644 OpenKeychain/src/main/res/values-pt-rBR/strings.xml
 delete mode 100644 OpenKeychain/src/main/res/values-sl-rSI/strings.xml
 delete mode 100644 OpenKeychain/src/main/res/values-zh-rTW/strings.xml

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 89b0963d7..adbce496e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -709,7 +709,7 @@ public class PgpKeyOperation {
         {
 
             if (certificationKey == null) {
-                throw new PgpGeneralMsgIdException(R.string.error_signature_failed);
+                throw new PgpGeneralMsgIdException(R.string.error_no_signature_key);
             }
 
             PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 7b5461075..a44c9a586 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -188,7 +188,7 @@ public class OpenPgpService extends RemoteService {
                 } catch (PgpSignEncrypt.NoPassphraseException e) {
                     throw new Exception(getString(R.string.error_no_signature_passphrase));
                 } catch (PgpSignEncrypt.NoSigningKeyException e) {
-                    throw new Exception(getString(R.string.error_signature_failed));
+                    throw new Exception(getString(R.string.error_no_signature_key));
                 }
             } finally {
                 is.close();
@@ -292,7 +292,7 @@ public class OpenPgpService extends RemoteService {
                 } catch (PgpSignEncrypt.NoPassphraseException e) {
                     throw new Exception(getString(R.string.error_no_signature_passphrase));
                 } catch (PgpSignEncrypt.NoSigningKeyException e) {
-                    throw new Exception(getString(R.string.error_signature_failed));
+                    throw new Exception(getString(R.string.error_no_signature_key));
                 }
             } finally {
                 is.close();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 3f04a155b..bb54a9fe0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -871,7 +871,7 @@ public class KeychainIntentService extends IntentService
         } else if (e instanceof PgpSignEncrypt.NoPassphraseException) {
             message = getString(R.string.error_no_signature_passphrase);
         } else if (e instanceof PgpSignEncrypt.NoSigningKeyException) {
-            message = getString(R.string.error_signature_failed);
+            message = getString(R.string.error_no_signature_key);
         } else if (e instanceof PgpDecryptVerify.InvalidDataException) {
             message = getString(R.string.error_invalid_data);
         } else if (e instanceof PgpDecryptVerify.KeyExtractionException) {
diff --git a/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
index 694c7b046..bd47c1cef 100644
--- a/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>
diff --git a/OpenKeychain/src/main/res/raw-de/help_about.html b/OpenKeychain/src/main/res/raw-de/help_about.html
index 7dc0ee7d9..b356c9897 100644
--- a/OpenKeychain/src/main/res/raw-de/help_about.html
+++ b/OpenKeychain/src/main/res/raw-de/help_about.html
@@ -2,7 +2,7 @@
 <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> ist eine OpenPGP implementation für Android.</p>
+<p><a href="http://www.openkeychain.org">OpenKeychain</a> ist eine OpenPGP-Implementierung für Android.</p>
 <p>Lizenz: GPLv3+</p>
 
 <h2>Entwickler OpenKeychain</h2>
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index 58199a9c8..b3906cb20 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>
diff --git a/OpenKeychain/src/main/res/raw-el/help_changelog.html b/OpenKeychain/src/main/res/raw-el/help_changelog.html
index 694c7b046..bd47c1cef 100644
--- a/OpenKeychain/src/main/res/raw-el/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-el/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>
diff --git a/OpenKeychain/src/main/res/raw-es-rCO/help_about.html b/OpenKeychain/src/main/res/raw-es-rCO/help_about.html
deleted file mode 100644
index ae7e16aae..000000000
--- a/OpenKeychain/src/main/res/raw-es-rCO/help_about.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<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> is an OpenPGP implementation for Android.</p>
-<p>License: GPLv3+</p>
-
-<h2>Developers OpenKeychain</h2>
-<ul>
-<li>Dominik Schürmann (Lead developer)</li>
-<li>Ash Hughes (crypto patches)</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov (UI)</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>Sreeram Boyapati</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Developers APG 1.x</h2>
-<ul>
-<li>Thialfihar (Lead developer)</li>
-<li>'Senecaso' (QRCode, sign key, upload key)</li>
-<li>Markus Doits</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li>
-<li>
-<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-es-rCO/help_changelog.html b/OpenKeychain/src/main/res/raw-es-rCO/help_changelog.html
deleted file mode 100644
index 694c7b046..000000000
--- a/OpenKeychain/src/main/res/raw-es-rCO/help_changelog.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>2.5</h2>
-<ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key 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 pass phrase 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 pass phrase 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-es-rCO/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-es-rCO/help_nfc_beam.html
deleted file mode 100644
index 88492731c..000000000
--- a/OpenKeychain/src/main/res/raw-es-rCO/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<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-es-rCO/help_start.html b/OpenKeychain/src/main/res/raw-es-rCO/help_start.html
deleted file mode 100644
index 0e60c17a7..000000000
--- a/OpenKeychain/src/main/res/raw-es-rCO/help_start.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import 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>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-es-rCO/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-es-rCO/nfc_beam_share.html
deleted file mode 100644
index 083e055c7..000000000
--- a/OpenKeychain/src/main/res/raw-es-rCO/nfc_beam_share.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<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-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
index 4ad69fc20..6b7b7d975 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>corregido descifrado de mensajes/ficheros con pgp simétrico</li>
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
index 694c7b046..bd47c1cef 100644
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>
diff --git a/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
index 694c7b046..bd47c1cef 100644
--- a/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
index 7a22eafbb..b682e3ff7 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>certifications des clefs (merci à Vincent Breitmoser)</li>
+<li>nouvelle conception de la vérification des signatures</li>
+<li>longueur de clef personnalisée (merci à Greg Witczak)</li>
+<li>correction de la fonctionnalité partagée avec d'autres applis</li>
+</ul>
 <h2>2.5</h2>
 <ul>
 <li>corrige le déchiffrement des messages/fichiers pgp symétriques</li>
diff --git a/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
index 46604991c..bb65dc091 100644
--- a/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>Corretta la decodifica di messaggi PGP / file simmetrici</li>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index d6e03c7c1..45e0a4e95 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>対称暗号化PGPメッセージ/ファイルの復号化を修正</li>
diff --git a/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
index 694c7b046..bd47c1cef 100644
--- a/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
index 33207f8db..98b903355 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>naprawiono deszyfrowanie symetrycznych wiadomości/plików PGP</li>
diff --git a/OpenKeychain/src/main/res/raw-pt-rBR/help_about.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_about.html
deleted file mode 100644
index ae7e16aae..000000000
--- a/OpenKeychain/src/main/res/raw-pt-rBR/help_about.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<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> is an OpenPGP implementation for Android.</p>
-<p>License: GPLv3+</p>
-
-<h2>Developers OpenKeychain</h2>
-<ul>
-<li>Dominik Schürmann (Lead developer)</li>
-<li>Ash Hughes (crypto patches)</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov (UI)</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>Sreeram Boyapati</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Developers APG 1.x</h2>
-<ul>
-<li>Thialfihar (Lead developer)</li>
-<li>'Senecaso' (QRCode, sign key, upload key)</li>
-<li>Markus Doits</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li>
-<li>
-<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.html
deleted file mode 100644
index 694c7b046..000000000
--- a/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>2.5</h2>
-<ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key 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 pass phrase 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 pass phrase 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-pt-rBR/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
deleted file mode 100644
index 88492731c..000000000
--- a/OpenKeychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<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-pt-rBR/help_start.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_start.html
deleted file mode 100644
index 0e60c17a7..000000000
--- a/OpenKeychain/src/main/res/raw-pt-rBR/help_start.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import 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>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-pt-rBR/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
deleted file mode 100644
index 083e055c7..000000000
--- a/OpenKeychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<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-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index 8b1580c3a..f728e3d74 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>исправлено симметричное шифрование сообщений/файлов</li>
diff --git a/OpenKeychain/src/main/res/raw-sl-rSI/help_about.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_about.html
deleted file mode 100644
index ae7e16aae..000000000
--- a/OpenKeychain/src/main/res/raw-sl-rSI/help_about.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<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> is an OpenPGP implementation for Android.</p>
-<p>License: GPLv3+</p>
-
-<h2>Developers OpenKeychain</h2>
-<ul>
-<li>Dominik Schürmann (Lead developer)</li>
-<li>Ash Hughes (crypto patches)</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov (UI)</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>Sreeram Boyapati</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Developers APG 1.x</h2>
-<ul>
-<li>Thialfihar (Lead developer)</li>
-<li>'Senecaso' (QRCode, sign key, upload key)</li>
-<li>Markus Doits</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li>
-<li>
-<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sl-rSI/help_changelog.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_changelog.html
deleted file mode 100644
index 694c7b046..000000000
--- a/OpenKeychain/src/main/res/raw-sl-rSI/help_changelog.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>2.5</h2>
-<ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key 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 pass phrase 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 pass phrase 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-sl-rSI/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
deleted file mode 100644
index 88492731c..000000000
--- a/OpenKeychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<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-sl-rSI/help_start.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_start.html
deleted file mode 100644
index 0e60c17a7..000000000
--- a/OpenKeychain/src/main/res/raw-sl-rSI/help_start.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import 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>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-sl-rSI/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
deleted file mode 100644
index 083e055c7..000000000
--- a/OpenKeychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<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 694c7b046..bd47c1cef 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
index f3dd5d5b6..0c23a2094 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>сертифікації ключів (завдяки Вінсенту Бреймозеру)</li>
+<li>новий дизайн для перевірки підпису</li>
+<li>власна довжина ключа (завдяки Ґреґу Вітчаку)</li>
+<li>виправлено функцію поширення з інших програм</li>
+</ul>
 <h2>2.5</h2>
 <ul>
 <li>виправлено опис симетричних повідомлень/файлів pgp</li>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
deleted file mode 100644
index ae7e16aae..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<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> is an OpenPGP implementation for Android.</p>
-<p>License: GPLv3+</p>
-
-<h2>Developers OpenKeychain</h2>
-<ul>
-<li>Dominik Schürmann (Lead developer)</li>
-<li>Ash Hughes (crypto patches)</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov (UI)</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>Sreeram Boyapati</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Developers APG 1.x</h2>
-<ul>
-<li>Thialfihar (Lead developer)</li>
-<li>'Senecaso' (QRCode, sign key, upload key)</li>
-<li>Markus Doits</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li>
-<li>
-<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
deleted file mode 100644
index 694c7b046..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>2.5</h2>
-<ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key 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 pass phrase 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 pass phrase 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-zh-rTW/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html
deleted file mode 100644
index 88492731c..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<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-zh-rTW/help_start.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
deleted file mode 100644
index 0e60c17a7..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import 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>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-zh-rTW/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-zh-rTW/nfc_beam_share.html
deleted file mode 100644
index 083e055c7..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/nfc_beam_share.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<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-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index 694c7b046..bd47c1cef 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -1,6 +1,13 @@
 <html>
 <head></head>
 <body>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (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>
diff --git a/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml b/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml
index 586785a62..2a820b668 100644
--- a/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml
@@ -34,6 +34,8 @@
   <!--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-->
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index aeca098f0..204fac852 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -230,7 +230,6 @@
     <item quantity="one">%d Schlüssel gefunden.</item>
     <item quantity="other">%d Schlüssel gefunden.</item>
   </plurals>
-  <string name="unknown_signature">Unbekannte Signatur. Benutze den Button um den fehlenden Schlüssel nachzuschlagen.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d schlechter privater Schlüssel ignoriert. Evtl. wurde er mit folgender Option exportiert:\n --export-secret-subkeys\nUnbedingt mit der Option \n --export-secret-keys\nexportieren.</item>
     <item quantity="other">%d schlechte private Schlüssel ignoriert. Evtl. wurden sie mit folgender Option exportiert:\n --export-secret-subkeys\nUnbedingt mit der Option \n --export-secret-keys\nexportieren.</item>
@@ -262,7 +261,6 @@
   <string name="error_main_user_id_must_not_be_empty">Hauptbenutzer-ID darf nicht leer sein</string>
   <string name="error_key_needs_master_key">Mindestens ein Hauptschlüssel wird benötigt</string>
   <string name="error_no_encryption_keys_or_passphrase">Keine Schlüssel zur Verschlüsselung gegeben bzw. kein symmetrisches Passwort festgelegt</string>
-  <string name="error_signature_failed">Signieren fehlgeschlagen</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>
@@ -272,13 +270,14 @@
   <string name="error_wrong_passphrase">falsches Passwort</string>
   <string name="error_saving_keys">Es trat ein Fehler beim Speichern einiger Schlüssel auf</string>
   <string name="error_could_not_extract_private_key">Privater Schlüssel konnte nicht extrahiert werden</string>
+  <string name="error_expiry_must_come_after_creation">Ablaufdatum muss später sein als das Erstellungsdatum</string>
+  <string name="error_can_not_delete_contact">Sie können diesen Kontakt nicht löschen, denn es ist ihr eigener.</string>
+  <string name="error_can_not_delete_contacts">Sie können folgende Kontakte nicht löschen, denn sie gehören Ihnen selbst:\n%s</string>
+  <!--errors without preceeding Error:-->
   <string name="error_only_files_are_supported">Binäre Daten ohne Datei im Dateisystem werden nicht unterstützt. Dies wird nur durch ACTION_ENCRYPT_STREAM_AND_RETURN unterstützt.</string>
   <string name="error_jelly_bean_needed">Android 4.1 alias Jelly Bean wird benötigt um Androids NFC-Beam nutzen zu können!</string>
   <string name="error_nfc_needed">NFC steht auf diesem Gerät nicht zur Verfügung!</string>
   <string name="error_nothing_import">Nichts zu importieren!</string>
-  <string name="error_expiry_must_come_after_creation">Ablaufdatum muss später sein als das Erstellungsdatum</string>
-  <string name="error_can_not_delete_contact">Sie können diesen Kontakt nicht löschen, denn es ist ihr eigener.</string>
-  <string name="error_can_not_delete_contacts">Sie können folgende Kontakte nicht löschen, denn sie gehören Ihnen selbst:\n%s</string>
   <string name="error_keyserver_insufficient_query">Unzureichende Serveranfrage</string>
   <string name="error_keyserver_query">Keyserveranfrage fehlgeschlagen</string>
   <string name="error_keyserver_too_many_responses">Zu viele Antworten</string>
@@ -292,6 +291,7 @@
     <item quantity="one">Ein Teil der geladenen Datei ist ein gültiges OpenPGP Objekt aber kein OpenPGP Schlüssel</item>
     <item quantity="other">Teile der geladenen Dateien sind gültige OpenPGP Objekte aber keine OpenPGP Schlüssel</item>
   </plurals>
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Erledigt</string>
   <string name="progress_cancel">Abbrechen</string>
diff --git a/OpenKeychain/src/main/res/values-el/strings.xml b/OpenKeychain/src/main/res/values-el/strings.xml
index 73a736766..111c861e6 100644
--- a/OpenKeychain/src/main/res/values-el/strings.xml
+++ b/OpenKeychain/src/main/res/values-el/strings.xml
@@ -35,6 +35,8 @@
   <!--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-->
diff --git a/OpenKeychain/src/main/res/values-es-rCO/strings.xml b/OpenKeychain/src/main/res/values-es-rCO/strings.xml
deleted file mode 100644
index 0def5eba7..000000000
--- a/OpenKeychain/src/main/res/values-es-rCO/strings.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--title-->
-  <string name="title_select_recipients">Escoger llave pública</string>
-  <string name="title_select_secret_key">Escoger llave privada</string>
-  <string name="title_encrypt">Cifrar</string>
-  <string name="title_decrypt">Descifrar</string>
-  <string name="title_authentication">Contraseña</string>
-  <string name="title_create_key">Crear clave</string>
-  <string name="title_edit_key">Editar clave</string>
-  <string name="title_preferences">Preferencias</string>
-  <string name="title_api_registered_apps">Aplicaciones registradas</string>
-  <string name="title_set_passphrase">Establecer contraseña</string>
-  <string name="title_send_email">Enviar correo electrónico...</string>
-  <string name="title_encrypt_to_file">Cifrar a archivo</string>
-  <string name="title_decrypt_to_file">Descifrar a archivo</string>
-  <string name="title_import_keys">Importar claves</string>
-  <string name="title_export_key">Exportar clave</string>
-  <string name="title_export_keys">Exportar claves</string>
-  <string name="title_key_not_found">Clave no encontrada</string>
-  <string name="title_unknown_signature_key">Clave de firma desconocida</string>
-  <string name="title_help">Ayuda</string>
-  <!--section-->
-  <string name="section_user_ids">IDs de usuario</string>
-  <string name="section_keys">Claves</string>
-  <string name="section_general">General</string>
-  <string name="section_defaults">Por defecto</string>
-  <string name="section_advanced">Avanzado</string>
-  <!--button-->
-  <string name="btn_sign">Firmar</string>
-  <string name="btn_decrypt">Descifrar</string>
-  <string name="btn_select_encrypt_keys">Escoger destinatarios</string>
-  <string name="btn_encrypt_file">Cifrar archivo</string>
-  <string name="btn_save">Guardar</string>
-  <string name="btn_do_not_save">Cancelar</string>
-  <string name="btn_delete">Borrar</string>
-  <string name="btn_no_date">Ninguno</string>
-  <string name="btn_okay">Ok</string>
-  <string name="btn_search">Buscar</string>
-  <string name="btn_next">Siguiente</string>
-  <string name="btn_back">Atrás</string>
-  <!--menu-->
-  <string name="menu_preferences">Ajustes</string>
-  <string name="menu_import_from_file">Importar desde archivo</string>
-  <string name="menu_import_from_qr_code">Importar desde código QR</string>
-  <string name="menu_import_from_nfc">Importar desde NFC</string>
-  <string name="menu_export_key">Exportar a archivo</string>
-  <string name="menu_delete_key">Borrar clave</string>
-  <string name="menu_create_key">Crear clave</string>
-  <string name="menu_create_key_expert">Crear clave (experto)</string>
-  <string name="menu_search">Buscar</string>
-  <string name="menu_sign_key">Clave de firma</string>
-  <!--label-->
-  <string name="label_sign">Firmar</string>
-  <string name="label_message">Mensaje</string>
-  <string name="label_file">Archivo</string>
-  <string name="label_no_passphrase">Sin contraseña</string>
-  <string name="label_passphrase">Contraseña</string>
-  <string name="label_passphrase_again">De nuevo</string>
-  <string name="label_algorithm">Algoritmo</string>
-  <string name="label_ascii_armor">Armadura ASCII</string>
-  <string name="label_delete_after_encryption">Borrar después de cifrar</string>
-  <string name="label_delete_after_decryption">Borrar después de descifrar</string>
-  <string name="label_encryption_algorithm">Algoritmo de cifrado</string>
-  <string name="label_hash_algorithm">Algoritmo de Hash</string>
-  <string name="label_message_compression">Compresión de mensaje</string>
-  <string name="label_file_compression">Compresión de archivo</string>
-  <string name="label_key_id">ID de clave</string>
-  <string name="label_creation">Creación</string>
-  <string name="label_expiry">Expiración</string>
-  <string name="label_usage">Uso</string>
-  <string name="label_key_size">Tamaño de la clave</string>
-  <string name="label_main_user_id">ID de usuario principal</string>
-  <string name="label_name">Nombre</string>
-  <string name="label_comment">Comentario</string>
-  <string name="label_email">Correo electrónico</string>
-  <string name="unknown_status"></string>
-  <!--choice-->
-  <!--key flags-->
-  <!--sentences-->
-  <!--errors
-         no punctuation, all lowercase,
-         they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--progress dialogs, usually ending in '…'-->
-  <!--action strings-->
-  <!--key bit length selections-->
-  <!--compression-->
-  <!--Help-->
-  <!--Import-->
-  <!--Intent labels-->
-  <!--Remote API-->
-  <!--Share-->
-  <!--Key list-->
-  <!--Key view-->
-  <!--Navigation Drawer-->
-  <!--hints-->
-  <!--unsorted-->
-</resources>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index d4fe07cd6..634797a21 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -235,7 +235,6 @@
     <item quantity="one">Se ha encontrado %d clave.</item>
     <item quantity="other">Se han encontrado %d claves.</item>
   </plurals>
-  <string name="unknown_signature">Firma desconocida, pulsa el botón para buscar la clave extraviada.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d mala clave secreta ignorada. Quizás hayas exportado con la opción\n--export-secret-subkeys\nAsegúrate de que exportas con\n--export-secret-keys\nen su lugar.</item>
     <item quantity="other">%d malas claves secretas ignoradas. Quizás hayas exportado con la opción\n--export-secret-subkeys\nAsegúrate de que exportas con\n--export-secret-keys\nen su lugar.</item>
@@ -267,7 +266,6 @@
   <string name="error_main_user_id_must_not_be_empty">la ID del usuario principal no puede estar vacía</string>
   <string name="error_key_needs_master_key">necesitas al menos una clave maestra</string>
   <string name="error_no_encryption_keys_or_passphrase">no has proporcionado ninguna clave de cifrado o frase de contraseña</string>
-  <string name="error_signature_failed">la firma ha fallado</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>
@@ -277,14 +275,15 @@
   <string name="error_wrong_passphrase">frase de contraseña incorrecta</string>
   <string name="error_saving_keys">error al guardar algunas claves</string>
   <string name="error_could_not_extract_private_key">no se puede extraer la clave privada</string>
-  <string name="error_only_files_are_supported">Dirigir datos binarios sin un archivo real en el sistema de archivos es incompatible. Esto solo es compatible con ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">!Necesitas Android 4.1 alias Jelly Bean para poder usar la característica NFC Beam!</string>
-  <string name="error_nfc_needed">¡NFC no está disponible en tu dispositivo!</string>
-  <string name="error_nothing_import">¡Nada que importar!</string>
   <string name="error_expiry_must_come_after_creation">la fecha de caducidad debe ser posterior a la fecha de creación</string>
   <string name="error_save_first">Por favor, guarda el almacén de claves antes</string>
   <string name="error_can_not_delete_contact">no puedes eliminar este contacto porque eres tú mismo.</string>
   <string name="error_can_not_delete_contacts">no puedes eliminar los siguientes contactos porque son tú mismo:\n%s</string>
+  <!--errors without preceeding Error:-->
+  <string name="error_only_files_are_supported">Dirigir datos binarios sin un archivo real en el sistema de archivos es incompatible. Esto solo es compatible con ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
+  <string name="error_jelly_bean_needed">!Necesitas Android 4.1 alias Jelly Bean para poder usar la característica NFC Beam!</string>
+  <string name="error_nfc_needed">¡NFC no está disponible en tu dispositivo!</string>
+  <string name="error_nothing_import">¡Nada que importar!</string>
   <string name="error_keyserver_insufficient_query">Consulta al servidor insuficiente</string>
   <string name="error_keyserver_query">La consulta al servidor de claves ha fallado</string>
   <string name="error_keyserver_too_many_responses">Demasiadas respuestas</string>
@@ -299,6 +298,7 @@
     <item quantity="other">partes del archivo cargado son objetos OpenPGP válidos pero no claves OpenPGP</item>
   </plurals>
   <string name="error_change_something_first">Debes hacer cambios en el almacén de claves antes de que puedas guardarlo</string>
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Hecho.</string>
   <string name="progress_cancel">Cancelar</string>
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml
index e1e725234..87a3f0b62 100644
--- a/OpenKeychain/src/main/res/values-et/strings.xml
+++ b/OpenKeychain/src/main/res/values-et/strings.xml
@@ -101,6 +101,8 @@
   <!--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-->
diff --git a/OpenKeychain/src/main/res/values-fa-rIR/strings.xml b/OpenKeychain/src/main/res/values-fa-rIR/strings.xml
index fc802092c..9780a3bfe 100644
--- a/OpenKeychain/src/main/res/values-fa-rIR/strings.xml
+++ b/OpenKeychain/src/main/res/values-fa-rIR/strings.xml
@@ -12,6 +12,8 @@
   <!--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-->
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 333f6c21c..4be92a88f 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -196,6 +196,8 @@
   <string name="file_delete_confirmation">Êtes-vous sûr de vouloir supprimer\n%s ?</string>
   <string name="file_delete_successful">Supprimé avec succès.</string>
   <string name="no_file_selected">Choisir d\'abord un fichier.</string>
+  <string name="encrypt_sign_successful">Signé et/ou chiffré avec succès.</string>
+  <string name="encrypt_sign_clipboard_successful">Signé et/ou chiffré vers le presse-papiers avec succès.</string>
   <string name="enter_passphrase_twice">Saisir la phrase de passe deux fois.</string>
   <string name="select_encryption_key">Choisir au moins une clef de chiffrement.</string>
   <string name="select_encryption_or_signature_key">Choisir au moins une clef de chiffrement ou de signature.</string>
@@ -237,7 +239,6 @@
     <item quantity="one">%d clef trouvée.</item>
     <item quantity="other">%d clefs trouvées.</item>
   </plurals>
-  <string name="unknown_signature">Signature inconnue. Cliquer sur le bouton pour rechercher la clef manquante.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d mauvaise clef ignorée. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item>
     <item quantity="other">%d mauvaises clefs ignorées. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item>
@@ -269,7 +270,6 @@
   <string name="error_main_user_id_must_not_be_empty">l\'ID utilisateur principal ne doit pas être vide</string>
   <string name="error_key_needs_master_key">au moins une clef maîtresse est nécessaire</string>
   <string name="error_no_encryption_keys_or_passphrase">aucune clef ni phrase de passe n\'a été donnée</string>
-  <string name="error_signature_failed">échec lors de la signature</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>
@@ -279,14 +279,15 @@
   <string name="error_wrong_passphrase">phrase de passe erronnée</string>
   <string name="error_saving_keys">erreur lors de la sauvegarde de certaines clefs</string>
   <string name="error_could_not_extract_private_key">impossible d\'extraire la clef privée</string>
-  <string name="error_only_files_are_supported">Les données binaires directes sans fichier dans le système de fichiers ne sont pas prises en charge. C\'est uniquement pris en charge par ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Vous devez avoir Android 4.1 Jelly Bean pour utiliser la fonction NFC Beam !</string>
-  <string name="error_nfc_needed">NFC n\'est pas disponible sur votre appareil !</string>
-  <string name="error_nothing_import">Rien à importer !</string>
   <string name="error_expiry_must_come_after_creation">la date d\'expiration doit venir après la date de création</string>
   <string name="error_save_first">veuillez d\'abord enregistrer le trousseau</string>
   <string name="error_can_not_delete_contact">vous ne pouvez pas supprimer ce contact car c\'est le vôtre.</string>
   <string name="error_can_not_delete_contacts">vous ne pouvez pas supprimer les contacts suivants car c\'est les vôtres.\n%s</string>
+  <!--errors without preceeding Error:-->
+  <string name="error_only_files_are_supported">Les données binaires directes sans fichier dans le système de fichiers ne sont pas prises en charge. C\'est uniquement pris en charge par ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
+  <string name="error_jelly_bean_needed">Vous devez avoir Android 4.1 Jelly Bean pour utiliser la fonction NFC Beam !</string>
+  <string name="error_nfc_needed">NFC n\'est pas disponible sur votre appareil !</string>
+  <string name="error_nothing_import">Rien à importer !</string>
   <string name="error_keyserver_insufficient_query">Requête serveur insuffisante</string>
   <string name="error_keyserver_query">Échec lors de l\'interrogation du serveur de clefs</string>
   <string name="error_keyserver_too_many_responses">Trop de réponses</string>
@@ -301,6 +302,15 @@
     <item quantity="other">certaines parties du fichier chargé sont des objets OpenPGP valides mais pas des clefs OpenPGP</item>
   </plurals>
   <string name="error_change_something_first">Vous devez apporter des changements au trousseau avant de pouvoir l\'enregistrer</string>
+  <!--results shown after decryption/verification-->
+  <string name="decrypt_result_invalid_signature">Signature invalide !</string>
+  <string name="decrypt_result_signature_unknown_pub_key">Clef publique inconnue</string>
+  <string name="decrypt_result_signature_uncertified">Signature valide (non certifiée)</string>
+  <string name="decrypt_result_signature_certified">Signature valide (certifiée)</string>
+  <string name="decrypt_result_decrypted">Déchiffré avec succès</string>
+  <string name="decrypt_result_decrypted_unknown_pub_key">Déchiffré avec succès, mais la clef publique est inconnue</string>
+  <string name="decrypt_result_decrypted_and_signature_uncertified">Déchiffré avec succès et la signature est valide (non certifiée)</string>
+  <string name="decrypt_result_decrypted_and_signature_certified">Déchiffré avec succès et la signature est valide (certifiée)</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Terminé.</string>
   <string name="progress_cancel">Annuler</string>
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index 3f680697e..0c25f3eb3 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -237,7 +237,6 @@
     <item quantity="one">Trovata %d chiave.</item>
     <item quantity="other">Trovate %d chiavi.</item>
   </plurals>
-  <string name="unknown_signature">Firma sconosciuta, clicca il pulsante per ricercare la chiave mancante.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d chiave segreta non valida ignorata. Forse hai esportato con opzione\n--export-secret-subkeys\nAssicurati di esportare con\n--export-secret-keys\ninvece.</item>
     <item quantity="other">%d chiavi private non valide  ignorate. Forse hai esportato con opzione\n--export-secret-subkeys\nAssicurati di esportare con\n--export-secret-keys\ninvece.</item>
@@ -269,7 +268,6 @@
   <string name="error_main_user_id_must_not_be_empty">id utente principale non puo\' essere vuoto</string>
   <string name="error_key_needs_master_key">necessaria almeno una chiave principale</string>
   <string name="error_no_encryption_keys_or_passphrase">nessuna chiave di codifica o frase di accesso fornita</string>
-  <string name="error_signature_failed">firma fallita</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>
@@ -279,14 +277,15 @@
   <string name="error_wrong_passphrase">frase di accesso errata</string>
   <string name="error_saving_keys">errore nel salvataggio di alcune chiavi</string>
   <string name="error_could_not_extract_private_key">impossibile estrarre la chiave privata</string>
-  <string name="error_only_files_are_supported">Flusso di dati diretto senza file corrispettivo nel filesystem non e\' supportato. Supportato soltanto da ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Devi avere Android 4.1 alias Jelly Bean per usare Android NFC Beam!</string>
-  <string name="error_nfc_needed">NFC non disponibile nel tuo dispositivo!</string>
-  <string name="error_nothing_import">Niente da importare!</string>
   <string name="error_expiry_must_come_after_creation">La data di scadenza deve essere postuma quella di creazione</string>
   <string name="error_save_first">si prega di salvare il portachiavi primo</string>
   <string name="error_can_not_delete_contact">Non è possibile eliminare questo contatto, perché è il proprio.</string>
   <string name="error_can_not_delete_contacts">Non è possibile eliminare i seguenti contatti perché sono i propri:\n%s</string>
+  <!--errors without preceeding Error:-->
+  <string name="error_only_files_are_supported">Flusso di dati diretto senza file corrispettivo nel filesystem non e\' supportato. Supportato soltanto da ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
+  <string name="error_jelly_bean_needed">Devi avere Android 4.1 alias Jelly Bean per usare Android NFC Beam!</string>
+  <string name="error_nfc_needed">NFC non disponibile nel tuo dispositivo!</string>
+  <string name="error_nothing_import">Niente da importare!</string>
   <string name="error_keyserver_insufficient_query">Query di server insufficiente</string>
   <string name="error_keyserver_query">Interrogazione del server delle chiavi fallita</string>
   <string name="error_keyserver_too_many_responses">Troppi responsi</string>
@@ -301,6 +300,7 @@
     <item quantity="other">parti del file caricato sono oggetti OpenPGP validi, ma non chavi OpenPGP</item>
   </plurals>
   <string name="error_change_something_first">È necessario apportare modifiche al portachiavi prima prima che sia possibile salvarlo</string>
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Fatto.</string>
   <string name="progress_cancel">Annulla</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 86c6ebe63..f7d8c7205 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -193,6 +193,8 @@
   <string name="file_delete_confirmation">%s を削除してもかまいませんか?</string>
   <string name="file_delete_successful">削除に成功しました。</string>
   <string name="no_file_selected">最初にファイルを選択してください。</string>
+  <string name="encrypt_sign_successful">署名/暗号化に成功しました。</string>
+  <string name="encrypt_sign_clipboard_successful">クリップボードの中身の署名/暗号化に成功しました。</string>
   <string name="enter_passphrase_twice">もう一度パスフレーズを入れてください。</string>
   <string name="select_encryption_key">少なくとも1つの暗号化鍵を選択して下さい。</string>
   <string name="select_encryption_or_signature_key">少なくとも1つの暗号化鍵か署名鍵を選択して下さい。</string>
@@ -229,7 +231,6 @@
   <plurals name="keys_found">
     <item quantity="other">%d の鍵を発見。</item>
   </plurals>
-  <string name="unknown_signature">不明な署名、ボタンを押して見付からない鍵を検出してください。</string>
   <plurals name="bad_keys_encountered">
     <item quantity="other">%d の問題ある鍵を無視しました。 おそらく次のオプションでエクスポートしています\n --export-secret-subkeys\n代りに次のオプションでエクスポートしてください。\n --export-secret-keys</item>
   </plurals>
@@ -260,7 +261,6 @@
   <string name="error_main_user_id_must_not_be_empty">主ユーザIDは空にすることはできません</string>
   <string name="error_key_needs_master_key">主鍵が最低でも1つ必要です</string>
   <string name="error_no_encryption_keys_or_passphrase">鍵が暗号化されていないかパスフレーズが与えられていません</string>
-  <string name="error_signature_failed">署名に失敗</string>
   <string name="error_no_signature_passphrase">パスフレーズが与えられていません</string>
   <string name="error_no_signature_key">署名鍵を与えられていません</string>
   <string name="error_invalid_data">暗号化データが不正です</string>
@@ -270,14 +270,15 @@
   <string name="error_wrong_passphrase">正しくないパスフレーズです</string>
   <string name="error_saving_keys">鍵の保存エラー</string>
   <string name="error_could_not_extract_private_key">秘密鍵を取り出すことができません</string>
-  <string name="error_only_files_are_supported">ファイルシステムに存在するファイルではないバイナリデータはサポートされません。 ACTION_ENCRYPT_STREAM_AND_RETURN でのみサポートされます。</string>
-  <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1 (Jelly Bean) が必要です!</string>
-  <string name="error_nfc_needed">あなたのデバイスにはNFCが存在しません!</string>
-  <string name="error_nothing_import">インポートするものがありません!</string>
   <string name="error_expiry_must_come_after_creation">期限日時は生成日時より後である必要があります</string>
   <string name="error_save_first">まず鍵輪を保存してください</string>
   <string name="error_can_not_delete_contact">この連絡先はあなたなので削除できません。</string>
   <string name="error_can_not_delete_contacts">この連絡先はあなたなので削除できません。:\n%s</string>
+  <!--errors without preceeding Error:-->
+  <string name="error_only_files_are_supported">ファイルシステムに存在するファイルではないバイナリデータはサポートされません。 ACTION_ENCRYPT_STREAM_AND_RETURN でのみサポートされます。</string>
+  <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1 (Jelly Bean) が必要です!</string>
+  <string name="error_nfc_needed">あなたのデバイスにはNFCが存在しません!</string>
+  <string name="error_nothing_import">インポートするものがありません!</string>
   <string name="error_keyserver_insufficient_query">サーバへのクエリーが不足しています</string>
   <string name="error_keyserver_query">鍵サーバへのクエリーが失敗</string>
   <string name="error_keyserver_too_many_responses">レスポンスが多すぎます</string>
@@ -290,6 +291,7 @@
     <item quantity="other">読み込んだファイルのOpenPGPオブジェクト部分は正しいですが、OpenPGPの鍵ではありません</item>
   </plurals>
   <string name="error_change_something_first">あなたは鍵輪を保存する前に変更を加えなくてはなりません</string>
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">完了。</string>
   <string name="progress_cancel">キャンセル</string>
diff --git a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
index e16f6c11f..0b857b087 100644
--- a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
@@ -145,7 +145,6 @@
   <string name="error_key_needs_a_user_id">ten minste één gebruiksers-id vereist</string>
   <string name="error_main_user_id_must_not_be_empty">hoofdgebruikers-id kan niet leeg zijn</string>
   <string name="error_key_needs_master_key">ten minste een hoofdsleutel is vereist</string>
-  <string name="error_signature_failed">handtekening mislukt</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>
@@ -153,10 +152,12 @@
   <string name="error_no_symmetric_encryption_packet">kan geen pakket vinden met symmetrische versleuteling</string>
   <string name="error_wrong_passphrase">wachtwoord verekerd</string>
   <string name="error_could_not_extract_private_key">kan privésleutel niet uitpakken</string>
+  <!--errors without preceeding Error:-->
   <string name="error_only_files_are_supported">Ruwe invoer van binaire gegevens wordt niet ondersteund, alleen bij ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
   <string name="error_jelly_bean_needed">Android 4.1 Jelly Bean of hoger is vereist voor NFC Beam.</string>
   <string name="error_nfc_needed">Uw apparaat biedt geen ondersteuning voor NFC</string>
   <string name="error_nothing_import">Niets te importeren</string>
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_saving">opslaan...</string>
   <string name="progress_importing">importeren...</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index b52f88f8d..d709c1abd 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -245,7 +245,6 @@
     <item quantity="few">Znaleziono %d kluczy.</item>
     <item quantity="other">Znaleziono %d kluczy.</item>
   </plurals>
-  <string name="unknown_signature">Nieznany podpis, naciśnij przycisk, aby wyszukać brakujący klucz.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">Zignorowano %d niepoprawny klucz prywatny. Prawdopodobnie został wyeksportowany przy uzyciu opcji\n --export-secret-subkeys\nUpewnij się że eksportujesz go z opcją\n --export-secret-keys\nktóra jest poprawna.</item>
     <item quantity="few">Zignorowano %d niepoprawnych kluczy prywatnych. Prawdopodobnie zostały wyeksportowane przy uzyciu opcji\n --export-secret-subkeys\nUpewnij się że eksportujesz je z opcją\n --export-secret-keys\nktóra jest poprawna.</item>
@@ -278,7 +277,6 @@
   <string name="error_main_user_id_must_not_be_empty">główny identyfikator użytkownika nie może być pusty</string>
   <string name="error_key_needs_master_key">potrzeba co najmniej klucza głównego</string>
   <string name="error_no_encryption_keys_or_passphrase">nie podano hasła ani klucza szyfrującego</string>
-  <string name="error_signature_failed">podpisywanie nie powiodło się</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>
@@ -288,14 +286,15 @@
   <string name="error_wrong_passphrase">nieprawidłowe hasło</string>
   <string name="error_saving_keys">błąd przy zapisywaniu kluczy</string>
   <string name="error_could_not_extract_private_key">nie można wyodrębnić klucza prywatnego</string>
-  <string name="error_only_files_are_supported">Dane binarne pozbawione pliku nie są obsługiwane. To jest wspierane tylko dla akcji ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Potrzebujesz Androida 4.1 Jelly Bean, aby korzystać z Android NFC Beam!</string>
-  <string name="error_nfc_needed">NCF jest niedostępne na twoim urządzeniu</string>
-  <string name="error_nothing_import">Nie ma nic do zaimportowania!</string>
   <string name="error_expiry_must_come_after_creation">data wygaśnięcia musi być późniejsza niż data stworzenia</string>
   <string name="error_save_first">zapisz najpierw pęk kluczy</string>
   <string name="error_can_not_delete_contact">nie możesz usunąć tego kontaktu, ponieważ należy do ciebie.</string>
   <string name="error_can_not_delete_contacts">nie możesz usunąć tych kontaktów, ponieważ należą do ciebie:\n%s</string>
+  <!--errors without preceeding Error:-->
+  <string name="error_only_files_are_supported">Dane binarne pozbawione pliku nie są obsługiwane. To jest wspierane tylko dla akcji ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
+  <string name="error_jelly_bean_needed">Potrzebujesz Androida 4.1 Jelly Bean, aby korzystać z Android NFC Beam!</string>
+  <string name="error_nfc_needed">NCF jest niedostępne na twoim urządzeniu</string>
+  <string name="error_nothing_import">Nie ma nic do zaimportowania!</string>
   <string name="error_keyserver_insufficient_query">Niewystarczające zapytanie do serwera</string>
   <string name="error_keyserver_query">Odpytywanie serwera zakończone niepowodzeniem</string>
   <string name="error_keyserver_too_many_responses">Za dużo odpowiedzi</string>
@@ -312,6 +311,7 @@
     <item quantity="other">Część wczytanego pliku to poprawne obiekty OpenPGP, ale nie są kluczami OpenPGP</item>
   </plurals>
   <string name="error_change_something_first">Musisz dokonać zmian w pęku kluczy zanim będziesz mógł go zachować</string>
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Gotowe.</string>
   <string name="progress_cancel">Anuluj</string>
diff --git a/OpenKeychain/src/main/res/values-pt-rBR/strings.xml b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
deleted file mode 100644
index fc802092c..000000000
--- a/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--title-->
-  <!--section-->
-  <!--button-->
-  <!--menu-->
-  <!--label-->
-  <string name="unknown_status"></string>
-  <!--choice-->
-  <!--key flags-->
-  <!--sentences-->
-  <!--errors
-         no punctuation, all lowercase,
-         they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--progress dialogs, usually ending in '…'-->
-  <!--action strings-->
-  <!--key bit length selections-->
-  <!--compression-->
-  <!--Help-->
-  <!--Import-->
-  <!--Intent labels-->
-  <!--Remote API-->
-  <!--Share-->
-  <!--Key list-->
-  <!--Key view-->
-  <!--Navigation Drawer-->
-  <!--hints-->
-  <!--unsorted-->
-</resources>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index a70882105..51260f4a9 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -239,7 +239,6 @@
     <item quantity="few">Найдено %d ключей.</item>
     <item quantity="other">Найдено %d ключей.</item>
   </plurals>
-  <string name="unknown_signature">Неизвестная подпись. Нажмите кнопку, что бы найти ключ.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d плохой секретный ключ проигнорирован. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys</item>
     <item quantity="few">%d плохих секретных ключей проигнорировано. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys\n</item>
@@ -272,7 +271,6 @@
   <string name="error_main_user_id_must_not_be_empty">основная запись пользователя не может быть пустой</string>
   <string name="error_key_needs_master_key">необходим основной ключ</string>
   <string name="error_no_encryption_keys_or_passphrase">не задан ключ или пароль для шифрования</string>
-  <string name="error_signature_failed">ошибка подписи</string>
   <string name="error_no_signature_passphrase">пароль не задан</string>
   <string name="error_no_signature_key">ключ для подписи не задан</string>
   <string name="error_invalid_data">некорректное шифрование</string>
@@ -282,13 +280,14 @@
   <string name="error_wrong_passphrase">неправильный пароль</string>
   <string name="error_saving_keys">ошибка сохранения ключей</string>
   <string name="error_could_not_extract_private_key">не удалось извлечь личный ключ</string>
+  <string name="error_expiry_must_come_after_creation">срок годности не может быть раньше даты создания</string>
+  <string name="error_can_not_delete_contact">нельзя удалить свой собственный контакт. Пожалуйста, удалите его в разделе \'Мои ключи\'!</string>
+  <string name="error_can_not_delete_contacts">это ваши собственные контакты, их нельзя удалить:\n%s</string>
+  <!--errors without preceeding Error:-->
   <string name="error_only_files_are_supported">Прямая передача данных без использования файла в памяти устройства не поддерживается. Это возможно только для ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
   <string name="error_jelly_bean_needed">Для использования NFC Beam требуется Android 4.1+ !</string>
   <string name="error_nfc_needed">Ваше устройство не поддерживает NFC!</string>
   <string name="error_nothing_import">Нет данных для импорта!</string>
-  <string name="error_expiry_must_come_after_creation">срок годности не может быть раньше даты создания</string>
-  <string name="error_can_not_delete_contact">нельзя удалить свой собственный контакт. Пожалуйста, удалите его в разделе \'Мои ключи\'!</string>
-  <string name="error_can_not_delete_contacts">это ваши собственные контакты, их нельзя удалить:\n%s</string>
   <string name="error_keyserver_insufficient_query">Ограничение запроса сервера</string>
   <string name="error_keyserver_query">Сбой запроса сервера ключей</string>
   <string name="error_keyserver_too_many_responses">Слишком много ответов</string>
@@ -304,6 +303,7 @@
     <item quantity="few">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
     <item quantity="other">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
   </plurals>
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Готово.</string>
   <string name="progress_cancel">Отмена</string>
diff --git a/OpenKeychain/src/main/res/values-sl-rSI/strings.xml b/OpenKeychain/src/main/res/values-sl-rSI/strings.xml
deleted file mode 100644
index fc802092c..000000000
--- a/OpenKeychain/src/main/res/values-sl-rSI/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--title-->
-  <!--section-->
-  <!--button-->
-  <!--menu-->
-  <!--label-->
-  <string name="unknown_status"></string>
-  <!--choice-->
-  <!--key flags-->
-  <!--sentences-->
-  <!--errors
-         no punctuation, all lowercase,
-         they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--progress dialogs, usually ending in '…'-->
-  <!--action strings-->
-  <!--key bit length selections-->
-  <!--compression-->
-  <!--Help-->
-  <!--Import-->
-  <!--Intent labels-->
-  <!--Remote API-->
-  <!--Share-->
-  <!--Key list-->
-  <!--Key view-->
-  <!--Navigation Drawer-->
-  <!--hints-->
-  <!--unsorted-->
-</resources>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index d7e4afd7c..1d3d76248 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -93,6 +93,8 @@
   <string name="error_invalid_email">geçersiz eposta \'%s\'</string>
   <string name="error_key_size_minimum512bit">anahtar uzunluğu en az 512bit olmalı</string>
   <string name="error_corrupt_data">bozuk veri</string>
+  <!--errors without preceeding Error:-->
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_saving">kaydediliyor...</string>
   <string name="progress_importing">alıyor...</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index b2a27a3a5..49f70a16e 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -199,8 +199,6 @@
   <string name="file_delete_confirmation">Ви справді хочете вилучити\n%s?</string>
   <string name="file_delete_successful">Успішно вилучено.</string>
   <string name="no_file_selected">Виберіть спершу файл.</string>
-  <string name="decrypt_successful">Успішно розшифровано.</string>
-  <string name="decrypt_verified_successful">Успішно розшифровано та/або перевірено.</string>
   <string name="encrypt_sign_successful">Успішно підписано та/або перевірено.</string>
   <string name="encrypt_sign_clipboard_successful">Успішно підписано та/або зашифровано до буфера обміну.</string>
   <string name="enter_passphrase_twice">Введіть двічі парольну фразу.</string>
@@ -249,7 +247,6 @@
     <item quantity="few">Знайдено %d ключі.</item>
     <item quantity="other">Знайдено %d ключів.</item>
   </plurals>
-  <string name="unknown_signature">Невідомий підпис, натисніть кнопку для пошуку втраченого ключа.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d поганий секретний ключ проігнорований. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item>
     <item quantity="few">%d погані секретні ключі проігноровані. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item>
@@ -282,7 +279,6 @@
   <string name="error_main_user_id_must_not_be_empty">ІД основного користувача не має бути порожнім</string>
   <string name="error_key_needs_master_key">потрібний хоча б один основний ключ</string>
   <string name="error_no_encryption_keys_or_passphrase">не вказано ключі шифрування або парольну фразу</string>
-  <string name="error_signature_failed">підпис не вдався</string>
   <string name="error_no_signature_passphrase">не подано парольної фрази</string>
   <string name="error_no_signature_key">не подано ключ підпису</string>
   <string name="error_invalid_data">недійсні дані шифрування</string>
@@ -292,14 +288,15 @@
   <string name="error_wrong_passphrase">помилкова парольна фраза</string>
   <string name="error_saving_keys">помилка збереження деяких ключів</string>
   <string name="error_could_not_extract_private_key">не можна витягти секретний ключ</string>
-  <string name="error_only_files_are_supported">Прямі двійкові дані без справжнього файлу у файловій системі не підтримуються. Підтримується лише  ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-  <string name="error_jelly_bean_needed">Вам потрібний Android 4.1 Jelly Bean для використання функції Androids NFC промінь!</string>
-  <string name="error_nfc_needed">NFC недоступний на вашому пристрої!</string>
-  <string name="error_nothing_import">Нема що імпортувати!</string>
   <string name="error_expiry_must_come_after_creation">дата завершення дії має йти після дати створення</string>
   <string name="error_save_first">спершу збережіть в\'язку ключів</string>
   <string name="error_can_not_delete_contact">ви не можете вилучити цей контакт, тому що він ваш власний.</string>
   <string name="error_can_not_delete_contacts">ви не можете вилучити наступні контакти, тому що вони - ваші власні:\n%s</string>
+  <!--errors without preceeding Error:-->
+  <string name="error_only_files_are_supported">Прямі двійкові дані без справжнього файлу у файловій системі не підтримуються. Підтримується лише  ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
+  <string name="error_jelly_bean_needed">Вам потрібний Android 4.1 Jelly Bean для використання функції Androids NFC промінь!</string>
+  <string name="error_nfc_needed">NFC недоступний на вашому пристрої!</string>
+  <string name="error_nothing_import">Нема що імпортувати!</string>
   <string name="error_keyserver_insufficient_query">Запит обмеженого сервера</string>
   <string name="error_keyserver_query">Збій сервера ключа запиту</string>
   <string name="error_keyserver_too_many_responses">Забагато відповідей</string>
@@ -316,6 +313,15 @@
     <item quantity="other">частин завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item>
   </plurals>
   <string name="error_change_something_first">Вам потрібно внести зміни до в\'язки ключів перед тим, як зможете їх зберегти.</string>
+  <!--results shown after decryption/verification-->
+  <string name="decrypt_result_invalid_signature">Невірний підпис!</string>
+  <string name="decrypt_result_signature_unknown_pub_key">Невідомий відкритий ключ</string>
+  <string name="decrypt_result_signature_uncertified">Дійсний підпис (несертифікований)</string>
+  <string name="decrypt_result_signature_certified">Дійсний підпис (сертифікований)</string>
+  <string name="decrypt_result_decrypted">Успішно розшифровано.</string>
+  <string name="decrypt_result_decrypted_unknown_pub_key">Успішно розшифрований, але невідомий відкритий ключ</string>
+  <string name="decrypt_result_decrypted_and_signature_uncertified">Успішно розшифрований та дійсний підпис (несертифіковано)</string>
+  <string name="decrypt_result_decrypted_and_signature_certified">Успішно розшифрований та дійсний підпис (сертифіковано)</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Готово.</string>
   <string name="progress_cancel">Скасувати</string>
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index fc802092c..000000000
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--title-->
-  <!--section-->
-  <!--button-->
-  <!--menu-->
-  <!--label-->
-  <string name="unknown_status"></string>
-  <!--choice-->
-  <!--key flags-->
-  <!--sentences-->
-  <!--errors
-         no punctuation, all lowercase,
-         they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--progress dialogs, usually ending in '…'-->
-  <!--action strings-->
-  <!--key bit length selections-->
-  <!--compression-->
-  <!--Help-->
-  <!--Import-->
-  <!--Intent labels-->
-  <!--Remote API-->
-  <!--Share-->
-  <!--Key list-->
-  <!--Key view-->
-  <!--Navigation Drawer-->
-  <!--hints-->
-  <!--unsorted-->
-</resources>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index fa21e211b..1db5c8665 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -120,12 +120,13 @@
   <string name="error_key_needs_a_user_id">需要至少一个用户id</string>
   <string name="error_main_user_id_must_not_be_empty">主用户id不能是空的</string>
   <string name="error_key_needs_master_key">需要至少一个主密钥</string>
-  <string name="error_signature_failed">签名失败</string>
   <string name="error_no_signature_passphrase">没有提供密语</string>
   <string name="error_no_signature_key">没有提供密钥</string>
   <string name="error_invalid_data">不是有效的加密数据</string>
   <string name="error_corrupt_data">损坏的数据</string>
   <string name="error_wrong_passphrase">错误的密语</string>
+  <!--errors without preceeding Error:-->
+  <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_saving">保存...</string>
   <string name="progress_importing">导入中...</string>
-- 
cgit v1.2.3