moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-20 04:41:52 -05:00
Code Issues Releases Wiki Activity

be more precise on importresult overall error

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-09-23 16:23:13 +02:00
parent da1779816b
commit c5239d6e9b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
View File

@ -165,7 +165,7 @@ public class ImportKeyResult extends OperationResult {
? R.string.import_error_nothing_cancelled ? R.string.import_error_nothing_cancelled
: R.string.import_error_nothing); : R.string.import_error_nothing);
} else { } else {
str = activity.getString(R.string.import_error); str = activity.getResources().getQuantityString(R.plurals.import_error, mBadKeys);
} }
} }

9
OpenKeychain/src/main/res/values/strings.xml
View File

@ -395,15 +395,18 @@
<item quantity="other">"Successfully updated %1$d keys%2$s."</item> <item quantity="other">"Successfully updated %1$d keys%2$s."</item>
</plurals> </plurals>
<plurals name="import_keys_with_errors"> <plurals name="import_keys_with_errors">
<item quantity="one">"Import failed for one key."</item> <item quantity="one">"Import failed for one key!"</item>
<item quantity="other">"Import failed for %d keys."</item> <item quantity="other">"Import failed for %d keys!"</item>
</plurals> </plurals>
<string name="view_log">"View Log"</string> <string name="view_log">"View Log"</string>
<string name="import_error_nothing">"Nothing to import."</string> <string name="import_error_nothing">"Nothing to import."</string>
<string name="import_error_nothing_cancelled">"Import cancelled."</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_warnings">", with warnings"</string>
<string name="import_with_cancelled">", until cancelled"</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 --> <!-- Intent labels -->
<string name="intent_decrypt_file">"Decrypt File with OpenKeychain"</string> <string name="intent_decrypt_file">"Decrypt File with OpenKeychain"</string>