October 2012 - tor-commits - lists.torproject.org

[translation/orbot] Update translations for orbot
by translation＠torproject.org 01 Oct '12

01 Oct '12

commit 2bc820faa998a822dea12d1066833b29dc8e87cc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 1 12:15:07 2012 +0000 Update translations for orbot --- values-nl/strings.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/values-nl/strings.xml b/values-nl/strings.xml index fb3e00f..105f489 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -25,6 +25,8 @@ <string name="menu_stop">Stop</string> <string name="menu_about">Over</string> <string name="menu_wizard">Wizard</string> + <string name="main_layout_download">Download (snelheid/totaal)</string> + <string name="main_layout_upload">Upload (snelheid/totaal)</string> <string name="button_help">Help</string> <string name="button_close">Afsluiten</string> <string name="button_about">Over</string> @@ -72,6 +74,9 @@ <string name="wizard_tips_msg">We raden je aan om apps te downloaden die zich automatisch verbinden met Orbot. Klik op de knoppen hieronder om te installeren.</string> <string name="wizard_tips_otrchat">Gibberbot - Veilige instant messaging client voor Android</string> <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe je apps te configureren voor Orbot</string> + <string name="wizard_tips_duckgo">Duckduckgo Zoekmachine app</string> + <string name="wizard_tips_firefox">Firefox met Proxy Mobile extensie (vergt extra installatie achteraf)</string> + <string name="wizard_tips_twitter">Twitter ondersteunt http proxy \"localhost:8118\"</string> <string name="wizard_proxy_help_info">Proxy Instellingen</string> <string name="wizard_proxy_help_msg">Als de Android app die je gebruikt beschikt over een HTTP of SOCKS proxy instelling, dan kun je het configureren zodat het via Orbot over het Tor netwerk gaat.\n\n\nDe host instelling is 127.0.0.1 of \"localhost\". De poort voor SOCKS is 9050 en voor HTTP 8118. Gebruik SOCKS4A of SOCKS5 indien mogelijk.\n\n\nJe kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyurl.com/proxyandroid te gaan\n </string> <string name="wizard_final">Orbot is klaar!</string>

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 01 Oct '12

01 Oct '12

commit bd3f2f0bd850de77c6e29b35aa1d8f4014023c71 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 1 09:15:15 2012 +0000 Update translations for orbot_completed --- values/strings.xml | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/values/strings.xml b/values/strings.xml index 461bf86..70f66b4 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -25,6 +25,8 @@ <string name="menu_stop">Stop</string> <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> + <string name="main_layout_download">Download (speed/total)</string> + <string name="main_layout_upload">Upload (speed/total)</string> <string name="button_help">Help</string> <string name="button_close">Close</string> <string name="button_about">About</string> @@ -72,6 +74,9 @@ <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 in the Android Market.</string> <string name="wizard_tips_otrchat">Gibberbot - 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_firefox">Firefox with Proxy Mobile add-on (extra install after)</string> + <string name="wizard_tips_twitter">Twitter supports http proxy \"localhost:8118\"</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> @@ -187,8 +192,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 01 Oct '12

01 Oct '12

