diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-24 00:37:38 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-24 00:37:38 +0200 |
| commit | 7ba0b93ceb2919aa549c14560ab434c39a364445 (patch) | |
| tree | 2b296f3e6c7b696da0301af75b0f8dbd9a8118dd /OpenKeychain/src/main/res | |
| parent | 5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed (diff) | |
| download | open-keychain-7ba0b93ceb2919aa549c14560ab434c39a364445.tar.gz open-keychain-7ba0b93ceb2919aa549c14560ab434c39a364445.tar.bz2 open-keychain-7ba0b93ceb2919aa549c14560ab434c39a364445.zip | |
Move proxy pref values out of strings
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/proxy_prefs.xml | 2 |
3 files changed, 4 insertions, 6 deletions
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> diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml index 94e101cb6..d8e9d8b89 100644 --- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -27,7 +27,7 @@ <ListPreference android:entries="@array/pref_proxy_type_entries" android:entryValues="@array/pref_proxy_type_values" - android:defaultValue="@string/pref_proxy_type_value_http" + android:defaultValue="proxyHttp" android:key="proxyType" android:persistent="true" android:title="@string/pref_proxy_type_title" /> |