January 2018 - tor-commits - lists.torproject.org

[orbot/master] Merge branch 'BjarniRunar-master'
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit 792ee2b1f51185105e449e899d7217a0998cab3c Merge: c7b14412 0d4a7358 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jan 4 17:43:03 2018 -0500 Merge branch 'BjarniRunar-master' app/src/main/res/values/strings.xml | 3 ++- app/src/main/res/xml/preferences.xml | 6 ++++++ .../src/main/java/org/torproject/android/service/TorService.java | 2 ++ .../src/main/java/org/torproject/android/service/util/Prefs.java | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-)

1 0

[orbot/master] add comment about app updates URL
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit c7b14412f39086bcaa00504677b5963f4bb3211a Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jan 4 17:18:03 2018 -0500 add comment about app updates URL --- app/src/main/java/org/torproject/android/OrbotApp.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index 0b86d5b6..2bca1b45 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -45,6 +45,7 @@ public class OrbotApp extends Application implements OrbotConstants Languages.setup(OrbotMainActivity.class, R.string.menu_settings); Languages.setLanguage(this, Prefs.getDefaultLocale(), true); + //check for updates via github, since it is unlikely to be blocked; notify the user of places where upgrades can be found new AppUpdater(this) .setUpdateFrom(UpdateFrom.JSON) .setUpdateJSON("https://raw.githubusercontent.com/n8fr8/orbot/master/update.json")

1 0

