[tor-commits] [translation/orbot] Update translations for orbot

translation at torproject.org translation at torproject.org
Thu Jun 21 09:15:17 UTC 2012 

commit 2c4450514476e7b4d568581a77e641df4fc8d37f
Author: Translation commit bot <translation at torproject.org>
Date:   Thu Jun 21 09:15:14 2012 +0000

    Update translations for orbot
---
 values-ar/strings.xml    |    5 +++--
 values-bg/strings.xml    |    5 +++--
 values-ca/strings.xml    |   19 ++++++++++---------
 values-cs/strings.xml    |   21 +++++++++++----------
 values-de/strings.xml    |    5 +++--
 values-el/strings.xml    |   21 +++++++++++----------
 values-es/strings.xml    |    5 +++--
 values-es_AR/strings.xml |   21 +++++++++++----------
 values-eu/strings.xml    |    7 ++++---
 values-fa/strings.xml    |    5 +++--
 values-fr/strings.xml    |    5 +++--
 values-hu/strings.xml    |    5 +++--
 values-it/strings.xml    |    5 +++--
 values-ja/strings.xml    |   15 ++++++++-------
 values-mk/strings.xml    |   19 ++++++++++---------
 values-ms_MY/strings.xml |    5 +++--
 values-nb/strings.xml    |   21 +++++++++++----------
 values-nl/strings.xml    |    5 +++--
 values-pl/strings.xml    |    5 +++--
 values-pt/strings.xml    |   21 +++++++++++----------
 values-pt_BR/strings.xml |    5 +++--
 values-ru/strings.xml    |    5 +++--
 values-sv/strings.xml    |   17 +++++++++--------
 values-zh/strings.xml    |   17 +++++++++--------
 values/strings.xml       |   21 +++++++++++----------
 25 files changed, 155 insertions(+), 130 deletions(-)

diff --git a/values-ar/strings.xml b/values-ar/strings.xml
index 0d6debe..3afb075 100644
--- a/values-ar/strings.xml
+++ b/values-ar/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">نقاط الدخول</string>
   <string name="pref_entrance_node_summary">بصمات، اسماء مستعارة، البلدان و العناوين لأول نقطة اتصال</string>
   <string name="pref_entrance_node_dialog">أدخل نقاط الدخول</string>
-  <string name="pref_use_whispercore">استخدم WhisperCore</string>
-  <string name="pref_use_whispercore_summary">استخدم مكتبة NetFilter مغلقة المصدر و المقدمة من WhisperSystems (تحتاج لتنزيل WhisperCore)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">نوع البروكسي</string>
   <string name="pref_proxy_type_summary">البروتوكول ليستخدم مع خادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">أدخل نوع البروكسي</string>
diff --git a/values-bg/strings.xml b/values-bg/strings.xml
index 2c46407..9d166d4 100644
--- a/values-bg/strings.xml
+++ b/values-bg/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Входящи точки</string>
   <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
   <string name="pref_entrance_node_dialog">Въведи входящи точки</string>
-  <string name="pref_use_whispercore">Използвай 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_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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Тип прокси</string>
   <string name="pref_proxy_type_summary">Протокол за прокси сървър: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Тип на входящо прокси</string>
diff --git a/values-ca/strings.xml b/values-ca/strings.xml
index beb4b9b..e544868 100644
--- a/values-ca/strings.xml
+++ b/values-ca/strings.xml
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values-cs/strings.xml b/values-cs/strings.xml
index 96eb1ff..ed49628 100644
--- a/values-cs/strings.xml
+++ b/values-cs/strings.xml
@@ -79,7 +79,7 @@
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
   <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>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values-de/strings.xml b/values-de/strings.xml
index cc0d990..f921c22 100644
--- a/values-de/strings.xml
+++ b/values-de/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Eingangs-Knoten</string>
   <string name="pref_entrance_node_summary">Fingerprints, Spitznamen, Land und Adressen für den ersten Punkt</string>
   <string name="pref_entrance_node_dialog">Eingangs-Knoten angeben</string>
-  <string name="pref_use_whispercore">Verwende WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Verwende die proprietäre NetFilter-API von WhisperSystems (benötigt ein Gerät mit installiertem WhisperCore)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Proxy-Typ</string>
   <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers:HTTP,HTTPS,Socks4,Socks5</string>
   <string name="pref_proxy_type_dialog">Proxy-Typ angeben</string>
diff --git a/values-el/strings.xml b/values-el/strings.xml
index 66020c7..4cfce23 100644
--- a/values-el/strings.xml
+++ b/values-el/strings.xml
@@ -79,7 +79,7 @@
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
   <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>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values-es/strings.xml b/values-es/strings.xml
index 98bc2cf..6d393bb 100644
--- a/values-es/strings.xml
+++ b/values-es/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Los nodos de entrada</string>
   <string name="pref_entrance_node_summary">Las llaves publicas, apodos, países y direcciones para el primer salto, o nodo (primer servidor que se conectara para acceder a la red Tor)</string>
   <string name="pref_entrance_node_dialog">Introduzca los nodos de entrada</string>
