From 647b802b596d42aaff89a9914af19ecc41b05419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 24 Jan 2014 16:05:34 +0100
Subject: [PATCH] Fix language problems (thanks to yahoe.001)

---
 OpenPGP-Keychain/res/raw/help_changelog.html  | 46 +++++++++----------
 OpenPGP-Keychain/res/values/strings.xml       |  7 ++-
 .../keychain/ui/ImportKeysActivity.java       |  5 +-
 3 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/OpenPGP-Keychain/res/raw/help_changelog.html b/OpenPGP-Keychain/res/raw/help_changelog.html
index cfe2c8e34..dee9d366e 100644
--- a/OpenPGP-Keychain/res/raw/help_changelog.html
+++ b/OpenPGP-Keychain/res/raw/help_changelog.html
@@ -7,43 +7,43 @@ And don't add newlines before or after p tags because of transifex -->
 <body>
 <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>
+<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 k9mail integration</li>
+<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>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>
+<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 key server support</li>
-<li>app2sd (untested, let me know if there are problems)</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>
@@ -52,7 +52,7 @@ And don't add newlines before or after p tags because of transifex -->
 
 <h2>1.0.7</h2>
 <ul>
-<li>clear sign problem with lacking trailing newline fixed</li>
+<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>
 
@@ -89,9 +89,9 @@ And don't add newlines before or after p tags because of transifex -->
 <h2>1.0.2</h2>
 <ul>
 <li>filterable key lists</li>
-<li>smarter preselection of encryption keys</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 k9, new beta build available</li>
+<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
 </ul>
 
 <h2>1.0.1</h2>
@@ -101,7 +101,7 @@ And don't add newlines before or after p tags because of transifex -->
 
 <h2>1.0.0</h2>
 <ul>
-<li>k9mail integration, APG supporting beta build of k9mail</li>
+<li>K-9 Mail integration, APG supporting beta build of k9mail</li>
 <li>support of more file managers (including ASTRO)</li>
 <li>Slovenian translation</li>
 <li>new database, much faster, less memory usage</li>
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 43c1384f8..6f637cdc0 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -230,7 +230,12 @@
     </plurals>
 
     <string name="unknown_signature_key_touch_to_look_up">Unknown signature, touch to look up key.</string>
-    <string name="bad_keys_encountered">%d bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</string>
+
+    <plurals name="bad_keys_encountered">
+        <item quantity="one">%d bad secret key ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item>
+        <item quantity="other">%d bad secret keys ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item>
+    </plurals>
+
     <string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string>
     <string name="key_send_success">Successfully sent key to server</string>
     <string name="key_sign_success">Successfully signed key</string>
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 55a6085b6..1be5b8548 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -377,8 +377,9 @@ public class ImportKeysActivity extends DrawerActivity implements OnNavigationLi
 
                             alert.setIcon(android.R.drawable.ic_dialog_alert);
                             alert.setTitle(R.string.warning);
-                            alert.setMessage(ImportKeysActivity.this.getString(
-                                    R.string.bad_keys_encountered, bad));
+
+                            alert.setMessage(ImportKeysActivity.this.getResources()
+                                    .getQuantityString(R.plurals.bad_keys_encountered, bad, bad));
 
                             alert.setPositiveButton(android.R.string.ok,
                                     new DialogInterface.OnClickListener() {
