diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-23 16:06:59 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-23 16:06:59 +0100 |
commit | ff0edb2bfe3a729d1ede1f7f03a1ec592669169b (patch) | |
tree | f55a2f6bdf3e2625aa21bcb90801d7ba3b5df5b7 /OpenKeychain/src/main/res/values/strings.xml | |
parent | 73ce6fc7bb9cd5a024bfe510e862dd9d6af3d2de (diff) | |
parent | fd24acbf0e54be2be222ca107d97c63f308a1d4a (diff) | |
download | open-keychain-ff0edb2bfe3a729d1ede1f7f03a1ec592669169b.tar.gz open-keychain-ff0edb2bfe3a729d1ede1f7f03a1ec592669169b.tar.bz2 open-keychain-ff0edb2bfe3a729d1ede1f7f03a1ec592669169b.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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f32eb0269..9920d8057 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -95,7 +95,7 @@ <string name="btn_add_files">"Add file(s)"</string> <string name="btn_share_decrypted_text">"Share"</string> <string name="btn_open_with">"Open with…"</string> - <string name="btn_copy_decrypted_text">"Copy decrypted text"</string> + <string name="btn_copy_decrypted_text">"Copy to clipboard"</string> <string name="btn_decrypt_clipboard">"Read from clipboard"</string> <string name="btn_decrypt_files">"Select input file"</string> <string name="btn_encrypt_files">"Encrypt files"</string> @@ -1401,6 +1401,10 @@ <string name="msg_data_mime_filename">"Filename: '%s'"</string> <string name="msg_data_mime_from_extension">"Guessing MIME type from extension"</string> <string name="msg_data_mime_length">"Content-Length: %s"</string> + <string name="msg_data_mime_charset">"Charset is '%s'"</string> + <string name="msg_data_mime_charset_faulty">"Charset is '%s', but decoding failed!"</string> + <string name="msg_data_mime_charset_guess">"Charset appears to be '%s'"</string> + <string name="msg_data_mime_charset_unknown">"Charset is unknown, or data is not text."</string> <string name="msg_data_mime">"Parsing MIME data structure"</string> <string name="msg_data_mime_ok">"Finished parsing"</string> <string name="msg_data_mime_none">"No MIME structure found"</string> |