diff --git a/OpenKeychain/src/main/res/raw-cs/help_about.html b/OpenKeychain/src/main/res/raw-cs/help_about.html
index f536fecbd..6394ce319 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_about.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_about.html
@@ -3,11 +3,11 @@
 <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>
+<p>Licence: GPLv3+</p>
 
-<h2>Developers</h2>
+<h2>Vývojáři</h2>
 <ul>
-<li>Dominik Schürmann (Maintainer)</li>
+<li>Dominik Schürmann (Hlavní vývojář)</li>
 <li>Art O Cathain</li>
 <li>Ash Hughes</li>
 <li>Brian C. Barnes</li>
@@ -27,7 +27,7 @@
 <li>Tim Bray</li>
 <li>Vincent Breitmoser</li>
 </ul>
-<h2>Libraries</h2>
+<h2>Knihovny</h2>
 <ul>
 <li>
 <a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.html b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
index e27ac7475..687fd99b9 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
@@ -7,7 +7,7 @@
 <li>Key edit: awesome new design, key revocation</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
 <li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
 <li>File encryption: awesome new design, support for encrypting multiple files</li>
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
@@ -38,7 +38,7 @@
 <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>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-de/help_about.html b/OpenKeychain/src/main/res/raw-de/help_about.html
index f5622d54a..934caa832 100644
--- a/OpenKeychain/src/main/res/raw-de/help_about.html
+++ b/OpenKeychain/src/main/res/raw-de/help_about.html
@@ -5,7 +5,7 @@
 <p><a href="http://www.openkeychain.org">OpenKeychain</a> ist eine OpenPGP-Implementierung für Android.</p>
 <p>Lizenz: GPLv3+</p>
 
-<h2>Developers</h2>
+<h2>Engwickler</h2>
 <ul>
 <li>Dominik Schürmann (Maintainer)</li>
 <li>Art O Cathain</li>
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index 674d9c93f..a706b92d4 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
@@ -3,17 +3,17 @@
 <body>
 <h2>2.8</h2>
 <ul>
-<li>So many bugs have been fixed in this release that we focus on the main new features</li>
-<li>Key edit: awesome new design, key revocation</li>
-<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
-<li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
-<li>File encryption: awesome new design, support for encrypting multiple files</li>
-<li>New icons to show status of key (by Brennan Novak)</li>
-<li>Important bug fix: Importing of large key collections from a file is now possible</li>
-<li>Notification showing cached passphrases</li>
+<li>Es wurden in diesem Release so viele Bugs ausgebessert, sodass wir uns besser auf die neuen Funktionen konzentrieren</li>
+<li>Schlüsselbearbeitung: tolles neues Design und Schlüsselrückruf</li>
+<li>Schlüsselimport: tolles neues Design, gesicherte Verbindungen zum Schlüsselserver über HKPS, Schlüsselserver [?] über DNS SRV Einträge </li>
+<li>Neuer Bildschirm bei der ersten Öffnung</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>Dateiverschlüsselung: tolles neues Design, Unterstützung für mehrere Dateien</li>
+<li>Neue Icons zum Anzeigen des Schlüsselstatus' (von Brennan Novak)</li>
+<li>Wichtige Ausbesserung eines Bugs: Importieren größerer Schlüsselsammlungen aus einer Datei ist nun möglich </li>
+<li>Benachrichtigung, die die Passphrasen im Cache anzeigt </li>
 </ul>
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+<p>Dieser Release wäre ohne die Arbeit von Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray und Thialfihar nicht möglich </p>
 
 <h2>2.7</h2>
 <ul>
@@ -21,7 +21,7 @@
 <li>Neues Schlüsselansicht Design (Dominik, Vincent)</li>
 <li>Neue flache Android Buttons (Dominik, Vincent)</li>
 <li>API Fehler behoben (Dominik)</li>
-<li>keybase.io importiert (Tim Bray)</li>
+<li>Import aus keybase.io (Tim Bray)</li>
 </ul>
 <h2>2.6.1</h2>
 <ul>