[orbot/master] Merge branch 'master' of https://github.com/BjarniRunar/orbot into BjarniRunar-master
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit 0d4a7358fbad4579d0cb90ca03a823875591b905 Merge: c7b14412 51216a45 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jan 4 17:42:20 2018 -0500 Merge branch 'master' of https://github.com/BjarniRunar/orbot into BjarniRunar-master app/src/main/res/values/strings.xml | 3 ++- app/src/main/res/xml/preferences.xml | 6 ++++++ .../src/main/java/org/torproject/android/service/TorService.java | 2 ++ .../src/main/java/org/torproject/android/service/util/Prefs.java | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --cc app/src/main/res/values/strings.xml index 23fbc641,64c4a975..9feb04a3 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@@ -1,259 -1,261 +1,260 @@@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Orbot</string> - <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> - <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">start and stop Tor</string> - <string name="tor_proxy_service_process">torproxyservice</string> - <string name="status_starting_up">Orbot is starting…</string> - <string name="status_activated">Connected to the Tor network</string> - <string name="status_disabled">Orbot is deactivated</string> - <string name="status_shutting_down">TorService is shutting down</string> - <string name="tor_process_starting">Starting Tor client…</string> - <string name="tor_process_complete">complete.</string> - <string name="tor_process_waiting">waiting.</string> - <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> - <string name="menu_home">Home</string> - <string name="menu_browse">Browse</string> - <string name="menu_settings">Settings</string> - <string name="menu_log">Log</string> - <string name="menu_info">Help</string> - <string name="menu_apps">Apps...</string> - <string name="menu_start">Start</string> - <string name="menu_stop">Stop</string> - <string name="menu_about">About</string> - <string name="menu_promo_apps">Get apps…</string> - <string name="main_layout_download">Download</string> - <string name="main_layout_upload">Upload</string> - <string name="button_help">Help</string> - <string name="button_close">Close</string> - <string name="button_about">About</string> - <string name="button_clear_log">Clear Log</string> - <string name="menu_verify">Check</string> - <string name="menu_exit">Exit</string> - <string name="menu_scan">Scan BridgeQR</string> - <string name="menu_share_bridge">Share BridgeQR</string> - <string name="press_to_start">- long press to start -</string> - <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> - <string name="pref_trans_proxy_title">Transparent Proxying</string> - <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> - <string name="pref_transparent_all_title">Tor Everything</string> - <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> - <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> - <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> - <string name="pref_transparent_port_title">Port List</string> - <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> - <string name="pref_transparent_port_dialog">Enter ports to proxy</string> - <string name="pref_has_root">Request Root Access</string> - <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor binaries successfully installed!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> - <string name="title_error">Application Error</string> - <string name="wizard_title">Orbot</string> - <string name="wizard_btn_tell_me_more">About Orbot</string> - <string name="btn_next">Next</string> - <string name="btn_back">Back</string> - <string name="btn_finish">Finish</string> - <string name="btn_okay">Okay</string> - <string name="btn_cancel">Cancel</string> -  - <string name="wizard_details">Some Orbot Details</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> - <string name="wizard_permissions_root">Permission Granted</string> - <string name="wizard_permissions_stock">Orbot Permissions</string> - <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> - <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> - <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> - <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> - <string name="wizard_permission_enable_root">Grant Root for Orbot</string> - <string name="wizard_configure">Configure Torification</string> - <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> - <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> - <string name="wizard_tips_tricks">Orbot-enabled Apps</string> - <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> - <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string> - <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> - <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> - <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> - <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> - <string name="wizard_proxy_help_info">Proxy Settings</string> - <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot is ready!</string> - <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string> - <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string> -  - <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 \'Browser\' button to test your connection. \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 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> -  -  - <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> -  - <string name="wizard_warning_title">Warning</string> - <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> -  - <string name="wizard_permissions_title">Permissions</string> - <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> - <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> - <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string> -  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> - <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string> - <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> - <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string> - <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string> -  - <string name="wizard_transproxy_title">Transparent Proxying</string> - <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> - <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> - <string name="wizard_transproxy_none">None</string> - <string name="pref_transparent_tethering_title">Tor Tethering</string> - <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> - <string name="button_grant_superuser">Request Superuser Access</string> - <string name="pref_select_apps">Select Apps</string> - <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> - <string name="pref_node_configuration">Node Configuration</string> - <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> - <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_allow_background_starts_title">Allow Background Starts</string> - <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string> + <string name="app_name">Orbot</string> + <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> + <string name="internal_web_url">http://orbot/</string> + <string name="default_web_url">http://check.torproject.org</string> + <string name="secure_default_web_url">https://check.torproject.org</string> + <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> + <string name="control_permission_label">start and stop Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot is starting…</string> + <string name="status_activated">Connected to the Tor network</string> + <string name="status_disabled">Orbot is deactivated</string> + <string name="status_shutting_down">TorService is shutting down</string> + <string name="tor_process_starting">Starting Tor client…</string> + <string name="tor_process_complete">complete.</string> + <string name="tor_process_waiting">waiting.</string> + <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> + <string name="menu_home">Home</string> + <string name="menu_browse">Browse</string> + <string name="menu_settings">Settings</string> + <string name="menu_log">Log</string> + <string name="menu_info">Help</string> + <string name="menu_apps">Apps...</string> + <string name="menu_start">Start</string> + <string name="menu_stop">Stop</string> + <string name="menu_about">About</string> + <string name="menu_promo_apps">Get apps…</string> + <string name="main_layout_download">Download</string> + <string name="main_layout_upload">Upload</string> + <string name="button_help">Help</string> + <string name="button_close">Close</string> + <string name="button_about">About</string> + <string name="button_clear_log">Clear Log</string> + <string name="menu_verify">Check</string> + <string name="menu_exit">Exit</string> + <string name="menu_scan">Scan BridgeQR</string> + <string name="menu_share_bridge">Share BridgeQR</string> + <string name="press_to_start">- long press to start -</string> + <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> + <string name="pref_trans_proxy_title">Transparent Proxying</string> + <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> + <string name="pref_transparent_all_title">Tor Everything</string> + <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> + <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> + <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> + <string name="pref_transparent_port_title">Port List</string> + <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> + <string name="pref_transparent_port_dialog">Enter ports to proxy</string> + <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Tor binaries successfully installed!</string> + <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> + <string name="title_error">Application Error</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">About Orbot</string> + <string name="btn_next">Next</string> + <string name="btn_back">Back</string> + <string name="btn_finish">Finish</string> + <string name="btn_okay">Okay</string> + <string name="btn_cancel">Cancel</string> +  + <string name="wizard_details">Some Orbot Details</string> + <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> + <string name="wizard_permissions_root">Permission Granted</string> + <string name="wizard_permissions_stock">Orbot Permissions</string> + <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> + <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> + <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> + <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> + <string name="wizard_permission_enable_root">Grant Root for Orbot</string> + <string name="wizard_configure">Configure Torification</string> + <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> + <string name="wizard_configure_all">Proxy All Apps Through Tor</string> + <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> + <string name="wizard_tips_tricks">Orbot-enabled Apps</string> + <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> + <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string> + <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> + <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> + <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> + <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> + <string name="wizard_proxy_help_info">Proxy Settings</string> + <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> + <string name="wizard_final">Orbot is ready!</string> + <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string> + <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string> +  + <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 \'Browser\' button to test your connection. \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 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> +  +  + <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> +  + <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> +  + <string name="wizard_permissions_title">Permissions</string> + <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> + <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> + <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string> +  + <string name="wizard_tips_title">Orbot-Enabled Apps</string> + <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> + <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string> + <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> + <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string> + <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string> +  + <string name="wizard_transproxy_title">Transparent Proxying</string> + <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> + <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> + <string name="wizard_transproxy_none">None</string> + <string name="pref_transparent_tethering_title">Tor Tethering</string> + <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> + <string name="button_grant_superuser">Request Superuser Access</string> + <string name="pref_select_apps">Select Apps</string> + <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> + <string name="pref_node_configuration">Node Configuration</string> + <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> + <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_allow_background_starts_title">Allow Background Starts</string> + <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string> + + <string name="button_proxy_all">Proxy All</string> + <string name="button_proxy_none">Proxy None</string> + <string name="button_invert_selection">Invert Selection</string> + + <string name="pref_proxy_title">Outbound Network Proxy (Optional)</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">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">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="pref_proxy_username_title">Outbound Proxy Username</string> + <string name="pref_proxy_username_summary">Proxy Username (Optional)</string> + <string name="pref_proxy_username_dialog">Enter Proxy Username</string> + + <string name="pref_proxy_password_title">Outbound Proxy Password</string> + <string name="pref_proxy_password_summary">Proxy Password (Optional)</string> + <string name="pref_proxy_password_dialog">Enter Proxy Password</string> + + + <string name="status">Status</string> + <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying…</string> + <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying…</string> + <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> + <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> + <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> + <string name="transproxy_rules_cleared">TransProxy rules cleared</string> + <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> + <string name="privoxy_is_running_on_port_">Polipo is running on port: </string> + <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying…</string> + <string name="bridge_error">Bridge Error</string> + <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> + <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> + <string name="error">Error</string> + <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> + <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> + <string name="exit_nodes">Exit Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> + <string name="enter_exit_nodes">Enter Exit Nodes</string> + <string name="exclude_nodes">Exclude Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> + <string name="enter_exclude_nodes">Enter Exclude Nodes</string> + <string name="strict_nodes">Strict Nodes</string> + <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> + <string name="bridges">Bridges</string> + <string name="use_bridges">Use Bridges</string> + <string name="bridges_obfuscated">Obfuscated Bridges</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrances into the Tor Network</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> + <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> + <string name="enter_bridge_addresses">Enter Bridge Addresses</string> + <string name="relays">Relays</string> + <string name="relaying">Relaying</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> + <string name="relay_port">Relay Port</string> + <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> + <string name="enter_or_port">Enter OR port</string> + <string name="relay_nickname">Relay nickname</string> + <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> + <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> + <string name="reachable_addresses">Reachable Addresses</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> + <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">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> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> + <string name="project_home">Project Home(s): </string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <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: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> + <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string> + <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string> + <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> + <string name="hidden_service_request">An app wants to open hidden server port %1$s to the Tor network. This is safe if you trust the app.</string> + <string name="found_existing_tor_process">found existing Tor process…</string> + <string name="something_bad_happened">Something bad happened. Check the log</string> + <string name="hidden_service_on">hidden service on:</string> + <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> + <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string> + <string name="pref_use_sys_iptables_title">Use Default Iptables</string> + <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> + + <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> + + <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> + <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> + + <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string> + <string name="pref_use_expanded_notifications_title">Expanded Notifications</string> + + <string name="notification_using_bridges">Bridges enabled!</string> + <string name="default_bridges" /> + <string name="set_locale_title">Language</string> + <string name="set_locale_summary">Choose the locale and language for Orbot</string> + <string name="wizard_locale_title">Choose Language</string> + <string name="wizard_locale_msg">Leave default or switch the current language</string> + <string name="powered_by">powered by Tor</string> + <string name="btn_save_settings">Save Settings</string> + <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string> + <string name="bandwidth_">Bandwidth:</string> + <string name="down">down</string> + <string name="up">up</string> + <string name="pref_disable_network_title">No Network Auto-Sleep</string> + <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string> + <string name="newnym">You\'ve switched to a new Tor identity!</string> + + <string name="menu_verify_browser">Browser</string> - <string name="menu_use_chatsecure">Use ChatSecure</string> + <string name="pref_open_proxy_on_all_interfaces_title">Open Proxy on All Interfaces</string> + <string name="pref_open_proxy_on_all_interfaces_summary">Allow Wifi peers, tethered devices and anyone else who can connect to your IP, to access Tor</string> - <string name="button_proxy_all">Proxy All</string> - <string name="button_proxy_none">Proxy None</string> - <string name="button_invert_selection">Invert Selection</string> - - <string name="pref_proxy_title">Outbound Network Proxy (Optional)</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">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">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="pref_proxy_username_title">Outbound Proxy Username</string> - <string name="pref_proxy_username_summary">Proxy Username (Optional)</string> - <string name="pref_proxy_username_dialog">Enter Proxy Username</string> - - <string name="pref_proxy_password_title">Outbound Proxy Password</string> - <string name="pref_proxy_password_summary">Proxy Password (Optional)</string> - <string name="pref_proxy_password_dialog">Enter Proxy Password</string> - - - <string name="status">Status</string> - <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying…</string> - <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying…</string> - <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> - <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> - <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> - <string name="transproxy_rules_cleared">TransProxy rules cleared</string> - <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> - <string name="privoxy_is_running_on_port_">Polipo is running on port: </string> - <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying…</string> - <string name="bridge_error">Bridge Error</string> - <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> - <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> - <string name="error">Error</string> - <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> - <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> - <string name="exit_nodes">Exit Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> - <string name="enter_exit_nodes">Enter Exit Nodes</string> - <string name="exclude_nodes">Exclude Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> - <string name="enter_exclude_nodes">Enter Exclude Nodes</string> - <string name="strict_nodes">Strict Nodes</string> - <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> - <string name="bridges">Bridges</string> - <string name="use_bridges">Use Bridges</string> - <string name="bridges_obfuscated">Obfuscated Bridges</string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> - <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> - <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> - <string name="enter_bridge_addresses">Enter Bridge Addresses</string> - <string name="relays">Relays</string> - <string name="relaying">Relaying</string> - <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> - <string name="relay_port">Relay Port</string> - <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> - <string name="enter_or_port">Enter OR port</string> - <string name="relay_nickname">Relay nickname</string> - <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> - <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> - <string name="reachable_addresses">Reachable Addresses</string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> - <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">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> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> - <string name="project_home">Project Home(s): </string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> - <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: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> - <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string> - <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string> - <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %1$s to the Tor network. This is safe if you trust the app.</string> - <string name="found_existing_tor_process">found existing Tor process…</string> - <string name="something_bad_happened">Something bad happened. Check the log</string> - <string name="hidden_service_on">hidden service on:</string> - <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> - <string name="unable_to_start_tor">Unable to start Tor:</string> - <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string> - <string name="pref_use_sys_iptables_title">Use Default Iptables</string> - <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> - - <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> - - <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> - <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> - - <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string> - <string name="pref_use_expanded_notifications_title">Expanded Notifications</string> - - <string name="notification_using_bridges">Bridges enabled!</string> - <string name="default_bridges" /> - <string name="set_locale_title">Language</string> - <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> - <string name="powered_by">powered by Tor</string> - <string name="btn_save_settings">Save Settings</string> - <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string> - <string name="bandwidth_">Bandwidth:</string> - <string name="down">down</string> - <string name="up">up</string> - <string name="pref_disable_network_title">No Network Auto-Sleep</string> - <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string> - <string name="newnym">You\'ve switched to a new Tor identity!</string> - - <string name="menu_verify_browser">Browser</string> - <string name="menu_use_chatsecure">Use ChatSecure</string> - <string name="permission_manage_tor_label">Manage Tor</string> <string name="permission_manage_tor_description">Enable this app to control the Tor service</string> <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot works best with Orfox Browser. Install now?</string> diff --cc orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 5bfaf7c4,bdfe1a96..806516d7 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@@ -108,8 -109,12 +109,12 @@@ public class Prefs return prefs.getBoolean(PREF_ALLOW_BACKGROUND_STARTS, true); } + public static boolean openProxyOnAllInterfaces() { + return prefs.getBoolean(PREF_OPEN_PROXY_ON_ALL_INTERFACES, false); + } + public static boolean useVpn() { - return prefs.getBoolean(PREF_USE_VPN, true); + return prefs.getBoolean(PREF_USE_VPN, false); } public static void putUseVpn(boolean value) {

