From bb395a78d6b931524f2fcc8694cba54f18327cf2 Mon Sep 17 00:00:00 2001
From: Synced Synapse <synced.synapse@gmail.com>
Date: Sun, 28 Jun 2020 17:21:22 +0100
Subject: [PATCH] Keep all strings to be localized in strings.xml

Remove strings to be localized from arrays.xml, keeping them all in strings.xml, to facilitate localization efforts.
---
 app/src/main/res/values-ca/arrays.xml  | 25 -------------------------
 app/src/main/res/values-ca/strings.xml |  4 ++++
 app/src/main/res/values-de/arrays.xml  |  9 ---------
 app/src/main/res/values-de/strings.xml |  4 ++++
 app/src/main/res/values-fr/arrays.xml  | 25 -------------------------
 app/src/main/res/values-fr/strings.xml |  4 ++++
 app/src/main/res/values-iw/arrays.xml  |  9 ---------
 app/src/main/res/values-iw/strings.xml |  5 +++++
 app/src/main/res/values-ko/arrays.xml  | 24 ------------------------
 app/src/main/res/values-ko/strings.xml |  4 ++++
 app/src/main/res/values-pl/arrays.xml  | 25 -------------------------
 app/src/main/res/values-pl/strings.xml |  4 ++++
 app/src/main/res/values-pt/arrays.xml  | 25 -------------------------
 app/src/main/res/values-pt/strings.xml |  4 ++++
 app/src/main/res/values-uk/strings.xml |  4 ++++
 app/src/main/res/values/arrays.xml     |  6 +++---
 app/src/main/res/values/strings.xml    |  5 +++++
 17 files changed, 41 insertions(+), 145 deletions(-)
 delete mode 100644 app/src/main/res/values-ca/arrays.xml
 delete mode 100644 app/src/main/res/values-de/arrays.xml
 delete mode 100644 app/src/main/res/values-fr/arrays.xml
 delete mode 100644 app/src/main/res/values-iw/arrays.xml
 delete mode 100644 app/src/main/res/values-ko/arrays.xml
 delete mode 100644 app/src/main/res/values-pl/arrays.xml
 delete mode 100644 app/src/main/res/values-pt/arrays.xml

