From 1351c8b885f30019e74eb099a04887c28f59464d Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Mon, 27 Nov 2017 18:46:13 +0100
Subject: [PATCH] move string arrays into string.xml files so they do not get
 forgotten by translators

---
 app/src/main/res/values-de/array.xml       | 23 ------------------
 app/src/main/res/values-de/strings.xml     | 10 ++++++++
 app/src/main/res/values-ja/array.xml       | 13 -----------
 app/src/main/res/values-ja/strings.xml     | 10 ++++++++
 app/src/main/res/values-nl/array.xml       | 27 ----------------------
 app/src/main/res/values-nl/strings.xml     | 13 +++++++++++
 app/src/main/res/values-ru/array.xml       | 23 ------------------
 app/src/main/res/values-ru/strings.xml     | 10 ++++++++
 app/src/main/res/values/array.xml          | 23 ------------------
 app/src/main/res/values/donottranslate.xml | 10 ++++++++
 app/src/main/res/values/strings.xml        | 10 ++++++++
 11 files changed, 63 insertions(+), 109 deletions(-)
 delete mode 100644 app/src/main/res/values-de/array.xml
 delete mode 100644 app/src/main/res/values-ja/array.xml
 delete mode 100644 app/src/main/res/values-nl/array.xml
 delete mode 100644 app/src/main/res/values-ru/array.xml
 delete mode 100644 app/src/main/res/values/array.xml

diff --git a/app/src/main/res/values-de/array.xml b/app/src/main/res/values-de/array.xml
deleted file mode 100644
index da7139255..000000000
--- a/app/src/main/res/values-de/array.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="pull_notification_check_interval_names">
-        <item>15 Minuten</item>
-        <item>20 Minuten</item>
-        <item>25 Minuten</item>
-        <item>30 Minuten</item>
-        <item>45 Minuten</item>
-        <item>1 Stunde</item>
-        <item>2 Stunden</item>
-    </string-array>
-
-    <string-array name="pull_notification_check_intervals" inputType="integer">
-        <item>15</item>
-        <item>20</item>
-        <item>25</item>
-        <item>30</item>
-        <item>45</item>
-        <item>60</item>
-        <item>120</item>
-    </string-array>
-
-</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a96814d51..b8f738125 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -141,6 +141,16 @@
     <string name="pref_title_custom_tabs">Öffne Links in der App</string>
     <string name="pref_title_hide_follow_button">Verstecke Button bei Bildlauf </string>
 
+    <string-array name="pull_notification_check_interval_names">
+        <item>15 Minuten</item>
+        <item>20 Minuten</item>
+        <item>25 Minuten</item>
+        <item>30 Minuten</item>
+        <item>45 Minuten</item>
+        <item>1 Stunde</item>
+        <item>2 Stunden</item>
+    </string-array>
+
     <string name="notification_mention_format">%s hat dich erwähnt</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s und %4$d andere</string>
     <string name="notification_summary_medium">%1$s, %2$s, und %3$s</string>
diff --git a/app/src/main/res/values-ja/array.xml b/app/src/main/res/values-ja/array.xml
deleted file mode 100644
index 1f10c2b5c..000000000
--- a/app/src/main/res/values-ja/array.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="pull_notification_check_interval_names">
-        <item>15分</item>
-        <item>20分</item>
-        <item>25分</item>
-        <item>30分</item>
-        <item>45分</item>
-        <item>1時間</item>
-        <item>2時間</item>
-    </string-array>
-
-</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 251fa7a0c..8aa1bfad1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -174,6 +174,16 @@
     <string name="pref_title_show_replies">返信を表示</string>
     <string name="pref_title_show_media_preview">メディアのプレビューを表示する</string>
 
+    <string-array name="pull_notification_check_interval_names">
+        <item>15分</item>
+        <item>20分</item>
+        <item>25分</item>
+        <item>30分</item>
+        <item>45分</item>
+        <item>1時間</item>
+        <item>2時間</item>
+    </string-array>
+
     <string name="notification_channel_mention_name">新しい返信</string>
     <string name="notification_channel_mention_descriptions">新しい返信の通知</string>
     <string name="notification_channel_follow_name">新しいフォロワー</string>
