diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-08 20:21:37 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-08 20:21:37 +0200 |
commit | 1c556344c99533f10384da3e41d18c62eec6e330 (patch) | |
tree | 82327e1d4c1b71e933520ec436672757c5d1ee24 /OpenKeychain/src/main/res/values/strings.xml | |
parent | 1fb0ed8454c5a6cac16db336dc3af33013308d01 (diff) | |
parent | ba9b8f3a6009ca60abffccc3e3fbd160e0fa420c (diff) | |
download | open-keychain-1c556344c99533f10384da3e41d18c62eec6e330.tar.gz open-keychain-1c556344c99533f10384da3e41d18c62eec6e330.tar.bz2 open-keychain-1c556344c99533f10384da3e41d18c62eec6e330.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index e39132f42..03493d697 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -436,7 +436,6 @@ <string name="progress_decrypting">"decrypting data…"</string> <string name="progress_preparing_signature">"preparing signature…"</string> <string name="progress_generating_signature">"generating signature…"</string> - <string name="progress_processing_signature">"processing signature…"</string> <string name="progress_verifying_signature">"verifying signature…"</string> <string name="progress_signing">"signing…"</string> <string name="progress_certifying">"certifying…"</string> @@ -1174,6 +1173,7 @@ <string name="msg_dc_error_input">"Error opening input data stream!"</string> <string name="msg_dc_error_no_data">"No encrypted data found in stream!"</string> <string name="msg_dc_error_no_key">"No encrypted data with known secret key found in stream!"</string> + <string name="msg_dc_error_no_signature">"Missing signature data!"</string> <string name="msg_dc_error_pgp_exception">"Encountered OpenPGP Exception during operation!"</string> <string name="msg_dc_integrity_check_ok">"Integrity check OK!"</string> <string name="msg_dc_ok_meta_only">"Only metadata was requested, skipping decryption"</string> @@ -1197,8 +1197,9 @@ <!-- Messages for VerifySignedLiteralData operation --> <string name="msg_vl">"Starting signature check"</string> - <string name="msg_vl_error_no_siglist">"No signature list in signed literal data"</string> - <string name="msg_vl_error_wrong_key">"Message not signed with right key"</string> + <string name="msg_vl_error_no_siglist">"No signature list in signed literal data!"</string> + <string name="msg_vl_error_wrong_key">"Message not signed with expected key!"</string> + <string name="msg_vl_error_no_signature">"Missing signature data!"</string> <string name="msg_vl_error_missing_literal">"No payload in signed literal data"</string> <string name="msg_vl_clear_meta_file">"Filename: %s"</string> <string name="msg_vl_clear_meta_mime">"MIME type: %s"</string> @@ -1220,7 +1221,6 @@ <!-- Messages for PgpSignEncrypt operation --> <string name="msg_pse_asymmetric">"Preparing public keys for encryption"</string> - <string name="msg_pse_clearsign_only">"Signing of cleartext input not supported!"</string> <string name="msg_pse_compressing">"Preparing compression"</string> <string name="msg_pse_encrypting">"Encrypting data"</string> <string name="msg_pse_error_bad_passphrase">"Bad password!"</string> |