commit c7e55cac6210e71404d68d7cdaf8c63624fb5984 Author: Adrian-Ken Rueegsegger ken@codelabs.ch Date: Fri Feb 10 23:08:37 2012 +0100

Add strings and prefs related to obfuscated bridges --- res/values/strings.xml | 2 ++ res/xml/preferences.xml | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml index 9da8b98..f519a91 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -209,7 +209,9 @@ <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> <string name="bridges">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_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="enter_bridge_addresses">Enter Bridge Addresses</string> <string name="relays">Relays</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 15f3abc..683208c 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -94,18 +94,20 @@ android:summary="@string/use_only_these_specified_nodes"/>

<CheckBoxPreference android:defaultValue="true" 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" android:title="@string/bridges" android:summary="@string/ip_address_and_port_of_bridges" android:dialogTitle="@string/enter_bridge_addresses" android:defaultValue="@string/default_bridges" /> -</PreferenceCategory> -

+</PreferenceCategory>

<PreferenceCategory android:title="@string/relays"> <CheckBoxPreference android:key="pref_or"