- tor-commits - lists.torproject.org

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 21 Jun '12

21 Jun '12

commit aeb067a4b292e06cfe425d09e58e957fc4ca9948 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 09:15:18 2012 +0000 Update translations for orbot_completed --- values/strings.xml | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) 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 @@  <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(a)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_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>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 21 Jun '12

21 Jun '12

commit 2c4450514476e7b4d568581a77e641df4fc8d37f Author: Translation commit bot <translation(a)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_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_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_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 @@  <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(a)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_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_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 @@  <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(a)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_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_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 @@  <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(a)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_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_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_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_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_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_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_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_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_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 @@  <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(a)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_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_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_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 @@  <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(a)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_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_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_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 @@  <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(a)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_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_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 @@  <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(a)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_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>

1 0

[orbot/master] fixing libevent broken ssl building
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit aba382c581482e16c670cc564421691269b12573 Author: n8fr8 <nathan(a)freitas.net> Date: Wed May 9 00:43:33 2012 -0400 fixing libevent broken ssl building --- external/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/external/Makefile b/external/Makefile index 61742bf..1a7a3c5 100644 --- a/external/Makefile +++ b/external/Makefile @@ -93,7 +93,7 @@ libevent/Makefile: cp config.sub libevent cp config.guess libevent cd libevent && \ - CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" LIBS="-L$(EXTERNAL_ROOT)/lib -lcrypto -lssl" \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ ./configure \ --host=$(HOST) \ --disable-shared

1 0

[orbot/master] updated makefile to fix issues resources
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit 0604eb2ba03c3f408027236e5cb42c65d7dd7ef8 Author: n8fr8 <nathan(a)freitas.net> Date: Sun May 6 22:47:34 2012 -0400 updated makefile to fix issues resources - moved jtorctrl.jar to jtorctl.jar for consistency with source library - make assets now zips up tor binary and renames to .mp3 extension to handle issues with older Android devices breaking when trying to decompress a large file. By naming mp3, there is no attempt to decompress. --- .classpath | 2 +- external/Makefile | 39 +++++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.classpath b/.classpath index 37d42de..d2c46be 100644 --- a/.classpath +++ b/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> - <classpathentry kind="lib" path="libs/jtorctrl.jar"/> + <classpathentry kind="lib" path="libs/jtorctl.jar"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/external/Makefile b/external/Makefile index ff420c6..8639a08 100644 --- a/external/Makefile +++ b/external/Makefile @@ -187,7 +187,7 @@ obfsproxy-clean: # privoxy -privoxy/Makefile: +privoxy/config.log: cd privoxy && \ autoheader cd privoxy && \ @@ -199,7 +199,7 @@ privoxy/Makefile: ./configure \ --host=arm-linux-eabi --disable-pthread -privoxy-build-stamp: privoxy/Makefile +privoxy-build-stamp: privoxy/config.log $(MAKE) -C privoxy touch privoxy-build-stamp @@ -219,34 +219,45 @@ privoxy-clean: #------------------------------------------------------------------------------# # JTorControl library -jtorctrl: +jtorctl/bin/jtorctl.jar: test -d jtorctl/bin || mkdir jtorctl/bin cd jtorctl && \ javac net/freehaven/tor/control/TorControlConnection.java -d bin cd jtorctl/bin && \ - jar cvf jtorctrl.jar * - cp jtorctl/bin/jtorctrl.jar bin + jar cvf jtorctl.jar * -jtorctrl-clean: - -rm bin/jtorctrl.jar +jtorctl-build-stamp: jtorctl/bin/jtorctl.jar + touch jtorctl-build-stamp + +jtorctl: jtorctl-build-stamp + test -d bin || mkdir bin + cp jtorctl/bin/jtorctl.jar bin + +jtorctl-clean: + -rm -rf jtorctl/bin + -rm jtorctl-build-stamp #------------------------------------------------------------------------------# -# cleanup, cleanup, put the toys away -assets: tor privoxy jtorctrl obfsproxy +#create and clean assets: FYI - tor is stored as a ZIP file with an mp3 extension +#in order to stop Android OS (older devices) from trying to compress/decompress it +#this is related to a bug in compression of assets and resources > 1MB + +assets: tor privoxy jtorctl obfsproxy install -d ../res/raw install -d ../libs - install bin/tor ../res/raw install bin/privoxy ../res/raw install bin/obfsproxy ../res/raw - install bin/jtorctrl.jar ../libs + install bin/jtorctl.jar ../libs + cd bin && \ + zip ../../res/raw/tor.mp3 tor assets-clean: - -rm ../res/raw/tor + -rm ../res/raw/tor.mp3 -rm ../res/raw/privoxy - -rm ../libs/jtorctrl.jar + -rm ../libs/jtorctl.jar -rm ../res/raw/obfsproxy #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away -clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctrl-clean assets-clean +clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctl-clean assets-clean

1 0