diff --git a/app/src/main/res/values-ca/arrays.xml b/app/src/main/res/values-ca/arrays.xml
deleted file mode 100644
index 5d7a251..0000000
--- a/app/src/main/res/values-ca/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright 2015 Synced Synapse. All rights reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<resources>
-    <!-- Download connection types -->
-    <string-array name="entries_download_media_items">
-        <item>Wi-Fi</item>
-        <item>Mòbil</item>
-        <item>Qualsevol</item>
-    </string-array>
-
-</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0ce3a20..523a22e 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -318,4 +318,8 @@
     <string name="wizard_search_no_host_found"><![CDATA[     No s\'ha pogut trobar cap Centre Multimèdia en la xarxa local.<br/>Si us cal ajauda per configurar-ho, la trobareu <a href="http://syncedsynapse.com/kore/kore-faq/">aquí</a>.<br/><br/>     Premeu <i>Cerca</i> per tornar a cercar o <i>Següent</i> per configura-ho manualment.     ]]></string>
     <string name="wizard_search_no_network_connection"><![CDATA[     Activeu la connexió a la xarxa abans de cerecar Centgres Multimèdia.<br/>     ]]></string>
     <string name="wizard_search_host_found"><![CDATA[     S\'han trobat aquets Centres Multimèdia en la xarxa.<br/><br/>Seleccioneu-ne un o premeu <i>Següent</i> per afegir-ne un manualment.     ]]></string>
+
+    <string name="wifi_network">Wi-Fi</string>
+    <string name="mobile_network">Mòbil</string>
+    <string name="any_network">Qualsevol</string>
 </resources>
diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml
deleted file mode 100644
index ca24465..0000000
--- a/app/src/main/res/values-de/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Download connection types -->
-    <string-array name="entries_download_media_items">
-        <item>WLAN</item>
-        <item>Mobiles Internet</item>
-        <item>Beliebig</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 9b7f3ec..99e04ac 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -416,4 +416,8 @@
 	
 	<string name="disable_local_playback_support">Lokale Unterstüzung für die Wiedergabe deaktivieren</string>
     <string name="disable_local_playback_support_summary">Deaktiviert die Unterstützung für das lokale Abspielen von Medien auf dem Gerät, auf dem Kore ausgeführt wird.</string>
+
+    <string name="wifi_network">WLAN</string>
+    <string name="mobile_network">Mobiles Internet</string>
+    <string name="any_network">Beliebig</string>
 </resources>
diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml
deleted file mode 100644
index 170b871..0000000
--- a/app/src/main/res/values-fr/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright 2015 Synced Synapse. All rights reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<resources>
-    <!-- Download connection types -->
-    <string-array name="entries_download_media_items">
-        <item>Wi-Fi</item>
-        <item>Mobile</item>
-        <item>Tous</item>
-    </string-array>
-
-</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 60c0385..1dd6dc4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -437,4 +437,8 @@
     <string name="disable_local_playback_support_summary">Désactive la prise en charge de la lecture locale de média sur l\'appareil exécutant Kore</string>
     <string name="language">Langue</string>
 
+    <string name="wifi_network">Wi-Fi</string>
+    <string name="mobile_network">Mobile</string>
+    <string name="any_network">Tous</string>
+
 </resources>
diff --git a/app/src/main/res/values-iw/arrays.xml b/app/src/main/res/values-iw/arrays.xml
deleted file mode 100644
index 48c8151..0000000
--- a/app/src/main/res/values-iw/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Download connection types -->
-    <string-array name="entries_download_media_items">
-        <item>רשת אלחוטית</item>
-        <item>רשת סלולרית</item>
-        <item>כל רשת</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 76108cc..28ea2d7 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -430,4 +430,9 @@
 
     <string name="disable_local_playback_support">השבתת תמיכה בנגינה מקומית</string>
     <string name="disable_local_playback_support_summary">השבתת תמיכה בנגינת מדיה באופן מקומי על ההתקן שמפעיל את Kore.</string>
+
+    <string name="wifi_network">רשת אלחוטית</string>
+    <string name="mobile_network">רשת סלולרית</string>
+    <string name="any_network">כל רשת</string>
+
 </resources>
diff --git a/app/src/main/res/values-ko/arrays.xml b/app/src/main/res/values-ko/arrays.xml
deleted file mode 100644
index e0caf39..0000000
--- a/app/src/main/res/values-ko/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright 2015 Synced Synapse. All rights reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<resources>
-    <!-- Download connection types -->
-    <string-array name="entries_download_media_items">
-        <item>WiFi</item>
-        <item>데이터</item>
-        <item>모두</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c91e5fb..0e7b027 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -445,4 +445,8 @@
     <string name="disable_local_playback_support">로컬 재생 사용 안 함</string>
     <string name="disable_local_playback_support_summary">Kore를 실행 중인 장치에 로컬 재생 지원을 사용하지 않습니다.</string>
     <string name="language">언어</string>
+
+    <string name="wifi_network">WiFi</string>
+    <string name="mobile_network">데이터</string>
+    <string name="any_network">모두</string>
 </resources>
diff --git a/app/src/main/res/values-pl/arrays.xml b/app/src/main/res/values-pl/arrays.xml
deleted file mode 100644
index ba6584e..0000000
--- a/app/src/main/res/values-pl/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright 2015 Synced Synapse. All rights reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<resources>
-    <!-- Download connection types -->
-    <string-array name="entries_download_media_items">
-        <item>Wi-Fi</item>
-        <item>Mobilne</item>
-        <item>Wszystkie</item>
-    </string-array>
-
-</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c95d879..2b80dba 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -429,4 +429,8 @@
 
     <string name="disable_local_playback_support">Wyłącz odtwarzanie na urządzeniu</string>
     <string name="disable_local_playback_support_summary">Wyłącza odtwarzanie multimediów na urządzeniu przy uruchomieniu Kore.</string>
+
+    <string name="wifi_network">Wi-Fi</string>
+    <string name="mobile_network">Mobilne</string>
+    <string name="any_network">Wszystkie</string>
 </resources>
diff --git a/app/src/main/res/values-pt/arrays.xml b/app/src/main/res/values-pt/arrays.xml
deleted file mode 100644
index a062a1f..0000000
--- a/app/src/main/res/values-pt/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright 2015 Synced Synapse. All rights reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<resources>
-    <!-- Download connection types -->
-    <string-array name="entries_download_media_items">
-        <item>Wi-Fi</item>
-        <item>Rede Móvel</item>
-        <item>Todas</item>
-    </string-array>
-
-</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 1cdd399..a59d767 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -363,4 +363,8 @@ Se necessitar de ajuda, visite o nosso <b><a href="http://forum.kodi.tv/forumdis
   <!--<string name="error_during_purchased">Ocorreu um erro durante a compra.</string>-->
   <!--<string name="purchase_thanks">Obrigado pelo apoio!</string>-->
 
+  <string name="wifi_network">Wi-Fi</string>
+  <string name="mobile_network">Rede Móvel</string>
+  <string name="any_network">Todas</string>
+
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7217e15..0cb819c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -444,4 +444,8 @@
     <string name="disable_local_playback_support">Вимкнути підтримку локального відтворення</string>
     <string name="disable_local_playback_support_summary">Відключає відтворення мультимедіа на пристрої під час роботи Kore.</string>
     <string name="language">Мова</string>
+
+    <string name="wifi_network">Wi-Fi</string>
+    <string name="mobile_network">Мобільна мережа</string>
+    <string name="any_network">Будь-яке</string>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 1d0ca02..e07c8de 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -95,9 +95,9 @@
 
     <!-- Download connection types -->
     <string-array name="entries_download_media_items">
-        <item>WiFi</item>
-        <item>Mobile</item>
-        <item>Any</item>
+        <item>@string/wifi_network</item>
+        <item>@string/mobile_network</item>
+        <item>@string/any_network</item>
     </string-array>
 
     <string-array name="entry_values_download_media_items">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7cae521..c53fb94 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -478,4 +478,9 @@
     <string name="disable_local_playback_support">Disable local playback support</string>
     <string name="disable_local_playback_support_summary">Disables support for playing media locally on the device running Kore.</string>
     <string name="language">Language</string>
+
+    <string name="wifi_network">Wi-Fi</string>
+    <string name="mobile_network">Mobile</string>
+    <string name="any_network">Any</string>
+
 </resources>
\ No newline at end of file