@@ -29,17 +29,17 @@
 </ul>
 <h2>2.6</h2>
 <ul>
-<li>Key certifications (thanks to Vincent Breitmoser)</li>
-<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
-<li>New design for signature verification</li>
-<li>Custom key length (thanks to Greg Witczak)</li>
-<li>Fix share-functionality from other apps</li>
+<li>Schlüsselzertifizierungen (danke an Vincent Breitmoser) </li>
+<li>Unterstützung für GnuPG-Teilschlüssel (danke an Vincent Breitmoser) </li>
+<li>Neues Design für Signaturverifikation</li>
+<li>Benutzerdefinierte Schlüssellänge (Dank an Greg Witczak)</li>
+<li>Fehler behoben bei der Teilen-Funktion von anderen Apps</li>
 </ul>
 <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>Fehler bei der Entschlüsselung symmetrischer PGP Nachrichten/Dateien behoben </li>
+<li>Refactored key edit screen (thanks to Ash Hughes)</li>
+<li>Neues modernes Design für Verschlüsselungs-/Entschlüsselungs-Bildschirme</li>
 <li>OpenPGP API Version 3 (mehrfache api accounts, interne fehlerbehebungen, schlüssel suche)</li>
 </ul>
 <h2>2.4</h2>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
index e27ac7475..687fd99b9 100644
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.html
@@ -7,7 +7,7 @@
 <li>Key edit: awesome new design, key revocation</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
 <li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
 <li>File encryption: awesome new design, support for encrypting multiple files</li>
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
@@ -38,7 +38,7 @@
 <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>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-it/help_about.html b/OpenKeychain/src/main/res/raw-it/help_about.html
index e26c8e246..7b586cbd3 100644
--- a/OpenKeychain/src/main/res/raw-it/help_about.html
+++ b/OpenKeychain/src/main/res/raw-it/help_about.html
@@ -5,9 +5,9 @@
 <p><a href="http://www.openkeychain.org">OpenKeychain</a> un implementazione OpenPGP per Android.</p>
 <p>Licenza: GPLv3+</p>
 
-<h2>Developers</h2>
+<h2>Sviluppatori</h2>
 <ul>
-<li>Dominik Schürmann (Maintainer)</li>
+<li>Dominik Schürmann (Manutentore)</li>
 <li>Art O Cathain</li>
 <li>Ash Hughes</li>
 <li>Brian C. Barnes</li>
@@ -34,13 +34,13 @@
 <li>
 <a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Licenza Apache v2)</li>
 <li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
+<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Licenza Apache v2)</li>
 <li>
-<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
+<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Licenza Apache v2)</li>
 <li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
+<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Licenza Apache v2)</li>
 <li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
+<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Licenza Apache v2)</li>
 <li>
 <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licenza Apache v2)</li>
 <li>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.html b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
index 3bc039642..0b6fabc24 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
@@ -7,7 +7,7 @@
 <li>Key edit: awesome new design, key revocation</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
 <li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
 <li>File encryption: awesome new design, support for encrypting multiple files</li>
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
@@ -38,7 +38,7 @@
 <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>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API versie 3 (meerdere api accounts, interne fixes, sleutel lookup)</li>
 </ul>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
index eded2c8c4..eb2dc26c1 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
@@ -7,7 +7,7 @@
 <li>Key edit: awesome new design, key revocation</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
 <li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
 <li>File encryption: awesome new design, support for encrypting multiple files</li>
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
@@ -38,7 +38,7 @@
 <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>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API wersja 3 (wiele kont API, wewnętrzne poprawki, wyszukiwanie kluczy)</li>
 </ul>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index f74a54762..6d9c92e9b 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
@@ -7,7 +7,7 @@
 <li>Key edit: awesome new design, key revocation</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
 <li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
 <li>File encryption: awesome new design, support for encrypting multiple files</li>
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
@@ -38,7 +38,7 @@
 <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>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API версии 3 (множественные аккаунты, внутренние исправления, поиск ключей)</li>
 </ul>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.html b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
