From 78e834120698e783e7d72427511243502d1d218e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 12 Sep 2015 15:02:46 -0700
Subject: [PATCH] Replace string array items with strings

Fixes #206. Two other small fixes too:

* Units don't really translate, and they are appended to java strings anyway.
  If it is to be translated, do a proper formatted string.
* Placed the light theme above the dark one, since it's the default.
---
 F-Droid/res/values/array.xml          | 33 +++++++++++----------------
 F-Droid/res/values/donottranslate.xml | 10 +++++++-
 F-Droid/res/values/strings.xml        | 11 +++++++++
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/F-Droid/res/values/array.xml b/F-Droid/res/values/array.xml
index 4b49516e6..ca2253a25 100644
--- a/F-Droid/res/values/array.xml
+++ b/F-Droid/res/values/array.xml
@@ -1,25 +1,18 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-	<string-array name="updateIntervalNames">
-		<item>Never</item>
-		<item>Hourly</item>
-		<item>Every 4 Hours</item>
-		<item>Every 12 Hours</item>
-		<item>Daily</item>
-		<item>Weekly</item>
-		<item>Every 2 Weeks</item>
-	</string-array>
+    <string-array name="updateIntervalNames">
+        <item>@string/interval_never</item>
+        <item>@string/interval_1h</item>
+        <item>@string/interval_4h</item>
+        <item>@string/interval_12h</item>
+        <item>@string/interval_1d</item>
+        <item>@string/interval_1w</item>
+        <item>@string/interval_2w</item>
+    </string-array>
 
-	<string-array name="themeNames">
-		<item>Dark</item>
-		<item>Light</item>
-	</string-array>
+    <string-array name="themeNames">
+        <item>@string/theme_light</item>
+        <item>@string/theme_dark</item>
+    </string-array>
 
-        <string-array name="file_size_units">
-            <item>B</item>
-            <item>KiB</item>
-            <item>MiB</item>
-            <item>GiB</item>
-            <item>TiB</item>
-        </string-array>
 </resources>
diff --git a/F-Droid/res/values/donottranslate.xml b/F-Droid/res/values/donottranslate.xml
index f5747526c..ae132d1cb 100644
--- a/F-Droid/res/values/donottranslate.xml
+++ b/F-Droid/res/values/donottranslate.xml
@@ -24,8 +24,8 @@
 	</string-array>
 
 	<string-array name="themeValues">
-		<item>dark</item>
 		<item>light</item>
+		<item>dark</item>
 	</string-array>
 
     <string-array name="languageValues">
@@ -73,4 +73,12 @@
         <item>zh-rHK</item>
     </string-array>
 
+    <string-array name="file_size_units">
+        <item>B</item>
+        <item>KiB</item>
+        <item>MiB</item>
+        <item>GiB</item>
+        <item>TiB</item>
+    </string-array>
+
 </resources>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index ca8771a7a..c1b41658a 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -394,4 +394,15 @@
     <string name="perms_new_perm_prefix">NEW: </string>
     <string name="perms_description_app">Provided by %1$s.</string>
     <string name="downloading">Downloading…</string>
+
+    <string name="interval_never">Never</string>
+    <string name="interval_1h">Hourly</string>
+    <string name="interval_4h">Every 4 hours</string>
+    <string name="interval_12h">Every 12 hours</string>
+    <string name="interval_1d">Daily</string>
+    <string name="interval_1w">Weekly</string>
+    <string name="interval_2w">Every 2 weeks</string>
+
+    <string name="theme_light">Light</string>
+    <string name="theme_dark">Dark</string>
 </resources>