3 files changed, 21 insertions, 109 deletions
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
deleted file mode 100644
index e414324d0..000000000
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<html>
-<head></head>
-<body>
-<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>Absturz bei leeren Nutzer IDs behoben </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>Neus Design für die Liste der öffentlichen Schlüssel</li>
-<li>new public key view</li>
-<li>Fehler beim Schlüsselimport behoben</li>
-<li>key cross-certification (thanks to Ash Hughes)</li>
-<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
-<li>Erste Version mit neuen Sprachen (Danke an die Mitwirkenden bei 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>Viele Fehler behoben</li>
-<li>Neue API für Entwickler</li>
-<li>PRNG Bugfix von Google</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Komlett neu designd</li>
-<li>Öffentliche Schlüssel teilen via QR Code, NFC Beam</li>
-<li>Schlüssel signieren</li>
-<li>Schlüssel auf den Server hochladen</li>
-<li>Importprobleme behoben</li>
-<li>new AIDL API</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Grundlegende Schlüsselserverunterstützung</li>
-<li>app2sd</li>
-<li>mehr Auswahlmöglichkeiten für den Passwortcache: 1, 2, 4, 8, Stunden</li>
-<li>Übersetzungen: norwegisch (Danke, Sander Danielsen), chinesisch (danke, Zhang Fredrick)</li>
-<li>Fehlerbehebungen</li>
-<li>Optimierungen</li>
-</ul>
-<h2>1.0.7</h2>
-<ul>
-<li>fixed problem with signature verification of texts with trailing newline</li>
-<li>weitere Optionen für die Time-to-live des Passphrasencaches (20, 40, 60 mins)</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>crash beim Hinzufügen eines Kontos auf Froyo repariert</li>
-<li>sichere Dateilöschung</li>
-<li>Option, um Schlüsseldatei nach dem Import zu löschen</li>
-<li>Streamverschlüsselung/-entschlüsselung (Galerie, etc.)</li>
-<li>neue Optionen (Sprache, v3-Unterschriften erzwingen)</li>
-<li>Interfaceänderungen</li>
-<li>Fehlerbehebungen</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Deutsche und Italienische Übersetzung</li>
-<li>viel kleineres Paket, dank reduzierter BC Quellen</li>
-<li>Neues Einstellungs-GUI</li>
-<li>Lay-Out-Anpassung für die Lokalisierung</li>
-<li>Fehler bei Signatur behoben</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>Absturz während der Verschlüsselung/Signierung und möglicherweise Schlüsselexport behoben.</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Filterbare Schlüsselliste</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>Unterstützung von mehr Filemanagern (einschließlich ASTRO)</li>
-<li>Slowenische Übersetzung</li>
-<li>Neue Datenbank, viel schneller, weniger Speicherbedarf</li>
-<li>defined Intents and content provider for other apps</li>
-<li>Fehlerbehebungen</li>
-</ul>
-</body>
-</html>
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_about.html b/OpenPGP-Keychain/src/main/res/raw/help_about.html
index 2ffbb47a6..847168446 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw/help_about.html
@@ -19,10 +19,12 @@ And don't add newlines before or after p tags because of transifex -->
 <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>
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
index 17ad853de..0e7c4d212 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
@@ -5,6 +5,24 @@ And don't add newlines before or after p tags because of transifex -->
 <head>
 </head>
 <body>
+<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</h2>
 <ul>
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>