From 4ab8fe13dea85e23f856bbe853fbf81af908edea Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 9 Jan 2016 16:17:39 +0100
Subject: let the user decide on whether or not to compress pictures

---
 src/main/res/values/arrays.xml  | 12 ++++++++++++
 src/main/res/values/strings.xml |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

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

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 5be352d1..ca63a0f1 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -57,4 +57,16 @@
 		<item>voice</item>
 		<item>location</item>
 	</string-array>
+
+	<string-array name="picture_compression_values">
+		<item>never</item>
+		<item>auto</item>
+		<item>always</item>
+	</string-array>
+
+	<string-array name="picture_compression_entries">
+		<item>@string/never</item>
+		<item>@string/automatically</item>
+		<item>@string/always</item>
+	</string-array>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 049a5dc6..deffa64e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -287,7 +287,7 @@
 	<string name="pref_about_conversations_summary">Build and licensing information</string>
 	<string name="pref_about_message" translatable="false">
 			Conversations • the very last word in instant messaging.
-			\n\nCopyright © 2014-2015 Daniel Gultsch
+			\n\nCopyright © 2014-2016 Daniel Gultsch
 			\n\nThis program is free software: you can redistribute it and/or modify
 			it under the terms of the GNU General Public License as published by
 			the Free Software Foundation, either version 3 of the License, or
@@ -571,4 +571,8 @@
 	<string name="notify_only_when_highlighted">Notify only when highlighted</string>
 	<string name="notify_never">Notifications disabled</string>
 	<string name="notify_paused">Notifications paused</string>
+	<string name="pref_picture_compression">Compress Pictures</string>
+	<string name="pref_picture_compression_summary">Resize and compressed pictures</string>
+	<string name="always">Always</string>
+	<string name="automatically">Automatically</string>
 </resources>
-- 
cgit v1.2.3