diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-16 21:04:43 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-16 21:04:43 +0200 |
| commit | c00343d516f1afc2d4e062d30eba07689fc3092a (patch) | |
| tree | afe6ca69aa8d053a3129d3269f5653c7020e76b6 /OpenKeychain/src/main/res | |
| parent | e38f6a2a46c5b246f2f6a60d497f85f95c10908a (diff) | |
| download | open-keychain-c00343d516f1afc2d4e062d30eba07689fc3092a.tar.gz open-keychain-c00343d516f1afc2d4e062d30eba07689fc3092a.tar.bz2 open-keychain-c00343d516f1afc2d4e062d30eba07689fc3092a.zip | |
modify*Key: improve handling of passphrase modification (add tests, too)
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f6c208ca0..5259336ec 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -644,10 +644,14 @@ <string name="msg_mf_error_noexist_revoke">Bad user id for revocation specified!</string> <string name="msg_mf_error_revoked_primary">Revoked user ids cannot be primary!</string> <string name="msg_mf_error_null_expiry">Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!</string> + <string name="msg_mf_error_passphrase_master">Fatal error decrypting master key! This is likely a programming error, please file a bug report!</string> <string name="msg_mf_error_pgp">PGP internal exception!</string> <string name="msg_mf_error_sig">Signature exception!</string> <string name="msg_mf_master">Modifying master certifications</string> - <string name="msg_mf_passphrase">Changing passphrase</string> + <string name="msg_mf_passphrase">Changing passphrase for keyring…</string> + <string name="msg_mf_passphrase_key">Changing passphrase for subkey %s</string> + <string name="msg_mf_passphrase_empty_retry">Setting new passphrase failed, trying again with empty old passphrase</string> + <string name="msg_mf_passphrase_fail">Passphrase for subkey could not be changed! (Does it have a different one from the other keys?)</string> <string name="msg_mf_primary_replace_old">Replacing certificate of previous primary user id</string> <string name="msg_mf_primary_new">Generating new certificate for new primary user id</string> <string name="msg_mf_subkey_change">Modifying subkey %s</string> |