diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-28 19:00:44 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-28 19:15:28 +0200 |
commit | d6a2875816f6caf1b6ed8cbc69c4779192b54c99 (patch) | |
tree | e0b8a908ef8f205953c4188c9499c15a951ecf35 /OpenKeychain/src/main/res/values | |
parent | b7b22beafc69f9b936196eb2aea3b5fd89b3639e (diff) | |
download | open-keychain-d6a2875816f6caf1b6ed8cbc69c4779192b54c99.tar.gz open-keychain-d6a2875816f6caf1b6ed8cbc69c4779192b54c99.tar.bz2 open-keychain-d6a2875816f6caf1b6ed8cbc69c4779192b54c99.zip |
code cleanup and plurals in import log entries
closes #698
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2dfa06e21..39b105664 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -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> |