From 15e30e50aabf9482d9cb705ce8788027a95393e2 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Mon, 29 Sep 2014 12:49:26 -0400
Subject: Fix typos in string resource

---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d976dce..a4302a24 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -256,10 +256,10 @@
     <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
     <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
     <string name="pref_use_indicate_received">Request message receipts</string>
-    <string name="pref_use_indicate_received_summary">Received masseges will be marked with a green tick. Be aware that this might no work in every case.</string>
+    <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported.</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
     <string name="pref_expert_options_other">Other</string>
     <string name="pref_conference_name">Conference name</string>
     <string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
 
-</resources>
\ No newline at end of file
+</resources>
-- 
cgit v1.2.3


From 503d9e7a1e92fc1345e408f33ca1a4a346abf0b9 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Mon, 29 Sep 2014 13:03:53 -0400
Subject: Remove full stop in description for consistency

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

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a4302a24..b1156e27 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -256,7 +256,7 @@
     <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
     <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
     <string name="pref_use_indicate_received">Request message receipts</string>
-    <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported.</string>
+    <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
     <string name="pref_expert_options_other">Other</string>
     <string name="pref_conference_name">Conference name</string>
-- 
cgit v1.2.3


From 2ec021a42629120e8b4f1ae5a95027ec414b2b5c Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 13 Oct 2014 12:36:41 +0200
Subject: redesigned contact details a bit

---
 res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 58af226b..d694f8ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,5 +265,6 @@
     <string name="conference_banned">You are banned from this conference</string>
     <string name="conference_members_only">This conference is members only</string>
     <string name="conference_kicked">You have been kicked from this conference</string>
+    <string name="using_account">using account %s</string>
 
-</resources>
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From d61e4cce1075e3561406be96b402def5f90dcd58 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 13 Oct 2014 14:36:19 +0200
Subject: reworked muc details and contact details a bit

---
 res/values/styles.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'res/values')

diff --git a/res/values/styles.xml b/res/values/styles.xml
index a827fe36..64bde770 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,15 +1,4 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
-        <item name="android:drawableBottom">@drawable/section_header</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/primarytext</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="Divider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1.5dp</item>
-- 
cgit v1.2.3


From e98460771bac4e2252556ea6cf483c93a1ecf176 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Tue, 14 Oct 2014 18:16:03 +0200
Subject: read image bounds on downloaded image

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d694f8ef..900d6db4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -266,5 +266,6 @@
     <string name="conference_members_only">This conference is members only</string>
     <string name="conference_kicked">You have been kicked from this conference</string>
     <string name="using_account">using account %s</string>
+    <string name="checking_image">Checking image on HTTP host</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From f5019ba96647bd1c33153e6e9099d21dcf47bfa7 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 15 Oct 2014 22:08:13 +0200
Subject: detect deleted files on start up. got rid of lagecy image provider
 for performance reasons. NOTE: this will prevent you to access images older
 than version 0.6

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 22622f60..18eec00a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -267,5 +267,6 @@
     <string name="conference_kicked">You have been kicked from this conference</string>
     <string name="using_account">using account %s</string>
     <string name="checking_image">Checking image on HTTP host</string>
+    <string name="image_file_deleted">The image file has been deleted</string>
 
 </resources>
-- 
cgit v1.2.3


From 0605390144b85dfe3531ad47cfa276f9f5c8ba5b Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 17 Oct 2014 13:09:02 +0200
Subject: do not attempt to download images when not connected

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18eec00a..b08b793e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -268,5 +268,6 @@
     <string name="using_account">using account %s</string>
     <string name="checking_image">Checking image on HTTP host</string>
     <string name="image_file_deleted">The image file has been deleted</string>
+    <string name="not_connected_try_again">You are not connected. Try again later</string>
 
 </resources>
-- 
cgit v1.2.3


From 6c7c3ddf15aebaedbd4c62e7771bb7e378ebf4ad Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 19 Oct 2014 15:53:03 -0400
Subject: Add "Enable legacy SSL" preference

---
 res/values/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18eec00a..4351c118 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -249,8 +249,10 @@
     <string name="pref_force_encryption">Force end-to-end encryption</string>
     <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
     <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
