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 -->
2.2
-- New design with navigation drawer
-- New public key list design
-- New public key view
-- Bug fixes for importing of keys
-- Key cross-certification (thanks to Ash Hughes)
-- Handle UTF-8 passwords properly (thanks to Ash Hughes)
-- First version with new languages (thanks to the contributors on Transifex)
-- Sharing of keys via QR Codes fixed and improved
-- Package signature verification for API
+- new design with navigation drawer
+- new public key list design
+- new public key view
+- bug fixes for importing of keys
+- key cross-certification (thanks to Ash Hughes)
+- handle UTF-8 passwords properly (thanks to Ash Hughes)
+- first version with new languages (thanks to the contributors on Transifex)
+- sharing of keys via QR Codes fixed and improved
+- package signature verification for API
2.1.1
-- API Updates, preparation for k9mail integration
+- API Updates, preparation for K-9 Mail integration
2.1
-- Lots of bug fixes
-- New API for developers
+- lots of bug fixes
+- new API for developers
- PRNG bug fix by Google
2.0
-- Complete redesign
-- Share public keys via qr codes, nfc beam
-- Sign keys
-- Upload keys to server
-- Fixes import issues
-- New AIDL API
+- complete redesign
+- share public keys via qr codes, nfc beam
+- sign keys
+- upload keys to server
+- fixes import issues
+- new AIDL API
1.0.8
- basic key server support
-- app2sd (untested, let me know if there are problems)
+- app2sd
- more choices for pass phrase cache: 1, 2, 4, 8, hours
- translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
- bugfixes
@@ -52,7 +52,7 @@ And don't add newlines before or after p tags because of transifex -->
1.0.7
-- clear sign problem with lacking trailing newline fixed
+- fixed problem with signature verification of texts with trailing newline
- more options for pass phrase cache time to live (20, 40, 60 mins)
@@ -89,9 +89,9 @@ And don't add newlines before or after p tags because of transifex -->
1.0.2
- filterable key lists
-- smarter preselection of encryption keys
+- smarter pre-selection of encryption keys
- new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
-- fixes and additional features (key preselection) for k9, new beta build available
+- fixes and additional features (key preselection) for K-9 Mail, new beta build available
1.0.1
@@ -101,7 +101,7 @@ And don't add newlines before or after p tags because of transifex -->
1.0.0
-- k9mail integration, APG supporting beta build of k9mail
+- K-9 Mail integration, APG supporting beta build of k9mail
- support of more file managers (including ASTRO)
- Slovenian translation
- new database, much faster, less memory usage
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 @@
Unknown signature, touch to look up key.
- %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.
+
+
+ - %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.
+ - %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.
+
+
Unknown key %s, do you want to try finding it on a keyserver?
Successfully sent key to server
Successfully signed key
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() {