diff --git a/app/src/main/res/values-nl/array.xml b/app/src/main/res/values-nl/array.xml
deleted file mode 100644
index e4bbc1bab..000000000
--- a/app/src/main/res/values-nl/array.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="pull_notification_check_interval_names">
-        <item>5 minuten</item>
-        <item>10 minuten</item>
-        <item>15 minuten</item>
-        <item>20 minuten</item>
-        <item>25 minuten</item>
-        <item>30 minuten</item>
-        <item>45 minuten</item>
-        <item>1 uur</item>
-        <item>2 uur</item>
-    </string-array>
-
-    <string-array name="pull_notification_check_intervals" inputType="integer">
-        <item>5</item>
-        <item>10</item>
-        <item>15</item>
-        <item>20</item>
-        <item>25</item>
-        <item>30</item>
-        <item>45</item>
-        <item>60</item>
-        <item>120</item>
-    </string-array>
-
-</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0cdd8db1e..ee574bffd 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -149,6 +149,19 @@
     <string name="pref_title_show_boosts">Boosts tonen</string>
     <string name="pref_title_show_replies">Reacties tonen</string>
     <string name="pref_title_show_media_preview">Voorbeelden van media tonen</string>
+
+    <string-array name="pull_notification_check_interval_names">
+        <item>5 minuten</item>
+        <item>10 minuten</item>
+        <item>15 minuten</item>
+        <item>20 minuten</item>
+        <item>25 minuten</item>
+        <item>30 minuten</item>
+        <item>45 minuten</item>
+        <item>1 uur</item>
+        <item>2 uur</item>
+    </string-array>
+
     <string name="notification_channel_mention_name">Nieuwe vermeldingen</string>
     <string name="notification_channel_mention_descriptions">Meldingen over nieuwe vermeldingen</string>
     <string name="notification_channel_follow_name">Nieuwe volgers</string>
diff --git a/app/src/main/res/values-ru/array.xml b/app/src/main/res/values-ru/array.xml
deleted file mode 100644
index ff3de58b0..000000000
--- a/app/src/main/res/values-ru/array.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="pull_notification_check_interval_names">
-        <item>15 минут</item>
-        <item>20 минут</item>
-        <item>25 минут</item>
-        <item>30 минут</item>
-        <item>45 минут</item>
-        <item>1 час</item>
-        <item>2 часа</item>
-    </string-array>
-
-    <string-array name="pull_notification_check_intervals" inputType="integer">
-        <item>15</item>
-        <item>20</item>
-        <item>25</item>
-        <item>30</item>
-        <item>45</item>
-        <item>60</item>
-        <item>120</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e93f32782..26d99ca39 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -168,6 +168,16 @@
     <string name="pref_title_show_boosts">Показывать продвижения</string>
     <string name="pref_title_show_replies">Показывать ответы</string>
     <string name="pref_title_show_media_preview">Предпросмотр медиаконтента</string>
+
+    <string-array name="pull_notification_check_interval_names">
+        <item>15 минут</item>
+        <item>20 минут</item>
+        <item>25 минут</item>
+        <item>30 минут</item>
+        <item>45 минут</item>
+        <item>1 час</item>
+        <item>2 часа</item>
+    </string-array>
 	
     <string name="notification_channel_mention_name">Новые упоминания</string>
     <string name="notification_channel_mention_descriptions">Уведомлять о новых упоминаниях</string>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
deleted file mode 100644
index 94bc69d70..000000000
--- a/app/src/main/res/values/array.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="pull_notification_check_interval_names">
-        <item>15 minutes</item>
-        <item>20 minutes</item>
-        <item>25 minutes</item>
-        <item>30 minutes</item>
-        <item>45 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-    </string-array>
-
-    <string-array name="pull_notification_check_intervals" inputType="integer">
-        <item>15</item>
-        <item>20</item>
-        <item>25</item>
-        <item>30</item>
-        <item>45</item>
-        <item>60</item>
-        <item>120</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 434cf9b13..34d4ddca3 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -6,4 +6,14 @@
     <string name="oauth_scheme" translatable="false">oauth2redirect</string>
     <string name="oauth_redirect_host" translatable="false">com.keylesspalace.tusky</string>
     <string name="preferences_file_key" translatable="false">com.keylesspalace.tusky.PREFERENCES</string>
+
+    <string-array name="pull_notification_check_intervals" inputType="integer">
+        <item>15</item>
+        <item>20</item>
+        <item>25</item>
+        <item>30</item>
+        <item>45</item>
+        <item>60</item>
+        <item>120</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2f8983ed2..092c68f84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -177,6 +177,16 @@
     <string name="pref_title_show_replies">Show replies</string>
     <string name="pref_title_show_media_preview">Show media previews</string>
 
+    <string-array name="pull_notification_check_interval_names">
+        <item>15 minutes</item>
+        <item>20 minutes</item>
+        <item>25 minutes</item>
+        <item>30 minutes</item>
+        <item>45 minutes</item>
+        <item>1 hour</item>
+        <item>2 hours</item>
+    </string-array>
+
     <string name="notification_channel_mention_name">New Mentions</string>
     <string name="notification_channel_mention_descriptions">Notifications about new mentions</string>
     <string name="notification_channel_follow_name">New Followers</string>