Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

5 files changed, 56 insertions, 1 deletions

diff --git a/src/main/res/layout/dialog_userdecision.xml b/src/main/res/layout/dialog_userdecision.xml
new file mode 100644
index 00000000..edeff812
--- /dev/null
+++ b/src/main/res/layout/dialog_userdecision.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="Medium Text"
+        android:id="@+id/dlgUserDecQuestion" />
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/cplus_remember_userdecision"
+        android:id="@+id/dlgUserDecRemember"
+        android:checked="false" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 5bd93fa8..01d15d10 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -491,4 +491,13 @@
     <string name="dlg_msg_details_msg_status_unsend">In Übertragung</string>
     <string name="dlg_msg_details_msg_status_offered">Angeboten</string>
     <string name="dlg_msg_details_msg_status_failed">Fehlgeschlagen</string>
+  <string name="pref_resize_picture_ask">nachfragen</string>
+  <string name="pref_resize_picture_always">immer</string>
+  <string name="pref_resize_picture_never">nie</string>
+  <string name="pref_resize_picture_summary">Sollen Bilder vor dem Senden verkleinert werden oder nicht?</string>
+  <string name="pref_resize_picture">Bilder verkleinern</string>
+  <string name="cplus_yes">Ja</string>
+  <string name="cplus_no">Nein</string>
+  <string name="cplus_remember_userdecision">Diese Entscheidung merken</string>
+  <string name="userdecision_question_resize_picture">Soll das Bild verkleinert werden?</string>
 </resources>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index c555d4ba..24f8790c 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -69,5 +69,14 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-
+	<string-array name="resize_picture_setting_entries">
+		<item>@string/pref_resize_picture_ask</item>
+        <item>@string/pref_resize_picture_always</item>
+        <item>@string/pref_resize_picture_never</item>
+    </string-array>
+	<string-array name="resize_picture_setting_values">
+        <item>ASK</item>
+        <item>ALWAYS</item>
+        <item>NEVER</item>
+    </string-array>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 277d4790..33f89e7a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -520,4 +520,13 @@
     <string name="dlg_msg_details_msg_status_unsend">Unsend</string>
     <string name="dlg_msg_details_msg_status_offered">Offered</string>
     <string name="dlg_msg_details_msg_status_failed">Failed</string>
+    <string name="pref_resize_picture_ask">ask</string>
+    <string name="pref_resize_picture_always">always</string>
+    <string name="pref_resize_picture_never">never</string>
+    <string name="pref_resize_picture_summary">Whether pictures shall be resized or not</string>
+    <string name="pref_resize_picture">Resize pictures</string>
+    <string name="cplus_yes">Yes</string>
+    <string name="cplus_no">No</string>
+    <string name="cplus_remember_userdecision">Remember this decision</string>
+    <string name="userdecision_question_resize_picture">Shall the picture be resized?</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 9def87c4..e36b3e8b 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -44,6 +44,14 @@
         </PreferenceScreen>
 
         <ListPreference
+            android:defaultValue="ASK"
+            android:entries="@array/resize_picture_setting_entries"
+            android:entryValues="@array/resize_picture_setting_values"
+            android:key="resize_picture"
+            android:summary="@string/pref_resize_picture_summary"
+            android:title="@string/pref_resize_picture"/>
+
+        <ListPreference
             android:defaultValue="2"
             android:entries="@array/confirm_strings"
             android:entryValues="@array/confirm_values"