index e5ff10005..635d02780 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
@@ -7,7 +7,7 @@
 <li>Key edit: awesome new design, key revocation</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
 <li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
 <li>File encryption: awesome new design, support for encrypting multiple files</li>
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
@@ -38,7 +38,7 @@
 <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>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>API OpenPGP, verzija 3 (podpora za več API računov, interni popravki, iskanje ključev)</li>
 </ul>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
index e27ac7475..687fd99b9 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
@@ -7,7 +7,7 @@
 <li>Key edit: awesome new design, key revocation</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
 <li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
 <li>File encryption: awesome new design, support for encrypting multiple files</li>
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
@@ -38,7 +38,7 @@
 <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>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index e27ac7475..687fd99b9 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -7,7 +7,7 @@
 <li>Key edit: awesome new design, key revocation</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
 <li>New first time screen</li>
-<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
 <li>File encryption: awesome new design, support for encrypting multiple files</li>
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
@@ -38,7 +38,7 @@
 <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>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
@@ -110,7 +110,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>Basic keyserver support</li>
 <li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
 <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
 <li>Bugfixes</li>
 <li>Optimizations</li>
@@ -118,7 +118,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 7948b7f1b..115da1278 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -275,6 +275,7 @@
   <string name="progress_decompressing_data">descomprimiendo los datos...</string>
   <string name="progress_verifying_integrity">verificando la integridad...</string>
   <string name="progress_deleting_securely">borrando \'%s\' de forma segura…</string>
+  <string name="progress_con_reimport">reimportando base de datos...</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">Nombre/Correo electrónico/Identidad de clave...</string>
   <string name="hint_keybase_search_hint">Nombre/Correo electrónico/Prueba/Clave...</string>
@@ -620,18 +621,37 @@
   <string name="msg_mf_unlock">Desbloqueando juego de claves</string>
   <!--Consolidate-->
   <string name="msg_con">Consolidando base de datos</string>
+  <string name="msg_con_error_bad_state">¡La consolidación se inició cuando no había una base de datos cacheada! Probablemente esto es un error de programación, por favor consigne un informe de fallos.</string>
   <string name="msg_con_save_secret">Guardando juegos de claves secretas (privadas)</string>
   <string name="msg_con_save_public">Guardando juegos de claves públicas</string>
   <string name="msg_con_db_clear">Limpiando base de datos</string>
-  <plurals name="msg_con_reimport_secret">
-    <item quantity="one">Reimportando una clave secreta (privada)</item>
-    <item quantity="other">Reimportando %d claves secretas (privadas)</item>
+  <string name="msg_con_success">Base de datos consolidada con éxito</string>
+  <string name="msg_con_critical_in">Entrando en fase crítica</string>
+  <string name="msg_con_critical_out">Abandonando fase crítica</string>
+  <string name="msg_con_delete_public">Borrando fichero de caché de juego de claves públicas</string>
+  <string name="msg_con_delete_secret">Borrando fichero de caché de juego de claves secretas (privadas)</string>
+  <string name="msg_con_error_db">¡Error al abrir la base de datos!</string>
+  <string name="msg_con_error_io_public">¡Error de E/S al escribir claves públicas en caché!</string>
+  <string name="msg_con_error_io_secret">¡Error de E/S al escribir claves secretas (privadas) en caché!</string>
+  <string name="msg_con_error_public">¡Error al reimportar claves públicas!</string>
+  <string name="msg_con_error_secret">¡Error reimportando claves secretas (privadas)!</string>
+  <plurals name="msg_con_recover">
+    <item quantity="one">Recuperando consolidación con %1$d clave secreta (privada) y %2$d pública</item>
+    <item quantity="other">Recuperando consolidación con %1$d claves secretas (privadas) y %2$d públicas</item>
   </plurals>
+  <string name="msg_con_recover_unknown">Recuperando desde un estado desconocido</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="one">Reimportando una clave pública</item>
     <item quantity="other">Reimportando %d claves públicas</item>
   </plurals>