commit dd1292ef6fc02eb657343d17398ad1ce7044cd10 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 1 09:15:13 2012 +0000 Update translations for orbot --- values-bg/strings.xml | 42 ------------- values-ca/strings.xml | 115 ------------------------------------ values-cs/strings.xml | 141 --------------------------------------------- values-eu/strings.xml | 63 -------------------- values-mk/strings.xml | 115 ------------------------------------ values-ms_MY/strings.xml | 1 - values-nb/strings.xml | 138 +------------------------------------------- values-pt/strings.xml | 144 ---------------------------------------------- values-sv/strings.xml | 125 +--------------------------------------- values/strings.xml | 9 ++- 10 files changed, 9 insertions(+), 884 deletions(-) diff --git a/values-bg/strings.xml b/values-bg/strings.xml index 9d166d4..fa92c48 100644 --- a/values-bg/strings.xml +++ b/values-bg/strings.xml @@ -6,7 +6,6 @@ <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">спри и стопирай Тор</string> - <string name="tor_proxy_service_process">torproxyservice</string> <string name="status_starting_up">Орбот стартира...</string> <string name="status_activated">Свързан към Тор мрежата</string> <string name="status_disabled">\"Орбот е деактивиран</string> @@ -37,10 +36,7 @@ <string name="pref_trans_proxy_summary">Автоматично прекарване на приложенията през Тор</string> <string name="pref_transparent_all_title">Всичко през Тор</string> <string name="pref_transparent_all_summary">Прехвърляй през Тор трафика на всички приложения</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">Списък портове</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">Въведи портове на прокси</string> <string name="pref_has_root">Изисквай Root достъп</string> <string name="pref_has_root_summary">Изисквай root достъп за прозрачно прокси</string> @@ -64,7 +60,6 @@ <string name="wizard_permissions_no_root">Ако нямате root достъп или не знаете за какво става въпрос, просто използвайте приложения направени да работят с Орбот.</string> <string name="wizard_permissions_consent">Разбирам и искам да продължа без Суперпотребител</string> <string name="wizard_permission_enable_root">Разреши Root за Орбот</string> - <string name="wizard_configure">Configure Torification</string> <string name="wizard_configure_msg">Орбот Ви дава възможност да прекарате всичкия трафик през Тор или да изберете приложения по отделно.</string> <string name="wizard_configure_all">Прекарай всички приложения през Тор</string> <string name="wizard_configure_select_apps">Избери отделни приложения за Тор</string> @@ -77,10 +72,7 @@ <string name="wizard_final">Орбот е готов!</string> <string name="wizard_final_msg">Стотици хиляди хора по света използват Тор по различни причини.\n\nЖурналисти и блогъри, защитници на човешките права, служители на закона, военни, корпорации, граждани под ограничителни режими, и просто обикновени граждани... и сега и ти си готов да го направиш също!</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 \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> - <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> <string name="pref_hs_group">Скрити услуги</string> - <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Стартирай Орбот при стартиране на устройството</string> <string name="pref_start_boot_summary">Автоматично стартирай Орбот и се свържи към Тор когато твоето Андроид устройство стартира</string>  @@ -91,12 +83,8 @@ <string name="wizard_warning_msg">Единствено инсталирането на Орбот няма автоматично да направи вашият мобилен трафик анонимен.\n\nТрябва правилно да конфигурирате Орбот, вашето устройство и други приложения, за да използвате успешно Тор.</string>  <string name="wizard_permissions_title">Права</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 \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  <string name="wizard_tips_title">Приложения през Орбот</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb: Браузър с повишена анонимност, който работи през Тор</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> @@ -109,19 +97,14 @@ <string name="wizard_transproxy_msg">Това позволява на приложенията Ви автоматично да използват мрежата на Тор без никаква конфигурация.</string> <string name="wizard_transproxy_hint">(Избери тази опция ако нямаш представа за какво става въпрос)</string> <string name="wizard_transproxy_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">Изискай достъп на Суперпотребител</string> <string name="pref_select_apps">Избери приложения</string> <string name="pref_select_apps_summary">Избрери приложения за използване през Тор</string> - <string name="pref_node_configuration">Node Configuration</string> <string name="pref_node_configuration_summary">Това са допълнителни настройки, които могат да намалят Вашата анонимност</string> <string name="pref_entrance_node">Входящи точки</string> - <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Въведи входящи точки</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Тип прокси</string> <string name="pref_proxy_type_summary">Протокол за прокси сървър: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Тип на входящо прокси</string> @@ -135,7 +118,6 @@ <string name="setting_up_full_transparent_proxying_">Конфигуриране на напълно прозрачно прокси...</string> <string name="setting_up_app_based_transparent_proxying_">Конфигуриране на прозрачно прокси на база приложение...</string> <string name="transparent_proxying_enabled">Прозрачно прокси АКТИВНО</string> - <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> <string name="warning_error_starting_transparent_proxying_">ВНИМАНИЕ: грешка при стартиране на прозрачно проски!</string> <string name="transproxy_rules_cleared">TransProxy правила изчистени</string> <string name="couldn_t_start_tor_process_">Неуспешно стартиране на Тор процес: </string> @@ -145,32 +127,14 @@ <string name="bridge_requires_ip">За да използвате бридж функционалността трябва да въведете поне един IP адрес на бридж.</string> <string name="send_email_for_bridges">Изпрати и-мейл до bridges(a)torproject.org със съдържание \"get bridges\" в и-мейл от акаунт в gmail.</string> <string name="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_">Твоите настройки за препращане предизвикаха изключение!</string> <string name="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">Въведи изходни точки</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">Край</string> - <string name="strict_nodes">Strict Nodes</string> - <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> <string name="bridges">Бриджове</string> <string name="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 адрес и порт на бриджове</string> <string name="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">Достижими адреси</string> <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Стартирай като клиент зад firewall с рестриктивни политики</string> <string name="reachable_ports">Достъпни портове</string> @@ -180,9 +144,6 @@ <string name="run_servers_accessible_via_the_tor_network">стартирай сървъри достъпни през Тор мрежата</string> <string name="enter_localhost_ports_for_hidden_services">въведи локални портове за скрити услуги</string> <string name="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">Тор лиценз</string> <string name="https_torproject_org">https://torproject.org</string> @@ -193,7 +154,6 @@ <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">Приложение иска да отвори порт на скрит сървър %S към Тор мрежата. Безопасно е да се доверите на приложението.</string> - <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string> <string name="hidden_service_on">Скрита услуга включена:</string> <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string> @@ -203,12 +163,10 @@ <string name="error_installing_binares">Двуичните файлове на Тор не бяха инсталирани или обновени.</string> <string name="pref_use_persistent_notifications">Винаги показвай икона в тулбара когато Орбот е свързан</string> <string name="pref_use_persistent_notifications_title">Уведомления винаги включени</string> - <string name="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> <string name="set_locale_title">Избери местоположение</string> <string name="set_locale_summary">Избери местоположение и език за Орбот</string> <string name="wizard_locale_title">Избери език</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> <string name="powered_by">powered by The Tor Project </string> <string name="btn_save_settings">Запази настройки</string> </resources> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index 413104b..f834ccb 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -11,9 +11,6 @@ <string name="status_activated">Connectat a la xarxa Tor</string> <string name="status_disabled">Orbot està desactivat</string> <string name="status_shutting_down">Orbot s\'està aturant</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">ATENCIÓ : El trànsit de la teva connexió ja no es anònim! Siusplau, configura les teves aplicacions per a usar HTTP proxy 127.0.0.1:8118, per SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string> <string name="menu_home">Lloc d\'inici</string> <string name="menu_browse">Navega</string> @@ -85,19 +82,9 @@ <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 \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat & per a Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</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_proxy_title">Outbound Network Proxy</string> - <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">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="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_">Privoxy 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 v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> - <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> - <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %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="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="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</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">Funciona gràcies al Projecte Tor</string> - <string name="btn_save_settings">Save Settings</string> </resources> diff --git a/values-cs/strings.xml b/values-cs/strings.xml index e568348..e335fa3 100644 --- a/values-cs/strings.xml +++ b/values-cs/strings.xml @@ -23,11 +23,9 @@ <string name="menu_apps">Aplikace</string> <string name="menu_start">Zapnout</string> <string name="menu_stop">Vypnout</string> - <string name="menu_about">About</string> <string name="menu_wizard">Průvodce</string> <string name="button_help">Pomoc</string> <string name="button_close">Zavřít</string> - <string name="button_about">About</string> <string name="button_clear_log">Vyčistit log</string> <string name="menu_verify">Ověřit</string> <string name="menu_exit">Konec</string> @@ -45,170 +43,31 @@ <string name="pref_has_root">Vyžaduje root přístup</string> <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string> <string name="status_install_success">Binárky toru byly úspěšně nainstalovány!</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">Chyba aplikace</string> <string name="wizard_title">Orbot</string> <string name="wizard_btn_tell_me_more">O Orbotovi</string> <string name="btn_next">Další</string> <string name="btn_back">Zpět</string> <string name="btn_finish">Dokončit</string> - <string name="btn_okay">Okay</string> <string name="btn_cancel">Zrušit</string>  - <string name="wizard_details">Some Orbot Details</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. 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">Práva udělena</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 in the Android Market.</string> - <string name="wizard_tips_otrchat">Gibberbot - 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_proxy_help_info">Nastavení Proxy</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 je připraven!</string> - <string name="wizard_final_msg">Hundreds of thousands 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="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> - <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden 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">Varování</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 \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</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_proxy_title">Outbound Network Proxy</string> - <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">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="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_">Privoxy 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 v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> - <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> - <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %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="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="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</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 The Tor Project </string> - <string name="btn_save_settings">Save Settings</string> </resources> diff --git a/values-eu/strings.xml b/values-eu/strings.xml index 1e61b79..613218b 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -37,10 +37,7 @@ <string name="pref_trans_proxy_summary">Aplikazioen Torifikatze Automatikoa</string> <string name="pref_transparent_all_title">Tor-tu Dena</string> <string name="pref_transparent_all_summary">Aplikazio guztien trafikoa Tor bidez proxyatu</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">Portu Zerrenda</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">Sartu proxyatzeko portuak</string> <string name="pref_has_root">Root sarrera eskatu</string> <string name="pref_has_root_summary">Root sarrera eskatu proxyatze gardenarentzat</string> @@ -56,47 +53,31 @@ <string name="btn_cancel">Utzi</string>  <string name="wizard_details">Orbot xehetasun batzuk</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. 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">Baimena Emanda</string> <string name="wizard_permissions_stock">Orbot Baimenak</string> <string name="wizard_premissions_msg_root">Bikain! Orbotentzako root baimenak gaituta dituzula detektatu dugu.</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">Root Orboti eman</string> <string name="wizard_configure">Torifikazioa Konfiguratu</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">Aplikazio gustiak Tor bidez proxyatu</string> <string name="wizard_configure_select_apps">Hautatu Banakako Aplikazioak Torentzat</string> <string name="wizard_tips_tricks">Orbot-gaitutako Aplikazioak</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 in the Android Market.</string> <string name="wizard_tips_otrchat">Gibberbot - Andriodrentzako berehalako mezulari bezero ziurra</string> <string name="wizard_tips_proxy">Proxy Ezarpenak - Ikasi zure aplikazioak Orbotekin funtziona dezaten nola konfiguratu</string> <string name="wizard_proxy_help_info">Proxy Ezarpenak</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 prest dago!</string> - <string name="wizard_final_msg">Hundreds of thousands 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="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> - <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> <string name="pref_hs_group">Ezkutuko Zerbitzuak</string> <string name="pref_general_group">Orokorra</string> <string name="pref_start_boot_title">Hasi Orbot Abiarazterakoan</string> <string name="pref_start_boot_summary">Automatikoki Orbot hasi eta Tor konektatu zure Android gailua abiarazterakoan</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">Abisua</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">Baimenak</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 \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  <string name="wizard_tips_title">Orbot-Gaitutako Aplikazioak</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb - Tor bidez lan egiten duen pribatutasun-hobetua duen nabigatzailea</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> @@ -106,22 +87,14 @@ <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/a…</string>-->  <string name="wizard_transproxy_title">Proxyatze Gardena</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">Bat ere ez</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">Supererabiltzaile sarrera eskatu</string> <string name="pref_select_apps">Aplikazioak hautatu</string> - <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> <string name="pref_node_configuration">Nodo Konfigurazioa</string> - <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> <string name="pref_entrance_node">Sarrera Nodoak</string> - <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Sartu Sarrera Nodoak</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Proxy mota</string> <string name="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Sartu Proxy Mota</string> @@ -132,57 +105,30 @@ <string name="pref_proxy_port_summary">Proxy zerbitzari portua</string> <string name="pref_proxy_port_dialog">Sartu Proxy portua</string> <string name="status">Egoera</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">Proxyatze gardena GAITUTA</string> - <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> <string name="warning_error_starting_transparent_proxying_">ABISUA: akatsa proxyatze gardena hasterakoan!</string> - <string name="transproxy_rules_cleared">TransProxy rules cleared</string> <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string> <string name="privoxy_is_running_on_port_">Privoxy hurrengo portua exekutatzen ari da:</string> - <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> <string name="bridge_error">Zubi Akatsa</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">Akatsa</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">Irteera Nodoak</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">Irteera Nodoak sartu</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">*Bakarrik* zehaztutako nodo hauek erabili</string> <string name="bridges">Zubiak</string> <string name="use_bridges">Zubiak erabili</string> <string name="bridges_obfuscated">Nahasitako Zubiak</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">Gaitu konfiguratutako zubiak nahasitako zubiak badira</string> <string name="ip_address_and_port_of_bridges">IP helbidea eta zubien portua</string> <string name="enter_bridge_addresses">Sartu Zubi Helbideak</string> <string name="relays">Erreleak</string> <string name="relaying">Erreleatzea</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">Errele Portua</string> - <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> <string name="enter_or_port">Sartu OR portua</string> <string name="relay_nickname">Errele ezizena</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">Portuak sartu</string> <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string> - <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">sartu localhost portuak ezkutuko zerbitzuentzat</string> <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</string> - <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> - <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">Tor Lizentzia</string> <string name="https_torproject_org">https://torproject.org</string> @@ -192,17 +138,9 @@ <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %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">ezkutuko zerbitzua hemen:</string> - <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string> <string name="pref_use_sys_iptables_title">Lehenetsitako Iptables erabili</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="notification_using_bridges">Zubiak gaituta!</string> <string name="default_bridges"/> <string name="set_locale_title">Lokala ezarri</string> @@ -210,5 +148,4 @@ <string name="wizard_locale_title">Hizkuntza aukeratu</string> <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara aldatu</string> <string name="powered_by">Tor Projectek indartua</string> - <string name="btn_save_settings">Save Settings</string> </resources> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 3a4959f..ce0bcb9 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -11,9 +11,6 @@ <string name="status_activated">Поврзан на мрежата Тор</string> <string name="status_disabled">\"Орбот е дезактивиран</string> <string name="status_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">ВНИМАНИЕ: Вашиот сообраќај сеуште не е анонимен! Треба да ги конфигурирате Вашите апликации да го користат проксито за HTTP, 127.0.0.1:8118, или проксито за SOCKS4A или SOCKS5, 127.0.0.1:9050</string> <string name="menu_home">Дома</string> <string name="menu_browse">Прелистување</string> @@ -85,19 +82,9 @@ <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 \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</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_proxy_title">Outbound Network Proxy</string> - <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">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="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_">Privoxy 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 v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> - <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> - <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %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="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="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</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">напојувано од проектот Тор</string> - <string name="btn_save_settings">Save Settings</string> </resources> diff --git a/values-ms_MY/strings.xml b/values-ms_MY/strings.xml index 70beb05..1a16594 100644 --- a/values-ms_MY/strings.xml +++ b/values-ms_MY/strings.xml @@ -121,7 +121,6 @@ <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Jenis Proxy</string> <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string> <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 30085e8..c0ab256 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -31,22 +31,10 @@ <string name="button_clear_log">Slett Logg</string> <string name="menu_verify">Check</string> <string name="menu_exit">Exit</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 All Trafikk</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 Liste</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="pref_has_root_summary">>Request root access for transparent proxying</string> <string name="wizard_title">Orbot</string> <string name="wizard_btn_tell_me_more">Om Orbot</string> <string name="btn_next">Neste</string> @@ -55,7 +43,6 @@ <string name="btn_okay">Ok</string> <string name="btn_cancel">Avbryt</string>  - <string name="wizard_details">Some Orbot Details</string> <string name="wizard_details_msg">Orbot er åpen programvare som inneholder Tor, LibEvent og Privoxy. Det leverer en lokal HTTP proxy (8118) og en SOCKS proxy (9050) tilkobling til Tor nettverket. Orbot kan også, med rot-tilgang, sende all internett-trafikk gjennom Tor.</string> <string name="wizard_permissions_root">Tilgang Innvilget</string> <string name="wizard_permissions_stock">Orbot Tilgangsnivåer</string> @@ -64,151 +51,28 @@ <string name="wizard_permissions_no_root">Hvis du ikke har rot-tilgang (eller ikke aner hva vi snakker om), sørg ihvertfall for å bruke programmer som er kompatible med Orbot.</string> <string name="wizard_permissions_consent">Jeg forstår og ønsker å fortsette uten Superbruker.</string> <string name="wizard_permission_enable_root">Gi Orbot tilgang.</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 in the Android Market.</string> - <string name="wizard_tips_otrchat">Gibberbot - 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_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 er klar!</string> <string name="wizard_final_msg">Hundretusener av mennesker over hele verden bruker Tor til en lang rekke forskjellige formål.\n\nJournalister og bloggere, menneskerettighetsforkjempere, politietterforskere, militære, bedrifter, mennesker i undertrykkende regimer, og vanlige borgere...og nå er du klar til å bruke det også!</string>  <string name="connect_first_time">Du er nå tilkoblet Tor-nettverket - men det betyr IKKE at ditt apparat er sikret. Du kan bruke \"Sjekk\" valget fra menyen for å sjekke din nettleser.\n\nBesøk oss på https://guardianproject.info/apps/orbot eller send en email til help(a)guardianproject.info for å få vite mer.</string> <string name="tor_check">Dette vil åpne din nettleser på https://check.torproject.org og sjekke om Orbot er riktig innstilt og om du er koblet til Tor.</string> - <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">Generelt</string> - <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Start Orbot og Tor automatisk når din Android starter opp.</string>   <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg med å forsvare deg mot innholdsfiltrering, trafikkanalyse og nettverksovervåkning som kan true ditt personvern, din konfidensielle informasjon og dine personlige forhold.\n\nDenne steg-for-steg guiden hjelper deg med å konfigurere Orbot og Tor på ditt apparat.</string>  <string name="wizard_warning_title">Advarsel</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 \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</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">Ingen</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_proxy_title">Outbound Network Proxy</string> - <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">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="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_">Privoxy 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 v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> - <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> - <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %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="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="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</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 The Tor Project </string> - <string name="btn_save_settings">Save Settings</string> </resources> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index d8c9097..3e7f20a 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -11,9 +11,6 @@ <string name="status_activated">Ligação estabelecida à rede Tor</string> <string name="status_disabled">\"Orbot está Desactivado</string> <string name="status_shutting_down">Orbot a encerrar</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">ATENÇÃO: A sua ligação ainda não é anónima! Por favor configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string> <string name="menu_home">Início</string> <string name="menu_browse">Explorar</string> @@ -34,18 +31,13 @@ <string name="press_to_start">- aguentar pressionado para iniciar - </string> <string name="pref_trans_proxy_group">Proxy Transparente (necessita de root)</string> <string name="pref_trans_proxy_title">Proxy Transparente</string> - <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> <string name="pref_transparent_all_title">Tor em Tudo</string> <string name="pref_transparent_all_summary">Passar todo o tráfego das apps pelo 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">Lista de Portas</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">Introduza portas para proxy</string> <string name="pref_has_root">Pedir Acesso como Root</string> <string name="pref_has_root_summary">Request root access for transparent proxying</string> <string name="status_install_success">Binários do Tor instalados com sucesso!</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">Erro de Aplicação</string> <string name="wizard_title">Orbot</string> <string name="wizard_btn_tell_me_more">Sobre o Orbot</string> @@ -56,159 +48,23 @@ <string name="btn_cancel">Cancelar</string>  <string name="wizard_details">Alguns detalhes sobre o Orbot</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. 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">Autorização concedida</string> <string name="wizard_permissions_stock">Permissões do Orbot</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">Autorizar acesso Root para o Orbot</string> <string name="wizard_configure">Configurar acesso com Tor</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 in the Android Market.</string> - <string name="wizard_tips_otrchat">Gibberbot - 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_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">Hundreds of thousands 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="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> - <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden 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 \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</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_proxy_title">Outbound Network Proxy</string> - <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">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="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_">Privoxy 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 v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> - <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> - <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %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="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="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</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 the Tor Project</string> - <string name="btn_save_settings">Save Settings</string> </resources> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index 734cd30..2c4f2d9 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -11,9 +11,6 @@ <string name="status_activated">Uppkopplad till Tor nätverket</string> <string name="status_disabled">\"Orbot är inaktiverad</string> <string name="status_shutting_down">Orbot avslutas</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">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina apps att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string> <string name="menu_home">Hem</string> <string name="menu_browse">Browse</string> @@ -36,14 +33,11 @@ <string name="pref_trans_proxy_title">Transparent Proxy</string> <string name="pref_trans_proxy_summary">Automatisk Torifiering av Appar</string> <string name="pref_transparent_all_title">Tor:a Allt</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">VARNING: Kringgår vanliga portar (80, 443, etc). *ANVÄND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar.</string> <string name="pref_transparent_port_title">Port-lista</string> <string name="pref_transparent_port_summary">Lista över portar att köra genom proxy. *ANVÄND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar</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="pref_has_root_summary">>Request root access for transparent proxying</string> <string name="status_install_success">Tor-binärer installerades utan problem!</string> <string name="status_install_fail">Tor-binärfilerna kunde inte installeras. Kontrollera loggen och underrätta tor-assistants(a)torproject.org</string> <string name="title_error">Applikationsfel</string> @@ -57,158 +51,41 @@  <string name="wizard_details">Orbot-information</string> <string name="wizard_details_msg">Orbot är en öppen källkods-applikation som innehåller Tor, LibEvent och Privoxy. Den tillhandahåller en local HTTP-proxy (8118) och en SOCKS-proxy (9050) in i Tor-nätverket. Orbot har också möjligheten, på en rootad enhet, att skicka all internet-trafik genom 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 in the Android Market.</string> - <string name="wizard_tips_otrchat">Gibberbot - 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_proxy_help_info">Proxy-inställningar</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">Hundreds of thousands 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="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string> - <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">Allmänt</string> - <string name="pref_start_boot_title">Start Orbot on Boot</string> - <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>   - <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 \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</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">Det här är avancerade inställningar som kan minska din anonymitet</string> <string name="pref_entrance_node">Ingångsnoder</string> - <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> - <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Proxy-typ</string> <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> <string name="pref_proxy_host_title">Proxy-värd</string> <string name="pref_proxy_host_summary">Proxy-servernamn</string> - <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Outbound Proxy Port</string> - <string name="pref_proxy_port_summary">Proxy server port</string> - <string name="pref_proxy_port_dialog">Enter Proxy port</string> - <string name="status">Status</string> <string name="setting_up_full_transparent_proxying_">Ställer in full transparent proxyfiering...</string> <string name="setting_up_app_based_transparent_proxying_">Ställer in app-baserad transparent proxyfiering...</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_">Kunde inte starta Tor-process:</string> <string name="privoxy_is_running_on_port_">Privoxy körs på port:</string> <string name="setting_up_port_based_transparent_proxying_">Ställer in port-baserad transparent proxyfiering...</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">Fel</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">Utgångsnoder</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">Allmänt</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">Projektets hemsidor:</string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> <string name="the_tor_license">Tor-licensen</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">Tredjepartsprogramvara:</string> - <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> - <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> - <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %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="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="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</string> - <string name="set_locale_summary">Choose the locale and language for Orbot</string> <string name="wizard_locale_title">Välj språk</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> <string name="powered_by">drivs av Tor-projektet</string> - <string name="btn_save_settings">Save Settings</string> </resources> diff --git a/values/strings.xml b/values/strings.xml index 461bf86..70f66b4 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -25,6 +25,8 @@ <string name="menu_stop">Stop</string> <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> + <string name="main_layout_download">Download (speed/total)</string> + <string name="main_layout_upload">Upload (speed/total)</string> <string name="button_help">Help</string> <string name="button_close">Close</string> <string name="button_about">About</string> @@ -72,6 +74,9 @@ <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 in the Android Market.</string> <string name="wizard_tips_otrchat">Gibberbot - 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_firefox">Firefox with Proxy Mobile add-on (extra install after)</string> + <string name="wizard_tips_twitter">Twitter supports http proxy \"localhost:8118\"</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> @@ -187,8 +192,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>

