From 7ba0b93ceb2919aa549c14560ab434c39a364445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 24 Aug 2015 00:37:38 +0200
Subject: Move proxy pref values out of strings

---
 OpenKeychain/src/main/res/values/arrays.xml  | 6 +++---
 OpenKeychain/src/main/res/values/strings.xml | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml
index ef3970672..28b6fcd78 100644
--- a/OpenKeychain/src/main/res/values/arrays.xml
+++ b/OpenKeychain/src/main/res/values/arrays.xml
@@ -34,8 +34,8 @@
         <item>@string/pref_proxy_type_choice_socks</item>
     </string-array>
     <string-array name="pref_proxy_type_values" translatable="false">
-        <item>@string/pref_proxy_type_value_http</item>
-        <item>@string/pref_proxy_type_value_socks</item>
+        <item>"proxyHttp"</item>
+        <item>"proxySocks"</item>
     </string-array>
     <string-array name="rev_del_dialog_entries" translatable="true">
         <item>@string/del_rev_dialog_choice_rev_upload</item>
@@ -67,6 +67,6 @@
     </string-array>
     <string-array name="theme_values" translatable="false">
         <item>"dark"</item>
-        <item>"ligh"</item>
+        <item>"light"</item>
     </string-array>
 </resources>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 643f41004..49c406a20 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -198,8 +198,6 @@
     <!-- proxy type choices and values -->
     <string name="pref_proxy_type_choice_http">"HTTP"</string>
     <string name="pref_proxy_type_choice_socks">"SOCKS"</string>
-    <string name="pref_proxy_type_value_http">"proxyHttp"</string>
-    <string name="pref_proxy_type_value_socks">"proxySocks"</string>
 
     <!-- OrbotHelper strings -->
     <string name="orbot_ignore_tor">"Don\'t use Tor"</string>
-- 
cgit v1.2.3