-  <string name="msg_con_success">Base de datos consolidada con éxito</string>
+  <string name="msg_con_reimport_public_skip">No hay claves públicas a reimportar, omitiendo...</string>
+  <plurals name="msg_con_reimport_secret">
+    <item quantity="one">Reimportando una clave secreta (privada)</item>
+    <item quantity="other">Reimportando %d claves secretas (privadas)</item>
+  </plurals>
+  <string name="msg_con_reimport_secret_skip">No hay claves públicas a reimportar, omitiendo...</string>
+  <string name="msg_con_warn_delete_public">Excepción borrando fichero de caché público</string>
+  <string name="msg_con_warn_delete_secret">Excepción borrando fichero de caché público</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_click_to_clear">Haga clic para limpiar las frases contraseña almacenadas en caché</string>
   <string name="passp_cache_notif_n_keys">OpenKeychain ha almacenado en caché %d frases contraseña</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 74fa562ff..41b7c24ae 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -275,6 +275,7 @@
   <string name="progress_decompressing_data">décompression des données...</string>
   <string name="progress_verifying_integrity">vérification de l\'intégrité...</string>
   <string name="progress_deleting_securely">suppression sûre de « %s »...</string>
+  <string name="progress_con_reimport">réimportation de la base de données...</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">Nom/courriel/ID de clef...</string>
   <string name="hint_keybase_search_hint">Nom/courriel/preuve/clef...</string>
@@ -620,18 +621,37 @@
   <string name="msg_mf_unlock">Déverrouillage du trousseau</string>
   <!--Consolidate-->
   <string name="msg_con">Consolidation de la base de données</string>
+  <string name="msg_con_error_bad_state">La consolidation a commencé alors qu\'aucune base de données n\'était en cache ! Ceci est probablement une erreur de programmation, veuillez remplir un rapport de bogue !</string>
   <string name="msg_con_save_secret">Enregistrement des trousseaux secrets</string>
   <string name="msg_con_save_public">Enregistrement des trousseaux publiques</string>
   <string name="msg_con_db_clear">Nettoyage de la base de données</string>
-  <plurals name="msg_con_reimport_secret">
-    <item quantity="one">Réimportation d\'une clef secrète</item>
-    <item quantity="other">Réimportation de %d clefs secrètes</item>
+  <string name="msg_con_success">Base de données consolidée avec succès</string>
+  <string name="msg_con_critical_in">Début de la phase critique</string>
+  <string name="msg_con_critical_out">Fin de la phase critique</string>
+  <string name="msg_con_delete_public">Suppression du fichier de cache du trousseau public</string>
+  <string name="msg_con_delete_secret">Suppression du fichier de cache du trousseau secret</string>
+  <string name="msg_con_error_db">Erreur lors de l\'ouverture de la base de données !</string>
+  <string name="msg_con_error_io_public">Erreur E/S lors de l\'écriture des clefs publiques vers le cache !</string>
+  <string name="msg_con_error_io_secret">Erreur E/S lors de l\'écriture des clefs secrètes vers le cache !</string>
+  <string name="msg_con_error_public">Erreur lors de la réimportation des clefs publiques !</string>
+  <string name="msg_con_error_secret">Erreur lors de la réimportation des clefs secrètes !</string>
+  <plurals name="msg_con_recover">
+    <item quantity="one">Consolidation de récupération avec %1$d clef secrète et %2$d publique</item>
+    <item quantity="other">Consolidation de récupération avec %1$d clefs secrètes et %2$d publiques</item>
   </plurals>
+  <string name="msg_con_recover_unknown">Récupération à partir d\'un état inconnu</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="one">Réimportation d\'une clef publique</item>
     <item quantity="other">Réimportation de %d clefs publiques</item>
   </plurals>
