diff options
| author | Daniel Ramos <hiperzone@gmail.com> | 2015-04-26 18:27:07 +0100 |
|---|---|---|
| committer | Daniel Ramos <hiperzone@gmail.com> | 2015-04-26 18:27:07 +0100 |
| commit | 674f377bd4e163bdcebb09c12a99947578b7265d (patch) | |
| tree | 392903a0e7e72c9a06e6d80caeec1e9cd6b7af2f /OpenKeychain/src/main/res/values/strings.xml | |
| parent | 40122d61ccd13a06602cf614f18aedee82bf1ad0 (diff) | |
| parent | 9eb98f6eb712ec6130ce45772fd6c351afdab1b2 (diff) | |
| download | open-keychain-674f377bd4e163bdcebb09c12a99947578b7265d.tar.gz open-keychain-674f377bd4e163bdcebb09c12a99947578b7265d.tar.bz2 open-keychain-674f377bd4e163bdcebb09c12a99947578b7265d.zip | |
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 33fc362a1..f77570a88 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -78,7 +78,8 @@ <string name="btn_view_cert_key">"View certification key"</string> <string name="btn_create_key">"Create key"</string> <string name="btn_add_files">"Add file(s)"</string> - <string name="btn_add_share_decrypted_text">"Share decrypted text"</string> + <string name="btn_share_decrypted_text">"Share decrypted text"</string> + <string name="btn_copy_decrypted_text">"Copy decrypted text"</string> <string name="btn_decrypt_clipboard">"Decrypt text from clipboard"</string> <string name="btn_decrypt_and_verify">"and verify signatures"</string> <string name="btn_decrypt_files">"Decrypt files"</string> @@ -285,16 +286,16 @@ <!-- results shown after decryption/verification --> <string name="decrypt_result_no_signature">"Not Signed"</string> <string name="decrypt_result_invalid_signature">"Invalid signature!"</string> - <string name="decrypt_result_signature_uncertified">"Signed by (not certified!)"</string> - <string name="decrypt_result_signature_certified">"Signed by"</string> - <string name="decrypt_result_signature_expired_key">"Key is expired!"</string> - <string name="decrypt_result_signature_revoked_key">"Key has been revoked!"</string> - <string name="decrypt_result_signature_missing_key">"Unknown public key"</string> + <string name="decrypt_result_signature_uncertified">"Signed by <b>unconfirmed</b> key"</string> + <string name="decrypt_result_signature_certified">"Signed by confirmed key"</string> + <string name="decrypt_result_signature_expired_key">"Signed by <b>expired</b> key!"</string> + <string name="decrypt_result_signature_revoked_key">"Signed by <b>revoked</b> key!"</string> + <string name="decrypt_result_signature_missing_key">"Signed by <b>unknown public key</b>"</string> <string name="decrypt_result_encrypted">"Encrypted"</string> <string name="decrypt_result_not_encrypted">"Not Encrypted"</string> <string name="decrypt_result_action_show">"Show"</string> <string name="decrypt_result_action_Lookup">"Lookup"</string> - <string name="decrypt_invalid_text">"Either the signature is invalid or the key has been revoked/is expired. You cannot be sure who wrote the text. Do you still want to display it?"</string> + <string name="decrypt_invalid_text">"Either the signature is invalid or the key has been revoked. You cannot be sure who wrote the text. Do you still want to display it?"</string> <string name="decrypt_invalid_button">"I understand the risks, display it!"</string> <!-- Add keys --> |