cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup and plurals in import log entries

Browse Source 
closes #698
This commit is contained in:
Vincent Breitmoser
2014-06-28 19:00:44 +02:00
parent b7b22beafc
commit d6a2875816
9 changed files with 140 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,19 +388,19 @@
<!-- Import result toast -->
<plurals name="import_keys_added_and_updated_1">
<item quantity="one">Successfully added %1$d key</item>
<item quantity="other">Successfully added %1$d keys</item>
<item quantity="one">Successfully imported key</item>
<item quantity="other">Successfully imported %1$d keys</item>
</plurals>
<plurals name="import_keys_added_and_updated_2">
<item quantity="one"> and updated %1$d key%2$s.</item>
<item quantity="one"> and updated key%2$s.</item>
<item quantity="other"> and updated %1$d keys%2$s.</item>
</plurals>
<plurals name="import_keys_added">
<item quantity="one">Successfully added %1$d key%2$s.</item>
<item quantity="other">Successfully added %1$d keys%2$s.</item>
<item quantity="one">Successfully imported key%2$s.</item>
<item quantity="other">Successfully imported %1$d keys%2$s.</item>
</plurals>
<plurals name="import_keys_updated">
<item quantity="one">Successfully updated %1$d key%2$s.</item>
<item quantity="one">Successfully updated key%2$s.</item>
<item quantity="other">Successfully updated %1$d keys%2$s.</item>
</plurals>
<string name="import_view_log">View Log</string>
@@ -542,8 +542,15 @@
<string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string>
<string name="msg_ip_uid_cert_error">Error processing certificate!</string>
<string name="msg_ip_uid_cert_good">User id is certified by %1$s (%2$s)</string>
<string name="msg_ip_uid_certs_unknown">Ignoring %s certificates from unknown pubkeys</string>
<string name="msg_ip_uid_classifying">Classifying user ids, using %s trusted signatures</string>
<plurals name="msg_ip_uid_certs_unknown">
<item quantity="one">Ignoring one certificate issued by an unknown public key</item>
<item quantity="other">Ignoring %s certificates issued by unknown public keys</item>
</plurals>
<plurals name="msg_ip_uid_classifying">
<item quantity="zero">Classifying user ids (no trusted keys available)</item>
<item quantity="one">Classifying user ids (using one trusted key)</item>
<item quantity="other">Classifying user ids (using %s trusted keys)</item>
</plurals>
<string name="msg_ip_uid_reorder">Re-ordering user ids</string>
<string name="msg_ip_uid_processing">Processing user id %s</string>
<string name="msg_ip_uid_revoked">User id is revoked</string>
@@ -588,9 +595,15 @@
<string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation certificate</string>
<string name="msg_kc_sub_revoke_dup">Removing redundant subkey revocation certificate</string>
<string name="msg_kc_success">Keyring canonicalization successful, no changes</string>
<string name="msg_kc_success_bad">Keyring canonicalization successful, removed %s erroneous certificates</string>
<plurals name="msg_kc_success_bad">
<item quantity="one">Keyring canonicalization successful, removed one erroneous certificate</item>
<item quantity="other">Keyring canonicalization successful, removed %d erroneous certificates</item>
</plurals>
<string name="msg_kc_success_bad_and_red">Keyring canonicalization successful, removed %1$s erroneous and %2$s redundant certificates</string>
<string name="msg_kc_success_redundant">Keyring canonicalization successful, removed %s redundant certificates</string>
<plurals name="msg_kc_success_redundant">
<item quantity="one">Keyring canonicalization successful, removed one redundant certificate</item>
<item quantity="other">Keyring canonicalization successful, removed %d redundant certificates</item>
</plurals>
<string name="msg_kc_uid_bad_err">Removing bad self certificate for user id %s</string>
<string name="msg_kc_uid_bad_local">Removing user id certificate with "local" flag</string>
<string name="msg_kc_uid_bad_time">Removing user id with future timestamp</string>