1 0

[orbot/master] updated icon and versionin (alpha 1.0.10)
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit eb2f1c22dfe1f3aa1c1cf8a2d99a7755a0a17228 Author: n8fr8 <nathan(a)freitas.net> Date: Tue Jul 24 13:08:58 2012 -0400 updated icon and versionin (alpha 1.0.10) --- AndroidManifest.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 99dff50..5e2d692 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.17-beta-1.0.9-rc4" - android:versionCode="42" + android:versionName="0.2.3.17-alpha-1.0.10" + android:versionCode="44" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="15"/> - <application android:name=".OrbotApp" android:icon="@drawable/icon" + <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="15"/> + <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:configChanges="locale" + android:configChanges="locale|orientation" > - <activity android:name=".Orbot"> + <activity android:name=".Orbot" android:configChanges="locale|orientation"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" />

1 0

[orbot/master] updated method for building privoxy from src
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit a80d029fef7fac75b5072740baa9cd54aa560491 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jul 6 14:53:29 2012 -0400 updated method for building privoxy from src --- external/Makefile | 29 +- external/privoxy.configure.in | 1463 +++++++++++++++++++++++++++++++++++++++++ external/privoxy.tar.gz | Bin 0 -> 1811124 bytes 3 files changed, 1490 insertions(+), 2 deletions(-) diff --git a/external/Makefile b/external/Makefile index f82c4c6..a1ae576 100644 --- a/external/Makefile +++ b/external/Makefile @@ -117,6 +117,29 @@ libevent-clean: git clean -fdx #------------------------------------------------------------------------------# +# iptables + +iptables/Makefile: + cd iptables && ./autogen.sh + cp config.sub iptables + cp config.guess iptables + cd iptables && \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -DNO_SHARED_LIBS -DXTABLES_INTERNAL -DIPTABLES_VERSION=\"1.4.10\" =-DXTABLES_VERSION=\"1.4.10\" # -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -DXTABLES_LIBDIR -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ + ./configure \ + --host=$(HOST) \ + --disable-shared + +iptables-build-stamp: iptables/Makefile + $(MAKE) -C iptables + touch iptables-build-stamp + +iptables: iptables-build-stamp + +iptables-clean: + -rm -f iptables-build-stamp + -cd iptables + +#------------------------------------------------------------------------------# # tor tor/configure: @@ -193,6 +216,9 @@ obfsproxy-clean: privoxy/config.log: + tar xzvf privoxy.tar.gz + mv privoxy*stable privoxy + cp privoxy.configure.in privoxy/configure.in cd privoxy && \ autoheader cd privoxy && \ @@ -216,8 +242,7 @@ privoxy: privoxy-build-stamp privoxy-clean: -rm -f bin/privoxy -rm -f privoxy-build-stamp - -cd privoxy && \ - git clean -fdx . + -rm -rf privoxy #------------------------------------------------------------------------------# # JTorControl library diff --git a/external/privoxy.configure.in b/external/privoxy.configure.in new file mode 100644 index 0000000..2945a7a --- /dev/null +++ b/external/privoxy.configure.in @@ -0,0 +1,1463 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id: configure.in,v 1.126 2009/03/21 10:45:06 fabiankeil Exp $ +dnl +dnl Written by and Copyright (C) 2001-2009 the +dnl Privoxy team. http://www.privoxy.org/ +dnl +dnl Based on the Internet Junkbuster originally written +dnl by and Copyright (C) 1997 Anonymous Coders and +dnl Junkbusters Corporation. http://www.junkbusters.com +dnl +dnl This program is free software; you can redistribute it +dnl and/or modify it under the terms of the GNU General +dnl Public License as published by the Free Software +dnl Foundation; either version 2 of the License, or (at +dnl your option) any later version. +dnl +dnl This program is distributed in the hope that it will +dnl be useful, but WITHOUT ANY WARRANTY; without even the +dnl implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. See the GNU General Public +dnl License for more details. +dnl +dnl The GNU General Public License should be included with +dnl this file. If not, you can view it at +dnl http://www.gnu.org/copyleft/gpl.html +dnl or write to the Free Software Foundation, Inc., 59 +dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. +dnl +dnl $Log: configure.in,v $ +dnl Revision 1.126 2009/03/21 10:45:06 fabiankeil +dnl Declare the code stable. +dnl +dnl Revision 1.125 2009/02/25 16:58:03 fabiankeil +dnl And the journey continues. Bump version to 3.0.12 UNRELEASED. +dnl +dnl Revision 1.124 2009/02/12 15:42:00 fabiankeil +dnl Declare the code stable. +dnl +dnl Revision 1.123 2009/02/06 18:17:32 fabiankeil +dnl Boldly enable keep-alive support where possible. +dnl +dnl Revision 1.122 2008/10/18 11:17:52 fabiankeil +dnl Connection keep-alive support is ready for testing, +dnl allow enabling it through the configure script. +dnl +dnl Revision 1.121 2008/08/30 12:03:07 fabiankeil +dnl Remove FEATURE_COOKIE_JAR. +dnl +dnl Revision 1.120 2008/08/21 17:19:50 fabiankeil +dnl Change version to 3.0.11 UNRELEASED. +dnl +dnl Revision 1.119 2008/08/13 16:53:50 fabiankeil +dnl Change version to 3.0.10 stable. +dnl +dnl Revision 1.118 2008/06/27 12:50:44 fabiankeil +dnl Here's looking at you, Gentoo Linux: Show a warning if +dnl --disable-pthread is used even though pthreads are available. +dnl +dnl Revision 1.117 2008/06/14 12:47:30 fabiankeil +dnl Set CODE_STATUS to beta. +dnl +dnl Revision 1.116 2008/06/08 11:55:09 fabiankeil +dnl - Show a warning if the soon-to-be-removed static PCRE code is used. +dnl - Hide the "using built-in static pcrs" message. With dynamic linking +dnl against PCRS disabled, the message isn't particularly useful. +dnl +dnl Revision 1.115 2008/05/25 15:50:14 fabiankeil +dnl Try to use zlib by default, but just show a warning if it's +dnl unavailable. Remove --enable-zlib, add --disable-zlib. +dnl +dnl Revision 1.114 2008/04/06 15:18:33 fabiankeil +dnl Oh well, rename the --enable-pcre-host-patterns option to +dnl --enable-extended-host-patterns as it's not really PCRE syntax. +dnl +dnl Revision 1.113 2008/04/06 14:54:26 fabiankeil +dnl Use PCRE syntax in host patterns when configured +dnl with --enable-pcre-host-patterns. +dnl +dnl Revision 1.112 2008/03/27 18:27:22 fabiankeil +dnl Remove kill-popups action. +dnl +dnl Revision 1.111 2008/02/03 14:40:47 fabiankeil +dnl Remove unused OSX_DARWIN macro. Reported by Mark Miller in #1852529. +dnl +dnl Revision 1.110 2008/01/26 10:52:13 fabiankeil +dnl Change version to 3.0.9 UNRELEASED. +dnl +dnl Revision 1.109 2008/01/20 14:07:09 fabiankeil +dnl Set CODE_STATUS to stable. +dnl +dnl Revision 1.108 2007/12/10 02:30:00 hal9 +dnl Change versioning for > 3.0.7 && < 3.0.8 +dnl +dnl Revision 1.107 2007/11/15 02:50:14 hal9 +dnl Setting to "beta" (for doc builds, etc). +dnl +dnl Revision 1.106 2007/05/11 11:49:41 fabiankeil +dnl Check for strlcat(). +dnl +dnl Revision 1.105 2007/04/09 17:34:58 fabiankeil +dnl Check for snprintf(). +dnl +dnl Revision 1.104 2007/03/31 13:35:11 fabiankeil +dnl Add checks for gettimeofday() and strlcpy(). +dnl +dnl Revision 1.103 2007/01/20 16:29:38 fabiankeil +dnl Suppress edit buttons for action files if Privoxy has +dnl no write access. Suggested by Roland in PR 1564026. +dnl +dnl Revision 1.102 2007/01/18 14:55:45 fabiankeil +dnl Check for tzset() and putenv() to make sure the +dnl replacement timegm() isn't included on systems +dnl where it fails to compile. +dnl +dnl Revision 1.101 2007/01/12 15:20:17 fabiankeil +dnl Temporarily ignore external libpcrs to prevent +dnl problems that are fixed in Privoxy's own version. +dnl +dnl Revision 1.100 2007/01/07 07:38:10 joergs +dnl Disabled -pipe for AmigaOS4. +dnl +dnl Revision 1.99 2007/01/01 19:36:37 fabiankeil +dnl Integrate a modified version of Wil Mahan's +dnl zlib patch (PR #895531). +dnl +dnl Revision 1.98 2006/12/17 19:15:26 fabiankeil +dnl Added ./configure switch for FEATURE_GRACEFUL_TERMINATION. +dnl +dnl Revision 1.97 2006/11/21 18:32:46 hal9 +dnl Setting version to 3.0.7 UNRELEASED for lack of a better setting. +dnl +dnl Revision 1.96 2006/11/18 14:42:51 fabiankeil +dnl Mark as stable. +dnl +dnl Revision 1.95 2006/11/14 02:08:59 hal9 +dnl Setting version string to 3.0.6 UNRELEASED. This needs to be reset to 3.0.6 +dnl stable just before CVS is tagged for release. +dnl +dnl Revision 1.94 2006/11/13 19:05:50 fabiankeil +dnl Make pthread mutex locking more generic. Instead of +dnl checking for OSX and OpenBSD, check for FEATURE_PTHREAD +dnl and use mutex locking unless there is an _r function +dnl available. Better safe than sorry. +dnl +dnl Fixes "./configure --disable-pthread" and should result +dnl in less threading-related problems on pthread-using platforms, +dnl but it still doesn't fix BR#1122404. +dnl +dnl Revision 1.93 2006/09/22 01:26:20 hal9 +dnl Set version to 3.0.5 BETA for hopefully release this weekend. +dnl +dnl Revision 1.92 2006/08/17 17:09:49 fabiankeil +dnl Added check for timegm(). +dnl +dnl Revision 1.91 2006/08/13 22:01:51 fabiankeil +dnl Added checks for strptime() and random() +dnl +dnl Revision 1.90 2006/07/18 14:48:45 david__schmidt +dnl Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +dnl with what was really the latest development (the v_3_0_branch branch) +dnl +dnl Revision 1.68.2.20 2004/01/31 16:31:46 oes +dnl Resetting version info to 0.0.0 UNRELEASED +dnl +dnl Revision 1.68.2.19 2004/01/30 09:26:03 oes +dnl Added docbook paths for debian sarge; set status for release +dnl +dnl Revision 1.68.2.18 2003/12/08 15:10:29 oes +dnl Bugfix: --with-docbook now correctly accepts its path parameter. Thanks, Roland! +dnl +dnl Revision 1.68.2.17 2003/10/18 18:41:26 david__schmidt +dnl Update to remain buildable on OS/2 - remove the failures +dnl due to missing unixisms +dnl +dnl Revision 1.68.2.16 2003/03/26 16:05:14 oes +dnl Marked as 0.0.0 UNRELEASED +dnl +dnl Revision 1.68.2.15 2003/03/26 00:25:00 oes +dnl Bump version for 3.0.2 +dnl +dnl Revision 1.68.2.14 2003/03/25 13:27:12 hal9 +dnl Manually apply Docbook/FreeBSD patch #708081 from a.go at tiscali.nl. +dnl +dnl Revision 1.68.2.13 2003/03/18 19:38:57 oes +dnl Set version info for 3.0.1 release +dnl +dnl Revision 1.68.2.12 2003/03/07 03:41:04 david__schmidt +dnl Wrapping all *_r functions (the non-_r versions of them) with mutex semaphores for OSX. Hopefully this will take care of all of those pesky crash reports. +dnl +dnl Revision 1.68.2.11 2003/03/06 15:22:37 oes +dnl Fixed minor shell syntax bug +dnl +dnl Revision 1.68.2.10 2003/01/08 16:39:41 oes +dnl Changing default to exclude FEATURE_IMAGE_DETECT_MSIE because of problem reports with recent IEs +dnl +dnl Revision 1.68.2.9 2002/12/13 23:47:45 hal9 +dnl Add openbsd $specialflags per gunner at styx2002.no-ip.org +dnl +dnl Revision 1.68.2.8 2002/11/27 12:55:26 oes +dnl Fixed broken handling of pre-set CFLAGS +dnl +dnl Revision 1.68.2.7 2002/10/25 02:44:22 hal9 +dnl Port of make install, etc from main trunk. Needs testing! Add Slackware +dnl support, and other related changes. Update related docs. +dnl +dnl Revision 1.68.2.6 2002/09/25 15:35:15 oes +dnl Marking as non-release +dnl +dnl Revision 1.68.2.5 2002/08/25 23:37:00 hal9 +dnl Getting ready for 3.0 release. +dnl +dnl Revision 1.68.2.4 2002/08/10 11:21:57 oes +dnl - Set Version to 2.9.20 (beta) +dnl - Add two AC_DEFINEs that indicate if the pcre*.h headers +dnl are located in a pcre/ subdir to the include path. +dnl +dnl Revision 1.68.2.3 2002/08/06 11:29:36 oes +dnl Fixed detection/inclusion of pcre.h, which is in a pcre subdir on RH +dnl +dnl Revision 1.68.2.2 2002/07/30 19:36:09 hal9 +dnl Bump version to 2.9.17. +dnl +dnl Revision 1.68.2.1 2002/07/26 15:21:12 oes +dnl Bumped version number for 2.9.16 freeze +dnl +dnl Revision 1.68 2002/05/25 16:54:54 jongfoster +dnl Detect if the compiler supports -pthread. +dnl Hopefully this will fix bug 560442. (I don't have a HP PA-RISC +dnl machine to test this!) +dnl +dnl Revision 1.67 2002/05/03 14:33:59 oes +dnl Generate doc/soucre/ldp.dsl +dnl +dnl Revision 1.66 2002/05/03 00:41:56 oes +dnl Set version to 2.9.15 to comply with new versioning scheme +dnl +dnl Revision 1.65 2002/04/25 19:13:57 morcego +dnl Removed RPM release number declaration on configure.in +dnl Changed makefile to use given value for RPM_PACKAGEV when on uploading +dnl targets (will produce an error, explaining who to do it, if no value +dnl if provided). +dnl +dnl Revision 1.64 2002/04/22 16:32:31 morcego +dnl configure.in, *.spec: Bumping release to 2 (2.9.14-2) +dnl -rh.spec: uid and gid are now macros +dnl -suse.spec: Changing the header Copyright to License (Copyright is +dnl deprecable) +dnl +dnl Revision 1.63 2002/04/11 11:00:21 oes +dnl Applied Moritz' fix for socklen_t on Solaris +dnl +dnl Revision 1.62 2002/04/11 10:09:20 oes +dnl Version 2.9.14 +dnl +dnl Revision 1.61 2002/04/10 18:14:45 morcego +dnl - (privoxy-rh.spec only) Relisting template files on the %%files section +dnl - (configure.in, privoxy-rh.spec) Bumped package release to 5 +dnl +dnl Revision 1.60 2002/04/09 16:38:49 oes +dnl Added detection of missing config.h.in +dnl +dnl Revision 1.59 2002/04/06 20:23:55 jongfoster +dnl Removing unnessacery tests (C++, ranlib) +dnl +dnl Revision 1.58 2002/04/04 20:49:20 swa +dnl attempt to consolidate the +dnl different dokbook versions. +dnl +dnl Revision 1.57 2002/04/04 00:36:36 gliptak +dnl always use pcre for matching +dnl +dnl Revision 1.56 2002/04/03 22:28:03 gliptak +dnl Removed references to gnu_regex +dnl +dnl Revision 1.55 2002/04/03 03:54:38 gliptak +dnl Checking pcre version +dnl +dnl Revision 1.54 2002/04/01 00:54:24 gliptak +dnl More changes needed around regex support. +dnl +dnl Revision 1.53 2002/03/29 20:09:01 swa +dnl al's patch +dnl +dnl Revision 1.52 2002/03/29 19:51:40 gliptak +dnl Correcting compile problem with Debian +dnl +dnl Revision 1.51 2002/03/28 20:43:00 swa +dnl set make correctly +dnl +dnl Revision 1.50 2002/03/27 03:03:45 hal9 +dnl Add test for man2html +dnl +dnl Revision 1.49 2002/03/27 02:19:52 david__schmidt +dnl More Mac OSX support: +dnl - Get rid of extraneous, noisy -pthread warnings +dnl - Define unix so we get oes' unix-tagged changes +dnl +dnl Revision 1.48 2002/03/26 22:29:54 swa +dnl we have a new homepage! +dnl +dnl Revision 1.47 2002/03/26 16:41:00 hal9 +dnl Upped RPM Release to 3 (need to build new RH packages) +dnl +dnl Revision 1.46 2002/03/24 18:55:06 jongfoster +dnl Making Docbook work under Windows +dnl +dnl Revision 1.45 2002/03/24 14:19:55 swa +dnl set rpm package release in configure.in. nowhere else. +dnl +dnl Revision 1.44 2002/03/24 13:25:43 swa +dnl name change related issues +dnl +dnl Revision 1.43 2002/03/24 12:56:21 swa +dnl name change related issues. +dnl +dnl Revision 1.42 2002/03/22 18:11:37 jongfoster +dnl Bumping version number to 2.9.12 +dnl +dnl Revision 1.41 2002/03/19 19:30:04 morcego +dnl - Fixing stylesheet checking on configure. If it is found, no further checks +dnl should be done +dnl +dnl - configure will now check for db2html or docbook2html (should work now +dnl on SuSe without the docbktls package) +dnl +dnl Revision 1.40 2002/03/09 14:33:30 oes +dnl Fixing the (harmless) AC_CHECK_FILE warnings +dnl +dnl Revision 1.39 2002/03/08 16:46:13 oes +dnl Added --enable-no-gifs +dnl +dnl Revision 1.38 2002/03/08 14:13:50 morcego +dnl Fixing configure, to remove a command not found error. +dnl +dnl Revision 1.37 2002/03/08 12:58:21 oes +dnl Tiny bugfix in AC_ARG_WITH(debug) +dnl +dnl Revision 1.36 2002/03/06 23:50:36 morcego +dnl Will not test for a text browser if we are not using docbook. +dnl +dnl Revision 1.35 2002/03/06 21:55:52 morcego +dnl New configure option: --with-docbook=(yes|no|directory) +dnl Preliminary new platform detection code included. Will work with the +dnl old one for now. No use just trowing it away +dnl +dnl Revision 1.34 2002/03/06 20:57:00 morcego +dnl Fixing detection of stylesheets on SuSe. +dnl +dnl Revision 1.33 2002/03/05 17:31:11 morcego +dnl Search for docbook.dsl. Should solve portability problems for SuSe. +dnl +dnl Revision 1.32 2002/03/05 14:07:43 morcego +dnl configure now detects rpm topdir, and change GNUmakefile acordingly +dnl (based on sugestion by Sarantis Paskalis) +dnl +dnl Revision 1.31 2002/03/05 13:43:28 morcego +dnl Checking for text browser, so redhat-dok can work. +dnl +dnl Revision 1.30 2002/03/04 17:58:01 oes +dnl Deleted _DEBUG and PID_FILE_PATH +dnl +dnl Revision 1.29 2002/02/28 14:20:53 oes +dnl Fixed detection of gethost*_r functions on Solaris +dnl +dnl Revision 1.28 2002/02/27 15:02:38 oes +dnl Incremented version number +dnl +dnl Revision 1.27 2002/01/10 12:35:18 oes +dnl Added cross-compile defaults to the AC_CHECK_SIZEOF macros +dnl to silence autoconf warnings. Numbers are for Intel/Linux. +dnl Is there a better way? +dnl +dnl Revision 1.26 2002/01/09 14:29:49 oes +dnl - Added AC_CHECK_FUNC tests for the availability of +dnl gethostbyname_r, gethostbyaddr_r, gmtime_r and +dnl localtime_r, as well as AC_TRY_COMPILE tests to +dnl determine their signatures. +dnl +dnl - Fixed a bug with the init of CFLAGS that was +dnl reported by barsnick +dnl +dnl Revision 1.25 2002/01/04 15:27:18 oes +dnl Changed quoting of CODE_STATUS for use in make +dnl +dnl Revision 1.24 2001/12/30 14:07:31 steudten +dnl - Add signal handling (unix) +dnl - Add SIGHUP handler (unix) +dnl - Add creation of pidfile (unix) +dnl - Add action 'top' in rc file (RH) +dnl - Add entry 'SIGNALS' to manpage +dnl - Add exit message to logfile (unix) +dnl +dnl Revision 1.23 2001/12/09 20:24:42 david__schmidt +dnl Change from "alpha" to "beta" in configure.in +dnl +dnl Revision 1.22 2001/12/01 11:24:01 jongfoster +dnl Renaming Makefile.in to GNUmakefile.in so that non-GNU versions of +dnl make break in a more obvious way. +dnl +dnl Revision 1.21 2001/11/30 21:35:54 jongfoster +dnl Bumping version number to 2.9.10 +dnl +dnl Revision 1.20 2001/10/23 21:24:09 jongfoster +dnl Support for FEATURE_CGI_EDIT_ACTIONS +dnl +dnl Revision 1.19 2001/10/07 15:33:14 oes +dnl Removed FEATURE_DENY_GZIP +dnl Bumped up version number +dnl +dnl Revision 1.18 2001/09/13 13:10:24 steudten +dnl +dnl PreWork for Debug Interface. +dnl Add new option "--with-debug" to enable debugging (flags aso.) +dnl +dnl Revision 1.17 2001/09/12 23:44:55 david__schmidt +dnl Mac OSX (Darwin) support added. +dnl +dnl Revision 1.16 2001/09/12 22:55:45 joergs +dnl AmigaOS support added. +dnl +dnl Revision 1.15 2001/09/12 17:28:59 david__schmidt +dnl +dnl OS/2 port: update autoconf'd support for the platform. +dnl +dnl Revision 1.14 2001/07/30 22:12:11 jongfoster +dnl Fixing Solaris build (I hope) and tidying up #defines: +dnl - All feature #defines are now of the form FEATURE_xxx +dnl - Permanently turned off WIN_GUI_EDIT +dnl - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS +dnl +dnl Revision 1.13 2001/07/29 17:09:17 jongfoster +dnl Major changes to build system in order to fix these bugs: +dnl - pthreads under Linux was broken - changed -lpthread to -pthread +dnl - Compiling in MinGW32 mode under CygWin now correctly detects +dnl which shared libraries are available +dnl - Solaris support (?) (Not tested under Solaris yet) +dnl +dnl Revision 1.12 2001/07/25 19:16:27 oes +dnl Bumping version number to 2.9.8 +dnl +dnl Revision 1.11 2001/07/21 18:00:07 jongfoster +dnl Bumping version number to 2.9.7 +dnl +dnl Revision 1.10 2001/07/18 17:25:04 oes +dnl Fixed a typo +dnl +dnl Revision 1.9 2001/07/15 19:45:13 jongfoster +dnl Added support for linking with POSIX threads library +dnl +dnl Revision 1.8 2001/07/15 17:54:29 jongfoster +dnl Renaming #define STATIC to STATIC_PCRE +dnl Adding new #define FEATURE_PTHREAD that will be used to enable +dnl POSIX threads support. +dnl +dnl Revision 1.7 2001/07/13 13:58:05 oes +dnl Completely reorganized the selection scheme for +dnl pcre, pcreposix, pcrs and gnu_regex: +dnl +dnl The presence of shared pcre, pcreposix or pcrs +dnl libraried is now autodetected. Additionally, the +dnl user can enforce using the built-in static variants +dnl by specifying --disable-dynamic-(pcre|pcrs). +dnl Care is taken to avoid that pcre is dyn, while pcreposix +dnl is static, if both are used and that pcrs is static if +dnl pcrs is. +dnl +dnl The choice between pcre, gnu or no regex for actionsfile +dnl URL matching is now via +dnl --(enable|disable)-regex-matching[=(gnu|pcre|no)] with the +dnl default being pcre. +dnl +dnl Revision 1.6 2001/06/29 21:56:40 oes +dnl Version -> 2.9.5 +dnl +dnl Revision 1.5 2001/06/29 13:26:27 oes +dnl Introduced #define CODE_STATUS +dnl +dnl Revision 1.4 2001/05/29 09:50:24 jongfoster +dnl Unified blocklist/imagelist/permissionslist. +dnl File format is still under discussion, but the internal changes +dnl are (mostly) done. +dnl +dnl Also modified interceptor behaviour: +dnl - We now intercept all URLs beginning with one of the following +dnl prefixes (and *only* these prefixes): +dnl * http://i.j.b/ +dnl * http://ijbswa.sf.net/config/ +dnl * http://ijbswa.sourceforge.net/config/ +dnl - New interceptors "home page" - go to http://i.j.b/ to see it. +dnl - Internal changes so that intercepted and fast redirect pages +dnl are not replaced with an image. +dnl - Interceptors now have the option to send a binary page direct +dnl to the client. (i.e. ijb-send-banner uses this) +dnl - Implemented show-url-info interceptor. (Which is why I needed +dnl the above interceptors changes - a typical URL is +dnl "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". +dnl The previous mechanism would not have intercepted that, and +dnl if it had been intercepted then it then it would have replaced +dnl it with an image.) +dnl +dnl Revision 1.3 2001/05/22 18:46:04 oes +dnl +dnl - Enabled filtering banners by size rather than URL +dnl by adding patterns that replace all standard banner +dnl sizes with the "Junkbuster" gif to the re_filterfile +dnl +dnl - Enabled filtering WebBugs by providing a pattern +dnl which kills all 1x1 images +dnl +dnl - Added support for PCRE_UNGREEDY behaviour to pcrs, +dnl which is selected by the (nonstandard and therefore +dnl capital) letter 'U' in the option string. +dnl It causes the quantifiers to be ungreedy by default. +dnl Appending a ? turns back to greedy (!). +dnl +dnl - Added a new interceptor ijb-send-banner, which +dnl sends back the "Junkbuster" gif. Without imagelist or +dnl MSIE detection support, or if tinygif = 1, or the +dnl URL isn't recognized as an imageurl, a lame HTML +dnl explanation is sent instead. +dnl +dnl - Added new feature, which permits blocking remote +dnl script redirects and firing back a local redirect +dnl to the browser. +dnl The feature is conditionally compiled, i.e. it +dnl can be disabled with --disable-fast-redirects, +dnl plus it must be activated by a "fast-redirects" +dnl line in the config file, has its own log level +dnl and of course wants to be displayed by show-proxy-args +dnl Note: Boy, all the #ifdefs in 1001 locations and +dnl all the fumbling with configure.in and acconfig.h +dnl were *way* more work than the feature itself :-( +dnl +dnl - Because a generic redirect template was needed for +dnl this, tinygif = 3 now uses the same. +dnl +dnl - Moved GIFs, and other static HTTP response templates +dnl to project.h +dnl +dnl - Some minor fixes +dnl +dnl - Removed some >400 CRs again (Jon, you really worked +dnl a lot! ;-) +dnl +dnl Revision 1.2 2001/05/20 01:21:20 jongfoster +dnl Version 2.9.4 checkin. +dnl - Merged popupfile and cookiefile, and added control over PCRS +dnl filtering, in new "permissionsfile". +dnl - Implemented LOG_LEVEL_FATAL, so that if there is a configuration +dnl file error you now get a message box (in the Win32 GUI) rather +dnl than the program exiting with no explanation. +dnl - Made killpopup use the PCRS MIME-type checking and HTTP-header +dnl skipping. +dnl - Removed tabs from "config" +dnl - Moved duplicated url parsing code in "loaders.c" to a new funcition. +dnl - Bumped up version number. +dnl +dnl Revision 1.1.1.1 2001/05/15 13:58:50 oes +dnl Initial import of version 2.9.3 source tree +dnl +dnl + + +dnl ================================================================= +dnl AutoConf Initialization +dnl ================================================================= + +AC_REVISION($Revision: 1.126 $) +AC_INIT(jcc.c) + +if test ! -f config.h.in; then + echo "You need to run autoheader first. " + echo -n "Shall I do this for you now? (y/n) " + read answer + if test "$answer" != "y"; then + exit 1 + else + autoheader + fi +fi + +AC_CONFIG_HEADER([config.h]) +AC_CANONICAL_HOST + +dodk=auto +DKPREFIX=none +AC_ARG_WITH(docbook, dnl + --with-docbook=[[yes|no|directory]] + Enable docbook documentation creation + (default = yes, for gnu and linux),[dnl +case "$with_docbook" in +yes) dodk=yes;; +no) dodk=no;; +*) + dodk=yes + DKPREFIX=$withval + ;; +esac +]) +DB2HTML=false +AC_ARG_WITH(db2html, dnl + --with-db2html=<path/executable> + Set the location of the docbook to html converter + (default = search),[dnl +DB2HTML=$withval +]) + +dnl ================================================================= +dnl Application version number +dnl ================================================================= + +VERSION_MAJOR=3 +VERSION_MINOR=0 +VERSION_POINT=12 +CODE_STATUS="stable" + +dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be +dnl used for CGI output. Set version to 0.0.0 and status to "UNRELEASED" +dnl whenever CVS in a stable branch differs from the last release. + +dnl ================================================================= +dnl Substitute the version numbers +dnl ================================================================= + +AC_SUBST(VERSION_MAJOR) +AC_SUBST(VERSION_MINOR) +AC_SUBST(VERSION_POINT) +AC_SUBST(CODE_STATUS) + +dnl +AC_DEFINE_UNQUOTED(VERSION_MAJOR,${VERSION_MAJOR}) +AC_DEFINE_UNQUOTED(VERSION_MINOR,${VERSION_MINOR}) +AC_DEFINE_UNQUOTED(VERSION_POINT,${VERSION_POINT}) +AC_DEFINE_UNQUOTED(VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}") +AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}") + +dnl ================================================================= +dnl Checks for programs needed to build. +dnl ================================================================= + +dnl Keep AC_PROG_CC from setting its own defaults: +if test "X$CFLAGS" = "X"; then + CFLAGS=" " +fi + +AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +AC_PROG_AWK + +AC_CHECK_PROG(GDB,gdb,yes,no) +AC_PATH_PROG(BGROUPS,groups,no,/bin:/usr/bin:/usr/local/bin) +AC_PATH_PROG(ID,id,no,/bin:/usr/bin:/usr/local/bin) +AC_SUBST(ID) +AC_SUBST(BGROUPS) + +dnl ================================================================= +dnl debug, gcc and gdb support +dnl ================================================================= + +AC_ARG_WITH(debug, + [ --with-debug Enable debug mode], + [ + if test "x$withval" != "xno" ; then + if test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + if test "$GDB"; then + CFLAGS="$CFLAGS -ggdb" + else + CFLAGS="$CFLAGS -g" + fi + CFLAGS="$CFLAGS -Wshadow -Wconversion" + else + CFLAGS="$CFLAGS -g" + fi + fi + fi + ], + [ + if test "X$CFLAGS" = "X "; then # if CFLAGS were unset (see above) + if test "$GCC" = yes; then + CFLAGS="-O2" + fi + fi + ] +) + +dnl ================================================================= +dnl Check for user and group validity +dnl ================================================================= + + +if test "$EMXOS2" = yes; then + echo "Skipping user and group validity stuff."; + +else + + $ID privoxy >/dev/null 2>/dev/null + if test $? -ne 0 ; then + AC_MSG_WARN(There is no user 'privoxy' on this system) + fi + AC_MSG_CHECKING([for user]) + AC_ARG_WITH(user, + [ --with-user=privoxy Set user under which privoxy will run], + [ + if test "x$withval" != "xyes"; then + if test $ID = no ; then + AC_MSG_ERROR(There is no 'id' program on this system) + else + AC_MSG_RESULT($with_user) + $ID $with_user 2>/dev/null >/dev/null + if test $? -eq 0 ; then + USER=$with_user; + else + AC_MSG_ERROR(There is no user '$with_user' on this system) + fi + fi + else + AC_MSG_ERROR(We need a user if you give me this parameter) + fi + ], + [ + if test $ID = no ; then + AC_MSG_ERROR(There is no 'id' programm on this system) + else + AC_MSG_RESULT(none specified) + USER=$with_user + fi + ] + ) + AC_SUBST(USER) + + AC_MSG_CHECKING([for group]) + AC_ARG_WITH(group, + [ --with-group=privoxy Set group for privoxy], + [ + if test "x$withval" != "xyes"; then + if test $BGROUPS = no ; then + AC_MSG_ERROR(There is no 'groups' program on this system) + else + AC_MSG_RESULT($with_group) + $BGROUPS $USER >/dev/null + if test $? -eq 0 ; then + # FIXME: this fails if valid group, but not first group + # listed. + if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then + AC_MSG_ERROR(The given value '$withval' does not match group entry) + else + GROUP=$with_group; + fi + else + AC_MSG_ERROR(There is no group entry for user '$USER') + fi + fi + else + AC_MSG_ERROR(We need a group if you give me this parameter) + fi + ], + [ + if test $BGROUPS = no ; then + AC_MSG_ERROR(There is no 'groups' programm on this system) + else + AC_MSG_RESULT(none specified) + GROUP=$with_group; + fi + ] + ) + AC_SUBST(GROUP) + +fi + +dnl ================================================================= +dnl additional gcc flags +dnl ================================================================= +dnl +if test "$GCC"; then + if test "$host" != "powerpc-unknown-amigaos"; then + CFLAGS="-pipe $CFLAGS" + fi +fi + + +dnl ================================================================= +dnl Build type +dnl ================================================================= +dnl +dnl Must do this first. +dnl +dnl Reason: This sets CFLAGS in order to switch the Cygwin compiler +dnl into Cygwin or MinGW32 modes. Depending on the mode selected, +dnl the compiler will use completely different sets of library +dnl and include files. +dnl +dnl ================================================================= + +AC_MINGW32 +AC_CYGWIN + +if test "$MINGW32" = "yes"; then + target_type=mingw +else + if test "$CYGWIN" = "yes"; then + target_type=cygwin + else + target_type=unix + fi +fi + +if test $dodk = auto; then + dodk=no + if test $target_type = unix; then + case "$host_os" in + linux* | gnu*) + dodk=yes + ;; + esac + fi +fi + +dnl Decide what to do based on target_type +dnl Note: PTHREAD_LIB is always set, even if pthread is disabled. +dnl This is because we don't know yet whether pthread is enabled. + +AC_ARG_ENABLE(mingw32, +[ --enable-mingw32 Use mingw32 for a Windows GUI], +[if test $enableval = yes; then + target_type=mingw +fi]) + +if test $target_type = mingw; then + WIN_ONLY= + SPECIAL_CFLAGS="-mwindows -mno-cygwin" + PTHREAD_LIB=-lpthreadGC + echo "Using mingw32 (Win32 GUI)" +else + WIN_ONLY=# + if test $target_type = cygwin; then + SPECIAL_CFLAGS="-mno-win32" + PTHREAD_LIB= + echo "Using Cygnus (Win32 command line)" + else + SPECIAL_CFLAGS= +dnl PTHREAD_LIB=-lpthread + fi +fi +AC_SUBST(WIN_ONLY) + +dnl Checking which text html browser we have avaliable +if test $dodk != no; then + AC_CHECK_PROGS(WDUMP,w3m lynx links,false) + if test "$WDUMP" = false; then + AC_MSG_WARN(You need some kind of text browser to build documentation $w3m, lynx and links are supported$) + fi + if test $DB2HTML = false; then + dnl We need to clean the variable, otherwise AC_CHECK_PROGS + dnl will fail + DB2HTML="" + AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false) + fi +fi +AC_SUBST(WDUMP) +AC_SUBST(DB2HTML) + +dnl If we use rpm, we need to check where %_topdir is +AC_CHECK_PROGS(RPMBIN,rpm,false) +if test $RPMBIN != false; then + RPM_BASE=`rpm --eval "%{_topdir}"` + if test "$RPM_BASE" = ""; then + RPM_BASE=/usr/src/redhat + fi +fi +AC_SUBST(RPM_BASE) + +dnl Check for jade, so we can build the documentation +AC_CHECK_PROGS(JADEBIN,jade openjade,false) +AC_SUBST(JADEBIN) + +dnl Check for man2html for docs. +AC_CHECK_PROGS(MAN2HTML,man2html,false) +AC_SUBST(MAN2HTML) + +dnl Set doc status flag for conditional content inclusions +DOC_STATUS=p-not-stable +if test $CODE_STATUS = stable; then + DOC_STATUS="p-stable" +fi +AC_SUBST(DOC_STATUS) + +dnl Checking for the docbook.dsl stylesheet file +dnl It is still not portable (directory slash) +JADECAT="" +if test $dodk = yes; then + if test $DKPREFIX = none; then + for i in /usr/share/sgml/docbook/dsssl-stylesheets \ + /usr/share/sgml/docbkdsl /usr/share/sgml/docbook-dsssl \ + /usr/local/share/sgml/docbook/dsssl/modular \ + /usr/share/sgml/docbook/stylesheet/dsssl/modular/ \ + ; do +dnl echo -n does not fly with /bin/sh. +dnl echo -n "checking for $i/html/docbook.dsl..." + AC_MSG_CHECKING([for $i]) + if test -f $i/html/docbook.dsl; then + echo "yes" + DKPREFIX=$i + break + else + echo "no" + fi + done +# where are the catalogs? + for i in /usr/share/sgml/CATALOG.docbk30 \ + /usr/share/sgml/CATALOG.docbk31 \ + /usr/share/sgml/CATALOG.docbk31 \ + /usr/local/share/sgml/docbook/3.0/docbook.cat \ + /usr/local/share/sgml/docbook/3.1/docbook.cat \ + /usr/share/sgml/docbook/dtd/3.1/docbook.cat \ + ; do +dnl echo -n "checking for $i..." + AC_MSG_CHECKING([for $i]) + if test -f $i; then + echo "yes" + JADECAT="$JADECAT -c $i" + else + echo "no" + fi + done + fi +fi +AC_SUBST(JADECAT) +AC_SUBST(DKPREFIX) + +dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS +old_CFLAGS_nospecial=$CFLAGS +CFLAGS="$CFLAGS $SPECIAL_CFLAGS" + +# Hack to force AutoConf to use the CFLAGS we just set +dnl Warning: This may break with a future version of Autoconf +dnl Tested with autoconf 2.13 +ac_cpp='$CPP $CPPFLAGS $SPECIAL_CFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + + +dnl ================================================================= +dnl Thread support +dnl ================================================================= + +AC_CHECK_HEADER(pthread.h, [have_pthread=yes], [have_pthread=no]) + +AC_ARG_ENABLE(pthread, +[ --disable-pthread Don't use POSIX threads (pthreads)], +[if test $enableval = no; then + # Disable pthreads + if test $have_pthread = yes; then + AC_MSG_WARN([pthreads seem to be available but you are using --disable-pthread.]) + AC_MSG_WARN([This is almost always a mistake and can render Privoxy unacceptable slow.]) + fi + have_pthread=no +fi]) + +if test $have_pthread = yes; then + PTHREAD_ONLY= + AC_DEFINE(FEATURE_PTHREAD) + echo Using POSIX threads + if test "$GCC" = "yes"; then + # Set a GCC specific switch: + if test "$target_type" = "unix"; then + ac_jgf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pthread" + AC_TRY_LINK([#include <pthread.h>], + [void *p = pthread_create;], + [ + # This compiler switch makes GCC on Linux thread-safe + # However, it's not supported on most other OS. + PTHREAD_LIB= + SPECIAL_CFLAGS="-pthread" + ]) + CFLAGS=$ac_jgf_save_CFLAGS + fi + fi +else + PTHREAD_ONLY=# + echo Using native threads +fi + +AC_SUBST(PTHREAD_ONLY) + +dnl ================================================================= +dnl Support for thread-safe versions of gethostbyaddr, gethostbyname, +dnl gmtime and localtime +dnl ================================================================= + +dnl Next line needed to find the gethost*_r functions on Solaris +AC_CHECK_LIB(nsl, gethostbyname) + +AC_CHECK_FUNC(gethostbyaddr_r, [ + AC_MSG_CHECKING([signature of gethostbyaddr_r]) + AC_TRY_COMPILE([ +# include <netdb.h> + ], [ + struct hostent *h, *hp; + char *a, *b; + int l, bl, t, e; + (void) gethostbyaddr_r(a, l, t, h, b, bl, &hp, &e) + ], [ + AC_DEFINE(HAVE_GETHOSTBYADDR_R_8_ARGS) + AC_MSG_RESULT([8 args]) + ], [ + AC_TRY_COMPILE([ +# include <netdb.h> + ], [ + struct hostent *h; + char *a, *b; + int l, bl, t, e; + (void) gethostbyaddr_r(a, l, t, h, b, bl, &e) + ], [ + AC_DEFINE(HAVE_GETHOSTBYADDR_R_7_ARGS) + AC_MSG_RESULT([7 args]) + ], [ + AC_TRY_COMPILE([ +# include <netdb.h> + ], [ + struct hostent_data *d; + struct hostent *h; + char a, + int l, t; + (void) gethostbyaddr_r(a, l, t, h, d) + ], [ + AC_DEFINE(HAVE_GETHOSTBYADDR_R_5_ARGS) + AC_MSG_RESULT([5 args]) + ], [ + AC_MSG_RESULT(unrecognised) + ]) + ]) + ]) +], [ + AC_MSG_RESULT(no) +]) + +AC_CHECK_FUNC(gethostbyname_r, [ + AC_MSG_CHECKING([signature of gethostbyname_r]) + AC_TRY_COMPILE([ +# include <netdb.h> + ], [ + struct hostent *h, *r; + char *n, *b; + int bl, e; + (void) gethostbyname_r(n, h, b, bl, &r, &e) + ], [ + AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARGS) + AC_MSG_RESULT([6 args]) + ], [ + AC_TRY_COMPILE([ +# include <netdb.h> + ], [ + struct hostent *h; + char *n, *b; + int bl, e; + (void) gethostbyname_r(n, h, b, bl, &e) + ], [ + AC_DEFINE(HAVE_GETHOSTBYNAME_R_5_ARGS) + AC_MSG_RESULT([5 args]) + ], [ + AC_TRY_COMPILE([ +# include <netdb.h> + ], [ + struct hostent_data *d; + struct hostent *h; + char *n, + (void) gethostbyname_r(n, h, d) + ], [ + AC_DEFINE(HAVE_GETHOSTBYNAME_R_3_ARGS) + AC_MSG_RESULT([3 args]) + ], [ + AC_MSG_RESULT(unrecognised) + ]) + ]) + ]) +], [ + AC_MSG_RESULT(no) +]) + +AC_CHECK_FUNC(gmtime_r, [ + AC_MSG_CHECKING([signature of gmtime_r]) + AC_TRY_COMPILE([ +# include <time.h> + ], [ + struct time *t; + struct tm *tm; + (void) gmtime_r(t, tm) + ], [ + AC_MSG_RESULT(ok) + AC_DEFINE(HAVE_GMTIME_R) + ], [ + AC_MSG_RESULT(unrecognised) + ]) +], [ + AC_MSG_RESULT(no) +]) + +AC_CHECK_FUNC(localtime_r, [ + AC_MSG_CHECKING([signature of localtime_r]) + AC_TRY_COMPILE([ +# include <time.h> + ], [ + struct time *t; + struct tm *tm; + (void) localtime_r(t, tm) + ], [ + AC_MSG_RESULT(ok) + AC_DEFINE(HAVE_LOCALTIME_R) + ], [ + AC_MSG_RESULT(unrecognised) + ]) +], [ + AC_MSG_RESULT(no) +]) + +dnl ================================================================= +dnl Solaris specific +dnl FIXME: Not tested on Solaris yet... +dnl ISFIXED: Have tested it on Solaris, but there are other ways to +dnl make these checks generic, e.g.: +dnl AC_CHECK_FUNC(getsockopt, , AC_CHECK_LIB(socket, getsockopt)) +dnl (Moritz Barsnick <moritz(a)barsnick.net>) +dnl ================================================================= + + +SOCKET_LIB= + +case "$host" in +*-solaris*) SOCKET_LIB="-lsocket -lnsl" + AC_DEFINE(__EXTENSIONS__) + if test "$GCC" = "yes"; then + # Set a GCC specific switch: + # This compiler switch makes Solaris thread-safe + PTHREAD_LIB= + SPECIAL_CFLAGS="-pthreads" + else + # What do we do without GCC? Guess this: + SPECIAL_CFLAGS="-D_REENTRANT" + fi +;; +esac + +AC_SUBST(SOCKET_LIB) + +dnl ================================================================= +dnl Solaris problem, and others perhaps (socklen_t is undefined) +dnl ================================================================= + +AC_MSG_CHECKING([for socklen_t]) +AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) + AC_DEFINE(socklen_t,int, + [ Define to 'int' if <sys/socket.h> doesn't have it. ])) + + +dnl ================================================================= +dnl OS/2 specific +dnl ================================================================= + +case "$host" in +*-os2-emx*) SOCKET_LIB=-lsocket +;; +esac + +AC_SUBST(SOCKET_LIB) + +dnl ================================================================= +dnl Mac OSX specific +dnl ================================================================= + +case "$host" in +*-apple-darwin*) SPECIAL_CFLAGS="-Dunix" +;; +esac + +dnl ================================================================= +dnl OpenBSD specific +dnl ================================================================= + +case "$host" in +*-openbsd*) SPECIAL_CFLAGS="$SPECIAL_CFLAGS -Dunix" +;; +esac + +dnl ================================================================= +dnl AmigaOS specific +dnl ================================================================= + +AMIGAOS_ONLY=# + +case "$host" in +*-amigaos) AMIGAOS_ONLY= +;; +esac + +AC_SUBST(AMIGAOS_ONLY) + +dnl ================================================================= +dnl Check for standard compiler stuff +dnl ================================================================= + +AC_EXEEXT +AC_OBJEXT +AC_HEADER_STDC +AC_HEADER_DIRENT +AC_C_CONST +AC_TYPE_SIZE_T +AC_TYPE_PID_T +AC_HEADER_TIME +AC_STRUCT_TM +AC_CHECK_SIZEOF(int, 4) +AC_CHECK_SIZEOF(char *, 4) +AC_CHECK_SIZEOF(long, 4) +AC_CHECK_SIZEOF(long long, 8) +AC_CHECK_SIZEOF(size_t, 4) + +dnl Checks for header files. +dnl AC_HEADER_SYS_WAIT +dnl AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/time.h unistd.h) +AC_CHECK_HEADERS([OS.h arpa/inet.h errno.h fcntl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h sys/wait.h unistd.h]) + +dnl Checks for library functions. +dnl AC_TYPE_SIGNAL +dnl AC_CHECK_FUNC(strstr) +dnl bcopy and memmove are for PCRE +AC_CHECK_FUNCS([strerror bcopy memmove]) +AC_PROG_GCC_TRADITIONAL +dnl uncommenting does not work for swa. suse linux +dnl AC_FUNC_MALLOC +AC_FUNC_SETPGRP +AC_TYPE_SIGNAL +dnl uncommenting does not work for swa. suse linux +dnl AC_FUNC_STAT +AC_CHECK_FUNCS([access atexit getcwd gethostbyaddr gethostbyaddr_r gethostbyname gethostbyname_r gettimeofday inet_ntoa localtime_r memchr memmove memset poll putenv random regcomp select setlocale snprintf socket strchr strdup strerror strftime strlcat strlcpy strptime strstr strtoul timegm tzset]) + + +dnl ================================================================= +dnl Checks for libraries. +dnl ================================================================= +dnl Note: Some systems may have the library but not the system header +dnl file, so we must check for both. +dnl Also check for correct version +AC_CHECK_LIB(pcre, pcre_compile, [ + AC_CHECK_HEADER(pcre.h, [ + AC_EGREP_HEADER(pcre_fullinfo, pcre.h, [have_pcre=yes], [AC_MSG_WARN([[pcre old version installed]]); have_pcre=no]) + ], [ + AC_CHECK_HEADER(pcre/pcre.h, [ + AC_EGREP_HEADER(pcre_fullinfo, pcre/pcre.h, [have_pcre=yes]; [AC_DEFINE(PCRE_H_IN_SUBDIR)], [AC_MSG_WARN([[pcre old version installed]]); have_pcre=no]) + ], [have_pcre=no]) + ]) +], [have_pcre=no]) + +AC_CHECK_LIB(pcreposix, regcomp, [ + AC_CHECK_HEADER(pcreposix.h, [ + AC_EGREP_HEADER(pcreposix_regerror, pcreposix.h, [AC_MSG_WARN([[pcreposix old version installed]]); have_pcreposix=no], [have_pcreposix=yes]) + ], [ + AC_CHECK_HEADER(pcre/pcreposix.h, [ + AC_EGREP_HEADER(pcreposix_regerror, pcre/pcreposix.h, [AC_MSG_WARN([[pcreposix old version installed]]); have_pcreposix=no], [have_pcreposix=yes]; [AC_DEFINE(PCREPOSIX_H_IN_SUBDIR)]) + ], [have_pcreposix=no]) + ]) +], [have_pcreposix=no], -lpcre) + +dnl ================================================================ +dnl libpcrs is temporarily disabled. +dnl +dnl Privoxy's own pcrs version fixes some problems that +dnl are present in libpcrs 0.3, the last pcrs release we +dnl know of, and as libpcrs seems to be currently unmaintained +dnl we can't send these fixes upstream. +dnl ================================================================ +dnl +dnl AC_CHECK_LIB(pcrs, pcrs_compile, [AC_CHECK_HEADER(pcrs.h, [have_pcrs=yes], [have_pcrs=no])], [have_pcrs=no], -lpcre) + +dnl ================================================================= +dnl Always defined +dnl ================================================================= + +AC_DEFINE(__MT__) + +dnl ================================================================= +dnl Features +dnl ================================================================= + +AC_ARG_ENABLE(toggle, +[ --disable-toggle Don't support temporary disable], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_TOGGLE) +fi],AC_DEFINE(FEATURE_TOGGLE)) + +AC_ARG_ENABLE(force, +[ --disable-force Don't allow single-page disable], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_FORCE_LOAD) +fi],AC_DEFINE(FEATURE_FORCE_LOAD)) + +AC_ARG_ENABLE(fast-redirects, +[ --disable-fast-redirects Don't support fast redirects], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_FAST_REDIRECTS) +fi], AC_DEFINE(FEATURE_FAST_REDIRECTS)) + +AC_ARG_ENABLE(stats, +[ --disable-stats Don't keep statistics], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_STATISTICS) +fi],AC_DEFINE(FEATURE_STATISTICS)) + +AC_ARG_ENABLE(ie-images, +[ --enable-ie-images Enable a quick but not always reliable auto-detect whether requests from + MS Internet Explorer are for an image or not.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE) +fi],) + +AC_ARG_ENABLE(image-blocking, +[ --disable-image-blocking Don't try to figure out whether a request is + for an image or HTML - assume HTML.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_IMAGE_BLOCKING) +fi], +AC_DEFINE(FEATURE_IMAGE_BLOCKING)) + +AC_ARG_ENABLE(acl-files, +[ --disable-acl-files Prevents the use of ACL files to control access to + Privoxy by IP address.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_ACL) +fi], +AC_DEFINE(FEATURE_ACL)) + +AC_ARG_ENABLE(trust-files, +[ --disable-trust-files Prevents the use of trust files.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_TRUST) +fi], +AC_DEFINE(FEATURE_TRUST)) + +AC_ARG_ENABLE(editor, +[ --disable-editor Prevents the use of the web-based actions file + editor and web-based temporary disable setting.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_CGI_EDIT_ACTIONS) +fi], +AC_DEFINE(FEATURE_CGI_EDIT_ACTIONS)) + +AC_ARG_ENABLE(no-gifs, +[ --enable-no-gifs Use politically correct PNG format instead of GIF + for built-in images. May not work with all browsers.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_NO_GIFS) +fi]) + +AC_ARG_ENABLE(graceful-termination, +[ --enable-graceful-termination Allow to shutdown Privoxy through the webinterface.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_GRACEFUL_TERMINATION) +fi]) + +AC_ARG_ENABLE(extended-host-patterns, +[ --enable-extended-host-patterns Allow extended regular expressions in host patterns.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_EXTENDED_HOST_PATTERNS) +fi]) + +dnl pcre/pcrs is needed for CGI anyway, so +dnl the choice is only between static and +dnl dynamic: + +AC_ARG_ENABLE(dynamic-pcre, +[ --disable-dynamic-pcre Use the built-in, static pcre, even if libpcre is available], +[ if test $enableval = "no"; then have_pcre=no; fi ]) + +dnl ================================================= +dnl libpcrs is temporarily disabled, +dnl see comment above for the reason. +dnl ================================================= +dnl AC_ARG_ENABLE(dynamic-pcrs, +dnl [ --disable-dynamic-pcrs Use the built-in, static pcrs, even if libpcrs is available], +dnl [ if test $enableval = "no"; then have_pcrs=no; fi ]) + + +dnl ==================================================== +dnl This check is incomplete. For mingw32 zlib is found +dnl by configure, but not necessarily by the compiler. +dnl ==================================================== +AC_ARG_ENABLE(zlib, +[ --disable-zlib Don't use zlib to decompress data before filtering.], +[enableval2=$enableval], +[enableval2=yes]) +if test $enableval2 = yes; then + AC_CHECK_LIB(z, zlibVersion, [have_zlib="yes"], [have_zlib="no"]) + if test $have_zlib = "yes"; then + LIBS="$LIBS -lz" + AC_DEFINE(FEATURE_ZLIB,1,[Define to 1 to use compression through the zlib library.]) + else + AC_MSG_WARN([No zlib found. + Privoxy will not be able to filter compressed content. + This may become a fatal error in the future.]) + fi +fi + + +# If we have libpcre and either we also have pcreposix or +# we don't need pcreposix, then link pcre dynamically; else +# build it and link statically +# +if test $have_pcre = "yes"; then + echo "using libpcre" + pcre_dyn=yes + STATIC_PCRE_ONLY=# + LIBS="$LIBS -lpcre -lpcreposix" +else + AC_MSG_WARN([You are using the static PCRE code which is scheduled for removal, for details see: + https://sourceforge.net/mailarchive/message.php?msg_id=20080511195555.2dc6c…] + pcre_dyn=no + AC_DEFINE(STATIC_PCRE) + STATIC_PCRE_ONLY= +fi + +if test $have_pthread = "yes" -o $target_type = "mingw"; then + echo Enabling keep-alive support for outgoing connections. + AC_DEFINE(FEATURE_CONNECTION_KEEP_ALIVE) +fi + +dnl ================================================= +dnl libpcrs is temporarily disabled, +dnl see comment above for the reason. +dnl ================================================= +dnl # If we have libpcrs and pcre is linked dynamically +dnl # then also link pcrs dynamically, else build and link +dnl # pcrs statically +dnl +dnl if test $have_pcrs = "yes" -a $pcre_dyn = "yes"; then +dnl echo "using libpcrs" +dnl STATIC_PCRS_ONLY=# +dnl LIBS="$LIBS -lpcrs" +dnl else +dnl echo "using built-in static pcrs" + AC_DEFINE(STATIC_PCRS) + STATIC_PCRS_ONLY= +dnl fi + +AC_SUBST(STATIC_PCRE_ONLY) +AC_SUBST(STATIC_PCRS_ONLY) + +dnl ================================================================= +dnl Final cleanup and output +dnl ================================================================= + +dnl Remove the SPECIAL_CFLAGS stuff from CFLAGS, and add it seperately +dnl in the Makefile +CFLAGS=$old_CFLAGS_nospecial +AC_SUBST(SPECIAL_CFLAGS) + +AC_SUBST(PTHREAD_LIB) + +AC_OUTPUT(GNUmakefile doc/source/ldp.dsl) diff --git a/external/privoxy.tar.gz b/external/privoxy.tar.gz new file mode 100644 index 0000000..3439878 Binary files /dev/null and b/external/privoxy.tar.gz differ

