aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-04-21 20:39:52 +0200
committerChristian Schneppe <christian@pix-art.de>2017-04-21 20:39:52 +0200
commit0d1344dac5c373a4fe779eadf741676a8fe81e6b (patch)
treed5ff9b25e4b65ca22e056b16d5bfad3e4efc3104 /src/main/res
parentf5e5df7429efc924c9cec73c503086d047160654 (diff)
add 12 months duration for message deletion
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values-de/strings.xml1
-rw-r--r--src/main/res/values/arrays.xml2
-rw-r--r--src/main/res/values/strings.xml1
3 files changed, 4 insertions, 0 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 29ecd7a3d..f24856c89 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -724,5 +724,6 @@
<string name="pref_use_colored_names_to_indicate_status_summary">Kontaktnamen einfärben, um den Online-Status des Kontakts anzuzeigen</string>
<string name="send_message">Nachricht senden</string>
<string name="send_failed_resend">Zustellung fehlgeschlagen, sende erneut…</string>
+ <string name="timeout_12_months">12 Monate</string>
</resources>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index fd19b9442..8b0b38bf8 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -114,6 +114,7 @@
<item>604800</item>
<item>2592000</item>
<item>15811200</item>
+ <item>31622400</item>
</string-array>
<string-array name="automatic_message_deletion">
@@ -122,6 +123,7 @@
<item>@string/timeout_7_days</item>
<item>@string/timeout_30_days</item>
<item>@string/timeout_6_months</item>
+ <item>@string/timeout_12_months</item>
</string-array>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 57b26caf8..fa2dc4c50 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -744,6 +744,7 @@
<string name="timeout_7_days">7 days</string>
<string name="timeout_30_days">30 days</string>
<string name="timeout_6_months">6 months</string>
+ <string name="timeout_12_months">12 months</string>
<string name="today">Today</string>
<string name="start_chatting">Start chatting…</string>
<string name="pref_use_max_brightness_summary">Switch to maximum brightness while watching videos or images in fullscreen.</string>