-  <string name="pref_use_whispercore">Utilizar plataforma de seguridad WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Utilizar las API de NetFilter proporcionada por WhisperSystems (es necesario que su dispositivo tenga WhisperCore instalado)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Tipo de proxy</string>
   <string name="pref_proxy_type_summary">Protocolo que se utilizará para la configuracion del servidor proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string>
   <string name="pref_proxy_type_dialog">Introduzca el Tipo de Proxy</string>
diff --git a/values-es_AR/strings.xml b/values-es_AR/strings.xml
index 3e07a6e..73c8867 100644
--- a/values-es_AR/strings.xml
+++ b/values-es_AR/strings.xml
@@ -79,7 +79,7 @@
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
   <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>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values-eu/strings.xml b/values-eu/strings.xml
index a1ba776..1e61b79 100644
--- a/values-eu/strings.xml
+++ b/values-eu/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Sarrera Nodoak</string>
   <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
   <string name="pref_entrance_node_dialog">Sartu Sarrera Nodoak</string>
-  <string name="pref_use_whispercore">WhisperCore erabili</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Proxy mota</string>
   <string name="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Sartu Proxy Mota</string>
@@ -176,7 +177,7 @@
   <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
   <string name="enter_ports">Portuak sartu</string>
   <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string>
-  <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</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">sartu localhost portuak ezkutuko zerbitzuentzat</string>
   <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</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/values-fa/strings.xml b/values-fa/strings.xml
index b4e6e11..1b768d5 100644
--- a/values-fa/strings.xml
+++ b/values-fa/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">گره های ورودی</string>
   <string name="pref_entrance_node_summary">اثرانگشت ها، اسامی مستعار، کشورها و آدرسهای هاپ اول</string>
   <string name="pref_entrance_node_dialog">گره های ورودی را وارد کنید</string>
-  <string name="pref_use_whispercore">WhisperCore استفاده از </string>
-  <string name="pref_use_whispercore_summary">از NetFilter API های اختصاصی که توسط WhisperSystems فراهم شده اند استفاده کن(WhisperCore باید روی دستگاه نصب شده باشد)\n</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">نوع پروکسی</string>
   <string name="pref_proxy_type_summary">پروتکل مورد استفاده برای پراکسی سرور: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">نوع پروکسی را وارد کنید</string>
diff --git a/values-fr/strings.xml b/values-fr/strings.xml
index 5610967..4bd7784 100644
--- a/values-fr/strings.xml
+++ b/values-fr/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Nœuds d\'entrée</string>
   <string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string>
   <string name="pref_entrance_node_dialog">Entrez les nœuds d\'entrée</string>
-  <string name="pref_use_whispercore">Utilisez WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Utilisez les API propriétaires fournis par Netfilter WhisperSystems (dispositif nécessaire avec WhisperCore installé)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Type de proxy</string>
   <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur proxy : HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Entrez le type de proxy</string>
diff --git a/values-hu/strings.xml b/values-hu/strings.xml
index 37f9862..64112cb 100644
--- a/values-hu/strings.xml
+++ b/values-hu/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Belépő csomópontok</string>
   <string name="pref_entrance_node_summary">Ujjlenyomatok, becenevek, országok és címek az első ugráshoz</string>
   <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</string>
-  <string name="pref_use_whispercore">WhisperCore használata</string>
-  <string name="pref_use_whispercore_summary">Az eredeti NetFilter API használata amit a WhisperSystems biztosít (olyan eszköz szükséges, amire WhisperCore van telepítve)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Proxy típus</string>
   <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Adja meg a Proxy típust</string>
diff --git a/values-it/strings.xml b/values-it/strings.xml
index 0932cde..5684001 100644
--- a/values-it/strings.xml
+++ b/values-it/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Nodi di entrata</string>
   <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string>
   <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string>
-  <string name="pref_use_whispercore">Usa WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Utilizza le API proprietarie NetFilter fornite da WhisperSystems (è richiesto che sul dispositivo sia installato WhisperCore)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Tipo proxy</string>
   <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string>
diff --git a/values-ja/strings.xml b/values-ja/strings.xml
index 0b67ad6..5372e71 100644
--- a/values-ja/strings.xml
+++ b/values-ja/strings.xml
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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/values-mk/strings.xml b/values-mk/strings.xml
index 23bd508..e4dbb6c 100644
--- a/values-mk/strings.xml
+++ b/values-mk/strings.xml
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values-ms_MY/strings.xml b/values-ms_MY/strings.xml
index 14fef3c..70beb05 100644
--- a/values-ms_MY/strings.xml
+++ b/values-ms_MY/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Nod Kemasukan</string>
   <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string>
   <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string>
-  <string name="pref_use_whispercore">Guna WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Gunakan API NetFilter proprietari diperuntukkan oleh WhisperSystems (peranti yang dikehendaki dengan WhisperCore dipasang)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Jenis Proxy</string>
   <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string>
   <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
