From b5bbc8a117d7d6fcc793d26252d4058fc084cca8 Mon Sep 17 00:00:00 2001
From: nift4 <nift4@protonmail.com>
Date: Wed, 4 Jan 2023 17:49:08 +0100
Subject: [PATCH] fix array translation chaos

---
 README.md                                 |  2 +-
 app/src/main/res/values-cs/arrays.xml     |  9 ---------
 app/src/main/res/values-de/arrays.xml     | 10 ----------
 app/src/main/res/values-el/arrays.xml     |  9 ---------
 app/src/main/res/values-es-rMX/arrays.xml |  9 ---------
 app/src/main/res/values-et/arrays.xml     |  9 ---------
 app/src/main/res/values-fr/arrays.xml     |  9 ---------
 app/src/main/res/values-id/arrays.xml     |  9 ---------
 app/src/main/res/values-it/arrays.xml     |  9 ---------
 app/src/main/res/values-ja/arrays.xml     |  9 ---------
 app/src/main/res/values-pl/arrays.xml     | 10 ----------
 app/src/main/res/values-pt-rBR/arrays.xml |  9 ---------
 app/src/main/res/values-ro/arrays.xml     | 11 -----------
 app/src/main/res/values-ru/arrays.xml     |  9 ---------
 app/src/main/res/values-sk/arrays.xml     |  9 ---------
 app/src/main/res/values-tr/arrays.xml     |  9 ---------
 app/src/main/res/values-vi/arrays.xml     | 10 ----------
 app/src/main/res/values-zh-rCN/arrays.xml |  9 ---------
 app/src/main/res/values-zh-rTW/arrays.xml |  9 ---------
 app/src/main/res/values/arrays.xml        | 16 ++++++++--------
 app/src/main/res/values/strings.xml       |  1 +
 21 files changed, 10 insertions(+), 176 deletions(-)
 delete mode 100644 app/src/main/res/values-cs/arrays.xml
 delete mode 100644 app/src/main/res/values-de/arrays.xml
 delete mode 100644 app/src/main/res/values-el/arrays.xml
 delete mode 100644 app/src/main/res/values-es-rMX/arrays.xml
 delete mode 100644 app/src/main/res/values-et/arrays.xml
 delete mode 100644 app/src/main/res/values-fr/arrays.xml
 delete mode 100644 app/src/main/res/values-id/arrays.xml
 delete mode 100644 app/src/main/res/values-it/arrays.xml
 delete mode 100644 app/src/main/res/values-ja/arrays.xml
 delete mode 100644 app/src/main/res/values-pl/arrays.xml
 delete mode 100644 app/src/main/res/values-pt-rBR/arrays.xml
 delete mode 100644 app/src/main/res/values-ro/arrays.xml
 delete mode 100644 app/src/main/res/values-ru/arrays.xml
 delete mode 100644 app/src/main/res/values-sk/arrays.xml
 delete mode 100644 app/src/main/res/values-tr/arrays.xml
 delete mode 100644 app/src/main/res/values-vi/arrays.xml
 delete mode 100644 app/src/main/res/values-zh-rCN/arrays.xml
 delete mode 100644 app/src/main/res/values-zh-rTW/arrays.xml