1 0

[orbot/master] Merge branch 'syphyr-master'
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit ab472d54452263f4ca5d3c2adcfc27000ba77d41 Merge: 792ee2b1 4fc3e7e6 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jan 4 17:48:57 2018 -0500 Merge branch 'syphyr-master' app/src/main/res/values/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[orbot/master] Merge branch 'master' of https://github.com/syphyr/orbot into syphyr-master
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit 4fc3e7e6a8fc213495e2ab3900dedb39cb88c5f3 Merge: 792ee2b1 21b4521f Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jan 4 17:48:41 2018 -0500 Merge branch 'master' of https://github.com/syphyr/orbot into syphyr-master app/src/main/res/values/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --cc app/src/main/res/values/strings.xml index 9feb04a3,93275bef..266306cd --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@@ -1,259 -1,258 +1,259 @@@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Orbot</string> - <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> - <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">start and stop Tor</string> - <string name="tor_proxy_service_process">torproxyservice</string> - <string name="status_starting_up">Orbot is starting…</string> - <string name="status_activated">Connected to the Tor network</string> - <string name="status_disabled">Orbot is deactivated</string> - <string name="status_shutting_down">TorService is shutting down</string> - <string name="tor_process_starting">Starting Tor client…</string> - <string name="tor_process_complete">complete.</string> - <string name="tor_process_waiting">waiting.</string> - <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> - <string name="menu_home">Home</string> - <string name="menu_browse">Browse</string> - <string name="menu_settings">Settings</string> - <string name="menu_log">Log</string> - <string name="menu_info">Help</string> - <string name="menu_apps">Apps...</string> - <string name="menu_start">Start</string> - <string name="menu_stop">Stop</string> - <string name="menu_about">About</string> - <string name="menu_promo_apps">Get apps…</string> - <string name="main_layout_download">Download</string> - <string name="main_layout_upload">Upload</string> - <string name="button_help">Help</string> - <string name="button_close">Close</string> - <string name="button_about">About</string> - <string name="button_clear_log">Clear Log</string> - <string name="menu_verify">Check</string> - <string name="menu_exit">Exit</string> - <string name="menu_scan">Scan BridgeQR</string> - <string name="menu_share_bridge">Share BridgeQR</string> - <string name="press_to_start">- long press to start -</string> - <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> - <string name="pref_trans_proxy_title">Transparent Proxying</string> - <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> - <string name="pref_transparent_all_title">Tor Everything</string> - <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> - <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> - <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> - <string name="pref_transparent_port_title">Port List</string> - <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> - <string name="pref_transparent_port_dialog">Enter ports to proxy</string> - <string name="pref_has_root">Request Root Access</string> - <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor binaries successfully installed!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> - <string name="title_error">Application Error</string> - <string name="wizard_title">Orbot</string> - <string name="wizard_btn_tell_me_more">About Orbot</string> - <string name="btn_next">Next</string> - <string name="btn_back">Back</string> - <string name="btn_finish">Finish</string> - <string name="btn_okay">Okay</string> - <string name="btn_cancel">Cancel</string> -  - <string name="wizard_details">Some Orbot Details</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> - <string name="wizard_permissions_root">Permission Granted</string> - <string name="wizard_permissions_stock">Orbot Permissions</string> - <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> - <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> - <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> - <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> - <string name="wizard_permission_enable_root">Grant Root for Orbot</string> - <string name="wizard_configure">Configure Torification</string> - <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> - <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> - <string name="wizard_tips_tricks">Orbot-enabled Apps</string> - <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> - <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string> - <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> - <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> - <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> - <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> - <string name="wizard_proxy_help_info">Proxy Settings</string> - <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot is ready!</string> - <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string> - <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string> -  - <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 \'Browser\' button to test your connection. \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 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> -  -  - <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> -  - <string name="wizard_warning_title">Warning</string> - <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> -  - <string name="wizard_permissions_title">Permissions</string> - <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> - <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> - <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string> -  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> - <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string> - <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> - <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string> - <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string> -  - <string name="wizard_transproxy_title">Transparent Proxying</string> - <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> - <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> - <string name="wizard_transproxy_none">None</string> - <string name="pref_transparent_tethering_title">Tor Tethering</string> - <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> - <string name="button_grant_superuser">Request Superuser Access</string> - <string name="pref_select_apps">Select Apps</string> - <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> - <string name="pref_node_configuration">Node Configuration</string> - <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> - <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_allow_background_starts_title">Allow Background Starts</string> - <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string> - - <string name="button_proxy_all">Proxy All</string> - <string name="button_proxy_none">Proxy None</string> - <string name="button_invert_selection">Invert Selection</string> - - <string name="pref_proxy_title">Outbound Network Proxy (Optional)</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">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">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="pref_proxy_username_title">Outbound Proxy Username</string> - <string name="pref_proxy_username_summary">Proxy Username (Optional)</string> - <string name="pref_proxy_username_dialog">Enter Proxy Username</string> - - <string name="pref_proxy_password_title">Outbound Proxy Password</string> - <string name="pref_proxy_password_summary">Proxy Password (Optional)</string> - <string name="pref_proxy_password_dialog">Enter Proxy Password</string> - - - <string name="status">Status</string> - <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying…</string> - <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying…</string> - <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> - <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> - <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> - <string name="transproxy_rules_cleared">TransProxy rules cleared</string> - <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> - <string name="privoxy_is_running_on_port_">Polipo is running on port: </string> - <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying…</string> - <string name="bridge_error">Bridge Error</string> - <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> - <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> - <string name="error">Error</string> - <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> - <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> - <string name="exit_nodes">Exit Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> - <string name="enter_exit_nodes">Enter Exit Nodes</string> - <string name="exclude_nodes">Exclude Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> - <string name="enter_exclude_nodes">Enter Exclude Nodes</string> - <string name="strict_nodes">Strict Nodes</string> - <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> - <string name="bridges">Bridges</string> - <string name="use_bridges">Use Bridges</string> - <string name="bridges_obfuscated">Obfuscated Bridges</string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> - <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> - <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> - <string name="enter_bridge_addresses">Enter Bridge Addresses</string> - <string name="relays">Relays</string> - <string name="relaying">Relaying</string> - <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> - <string name="relay_port">Relay Port</string> - <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> - <string name="enter_or_port">Enter OR port</string> - <string name="relay_nickname">Relay nickname</string> - <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> - <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> - <string name="reachable_addresses">Reachable Addresses</string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> - <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">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> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> - <string name="project_home">Project Home(s): </string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> - <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: https://www.torproject.org</string> - <string name="libevent_version">LibEvent: http://www.monkey.org/~provos/libevent/</string> - <string name="polipo_version">Polipo: https://github.com/jech/polipo</string> - <string name="obfsproxy_version">Obfs4proxy: https://github.com/Yawning/obfs4</string> - <string name="openssl_version">OpenSSL: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %1$s to the Tor network. This is safe if you trust the app.</string> - <string name="found_existing_tor_process">found existing Tor process…</string> - <string name="something_bad_happened">Something bad happened. Check the log</string> - <string name="hidden_service_on">hidden service on:</string> - <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> - <string name="unable_to_start_tor">Unable to start Tor:</string> - <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string> - <string name="pref_use_sys_iptables_title">Use Default Iptables</string> - <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> - - <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> - - <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> - <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> - - <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string> - <string name="pref_use_expanded_notifications_title">Expanded Notifications</string> - - <string name="notification_using_bridges">Bridges enabled!</string> - <string name="default_bridges" /> - <string name="set_locale_title">Language</string> - <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> - <string name="powered_by">powered by Tor</string> - <string name="btn_save_settings">Save Settings</string> - <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string> - <string name="bandwidth_">Bandwidth:</string> - <string name="down">down</string> - <string name="up">up</string> - <string name="pref_disable_network_title">No Network Auto-Sleep</string> - <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string> - <string name="newnym">You\'ve switched to a new Tor identity!</string> - - <string name="menu_verify_browser">Browser</string> - <string name="menu_use_chatsecure">Use ChatSecure</string> + <string name="app_name">Orbot</string> + <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> + <string name="internal_web_url">http://orbot/</string> + <string name="default_web_url">http://check.torproject.org</string> + <string name="secure_default_web_url">https://check.torproject.org</string> + <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> + <string name="control_permission_label">start and stop Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot is starting…</string> + <string name="status_activated">Connected to the Tor network</string> + <string name="status_disabled">Orbot is deactivated</string> + <string name="status_shutting_down">TorService is shutting down</string> + <string name="tor_process_starting">Starting Tor client…</string> + <string name="tor_process_complete">complete.</string> + <string name="tor_process_waiting">waiting.</string> + <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> + <string name="menu_home">Home</string> + <string name="menu_browse">Browse</string> + <string name="menu_settings">Settings</string> + <string name="menu_log">Log</string> + <string name="menu_info">Help</string> + <string name="menu_apps">Apps...</string> + <string name="menu_start">Start</string> + <string name="menu_stop">Stop</string> + <string name="menu_about">About</string> + <string name="menu_promo_apps">Get apps…</string> + <string name="main_layout_download">Download</string> + <string name="main_layout_upload">Upload</string> + <string name="button_help">Help</string> + <string name="button_close">Close</string> + <string name="button_about">About</string> + <string name="button_clear_log">Clear Log</string> + <string name="menu_verify">Check</string> + <string name="menu_exit">Exit</string> + <string name="menu_scan">Scan BridgeQR</string> + <string name="menu_share_bridge">Share BridgeQR</string> + <string name="press_to_start">- long press to start -</string> + <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> + <string name="pref_trans_proxy_title">Transparent Proxying</string> + <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> + <string name="pref_transparent_all_title">Tor Everything</string> + <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> + <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> + <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> + <string name="pref_transparent_port_title">Port List</string> + <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> + <string name="pref_transparent_port_dialog">Enter ports to proxy</string> + <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Tor binaries successfully installed!</string> + <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> + <string name="title_error">Application Error</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">About Orbot</string> + <string name="btn_next">Next</string> + <string name="btn_back">Back</string> + <string name="btn_finish">Finish</string> + <string name="btn_okay">Okay</string> + <string name="btn_cancel">Cancel</string> +  + <string name="wizard_details">Some Orbot Details</string> + <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> + <string name="wizard_permissions_root">Permission Granted</string> + <string name="wizard_permissions_stock">Orbot Permissions</string> + <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> + <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> + <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> + <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> + <string name="wizard_permission_enable_root">Grant Root for Orbot</string> + <string name="wizard_configure">Configure Torification</string> + <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> + <string name="wizard_configure_all">Proxy All Apps Through Tor</string> + <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> + <string name="wizard_tips_tricks">Orbot-enabled Apps</string> + <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> + <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string> + <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> + <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> + <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> + <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> + <string name="wizard_proxy_help_info">Proxy Settings</string> + <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> + <string name="wizard_final">Orbot is ready!</string> + <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string> + <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string> +  + <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 \'Browser\' button to test your connection. \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 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> +  +  + <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> +  + <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> +  + <string name="wizard_permissions_title">Permissions</string> + <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> + <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> + <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string> +  + <string name="wizard_tips_title">Orbot-Enabled Apps</string> + <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> + <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string> + <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> + <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string> + <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string> +  + <string name="wizard_transproxy_title">Transparent Proxying</string> + <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> + <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> + <string name="wizard_transproxy_none">None</string> + <string name="pref_transparent_tethering_title">Tor Tethering</string> + <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> + <string name="button_grant_superuser">Request Superuser Access</string> + <string name="pref_select_apps">Select Apps</string> + <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> + <string name="pref_node_configuration">Node Configuration</string> + <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> + <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_allow_background_starts_title">Allow Background Starts</string> + <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string> + + <string name="button_proxy_all">Proxy All</string> + <string name="button_proxy_none">Proxy None</string> + <string name="button_invert_selection">Invert Selection</string> + + <string name="pref_proxy_title">Outbound Network Proxy (Optional)</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">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">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="pref_proxy_username_title">Outbound Proxy Username</string> + <string name="pref_proxy_username_summary">Proxy Username (Optional)</string> + <string name="pref_proxy_username_dialog">Enter Proxy Username</string> + + <string name="pref_proxy_password_title">Outbound Proxy Password</string> + <string name="pref_proxy_password_summary">Proxy Password (Optional)</string> + <string name="pref_proxy_password_dialog">Enter Proxy Password</string> + + + <string name="status">Status</string> + <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying…</string> + <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying…</string> + <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> + <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> + <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> + <string name="transproxy_rules_cleared">TransProxy rules cleared</string> + <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> + <string name="privoxy_is_running_on_port_">Polipo is running on port: </string> + <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying…</string> + <string name="bridge_error">Bridge Error</string> + <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> + <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> + <string name="error">Error</string> + <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> + <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> + <string name="exit_nodes">Exit Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> + <string name="enter_exit_nodes">Enter Exit Nodes</string> + <string name="exclude_nodes">Exclude Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> + <string name="enter_exclude_nodes">Enter Exclude Nodes</string> + <string name="strict_nodes">Strict Nodes</string> + <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> + <string name="bridges">Bridges</string> + <string name="use_bridges">Use Bridges</string> + <string name="bridges_obfuscated">Obfuscated Bridges</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrances into the Tor Network</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> + <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> + <string name="enter_bridge_addresses">Enter Bridge Addresses</string> + <string name="relays">Relays</string> + <string name="relaying">Relaying</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> + <string name="relay_port">Relay Port</string> + <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> + <string name="enter_or_port">Enter OR port</string> + <string name="relay_nickname">Relay nickname</string> + <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> + <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> + <string name="reachable_addresses">Reachable Addresses</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> + <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">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> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> + <string name="project_home">Project Home(s): </string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <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: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> - <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string> - <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string> - <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> ++ <string name="libevent_version">LibEvent: http://www.monkey.org/~provos/libevent/</string> ++ <string name="polipo_version">Polipo: https://github.com/jech/polipo</string> ++ <string name="obfsproxy_version">Obfs4proxy: https://github.com/Yawning/obfs4</string> ++ <string name="openssl_version">OpenSSL: http://www.openssl.org</string> + <string name="hidden_service_request">An app wants to open hidden server port %1$s to the Tor network. This is safe if you trust the app.</string> + <string name="found_existing_tor_process">found existing Tor process…</string> + <string name="something_bad_happened">Something bad happened. Check the log</string> + <string name="hidden_service_on">hidden service on:</string> + <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> + <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string> + <string name="pref_use_sys_iptables_title">Use Default Iptables</string> + <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> + + <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> + + <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> + <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> + + <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string> + <string name="pref_use_expanded_notifications_title">Expanded Notifications</string> + + <string name="notification_using_bridges">Bridges enabled!</string> + <string name="default_bridges" /> + <string name="set_locale_title">Language</string> + <string name="set_locale_summary">Choose the locale and language for Orbot</string> + <string name="wizard_locale_title">Choose Language</string> + <string name="wizard_locale_msg">Leave default or switch the current language</string> + <string name="powered_by">powered by Tor</string> + <string name="btn_save_settings">Save Settings</string> + <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string> + <string name="bandwidth_">Bandwidth:</string> + <string name="down">down</string> + <string name="up">up</string> + <string name="pref_disable_network_title">No Network Auto-Sleep</string> + <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string> + <string name="newnym">You\'ve switched to a new Tor identity!</string> + + <string name="menu_verify_browser">Browser</string> + <string name="pref_open_proxy_on_all_interfaces_title">Open Proxy on All Interfaces</string> + <string name="pref_open_proxy_on_all_interfaces_summary">Allow Wifi peers, tethered devices and anyone else who can connect to your IP, to access Tor</string> <string name="permission_manage_tor_label">Manage Tor</string> <string name="permission_manage_tor_description">Enable this app to control the Tor service</string>

