merge master

author: Ashley Hughes <spirit.returned@gmail.com> 2014-03-29 13:21:39 +0000
committer: Ashley Hughes <spirit.returned@gmail.com> 2014-03-29 13:21:39 +0000
commit: e1d07214dfe12f893aa4052e08dbc3025f5cb67d (patch)
tree: ef945347e987806f4f448e32671c039345985356 /OpenPGP-Keychain/src/main/res/raw-de
parent: 7a2d880c4db21ab62cb152f10d1938a36319acb3 (diff)
parent: 68668fd444b973502b91b7cbe0cf7dbdd8a8b5c4 (diff)
download: open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.tar.gz
open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.tar.bz2
open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.zip
3 files changed, 39 insertions, 14 deletions
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html
index 37d4193f7..7dc0ee7d9 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html
@@ -11,13 +11,19 @@
 <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>Entwickler APG 1.x</h2>
 <ul>
-<li>'Thialfihar' (Leitender Entwickler)</li>
+<li>Thialfihar (Lead developer)</li>
 <li>'Senecaso' (QR-Code, Schlüssel signtieren, Schlüssel hochladen)</li>
-<li>Oliver Runge</li>
 <li>Markus Doits</li>
 </ul>
 <h2>Bibliotheken</h2>
@@ -38,8 +44,6 @@
 <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache Lizenz v2)</li>
 <li>
 <a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Bibliothek</a> (Apache Lizenz v2)</li>
-<li>Icons von <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike Lizenz 3.0)</li>
-<li>Icons von <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Public Domain)</li>
 </ul>
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
index 1197869b5..13b210fcd 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
@@ -1,6 +1,27 @@
 <html>
 <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.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>
@@ -8,7 +29,7 @@
 <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>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>
@@ -38,15 +59,15 @@
 <h2>2.0</h2>
 <ul>
 <li>Komlett neu designd</li>
-<li>share public keys via qr codes, nfc beam</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>fixes import issues</li>
+<li>Importprobleme behoben</li>
 <li>new AIDL API</li>
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic keyserver support</li>
+<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>
@@ -98,8 +119,8 @@
 <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>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>
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
index d2735f739..7a652682e 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
@@ -1,15 +1,15 @@
 <html>
 <head></head>
 <body>
-<h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<h2>Los gehts</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>Ich habe einen Fehler in OpenKeychain gefunden!</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>
+<h2>Unterstützen</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>Übersetzungen</h2>
author	Ashley Hughes <spirit.returned@gmail.com>	2014-03-29 13:21:39 +0000
committer	Ashley Hughes <spirit.returned@gmail.com>	2014-03-29 13:21:39 +0000
commit	e1d07214dfe12f893aa4052e08dbc3025f5cb67d (patch)
tree	ef945347e987806f4f448e32671c039345985356 /OpenPGP-Keychain/src/main/res/raw-de
parent	7a2d880c4db21ab62cb152f10d1938a36319acb3 (diff)
parent	68668fd444b973502b91b7cbe0cf7dbdd8a8b5c4 (diff)
download	open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.tar.gz open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.tar.bz2 open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.zip