diff --git a/README.md b/README.md
index c33e47a..4af8c58 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ We use Weblate for translations: [https://translate.nift4.org/engage/foxmmm/](ht
 
 ### GitHub method for advanced users
 
-See [`app/src/main/res/values/strings.xml`](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/app/src/main/res/values/strings.xml) and [`app/src/main/res/values/arrays.xml`](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/app/src/main/res/values/arrays.xml)
+See [`app/src/main/res/values/strings.xml`](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/app/src/main/res/values/strings.xml)
 
 If your language is right to left don't forget to set `lang_support_rtl` to `true`.
 
diff --git a/app/src/main/res/values-cs/arrays.xml b/app/src/main/res/values-cs/arrays.xml
deleted file mode 100644
index a011e39..0000000
--- a/app/src/main/res/values-cs/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Dle systému</item>
-        <item>Tmavá</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Světlá</item>
-    </string-array>
-</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 f1dc336..0000000
--- a/app/src/main/res/values-de/arrays.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string-array name="theme_values_names">
-		<item>Systemvorgabe</item>
-		<item>Dunkel</item>
-		<item>AMOLED Black</item>
-		<item>Transparent</item>
-		<item>Hell</item>
-	</string-array>
-</resources>
diff --git a/app/src/main/res/values-el/arrays.xml b/app/src/main/res/values-el/arrays.xml
deleted file mode 100644
index 96a4372..0000000
--- a/app/src/main/res/values-el/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Προεπιλογή συστήματως</item>
-        <item>Σκωτεινό</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Ανοιχτό</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es-rMX/arrays.xml b/app/src/main/res/values-es-rMX/arrays.xml
deleted file mode 100644
index 0309e88..0000000
--- a/app/src/main/res/values-es-rMX/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Sistema</item>
-        <item>Oscuro</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Claro</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-et/arrays.xml b/app/src/main/res/values-et/arrays.xml
deleted file mode 100644
index a16f802..0000000
--- a/app/src/main/res/values-et/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Süsteem</item>
-        <item>Tume</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Hele</item>
-    </string-array>
-</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 b78a1b4..0000000
--- a/app/src/main/res/values-fr/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Système</item>
-        <item>Sombre</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Clair</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-id/arrays.xml b/app/src/main/res/values-id/arrays.xml
deleted file mode 100644
index 277a9ea..0000000
--- a/app/src/main/res/values-id/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Sistem</item>
-        <item>Gelap</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Terang</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml
deleted file mode 100644
index db5af4a..0000000
--- a/app/src/main/res/values-it/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Sistema</item>
-        <item>Scuro</item>
-        <item>AMOLED Black</item>
-        <item>Trasparente (chiaro)</item>
-        <item>Chiaro</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml
deleted file mode 100644
index 0528258..0000000
--- a/app/src/main/res/values-ja/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>システムの設定を使用</item>
-        <item>ダーク</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>ライト</item>
-    </string-array>
-</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 3220b50..0000000
--- a/app/src/main/res/values-pl/arrays.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Zgodny z systemem</item>
-        <item>Ciemny</item>
-        <item>Czarny</item>
-        <item>Przezroczysty (jasny)</item>
-        <item>Jasny</item>
-    </string-array>
-    <string-array name="permission_notification_dont_ask_again">Nie pytaj ponownie</string-array>
-</resources>
diff --git a/app/src/main/res/values-pt-rBR/arrays.xml b/app/src/main/res/values-pt-rBR/arrays.xml
deleted file mode 100644
index 72e9cf8..0000000
--- a/app/src/main/res/values-pt-rBR/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Sistema</item>
-        <item>Escuro</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Claro</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/arrays.xml b/app/src/main/res/values-ro/arrays.xml
deleted file mode 100644
index de0a9b6..0000000
--- a/app/src/main/res/values-ro/arrays.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- If translating, please remove "theme_values" -->
-    <string-array name="theme_values_names">
-        <item>Sistem</item>
-        <item>Întunecată</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Luminoasă</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml
deleted file mode 100644
index 7b2632c..0000000
--- a/app/src/main/res/values-ru/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Как в системе</item>
-        <item>Тёмная</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Светлая</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-sk/arrays.xml b/app/src/main/res/values-sk/arrays.xml
deleted file mode 100644
index 65f1605..0000000
--- a/app/src/main/res/values-sk/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Podľa systému</item>
-        <item>Tmavá</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Svetlá</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-tr/arrays.xml b/app/src/main/res/values-tr/arrays.xml
deleted file mode 100644
index 232c2e1..0000000
--- a/app/src/main/res/values-tr/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>Sistem</item>
-        <item>Koyu</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Açık</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/arrays.xml b/app/src/main/res/values-vi/arrays.xml
deleted file mode 100644
index 902dd7e..0000000
--- a/app/src/main/res/values-vi/arrays.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="theme_values_names">
-        <item>Hệ thống</item>
-        <item>Tối</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Sáng</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index 532b76c..0000000
--- a/app/src/main/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>跟随系统</item>
-        <item>深色模式</item>
-        <item>纯黑模式</item>
-        <item>透明模式 (明亮)</item>
-        <item>明亮模式</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index fe28cc7..0000000
--- a/app/src/main/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <string-array name="theme_values_names">
-        <item>跟隨系統</item>
-        <item>深色主題</item>
-        <item>AMOLED 純黑主题</item>
-        <item>透明主題 (明亮)</item>
-        <item>淺色主題</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index b50297b..ad7b4f3 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,5 +1,5 @@
 <resources>
-    <!-- If translating, please remove "theme_values" -->
+    <!-- DO NOT TRANSLATE arrays.xml -->
     <!-- Transparent dark theme has, erm, issues -->
     <string-array name="theme_values" translatable="false">
         <item>system</item>
@@ -10,12 +10,12 @@
         <item>light</item>
     </string-array>
 
-    <string-array name="theme_values_names">
-        <item>System</item>
-        <item>Dark</item>
-        <item>AMOLED Black</item>
-        <item>Transparent</item>
-        <item>Light</item>
+    <string-array name="theme_values_names" translatable="false">
+        <item>@string/theme_system</item>
+        <item>@string/theme_dark</item>
+        <item>@string/theme_black</item>
+        <!-- <item>@string/theme_transparent_dark</item> -->
+        <item>@string/theme_transparent_light</item>
+        <item>@string/theme_light</item>
     </string-array>
-    <string-array name="permission_notification_dont_ask_again">Don't prompt again</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 4eaf26b..61f4acb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,6 +262,7 @@
     <string name="theme_system">System</string>
     <string name="theme_dark">Dark</string>
     <string name="theme_black">AMOLED Black</string>
+    <string name="theme_transparent_dark">Dark (transparency)</string>
     <string name="theme_transparent_light">Light (transparency)</string>
     <string name="theme_light">Light</string>
     <string name="androidacy_update_needed">This app is outdated.</string>