[orbot/master] clean out all jars from libs
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit b0bb72abfb719103d0dd5c508614706d662cbec7 Author: n8fr8 <nathan(a)freitas.net> Date: Mon May 7 22:07:44 2012 -0400 clean out all jars from libs --- external/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/external/Makefile b/external/Makefile index 63e02f1..b6ec36a 100644 --- a/external/Makefile +++ b/external/Makefile @@ -255,7 +255,7 @@ assets-clean: -rm ../res/raw/tor -rm ../res/raw/tor.mp3 -rm ../res/raw/privoxy - -rm ../libs/jtorctl.jar + -rm ../libs/* -rm ../res/raw/obfsproxy #------------------------------------------------------------------------------#

1 0

[orbot/master] adding in clean of old tor res raw binary
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit c1bcc96472222e36e164cd28e4431a380e11f83d Author: n8fr8 <nathan(a)freitas.net> Date: Mon May 7 20:40:17 2012 -0400 adding in clean of old tor res raw binary --- external/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/external/Makefile b/external/Makefile index 8639a08..63e02f1 100644 --- a/external/Makefile +++ b/external/Makefile @@ -252,6 +252,7 @@ assets: tor privoxy jtorctl obfsproxy zip ../../res/raw/tor.mp3 tor assets-clean: + -rm ../res/raw/tor -rm ../res/raw/tor.mp3 -rm ../res/raw/privoxy -rm ../libs/jtorctl.jar

1 0

[orbot/master] added dep on openssl-static by libevent for some platforms
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit ad4060f2a012f8a0343bed0d6dec19c728cde5a0 Author: n8fr8 <nathan(a)freitas.net> Date: Wed May 9 00:11:59 2012 -0400 added dep on openssl-static by libevent for some platforms --- external/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/Makefile b/external/Makefile index b6ec36a..61742bf 100644 --- a/external/Makefile +++ b/external/Makefile @@ -93,7 +93,7 @@ libevent/Makefile: cp config.sub libevent cp config.guess libevent cd libevent && \ - CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" LIBS="-L$(EXTERNAL_ROOT)/lib -lcrypto -lssl" \ ./configure \ --host=$(HOST) \ --disable-shared @@ -102,7 +102,7 @@ libevent-build-stamp: libevent/Makefile $(MAKE) -C libevent touch libevent-build-stamp -libevent: libevent-build-stamp +libevent: openssl-static libevent-build-stamp test -d lib || mkdir lib test -d include || mkdir include cp libevent/.libs/libevent.a lib

1 0

[orbot/master] moved Tor data directory to app_data from cache
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit bf044b939035f81871597a9ab6fc86a7e8c0355c Author: n8fr8 <nathan(a)freitas.net> Date: Wed May 9 23:06:46 2012 -0400 moved Tor data directory to app_data from cache --- .../android/service/TorBinaryInstaller.java | 2 +- src/org/torproject/android/service/TorService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index bb51422..81f6db8 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -241,7 +241,7 @@ public class TorBinaryInstaller implements TorServiceConstants { Runtime.getRuntime().exec("chmod "+mode+" "+abspath).waitFor(); } /** - * Asserts that the binary files are installed in the cache directory. + * Asserts that the binary files are installed in the bin directory. * @param ctx context * @param showErrors indicates if errors should be alerted * @return false if the binary files could not be installed diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 90ec393..071b680 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -479,7 +479,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { appBinHome = getDir("bin",Application.MODE_PRIVATE); - appCacheHome = getCacheDir(); + appCacheHome = getDir("data",Application.MODE_PRIVATE); fileTor = new File(appBinHome, TOR_BINARY_ASSET_KEY); filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY);

1 0

[orbot/master] udpated manifest version
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit 81efd93305b7634569b7ffc1864f4a6b0df60c68 Author: n8fr8 <nathan(a)freitas.net> Date: Wed May 9 23:08:37 2012 -0400 udpated manifest version --- AndroidManifest.xml | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5ca9ead..682ffc8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.15-alpha-1.0.8-RC1" - android:versionCode="37" + android:versionName="0.2.3.15-alpha-1.0.8-RC2" + android:versionCode="38" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> @@ -11,8 +11,7 @@ <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="15"/> <application android:name=".OrbotApp" android:icon="@drawable/icon" android:label="@string/app_name" - android:configChanges="locale|orientation" - android:debuggable="true"> + android:configChanges="locale|orientation"> <activity android:name=".Orbot"> <intent-filter>

1 0

[orbot/master] added docs folder and readme's
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit 842f84e788c6641362a047c2cd34cbc7060336b4 Author: n8fr8 <nathan(a)freitas.net> Date: Wed May 9 23:08:00 2012 -0400 added docs folder and readme's --- docs/GSoC.txt | 45 +++++++++++++++++++++++++++ docs/WALKTHROUGH | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/docs/GSoC.txt b/docs/GSoC.txt new file mode 100644 index 0000000..d1d851e --- /dev/null +++ b/docs/GSoC.txt @@ -0,0 +1,45 @@ +GSoC Plan +========= + +A tl;dr version +--------------- +I will be improving the Orbot UI/UX, and adding several features such as data statistics and also +implementing the TorCheck API. I plan on extending the ORLib library and also creating an ORLib enabled +app as a sort of primer for other third party apps to follow + +The full version +---------------- + +Orbot UI/UX +=========== +At the moment, the Orbot UI/UX is clustered and not very intuitive. I plan on improving the existing +elements of the UI and also add a variety of new features such as + +* A new Set – up Wizard ( which checks for iptables ) +* Changes to the preferences ( should be made to follow the Android guidelines) + +Orbot Core app work +=================== +At the moment, Orbot displays a successful connection without actually checking the connection. This is a +pressing issue, because the user is not notified if the set-up has failed, unless he/she manually checks +the torcheck web service. This should be made automatic by making using of the TorCheck API. Also, Orbot +should be configured to show more information about the data being transmitted such as - + +* Amount of data transferred +* Quality of the connection +* Number of circuits connected + +ORLib +===== +Currently, ORLib is very minimal at the moment, both in term of features and support/documentation. ORLib +is very critical to the use of Orbot as it provides transparent proxying on non-rooted devices ( A major +chunk of android phones are un-rooted). I intend to - + +* Improve the existing library by adding additional features + * Check for existing of Orbot + * Check status of connection to Tor + * Provide option to start Orbot via intent +* Request hidden service by port, and get return hidden service .onion address +* Create an ORLib enabled “Twitter, Status.net or other micro blogging Client” – A sort of primer for + third-party apps +* Improve the documentation diff --git a/docs/WALKTHROUGH b/docs/WALKTHROUGH new file mode 100644 index 0000000..c3107e6 --- /dev/null +++ b/docs/WALKTHROUGH @@ -0,0 +1,90 @@ + +. +└── org + └── torproject + └── android + ├── AppManager.java + //this is what helps us track the app-by-app torification + //and gets the app name, icon, etc for display - we have some problems here + //in normalizing the icon on the list label + //some of this code came originally from DroidWall project (yay open source) + + ├── boot + │ └── OnbootBroadcastReceiver.java + //i think this is a dup now and should be removed + + ├── HiddenServiceManager.java + //empty! but at some point i thought it would be good to aggregate HS functions here + + ├── OnBootReceiver.java + //this is the class registered in AndroidManifest.xml to handle Onboot events + //to start Orbot/Tor when the device boots if the user has elected to do so - what kind of permissions does this require? + // <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> + // BTW, this shows up as a fairly unintrusive type perm request now in Android / in older versions (1.6 and earlier) + // it was reported "as read / monitor phone state" and paranoid Tor-types didn't like the idea of it + // in 1.6+ it has a much better UX in terms of having a more granular permisions around boot since it is a very + // common request - ah , that's awesome, i think i remember seeing sth of this sorts when i was going through the guardianproject mailing list. iirc this is something ioerror wanted + + + ├── Orbot.java + //our wonderful main activity! + + ├── ProcessSettingsAsyncTask.java + //this was just added in 1.0.5.x, but it was meant to help stop the UI blocking while processing settings and prefs + //it uses the AsyncTask feature of Android, which seems to work pretty well + //for this type of non-time critical function you just want to happen in the background at some point soon-ish + + ├── SettingsPreferences.java + // Settings activity that loads the res/xml/preferences.xml resource up + // has some custom event handlng, onActivityResult callback result code's as well + // basically meant to tell Orbot activity if critical settings have been modified and whether + // those new settings should be applied (like iptables/transproxy changes) + + ├── TorConstants.java + // globals! well, constants! but yeah, just a place to put values we use a lot + + ├── TorifiedApp.java + // object to store a single app's metadata for display in UI and for transproxy process + + ├── Utils.java + // random methods that can be useful, a.k.a. another place to put stuff + + ├── WizardActivity.java + // our original attempt at wizard activity that didn't get far + + └── WizardHelper.java + // the helper class that manages the dialog based wizard + + ├── service //okay the Service subpackage! + + │ ├── Api.java + //this is more code taken from DroidWall, that needs to be cleaned up and paired down to just what we need it for + //this is related to 1.0.5.x changes with how we bundle and install our C binaries (tor, privoxy and iptables) + + │ ├── ITorService.aidl + // the android remote interface definition file; + // this is the remote interface which the Orbot activity gets a reference to + // and that in the TorService is instantiated as the "binder" + + │ ├── ITorServiceCallback.aidl + // this is the callback interface that the Orbot activity instantiates, and passes + // to the ITorService; reverse of ITorService in a sense + + │ ├── TorBinaryInstaller.java + // this handles installation of binaries; uses Api.java; // tied into Wizard as well + + │ ├── TorServiceConstants.java + // reusable constants for just the Service package + + │ ├── TorService.java + // the main might powerful service class; Orbot and TorService are the front and backends of this whole app + // should run as a remote service, but the manifest doesn't seem to indicate that at the moment + + │ ├── TorServiceUtils.java + //utility methods for the service; specificaly check for root and tools for finding processID of background binaries + + │ └── TorTransProxy.java + // all the code for iptables transproxying management + + +

1 0