From bdae99c0847556dd8103f172fc1836eb83ae4c4a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 12 Feb 2016 17:08:09 +0100
Subject: mime: try to decode with given charset or utf-8 while file is read

---
 OpenKeychain/src/main/res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f32eb0269..7d66c06a1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -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>
-- 
cgit v1.2.3


From 4df63ccdeb8bd26f507c88980b360bdc367faa0f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 22 Feb 2016 22:22:45 +0100
Subject: displaytext: add "View Log" option, move "Copy to clipboard" into
 overflow menu

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 7d66c06a1..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>
-- 
cgit v1.2.3