diff --git a/values-nb/strings.xml b/values-nb/strings.xml
index 3fa640a..97024e9 100644
--- a/values-nb/strings.xml
+++ b/values-nb/strings.xml
@@ -79,7 +79,7 @@
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
   <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>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values-nl/strings.xml b/values-nl/strings.xml
index a602bef..b94c9df 100644
--- a/values-nl/strings.xml
+++ b/values-nl/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Toegangsnodes.</string>
   <string name="pref_entrance_node_summary">Fingerprints, nicks, landen en adressen voor de eerste hop</string>
   <string name="pref_entrance_node_dialog">Voer Toegangsnode in</string>
-  <string name="pref_use_whispercore">Gebruik WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Gebruik de propriëtaire NetFilter APIs aangeboden door WhisperSystems (vereist een apparaat met WhisperCore geïnstaleerd)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Proxy type</string>
   <string name="pref_proxy_type_summary">Protocol om te gebruiken voor proxy server: HTTP, HTTPS, SOCKS4, SOCKS5</string>
   <string name="pref_proxy_type_dialog">Voer proxy type in</string>
diff --git a/values-pl/strings.xml b/values-pl/strings.xml
index 8e303b2..a06a891 100644
--- a/values-pl/strings.xml
+++ b/values-pl/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Węzły wejściowe</string>
   <string name="pref_entrance_node_summary">Fingerprinty, nicki, państaw i adresy na ostatni skok</string>
   <string name="pref_entrance_node_dialog">Wpisz Węzły Wejściowe</string>
-  <string name="pref_use_whispercore">Użyj WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Użyj odpowiedniego NetFilter APIs dostarczonego przez WhisperSystems (wymagane urządzenie z zainstalowanym WhisperCore)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Typ Proxy</string>
   <string name="pref_proxy_type_summary">Protokół używany dla serwera proxy: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Wpis Typ Proxy</string>
diff --git a/values-pt/strings.xml b/values-pt/strings.xml
index 2e7a73d..3489432 100644
--- a/values-pt/strings.xml
+++ b/values-pt/strings.xml
@@ -79,7 +79,7 @@
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
   <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>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values-pt_BR/strings.xml b/values-pt_BR/strings.xml
index fca1502..336f32f 100644
--- a/values-pt_BR/strings.xml
+++ b/values-pt_BR/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Nós de Entrada</string>
   <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string>
   <string name="pref_entrance_node_dialog">Insira os Nós de Entrada</string>
-  <string name="pref_use_whispercore">Usar WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Usar as NetFilter APIs proprietárias providas por WhisperSystems (requerido dispositivo com WhisperCore instalado)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Tipo de Proxy</string>
   <string name="pref_proxy_type_summary">Protocolo para usar no servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Insira o Tipo de Proxy</string>
diff --git a/values-ru/strings.xml b/values-ru/strings.xml
index 51f1dcc..4e2f443 100644
--- a/values-ru/strings.xml
+++ b/values-ru/strings.xml
@@ -119,8 +119,9 @@
   <string name="pref_entrance_node">Входные узлы</string>
   <string name="pref_entrance_node_summary">Отпечатки, ники, страны и адреса для первого прыжка</string>
   <string name="pref_entrance_node_dialog">Введите входные узлы</string>
-  <string name="pref_use_whispercore">Использовать WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Использовать проприетарный NetFilter APIs предоставленный WhisperSystems (требует устройство с установленным WhisperCore)</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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Тип Прокси</string>
   <string name="pref_proxy_type_summary">Протокол для использования прокси-сервером: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Введите Тип Прокси</string>
diff --git a/values-sv/strings.xml b/values-sv/strings.xml
index b17efce..06292c4 100644
--- a/values-sv/strings.xml
+++ b/values-sv/strings.xml
@@ -79,7 +79,7 @@
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
   <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
+  <string name="pref_hs_group">Hidden Service Hosting</string>
   <string name="pref_general_group">Allmänt</string>
   <string name="pref_start_boot_title">Start Orbot on Boot</string>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Ingångsnoder</string>
   <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_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_title">Outbound Network Proxy</string>
   <string name="pref_proxy_type_title">Proxy-typ</string>
   <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
   <string name="pref_proxy_host_title">Proxy-värd</string>
   <string name="pref_proxy_host_summary">Proxy-servernamn</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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">Tor-licensen</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Tredjepartsprogramvara:</string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values-zh/strings.xml b/values-zh/strings.xml
index edafc62..81bf156 100644
--- a/values-zh/strings.xml
+++ b/values-zh/strings.xml
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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">状态</string>
@@ -175,8 +176,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>
@@ -187,7 +188,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
   <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
diff --git a/values/strings.xml b/values/strings.xml
index 520215c..c2a5e2d 100644
--- a/values/strings.xml
+++ b/values/strings.xml
@@ -79,7 +79,7 @@
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
   <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>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
@@ -119,15 +119,16 @@
   <string name="pref_entrance_node">Entrance Nodes</string>
   <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_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_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>
@@ -175,8 +176,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>
@@ -186,8 +187,8 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>

More information about the tor-commits mailing list