-  <string name="msg_con_success">Base de données consolidée avec succès</string>
+  <string name="msg_con_reimport_public_skip">Aucune clef publique à réimporter, étape ignorée...</string>
+  <plurals name="msg_con_reimport_secret">
+    <item quantity="one">Réimportation d\'une clef secrète</item>
+    <item quantity="other">Réimportation de %d clefs secrètes</item>
+  </plurals>
+  <string name="msg_con_reimport_secret_skip">Aucune clef secrète à réimporter, étape ignorée...</string>
+  <string name="msg_con_warn_delete_public">Une exception a eu lieu lors de la suppression du fichier de cache publique</string>
+  <string name="msg_con_warn_delete_secret">Une exception a eu lieu lors de la suppression du fichier de cache publique</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_click_to_clear">Cliquer ici pour effacer les phrases de passe mises en cache</string>
   <string name="passp_cache_notif_n_keys">OpenKeychain a mis en cache %d phrases de passe</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 6a02916ad..bf2f83e66 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -270,6 +270,7 @@
   <string name="progress_decompressing_data">データの展開中...</string>
   <string name="progress_verifying_integrity">完全性の検証中...</string>
   <string name="progress_deleting_securely">\'%s\' を完全に削除中…</string>
+  <string name="progress_con_reimport">データベースの再インポート中...</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">名前/メール/鍵ID...</string>
   <string name="hint_keybase_search_hint">名前/メール/証明/鍵...</string>
@@ -606,16 +607,34 @@
   <string name="msg_mf_unlock">鍵輪のロック解除中</string>
   <!--Consolidate-->
   <string name="msg_con">データベースの統合中</string>
+  <string name="msg_con_error_bad_state">データベースでキャッシュせずに統合を開始します! これはおそらくプログラミングのエラーなので、バグレポートの提出をお願いします!</string>
   <string name="msg_con_save_secret">秘密鍵の鍵輪を保存中</string>
   <string name="msg_con_save_public">公開鍵の鍵輪を保存中</string>
   <string name="msg_con_db_clear">データベースの消去中</string>
-  <plurals name="msg_con_reimport_secret">
-    <item quantity="other">%d の秘密鍵を再インポート中</item>
+  <string name="msg_con_success">データベースの統合が成功しました</string>
+  <string name="msg_con_critical_in">クリティカルなフェーズに入りました</string>
+  <string name="msg_con_critical_out">クリティカルなフェーズを抜けました</string>
+  <string name="msg_con_delete_public">公開鍵輪のキャッシュファイルを削除中</string>
+  <string name="msg_con_delete_secret">秘密鍵輪のキャッシュファイルを削除中</string>
+  <string name="msg_con_error_db">データベースオープン中のエラー!</string>
+  <string name="msg_con_error_io_public">キャッシュに公開鍵を書く際にI/Oエラー!</string>
+  <string name="msg_con_error_io_secret">キャッシュに秘密鍵を書く際にI/Oエラー!</string>
+  <string name="msg_con_error_public">公開鍵の再インポートのエラー!</string>
+  <string name="msg_con_error_secret">秘密鍵の再インポートのエラー!</string>
+  <plurals name="msg_con_recover">
+    <item quantity="other">%1$d の秘密鍵と %2$d の公開鍵の統合のリカバリー中</item>
   </plurals>
+  <string name="msg_con_recover_unknown">不明な状態からリカバリー中</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="other">%d の公開鍵を再インポート中</item>
   </plurals>
-  <string name="msg_con_success">データベースの統合が成功しました</string>
+  <string name="msg_con_reimport_public_skip">再インポートで公開鍵がありません、スキップします...</string>
+  <plurals name="msg_con_reimport_secret">
+    <item quantity="other">%d の秘密鍵を再インポート中</item>
+  </plurals>
+  <string name="msg_con_reimport_secret_skip">再インポートで秘密鍵がありません、スキップします...</string>
+  <string name="msg_con_warn_delete_public">公開鍵キャッシュファイルの削除例外</string>
+  <string name="msg_con_warn_delete_secret">公開鍵キャッシュファイルの削除例外</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_click_to_clear">クリックしてパスフレーズのキャッシュをクリア</string>
   <string name="passp_cache_notif_n_keys">OpenKeychainは %d のパスフレーズをキャッシュしています</string>
