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.
This commit is contained in:
Daniel Martí 2015-09-12 15:02:46 -07:00
parent f2107219c2
commit 78e8341206
3 changed files with 33 additions and 21 deletions

View File

@ -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>
<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>
<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>

View File

@ -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>

View File

@ -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>