1 0

[orbot/master] Merge pull request #106 from Unpublished/fix_binary_search
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit b161043d6d9e65a99e4d873d7a7f11cbe525187e Merge: ab472d54 5c5790c8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 4 17:50:18 2018 -0500 Merge pull request #106 from Unpublished/fix_binary_search fix binary search app/src/main/java/org/torproject/android/ui/AppManagerActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[orbot/master] tweak default bridge behavior based on locale
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit 7e9890e8c5ee59969641fcb661ff15d56e9ef560 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jan 4 22:59:39 2018 -0500 tweak default bridge behavior based on locale --- .../org/torproject/android/OrbotMainActivity.java | 1 + .../ui/onboarding/BridgeWizardActivity.java | 24 ++++++++++++++++++---- .../org/torproject/android/service/util/Prefs.java | 9 ++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 059e4273..c9882b76 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -969,6 +969,7 @@ public class OrbotMainActivity extends AppCompatActivity if (mBtnBridges.isChecked()) { + Prefs.putBridgesEnabled(true); startActivity(new Intent(this, BridgeWizardActivity.class)); } else diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 82ff5fea..1a0f20ca 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -18,6 +18,7 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; +import android.widget.RadioButton; import android.widget.TextView; import android.widget.Toast; @@ -49,7 +50,9 @@ public class BridgeWizardActivity extends AppCompatActivity { setTitle(getString(R.string.bridges)); - findViewById(R.id.btnBridgesDirect).setOnClickListener(new View.OnClickListener() { + RadioButton btnDirect = (RadioButton) + findViewById(R.id.btnBridgesDirect); + btnDirect.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Prefs.setBridgesList(""); @@ -59,7 +62,8 @@ public class BridgeWizardActivity extends AppCompatActivity { } }); - findViewById(R.id.btnBridgesObfs4).setOnClickListener(new View.OnClickListener() { + RadioButton btnObfs4 = (RadioButton)findViewById(R.id.btnBridgesObfs4); + btnObfs4.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Prefs.setBridgesList("obfs4"); @@ -70,7 +74,9 @@ public class BridgeWizardActivity extends AppCompatActivity { }); - findViewById(R.id.btnBridgesMeek).setOnClickListener(new View.OnClickListener() { + RadioButton btnMeek = (RadioButton)findViewById(R.id.btnBridgesMeek); + + btnMeek.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Prefs.setBridgesList("meek"); @@ -81,12 +87,22 @@ public class BridgeWizardActivity extends AppCompatActivity { }); - findViewById(R.id.btnBridgesNew).setOnClickListener(new View.OnClickListener() { + RadioButton btnNew = (RadioButton)findViewById(R.id.btnBridgesNew); + btnNew.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { showGetBridgePrompt(""); } }); + + if (!Prefs.bridgesEnabled()) + btnDirect.setChecked(true); + else if (Prefs.getBridgesList().equals("meek")) + btnMeek.setChecked(true); + else if (Prefs.getBridgesList().equals("obfs4")) + btnObfs4.setChecked(true); + + } @Override diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 806516d7..0a2bf45e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -42,7 +42,9 @@ public class Prefs { } public static boolean bridgesEnabled() { - return prefs.getBoolean(PREF_BRIDGES_ENABLED, false); + //if phone is in Farsi, enable bridges by default + boolean bridgesEnabledDefault = Locale.getDefault().getLanguage().equals("fa"); + return prefs.getBoolean(PREF_BRIDGES_ENABLED, bridgesEnabledDefault); } public static void putBridgesEnabled(boolean value) { @@ -50,7 +52,10 @@ public class Prefs { } public static String getBridgesList() { - return prefs.getString(PREF_BRIDGES_LIST, ""); + String defaultBridgeType = "obfs4"; + if (Locale.getDefault().getLanguage().equals("fa")) + defaultBridgeType = "meek"; //if Farsi, use meek as the default bridge type + return prefs.getString(PREF_BRIDGES_LIST, defaultBridgeType); } public static void setBridgesList(String value) {

1 0

[orbot/master] updates to notification for Android O / SDK26
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit fec853c939ecd1fea46dbc46dc4633976a1f4607 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jan 4 22:30:05 2018 -0500 updates to notification for Android O / SDK26 --- app/src/main/res/layout/layout_main.xml | 7 +++-- .../org/torproject/android/service/TorService.java | 34 +++++++++++++++++++++- .../res/layout/layout_notification_expanded.xml | 2 +- orbotservice/src/main/res/values-cs/colors.xml | 9 ++++++ 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index f729a500..84d3156c 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -137,7 +137,7 @@ > <android.support.v7.widget.SwitchCompat android:id="@+id/btnVPN" - android:layout_width="140dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/apps_mode" android:layout_margin="9dp" @@ -257,9 +257,10 @@ android:layout_height="wrap_content" android:text="@string/use_bridges" android:layout_margin="3dp" - android:singleLine="true" app:switchPadding="3dp" - android:gravity="center_vertical" + android:layout_marginTop="10dp" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" /> </LinearLayout> <LinearLayout diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 73983895..e4f7f13a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -12,6 +12,7 @@ import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Application; import android.app.Notification; +import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; @@ -26,6 +27,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.database.Cursor; +import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; @@ -33,6 +35,7 @@ import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.provider.BaseColumns; +import android.support.annotation.RequiresApi; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; @@ -241,7 +244,31 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mNotificationShowing = false; } - + + private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1"; + + @RequiresApi(api = Build.VERSION_CODES.O) + private void createNotificationChannel () + { + NotificationManager mNotificationManager = + (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); +// The id of the channel. + +// The user-visible name of the channel. + CharSequence name = getString(R.string.app_name); +// The user-visible description of the channel. + String description = getString(R.string.app_description); + int importance = NotificationManager.IMPORTANCE_LOW; + NotificationChannel mChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name, importance); +// Configure the notification channel. + mChannel.setDescription(description); + mChannel.enableLights(false); + mChannel.enableVibration(false); + mChannel.setShowBadge(false); + mChannel.setLockscreenVisibility(Notification.VISIBILITY_SECRET); + mNotificationManager.createNotificationChannel(mChannel); + } + @SuppressLint("NewApi") protected void showToolbarNotification (String notifyMsg, int notifyType, int icon) { @@ -287,6 +314,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE); + mNotifyBuilder.setChannelId(NOTIFICATION_CHANNEL_ID); + mNotification = mNotifyBuilder.build(); if (Build.VERSION.SDK_INT >= 16 && Prefs.expandedNotifications()) { @@ -557,6 +586,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mActionBroadcastReceiver = new ActionBroadcastReceiver(); registerReceiver(mActionBroadcastReceiver, filter); + if (Build.VERSION.SDK_INT >= 26) + createNotificationChannel(); + new Thread(new Runnable () { public void run () diff --git a/orbotservice/src/main/res/layout/layout_notification_expanded.xml b/orbotservice/src/main/res/layout/layout_notification_expanded.xml index 1fa25227..0afa156b 100644 --- a/orbotservice/src/main/res/layout/layout_notification_expanded.xml +++ b/orbotservice/src/main/res/layout/layout_notification_expanded.xml @@ -19,7 +19,7 @@ android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/holo_purple" + android:background="@color/dark_purple" > <LinearLayout android:layout_width="match_parent" diff --git a/orbotservice/src/main/res/values-cs/colors.xml b/orbotservice/src/main/res/values-cs/colors.xml new file mode 100644 index 00000000..af92426f --- /dev/null +++ b/orbotservice/src/main/res/values-cs/colors.xml @@ -0,0 +1,9 @@ + + <resources> + <color name="panel_background">#ffffff</color> + <color name="panel_background_dark">#efefef</color> + <color name="panel_background_main">#efefef</color> + <color name="bright_green">#ccff2a</color> + <color name="dark_green">#669901</color> + <color name="dark_purple">#3f2b4f</color> + </resources>

1 0

[orbot/master] update to 16.0.0-BETA-3
by n8fr8＠torproject.org 05 Jan '18

05 Jan '18

commit a9d21aa0d8b10de9c4dc5fe6496bc785b431e571 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Jan 4 23:01:21 2018 -0500 update to 16.0.0-BETA-3 --- app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4ffdc227..3b6a8013 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,16 +30,16 @@ android { applicationId 'org.torproject.android' targetSdkVersion 23 maxSdkVersion 23 - versionCode 16000005 - versionName '16.0.0-BETA-2-multi-SDK16' + versionCode 16000006 + versionName '16.0.0-BETA-3-multi-SDK16' } fullperm { dimension "free" minSdkVersion 23 applicationId 'org.torproject.android' targetSdkVersion 26 - versionCode 16000006 - versionName '16.0.0-BETA-2-multi-SDK23' + versionCode 16000007 + versionName '16.0.0-BETA-3-multi-SDK23' } } }

1 0

[tor/master] smartlist.rs: The libc::c_char type is not the same as i8.
by nickm＠torproject.org 04 Jan '18

04 Jan '18

commit 1dab8bae21bc32e5d4e3ff954f4919d6506ad2e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 4 12:20:54 2018 -0500 smartlist.rs: The libc::c_char type is not the same as i8. The code had been using c_char and i8 interchangeably, but it turns out that c_char is only i8 on platforms where "char" is signed. On other platforms, c_char is u8. Fixes bug 24794; bug not on any released Tor. --- src/rust/smartlist/smartlist.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rust/smartlist/smartlist.rs b/src/rust/smartlist/smartlist.rs index ec5d7a57f..2a822d89f 100644 --- a/src/rust/smartlist/smartlist.rs +++ b/src/rust/smartlist/smartlist.rs @@ -33,7 +33,7 @@ impl Smartlist<String> for Stringlist { // unsafe, as we need to extract the smartlist list into a vector of // pointers, and then transform each element into a Rust string. - let elems: &[*const i8] = + let elems: &[*const c_char] = unsafe { slice::from_raw_parts(self.list, self.num_used as usize) }; for elem in elems.iter() {

1 0