Merge remote-tracking branch 'origin/master' into development

2014-10-09 16:25:53 +02:00
parent 9d01490d4e 23b1ac1716
commit 340ed7c08d
2 changed files with 2 additions and 2 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
@@ -163,7 +163,7 @@ public class ImportKeyResult extends OperationResult {
                duration = 0;
                color = Style.RED;
                str += " " + activity.getResources().getQuantityString(
-                        R.plurals.import_keys_with_errors, mBadKeys);
+                        R.plurals.import_keys_with_errors, mBadKeys, mBadKeys);
            }

        } else {