diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-02 16:05:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-02 16:05:28 +0200 |
| commit | 100b5f4c5f728b809f0e37d66fab3527e6fd83bd (patch) | |
| tree | d8ab54411646f7cfa370674f4f3437cb73f8ba23 /OpenKeychain/src/main/res/values | |
| parent | 144a10a3d043686755651852419c5a8bc6619f2a (diff) | |
| parent | ebcd243e975ce8f04298f6cd94cb940bfcea3d59 (diff) | |
| download | open-keychain-100b5f4c5f728b809f0e37d66fab3527e6fd83bd.tar.gz open-keychain-100b5f4c5f728b809f0e37d66fab3527e6fd83bd.tar.bz2 open-keychain-100b5f4c5f728b809f0e37d66fab3527e6fd83bd.zip | |
Merge branch 'create-keyring'
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 54ce523ce..be4892e96 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -626,6 +626,10 @@ <!-- modifySecretKeyRing --> <string name="msg_mr">Modifying keyring %s</string> <string name="msg_mf_error_encode">Encoding exception!</string> + <string name="msg_mf_error_fingerprint">Actual key fingerprint does not match expected!</string> + <string name="msg_mf_error_keyid">No keyid. This is a programming error, please file a bug report!</string> + <string name="msg_mf_error_integrity">Internal error, integrity check failed!</string> + <string name="msg_mf_error_revoked_primary">Revoked user ids cannot be primary!</string> <string name="msg_mf_error_pgp">PGP internal exception!</string> <string name="msg_mf_error_sig">Signature exception!</string> <string name="msg_mf_passphrase">Changing passphrase</string> |