aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-09 16:25:53 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-09 16:25:53 +0200
commit340ed7c08dc59ac4a90069112aa599c36f94d4b9 (patch)
tree8eb78f75b98f710e59241b8fc5d969e627bbb537 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results
parent9d01490d4e254bc9d9acbe4bf53ec22e53411495 (diff)
parent23b1ac1716e917b6092281c4e9378b3b9543e0ce (diff)
downloadopen-keychain-340ed7c08dc59ac4a90069112aa599c36f94d4b9.tar.gz
open-keychain-340ed7c08dc59ac4a90069112aa599c36f94d4b9.tar.bz2
open-keychain-340ed7c08dc59ac4a90069112aa599c36f94d4b9.zip
Merge remote-tracking branch 'origin/master' into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
index 0d71af876..b54dcc5d6 100644
--- 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 {