commit daf89658dc22696eff88e2f445eed592a6c09ca6 Author: n8fr8 nathan@freitas.net Date: Wed May 9 23:07:09 2012 -0400

clarified english strings for hidden srv and proxying --- res/values/strings.xml | 18 ++++++++++-------- res/xml/preferences.xml | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml index 57a7fd9..d891851 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -116,7 +116,7 @@ <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>

- <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string>

<string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> @@ -165,19 +165,21 @@ <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>

+<!-- <string name="pref_use_whispercore">Use WhisperCore</string> <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - - -<string name="pref_proxy_type_title">Proxy Type</string> + --> + + <string name="pref_proxy_title">Outbound Network Proxy</string> +<string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string>

-<string name="pref_proxy_host_title">Proxy Host</string> +<string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string>

-<string name="pref_proxy_port_title">Proxy Port</string> +<string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -225,8 +227,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> -<string name="enable_hidden_services">Enable Hidden Services</string> -<string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> +<string name="enable_hidden_services">Hidden Service Hosting</string> +<string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index c6bfcab..a046e08 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -171,7 +171,7 @@ android:summary="@string/the_addressable_name_for_your_hidden_service_generated_ android:title=".Onion Hostname"></EditTextPreference> </PreferenceCategory>

-<PreferenceCategory android:title="Proxy Service for Tor"> +<PreferenceCategory android:title="@string/pref_proxy_title"> <EditTextPreference android:key="pref_proxy_type" android:title="@string/pref_proxy_type_title" android:summary="@string/pref_proxy_type_summary"