diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-14 00:56:03 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-14 00:56:03 +0200 |
| commit | 88bbce831c30c1220e03439ffca4c8f390506ba6 (patch) | |
| tree | 74982b9f53abd4de3907a88a4dbbe67bfaea77b4 /OpenKeychain/src/main/res | |
| parent | db5d12800c01f41b04fd90426bc6ba2b4f99d72b (diff) | |
| parent | 760b05273c99dec72a4d0af525d101955f8f2234 (diff) | |
| download | open-keychain-88bbce831c30c1220e03439ffca4c8f390506ba6.tar.gz open-keychain-88bbce831c30c1220e03439ffca4c8f390506ba6.tar.bz2 open-keychain-88bbce831c30c1220e03439ffca4c8f390506ba6.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 62299ed34..e1fcf4a0b 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -701,7 +701,7 @@ <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_pgp">"Internal PGP error!"</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 for keyring…"</string> @@ -803,6 +803,30 @@ <string name="msg_dc_trail_unknown">"Encountered trailing data of unknown type"</string> <string name="msg_dc_unlocking">"Unlocking secret key"</string> + <!-- Messages for SignEncrypt operation --> + <string name="msg_se_asymmetric">"Preparing public keys for encryption"</string> + <string name="msg_se_clearsign_only">"Signing of cleartext input not supported!"</string> + <string name="msg_se_compressing">"Preparing compression"</string> + <string name="msg_se_encrypting">"Encrypting data"</string> + <string name="msg_se_error_bad_passphrase">"Bad passphrase!"</string> + <string name="msg_se_error_io">"Encountered IO Exception during operation!"</string> + <string name="msg_se_error_key_sign">"Selected signing key cannot sign data!"</string> + <string name="msg_se_error_sign_key">"Error fetching signing key!"</string> + <string name="msg_se_error_nfc">"NFC data error!"</string> + <string name="msg_se_error_no_passphrase">"No passphrase provided!"</string> + <string name="msg_se_error_pgp">"Internal PGP error!"</string> + <string name="msg_se_error_sig">"Encountered PGP signature exception!"</string> + <string name="msg_se_error_unlock">"Unknown error unlocking key!"</string> + <string name="msg_se_key_ok">"Encrypting for key: %s"</string> + <string name="msg_se_key_unknown">"Missing key for encryption: %s"</string> + <string name="msg_se_key_warn">"Bad key for encryption: %s"</string> + <string name="msg_se_ok">"Sign/Encrypt operation successful!"</string> + <string name="msg_se_pending_nfc">"NFC token required, requesting user input…"</string> + <string name="msg_se_signing">"Signing data (without encryption)"</string> + <string name="msg_se_sigcrypting">"Encrypting data with signature"</string> + <string name="msg_se">"Starting sign and/or encrypt operation"</string> + <string name="msg_se_symmetric">"Preparing symmetric encryption"</string> + <!-- PassphraseCache --> <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string> <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passphrases"</string> |