[tor-commits] [orbot/master] moved some pref strings to strings.xml

[n8fr8 at torproject.org]

commit 06d6d6d01bf2135f7563815ccab899cd94e68cde
Author: Nathan Freitas <nathan at freitas.net>
Date:   Mon Jul 25 10:51:50 2011 -0400

    moved some pref strings to strings.xml
---
 res/xml/preferences.xml |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e1aaad4..a6c0f67 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -35,8 +35,8 @@ android:title="@string/pref_transparent_all_title"/>
 <Preference
 android:defaultValue="" 
 android:key="pref_transparent_app_list"
-android:title="Select Apps"
-android:summary="Choose Apps to Route Through Tor"
+android:title="@string/pref_select_apps"
+android:summary="@string/pref_select_apps_summary"
 android:enabled="true"/>
 
 <CheckBoxPreference
@@ -49,11 +49,13 @@ android:title="@string/pref_transparent_tethering_title"/>
 
 </PreferenceCategory>
 
-<PreferenceCategory android:title="Node Configuration" android:summary="These are advanced settings that can reduce your anonymity">
+<PreferenceCategory android:title="@string/pref_node_configuration"
+ android:summary="@string/pref_node_configuration_summary">
+ 
 <EditTextPreference android:key="pref_entrance_nodes"
-android:title="Entrance Nodes"
-android:summary="Fingerprints, nicks, countries and addresses for the first hop"
-android:dialogTitle="Enter Entrance Nodes"
+android:title="@string/pref_entrance_node"
+android:summary="@string/pref_entrance_node_summary"
+android:dialogTitle="@string/pref_entrance_node_dialog"
 />
 <EditTextPreference android:key="pref_exit_nodes"
 android:title="Exit Nodes"
@@ -77,11 +79,6 @@ android:summary="Use *only* these specified nodes"/>
 android:title="Use Bridges" android:key="pref_bridges_enabled" 
 android:summary="Enable alternate entrance nodes into the Tor Network"></CheckBoxPreference>
 
-<!-- 5/8/2010 NF: Arma says this doesn't actually work, so commenting out for now
-<CheckBoxPreference android:defaultValue="false" 
-android:title="Update from Authority" android:key="pref_bridges_update" 
-android:summary="Modify bridge list automatically"></CheckBoxPreference>
- -->
  
 <EditTextPreference android:key="pref_bridges_list"
 android:title="Bridges"