diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-16 06:40:03 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-16 06:53:50 +0200 |
commit | de0d95432e40b9ed436c3509364ba49d2e487723 (patch) | |
tree | 687d5cf24527f285e38e3f2c71db0b3fe966d563 /OpenKeychain/src/main/res/values/strings.xml | |
parent | a943bebfdf063700c01170ea264e342283e5d6b3 (diff) | |
download | open-keychain-de0d95432e40b9ed436c3509364ba49d2e487723.tar.gz open-keychain-de0d95432e40b9ed436c3509364ba49d2e487723.tar.bz2 open-keychain-de0d95432e40b9ed436c3509364ba49d2e487723.zip |
typed expected failures and a couple minor things
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8aa10943d..f6c208ca0 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -639,7 +639,7 @@ <string name="msg_mf_error_fingerprint">Actual key fingerprint does not match the expected one!</string> <string name="msg_mf_error_keyid">No key ID. This is an internal error, please file a bug report!</string> <string name="msg_mf_error_integrity">Internal error, integrity check failed!</string> - <string name="msg_mf_error_noexist_master">No master certificate found to modify!</string> + <string name="msg_mf_error_master_none">No master certificate found to operate on! (All revoked?)</string> <string name="msg_mf_error_noexist_primary">Bad primary user id specified!</string> <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> @@ -651,7 +651,7 @@ <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> - <string name="msg_mf_subkey_missing">Tried to operate on missing subkey %s!</string> + <string name="msg_mf_error_subkey_missing">Tried to operate on missing subkey %s!</string> <string name="msg_mf_subkey_new">Generating new %1$s bit %2$s subkey</string> <string name="msg_mf_subkey_new_id">New subkey ID: %s</string> <string name="msg_mf_error_past_expiry">Expiry date cannot be in the past!</string> |