diff options
| author | Vincent <valodim@mugenguild.com> | 2016-02-23 16:01:13 +0100 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-02-23 16:01:13 +0100 |
| commit | fd24acbf0e54be2be222ca107d97c63f308a1d4a (patch) | |
| tree | df87be1e599f5beb146f31e84deb74a815bdab4c /OpenKeychain/src/main/res/values | |
| parent | c1d268a5ecbb49a56561bd66c9b2967e282b9071 (diff) | |
| parent | 03e695c6509ee6ada0ad6a0a21181277ba298c34 (diff) | |
| download | open-keychain-fd24acbf0e54be2be222ca107d97c63f308a1d4a.tar.gz open-keychain-fd24acbf0e54be2be222ca107d97c63f308a1d4a.tar.bz2 open-keychain-fd24acbf0e54be2be222ca107d97c63f308a1d4a.zip | |
Merge pull request #1727 from open-keychain/mime-fallback
try to guess if data is text or not
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -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> |