diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-23 16:23:13 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-23 16:23:13 +0200 |
| commit | c5239d6e9b138925718e031df8da86f57035947a (patch) | |
| tree | 25c266b7344a5db00d977cc4d6a2ac4047018bcc | |
| parent | da1779816b8afc29d9c5efc38971346804ad191e (diff) | |
| download | open-keychain-c5239d6e9b138925718e031df8da86f57035947a.tar.gz open-keychain-c5239d6e9b138925718e031df8da86f57035947a.tar.bz2 open-keychain-c5239d6e9b138925718e031df8da86f57035947a.zip | |
be more precise on importresult overall error
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 9 |
2 files changed, 7 insertions, 4 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 3c07e8667..b5174bc63 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 @@ -165,7 +165,7 @@ public class ImportKeyResult extends OperationResult { ? R.string.import_error_nothing_cancelled : R.string.import_error_nothing); } else { - str = activity.getString(R.string.import_error); + str = activity.getResources().getQuantityString(R.plurals.import_error, mBadKeys); } } diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c77c50b72..3478acbbd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -395,15 +395,18 @@ <item quantity="other">"Successfully updated %1$d keys%2$s."</item> </plurals> <plurals name="import_keys_with_errors"> - <item quantity="one">"Import failed for one key."</item> - <item quantity="other">"Import failed for %d keys."</item> + <item quantity="one">"Import failed for one key!"</item> + <item quantity="other">"Import failed for %d keys!"</item> </plurals> <string name="view_log">"View Log"</string> <string name="import_error_nothing">"Nothing to import."</string> <string name="import_error_nothing_cancelled">"Import cancelled."</string> - <string name="import_error">"Error importing keys!"</string> <string name="import_with_warnings">", with warnings"</string> <string name="import_with_cancelled">", until cancelled"</string> + <plurals name="import_error"> + <item quantity="one">"Import failed!"</item> + <item quantity="other">"Import of %d keys failed!"</item> + </plurals> <!-- Intent labels --> <string name="intent_decrypt_file">"Decrypt File with OpenKeychain"</string> |