dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add strings and prefs related to obfuscated bridges

This commit is contained in:
Adrian-Ken Rueegsegger 2012-02-10 23:08:37 +01:00
parent bf92bd1cf3
commit c7e55cac62
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -209,7 +209,9 @@
<string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
<string name="bridges">Bridges</string> <string name="bridges">Bridges</string>
<string name="use_bridges">Use Bridges</string> <string name="use_bridges">Use Bridges</string>
<string name="bridges_obfuscated">Obfuscated Bridges</string>
<string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
<string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
<string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
<string name="enter_bridge_addresses">Enter Bridge Addresses</string> <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
<string name="relays">Relays</string> <string name="relays">Relays</string>

8
res/xml/preferences.xml
View File

@ -94,8 +94,11 @@ android:summary="@string/use_only_these_specified_nodes"/>
<CheckBoxPreference android:defaultValue="true" <CheckBoxPreference android:defaultValue="true"
android:title="@string/use_bridges" android:key="pref_bridges_enabled" android:title="@string/use_bridges" android:key="pref_bridges_enabled"
android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"></CheckBoxPreference> android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/>
<CheckBoxPreference android:key="pref_bridges_obfuscated"
android:title="@string/bridges_obfuscated"
android:summary="@string/enable_if_configured_bridges_are_obfuscated_bridges"/>
<EditTextPreference android:key="pref_bridges_list" <EditTextPreference android:key="pref_bridges_list"
android:title="@string/bridges" android:title="@string/bridges"
@ -103,10 +106,9 @@ android:summary="@string/ip_address_and_port_of_bridges"
android:dialogTitle="@string/enter_bridge_addresses" android:dialogTitle="@string/enter_bridge_addresses"
android:defaultValue="@string/default_bridges" android:defaultValue="@string/default_bridges"
/> />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/relays"> <PreferenceCategory android:title="@string/relays">
<CheckBoxPreference android:key="pref_or" <CheckBoxPreference android:key="pref_or"
android:defaultValue="false" android:defaultValue="false"