-    <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
-    <string name="pref_expert_options">Expert options</string>
+		<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
+		<string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
+		<string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
+		<string name="pref_expert_options">Expert options</string>
     <string name="pref_expert_options_summary">Please be very careful with those</string>
     <string name="pref_use_larger_font">Increase font size</string>
     <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
-- 
cgit v1.2.3


From 8263e073362aed2ebfda910df8ddad1e84302db1 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sun, 19 Oct 2014 23:42:53 +0200
Subject: mtm support for image downloader

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b08b793e..bc3fc6e4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -269,5 +269,6 @@
     <string name="checking_image">Checking image on HTTP host</string>
     <string name="image_file_deleted">The image file has been deleted</string>
     <string name="not_connected_try_again">You are not connected. Try again later</string>
+    <string name="check_image_filesize">Check image file size</string>
 
 </resources>
-- 
cgit v1.2.3


From 47485fe0c6fe5a567174eab038a1a2ffe1abefa6 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 19 Oct 2014 18:22:06 -0400
Subject: Fixed some strange wording in a string

Still doesn't sound right to me though...
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ac77ca66..3862bb7b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -253,7 +253,7 @@
 		<string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
 		<string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
 		<string name="pref_expert_options">Expert options</string>
-    <string name="pref_expert_options_summary">Please be very careful with those</string>
+    <string name="pref_expert_options_summary">Please be careful with these</string>
     <string name="pref_use_larger_font">Increase font size</string>
     <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
     <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
-- 
cgit v1.2.3


From d73a77643d7923cae0789c5ed9f6a2a4cf41385f Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 23 Oct 2014 21:27:41 +0200
Subject: context menu for messages. allow to resend single messages

---
 res/values/strings.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3862bb7b..0170b006 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -249,10 +249,10 @@
     <string name="pref_force_encryption">Force end-to-end encryption</string>
     <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
     <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
-		<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
-		<string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
-		<string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
-		<string name="pref_expert_options">Expert options</string>
+    <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
+    <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
+    <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
+    <string name="pref_expert_options">Expert options</string>
     <string name="pref_expert_options_summary">Please be careful with these</string>
     <string name="pref_use_larger_font">Increase font size</string>
     <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
@@ -272,5 +272,14 @@
     <string name="image_file_deleted">The image file has been deleted</string>
     <string name="not_connected_try_again">You are not connected. Try again later</string>
     <string name="check_image_filesize">Check image file size</string>
+    <string name="message_options">Message options</string>
+    <string name="copy_text">Copy text</string>
+    <string name="share_image">Share image</string>
+    <string name="copy_original_url">Copy original URL</string>
+    <string name="send_again">Send again</string>
+    <string name="image_url">Image URL</string>
+    <string name="message_text">Message text</string>
+    <string name="url_copied_to_clipboard">URL copied to clipboard</string>
+    <string name="message_copied_to_clipboard">Message copied to clipboard</string>
 
-</resources>
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From a5e73850b8273ad6f1fa753b8618503bc7d9d8fe Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 26 Oct 2014 10:37:21 -0400
Subject: Use consistent numbering

Fixes #585
---
 res/values/arrays.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res/values')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1a4fd25d..4acc9e62 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -22,7 +22,7 @@
     </string-array>
     <string-array name="mute_options_descriptions">
         <item>30 minutes</item>
-        <item>one hour</item>
+        <item>1 hour</item>
         <item>2 hours</item>
         <item>8 hours</item>
         <item>until further notice</item>
@@ -36,4 +36,4 @@
         <item>-1</item>
     </integer-array>
 
-</resources>
\ No newline at end of file
+</resources>
-- 
cgit v1.2.3


From 03593ba56fe0a15312e3ae231dfdaf3be6c7548a Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 29 Oct 2014 11:31:03 +0100
Subject: proper error state for images

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0170b006..e941ed6d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -281,5 +281,6 @@
     <string name="message_text">Message text</string>
     <string name="url_copied_to_clipboard">URL copied to clipboard</string>
     <string name="message_copied_to_clipboard">Message copied to clipboard</string>
+    <string name="image_transmission_failed">Image transmission failed</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3