1 0

[orbot/master] Modified iptables rules for transproxying. UDP is now blocked. Also removed some redundant rules and reordered others. I reordered by the idea that its generally easier to specifically allow traffic before your reject it.
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 26464765a92f6586e26e3c39c6af44201b936ee1 Author: patch <patrickbx(a)gmail.com> Date: Mon Jul 23 16:12:55 2012 -0400 Modified iptables rules for transproxying. UDP is now blocked. Also removed some redundant rules and reordered others. I reordered by the idea that its generally easier to specifically allow traffic before your reject it. Signed-off-by: n8fr8 <nathan(a)freitas.net> --- .../android/service/.TorServiceUtils.java.swp | Bin 0 -> 16384 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/service/.TorServiceUtils.java.swp b/src/org/torproject/android/service/.TorServiceUtils.java.swp new file mode 100644 index 0000000..b9f0c9e Binary files /dev/null and b/src/org/torproject/android/service/.TorServiceUtils.java.swp differ

1 0

[orbot/master] Modified iptables rules for transproxying. UDP is now blocked. Also removed some redundant rules and reordered others. I reordered by the idea that its generally easier to specifically allow traffic before your reject it.
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit c2f3f77053a3e3064f21e7b3d6210f3398cb52d1 Author: patch <patrickbx(a)gmail.com> Date: Mon Jul 23 16:12:55 2012 -0400 Modified iptables rules for transproxying. UDP is now blocked. Also removed some redundant rules and reordered others. I reordered by the idea that its generally easier to specifically allow traffic before your reject it. Signed-off-by: n8fr8 <nathan(a)freitas.net> --- .../torproject/android/service/TorTransProxy.java | 133 ++++++++++---------- 1 files changed, 64 insertions(+), 69 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 2571123..c248a9f 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -224,6 +224,15 @@ public class TorTransProxy implements TorServiceConstants { int torUid = context.getApplicationInfo().uid; + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) { @@ -235,9 +244,9 @@ public class TorTransProxy implements TorServiceConstants { { TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); - - // Set up port redirection - script.append(ipTablesPath); + + // Set up port redirection + script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost @@ -251,14 +260,28 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A OUTPUT -p udp -m owner --uid-owner "); + script.append(" -A OUTPUT -p udp"); + script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); script.append(" || exit\n"); - + + // Allow loopback + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + /* + //Outgoing loopback already allowed (23/7/12) + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -276,53 +299,32 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); } - - // Allow loopback + */ + + // Reject all other outbound TCP packets script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A OUTPUT"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p tcp"); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - // Reject DNS that is not from Tor (order is important - first matched rule counts!) - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" -p udp"); - script.append(" --dport "); - script.append(STANDARD_DNS_PORT); script.append(" -j REJECT"); script.append(" || exit\n"); - - // Reject all other outbound TCP packets + + // Reject all other outbound UDP packets script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A OUTPUT"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); - script.append(" -p tcp"); + script.append(" -p udp"); script.append(" -j REJECT"); script.append(" || exit\n"); + } } - - // Allow everything for Tor - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(torUid); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - String[] cmdAdd = {script.toString()}; code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); @@ -450,8 +452,8 @@ public class TorTransProxy implements TorServiceConstants { int torUid = context.getApplicationInfo().uid; - // Set up port redirection - script.append(ipTablesPath); + // Set up port redirection + script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost @@ -465,14 +467,36 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); + script.append(" -A OUTPUT -p udp"); + script.appent(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); script.append(" || exit\n"); + + // Allow loopback + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + + /* + //Outgoing loopback already allowed (23/7/12) + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -490,25 +514,8 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); - } - - // Allow loopback - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -p tcp"); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); + } */ - // Allow everything for Tor - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(torUid); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); if (TorService.ENABLE_DEBUG_LOG) { @@ -532,23 +539,11 @@ public class TorTransProxy implements TorServiceConstants { script.append(" --log-uid"); script.append(" || exit\n"); } - - // Reject DNS that is not from Tor (order is important - first matched rule counts!) - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -p udp"); - script.append(" --dport "); - script.append(STANDARD_DNS_PORT); - script.append(" -j REJECT"); - script.append(" || exit\n"); - - // Reject all other outbound TCP packets + + // Reject all other outbound packets by default script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -p tcp"); - script.append(" -j REJECT"); + script.append(" -P OUTPUT DROP"); script.append(" || exit\n"); String[] cmdAdd = {script.toString()};

1 0

[orbot/master] Data stats - ARRRRRRRR not working
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit f181f26d4e25c6514b66e06b119fe3ef12941575 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jul 3 14:09:49 2011 +0530 Data stats - ARRRRRRRR not working --- res/layout/layout_main.xml | 49 ++++++++ res/values/strings.xml | 2 + src/org/torproject/android/Orbot.java | 124 +++++++++++++------- src/org/torproject/android/service/TorService.java | 32 +++++- .../android/service/TorServiceConstants.java | 2 + 5 files changed, 161 insertions(+), 48 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index db167e3..4fae719 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -57,6 +57,55 @@ android:textColor="#ffffff" /> + <RelativeLayout android:id="@+id/trafficRow" + android:gravity="bottom" + android:layout_width="fill_parent" + android:layout_alignParentBottom="true" + android:visibility="invisible" + android:layout_height="80dp" + android:background="#A0909090"> + <TextView + android:id="@+id/trafficDownLabel" + android:textColor="#FFFFFFFF" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:textSize="16sp" + android:text="@string/main_layout_download" + android:gravity="center_vertical|center_horizontal" + android:textStyle="bold" /> + <TextView + android:id="@+id/trafficUpLabel" + android:textColor="#FFFFFFFF" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:text="@string/main_layout_upload" + android:textSize="16sp" + android:gravity="center_vertical|center_horizontal" + android:textStyle="bold" /> + <TextView + android:id="@+id/trafficDown" + android:textColor="#FF00B627" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@+id/trafficDownLabel" + android:textSize="24sp" + android:gravity="center_vertical|center_horizontal" + android:textStyle="bold" /> + <TextView + android:id="@+id/trafficUp" + android:textColor="#FFFF2211" + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/trafficUpLabel" + android:textSize="24sp" + android:gravity="center_vertical|center_horizontal" + android:textStyle="bold" /> + </RelativeLayout> + </LinearLayout> </FrameLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8cc6207..9fa461d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -31,6 +31,8 @@ <string name="menu_about">About</string> <string name="menu_wizard">Wizard</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> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 1a09ac7..fd0ace0 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -42,57 +42,64 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; public class Orbot extends Activity implements TorConstants, OnLongClickListener { - - - /* Useful UI bits */ - // so this is probably pretty obvious, here, but also an area - // which we might see quite a bit of change+complexity was the main screen - // UI gets new features - private TextView lblStatus = null; //the main text display widget - private ImageView imgStatus = null; //the main touchable image for activating Orbot - private ProgressDialog progressDialog; //the spinning progress dialog that shows up now and then - private MenuItem mItemOnOff = null; //the menu item which we toggle based on Orbot state - - /* Some tracking bits */ - private int torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service - // this is a value we get passed back from the TorService - - /* Tor Service interaction */ - /* The primary interface we will be calling on the service. */ - ITorService mService = null; //interface to remote TorService - private boolean autoStartOnBind = false; //controls whether service starts when class binds to it - SharedPreferences prefs; //what the user really wants! - - /** - * When the Orbot activity is created, we call startService - * to ensure the Tor remote service is running. However, it may - * already be running, and this should not create more than one instnace - */ + private static final int VISIBLE = 0; + /* Useful UI bits */ + private TextView lblStatus = null; //the main text display widget + private ImageView imgStatus = null; //the main touchable image for activating Orbot + private ProgressDialog progressDialog; + private MenuItem mItemOnOff = null; + private RelativeLayout trafficRow = null; // the row showing the traffic + private TextView downloadText = null; + private TextView uploadText = null; + + /* Some tracking bits */ + private int torStatus = STATUS_READY; //latest status reported from the tor service + + /* Tor Service interaction */ + /* The primary interface we will be calling on the service. */ + ITorService mService = null; + private boolean autoStartOnBind = false; + + SharedPreferences prefs; + + public static Orbot currentInstance = null; + + private static void setCurrent(Orbot current){ + Orbot.currentInstance = current; + } + + /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Orbot.setCurrent(this); + //if Tor binary is not running, then start the service up //might want to look at whether we need to call this every time //or whether binding to the service is enough - setLocale(); + setLocale(); + + startService(new Intent(INTENT_TOR_SERVICE)); + + prefs = PreferenceManager.getDefaultSharedPreferences(this); + + setContentView(R.layout.layout_main); + + lblStatus = (TextView)findViewById(R.id.lblStatus); + lblStatus.setOnLongClickListener(this); + imgStatus = (ImageView)findViewById(R.id.imgStatus); + imgStatus.setOnLongClickListener(this); + trafficRow = (RelativeLayout)findViewById(R.id.trafficRow); + downloadText = (TextView)findViewById(R.id.trafficDown); + uploadText = (TextView)findViewById(R.id.trafficUp); - prefs = PreferenceManager.getDefaultSharedPreferences(this); - - setContentView(R.layout.layout_main); - - //obvious? -yep got everything so far - lblStatus = (TextView)findViewById(R.id.lblStatus); - - imgStatus = (ImageView)findViewById(R.id.imgStatus); - imgStatus.setOnLongClickListener(this); - - startService(new Intent(INTENT_TOR_SERVICE)); } @@ -608,6 +615,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); mHandler.sendMessage(msg); + trafficRow.setVisibility(VISIBLE); + } //now we stop Tor! amazing! @@ -731,11 +740,22 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener break; case TorServiceConstants.DISABLE_TOR_MSG: - - updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); - - break; - + + updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); + + break; + + + case TorServiceConstants.MESSAGE_TRAFFIC_COUNT : + + DataCount datacount = (DataCount) msg.obj; + downloadText.setText(formatCount(datacount.Download)); + uploadText.setText(formatCount(datacount.Upload)); + downloadText.invalidate(); + uploadText.invalidate(); + + break; + default: super.handleMessage(msg); } @@ -885,5 +905,21 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener getResources().updateConfiguration(config, getResources().getDisplayMetrics()); } } - + + public class DataCount { + // data uploaded + public long Upload; + // data downloaded + public long Download; + } + + private String formatCount(long count) { + // Converts the supplied argument into a string. + // Under 2Mb, returns "xxx.xKb" + // Over 2Mb, returns "xxx.xxMb" + if (count < 1e6 * 2) + return ((float)((int)(count*10/1024))/10 + "kB"); + return ((float)((int)(count*100/1024/1024))/100 + "MB"); + } + } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 3ffa460..4aaf2b0 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -42,6 +42,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.os.IBinder; +import android.os.Looper; +import android.os.Message; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.preference.PreferenceManager; @@ -50,7 +52,7 @@ import android.util.Log; public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler { - public static boolean ENABLE_DEBUG_LOG = false; + public static boolean ENABLE_DEBUG_LOG = true; private static int currentStatus = STATUS_OFF; @@ -944,7 +946,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn.setEventHandler(this); conn.setEvents(Arrays.asList(new String[]{ - "ORCONN", "CIRC", "NOTICE", "WARN", "ERR"})); + "ORCONN", "CIRC", "NOTICE", "WARN", "ERR","BW"})); // conn.setEvents(Arrays.asList(new String[]{ // "DEBUG", "INFO", "NOTICE", "WARN", "ERR"})); @@ -1118,10 +1120,29 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append("kb written"); logNotice(sb.toString()); + DataCount datacount = new DataCount(); + + datacount.Download = read/1000; + datacount.Upload = written/1000; + + Message message = Message.obtain(); + message.what = MESSAGE_TRAFFIC_COUNT; + message.obj = datacount; + Orbot.currentInstance.mHandler.sendMessage(message); + + //sendCallbackStatusMessage(message); + } } + public class DataCount { + // data uploaded + public long Upload; + // data downloaded + public long Download; + } + public void circuitStatus(String status, String circID, String path) { if (ENABLE_DEBUG_LOG) @@ -1441,8 +1462,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - - boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); + + ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",true); + Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); + + boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); //boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 3fa3c55..3776118 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -85,4 +85,6 @@ public interface TorServiceConstants { //obfsproxy public static final String OBFSPROXY_ASSET_KEY = "obfsproxy"; + public static final int MESSAGE_TRAFFIC_COUNT = 5; + }

1 0

[orbot/master] Traffic is shown in the main UI
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit a2981152a73dec763db542345305427d7cef49d6 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jul 3 17:11:11 2011 +0530 Traffic is shown in the main UI --- src/org/torproject/android/Orbot.java | 42 +++++++++---------- src/org/torproject/android/service/TorService.java | 16 ++++++-- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index fd0ace0..93cec94 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -47,8 +47,6 @@ import android.widget.TextView; public class Orbot extends Activity implements TorConstants, OnLongClickListener { - - private static final int VISIBLE = 0; /* Useful UI bits */ private TextView lblStatus = null; //the main text display widget private ImageView imgStatus = null; //the main touchable image for activating Orbot @@ -615,23 +613,22 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); mHandler.sendMessage(msg); - trafficRow.setVisibility(VISIBLE); + trafficRow.setVisibility(RelativeLayout.VISIBLE); } //now we stop Tor! amazing! private void stopTor () throws RemoteException { - //if the service is bound, then turn it off, using the same "PROFILE_" technique - if (mService != null) - { - mService.setProfile(TorServiceConstants.PROFILE_OFF); - - //again this is related to the progress dialog or some other threaded UI object - Message msg = mHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); - mHandler.sendMessage(msg); - } - + if (mService != null) + { + mService.setProfile(TorServiceConstants.PROFILE_OFF); + Message msg = mHandler.obtainMessage(TorServiceConstants.DISABLE_TOR_MSG); + mHandler.sendMessage(msg); + trafficRow.setVisibility(RelativeLayout.GONE); + + } + } @@ -748,11 +745,11 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener case TorServiceConstants.MESSAGE_TRAFFIC_COUNT : - DataCount datacount = (DataCount) msg.obj; + Bundle data = msg.getData(); + DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); downloadText.setText(formatCount(datacount.Download)); uploadText.setText(formatCount(datacount.Upload)); - downloadText.invalidate(); - uploadText.invalidate(); + break; @@ -911,15 +908,16 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener public long Upload; // data downloaded public long Download; + + DataCount(long Upload, long Download){ + this.Upload = Upload; + this.Download = Download; + } } private String formatCount(long count) { - // Converts the supplied argument into a string. - // Under 2Mb, returns "xxx.xKb" - // Over 2Mb, returns "xxx.xxMb" - if (count < 1e6 * 2) - return ((float)((int)(count*10/1024))/10 + "kB"); - return ((float)((int)(count*100/1024/1024))/100 + "MB"); + + return count+" kB"; } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 4aaf2b0..0115146 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -41,9 +41,11 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.os.Bundle; import android.os.IBinder; import android.os.Looper; import android.os.Message; +import android.os.Parcelable; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.preference.PreferenceManager; @@ -1125,10 +1127,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst datacount.Download = read/1000; datacount.Upload = written/1000; - Message message = Message.obtain(); - message.what = MESSAGE_TRAFFIC_COUNT; - message.obj = datacount; - Orbot.currentInstance.mHandler.sendMessage(message); + Message msg = Message.obtain(); + msg.what = MESSAGE_TRAFFIC_COUNT; + //msg.obj = datacount; + Bundle data = new Bundle(); + data.putLong("upload", datacount.Upload); + data.putLong("download", datacount.Download); + + msg.setData(data); + + Orbot.currentInstance.mHandler.sendMessage(msg); //sendCallbackStatusMessage(message);

1 0

[orbot/master] Improved Formatting
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit e114be51d005e00f470f1bb870e6bcaa0ee295f7 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jul 3 17:41:43 2011 +0530 Improved Formatting Now shows the data with upto 2 decimal places. If under 2Mb, shows "xxx.xKb", else shows "xxx.xxMb" --- src/org/torproject/android/Orbot.java | 13 ++++++++++--- src/org/torproject/android/service/TorService.java | 11 +++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 93cec94..6eaa124 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -749,7 +749,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); downloadText.setText(formatCount(datacount.Download)); uploadText.setText(formatCount(datacount.Upload)); - + downloadText.invalidate(); + uploadText.invalidate(); break; @@ -916,8 +917,14 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener } private String formatCount(long count) { - - return count+" kB"; + // Converts the supplied argument into a string. + // Under 2Mb, returns "xxx.xKb" + // Over 2Mb, returns "xxx.xxMb" + if (count < 1e6 * 2) + return ((float)((int)(count*10/1024))/10 + "kB"); + return ((float)((int)(count*100/1024/1024))/100 + "MB"); + + //return count+" kB"; } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 0115146..e9fc224 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1122,10 +1122,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append("kb written"); logNotice(sb.toString()); - DataCount datacount = new DataCount(); - - datacount.Download = read/1000; - datacount.Upload = written/1000; + DataCount datacount = new DataCount(written,read); Message msg = Message.obtain(); msg.what = MESSAGE_TRAFFIC_COUNT; @@ -1149,6 +1146,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst public long Upload; // data downloaded public long Download; + + + DataCount(long Upload, long Download){ + this.Upload = Upload; + this.Download = Download; + } } public void circuitStatus(String status, String circID, String path) {

1 0