- tor-commits - lists.torproject.org

[tor/master] Don't redeclare environ if std headers already did
by nickm＠torproject.org 20 Feb '12

20 Feb '12

commit bc66878bdea0250991fc99b2d023146f67a6f4bb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 19 16:09:08 2012 +0100 Don't redeclare environ if std headers already did This would cause a redundant redeclaration warning on some versions of Linux otherwise. --- configure.in | 16 ++++++++++++++++ src/common/compat.c | 10 ++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 7b6d8fb..7415ce8 100644 --- a/configure.in +++ b/configure.in @@ -1086,6 +1086,17 @@ int main(int c, char **v) { puts(__FUNCTION__); }])], tor_cv_have_FUNCTION_macro=yes, tor_cv_have_FUNCTION_macro=no)) +AC_CACHE_CHECK([whether we have extern char **environ already declared], + tor_cv_have_environ_declared, + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +/* We define _GNU_SOURCE here because it is also defined in compat.c. + * Without it environ doesn't get declared. */ +#define _GNU_SOURCE +#include <unistd.h> +int main(int c, char **v) { char **t = environ; }])], + tor_cv_have_environ_declared=yes, + tor_cv_have_environ_declared=no)) + if test "$tor_cv_have_func_macro" = 'yes'; then AC_DEFINE(HAVE_MACRO__func__, 1, [Defined if the compiler supports __func__]) fi @@ -1099,6 +1110,11 @@ if test "$tor_cv_have_FUNCTION_macro" = 'yes'; then [Defined if the compiler supports __FUNCTION__]) fi +if test "$tor_cv_have_environ_declared" = 'yes'; then + AC_DEFINE(HAVE_EXTERN_ENVIRON_DECLARED__, 1, + [Defined if we have extern char **environ already declared]) +fi + # $prefix stores the value of the --prefix command line option, or # NONE if the option wasn't set. In the case that it wasn't set, make # it be the default, so that we can use it to expand directories now. diff --git a/src/common/compat.c b/src/common/compat.c index f25a8ac..30bde3d 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -16,7 +16,11 @@ * We also need it to make memmem get defined (where available) */ /* XXXX023 We should just use AC_USE_SYSTEM_EXTENSIONS in our autoconf, - * and get this (and other important stuff!) automatically */ + * and get this (and other important stuff!) automatically. Once we do that, + * make sure to also change the extern char **environ detection in + * configure.in, because whether that is declared or not depends on whether + * we have _GNU_SOURCE defined! Maybe that means that once we take this out, + * we can also take out the configure check. */ #define _GNU_SOURCE #include "compat.h" @@ -1663,9 +1667,11 @@ make_path_absolute(char *fname) } #ifndef HAVE__NSGETENVIRON -/* FreeBSD needs this; it doesn't seem to hurt other platforms. */ +#ifndef HAVE_EXTERN_ENVIRON_DECLARED__ +/* Some platforms declare environ under some circumstances, others don't. */ extern char **environ; #endif +#endif /** Return the current environment. This is a portable replacement for * 'environ'. */

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug5161'
by nickm＠torproject.org 20 Feb '12

20 Feb '12

commit 81fe3e438b39cd14986247581d03cb0d0d650f1d Merge: 73d2f33 bc66878 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 20 13:00:17 2012 -0500 Merge remote-tracking branch 'sebastian/bug5161' configure.in | 16 ++++++++++++++++ src/common/compat.c | 10 ++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix off-by-one error in test_util_make_environment
by nickm＠torproject.org 20 Feb '12

20 Feb '12

commit 857ae345c812297c0e92d65ee3afc354f91a9df9 Author: Patrick Mézard <patrick(a)mezard.eu> Date: Mon Feb 20 14:12:50 2012 +0100 Fix off-by-one error in test_util_make_environment --- src/test/test_util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 4fabc22..c7540e8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1945,7 +1945,8 @@ test_util_make_environment(void *ptr) "HOME=/home/foozer\000" "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/bin\000" "\000"; - size_t expected_windows_env_block_len = sizeof(expected_windows_env_block); + size_t expected_windows_env_block_len = + sizeof(expected_windows_env_block) - 1; smartlist_t *env_vars = smartlist_new_from_text_lines(env_vars_string); smartlist_t *env_vars_sorted = smartlist_new();

1 0

[tor/master] Merge remote-tracking branch 'pmezard/armv5'
by nickm＠torproject.org 20 Feb '12

20 Feb '12

commit 73d2f335c5ea13d9f8b8e6d3b4dd200057db70b3 Merge: cd029f0 857ae34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 20 12:53:49 2012 -0500 Merge remote-tracking branch 'pmezard/armv5' src/test/test_util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix crypto_hmac_sha256 documentation comment
by nickm＠torproject.org 20 Feb '12

20 Feb '12

commit cd029f0ca364c6b39c9774fbe337d3a85d7cb40b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Feb 6 02:29:48 2012 -0800 Fix crypto_hmac_sha256 documentation comment --- src/common/crypto.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 380dcf0..41f81eb 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1716,8 +1716,8 @@ crypto_hmac_sha1(char *hmac_out, } /** Compute the HMAC-SHA-256 of the msg_len bytes in msg, using - * the key of length key_len. Store the DIGEST_LEN-byte result - * in hmac_out. + * the key of length key_len. Store the DIGEST256_LEN-byte + * result in hmac_out. */ void crypto_hmac_sha256(char *hmac_out,

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 20 Feb '12

20 Feb '12

commit f9bd8c30ff5a3083b15d4fdd03690cca9a15a013 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 20 17:45:05 2012 +0000 Update translations for orbot --- values-fa/strings.xml | 330 ++++++++++++++++++++++++------------------------ values-zh/strings.xml | 339 +++++++++++++++++++++++++------------------------ 2 files changed, 337 insertions(+), 332 deletions(-) diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 499aee6..144db09 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -1,43 +1,43 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> - <string name="app_name">اوربات</string> + <string name="app_name">Orbot</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">شروع و پایان Tor</string> - <string name="tor_proxy_service_process">سرويس پروكسي تُر</string> - <string name="status_starting_up">Orbat آغاز می شود..</string> - <string name="status_activated">پیوسته به شبکه ی Tor</string> - <string name="status_disabled">اوربات غیرفعال شده است.</string> - <string name="status_shutting_down">اوربات در حال بسته شدن است.</string> - <string name="tor_process_starting">شروع کلاینت تور...</string> - <string name="tor_process_complete">تمام.</string> - <string name="tor_process_waiting">در حال انتظار.</string> - <string name="not_anonymous_yet">هشدار: فعالیت شما هنوز \"گمنام\" نیست! لطفن اپلیکیشن خود را تنظیم کنید تا از HTTP پروکسی 127.0.0.1:8118 و یا SOCKS4A و یا SOCKS5 پروکسی 127.0.01:9050 استفاده کند.</string> - <string name="menu_home">خانه</string> - <string name="menu_browse">جستجو</string> - <string name="menu_settings">تنظیمات</string> - <string name="menu_log">ورود</string> - <string name="menu_info">کمک</string> - <string name="menu_apps">واژ ه نامه</string> - <string name="menu_start">آغاز</string> - <string name="menu_stop">ایست</string> - <string name="menu_about">درباره</string> + <string name="control_permission_label">start and stop Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot is starting...</string> + <string name="status_activated">Connected to the Tor network</string> + <string name="status_disabled">\"Orbot is Deactivated</string> + <string name="status_shutting_down">Orbot is shutting down</string> + <string name="tor_process_starting">Starting Tor client...</string> + <string name="tor_process_complete">complete.</string> + <string name="tor_process_waiting">waiting.</string> + <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> + <string name="menu_home">Home</string> + <string name="menu_browse">Browse</string> + <string name="menu_settings">Settings</string> + <string name="menu_log">Log</string> + <string name="menu_info">Help</string> + <string name="menu_apps">Apps</string> + <string name="menu_start">Start</string> + <string name="menu_stop">Stop</string> + <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> - <string name="button_help">کمک</string> - <string name="button_close">بسته</string> - <string name="button_about">درباره</string> + <string name="button_help">Help</string> + <string name="button_close">Close</string> + <string name="button_about">About</string> <string name="button_clear_log">Clear Log</string> - <string name="menu_verify">بررسی</string> - <string name="menu_exit">خروج</string> - <string name="powered_by">فعال شده توسط Tor Project</string> + <string name="menu_verify">Check</string> + <string name="menu_exit">Exit</string> + <string name="powered_by">powered by the Tor Project</string> <string name="press_to_start">- long press to start -</string> - <string name="pref_trans_proxy_group">پروکسیدن شفاف (نیاز به Root دارد)</string> - <string name="pref_trans_proxy_title">پروکسیدن شفاف</string> - <string name="pref_trans_proxy_summary">Tori-نمایی اتوماتیک اپلیکیشن ها</string> - <string name="pref_transparent_all_title">شامل همه</string> - <string name="pref_transparent_all_summary">فعالیت همه اپلیکیشن ها را از طریق Tor پروکسی کنید.</string> + <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> + <string name="pref_trans_proxy_title">Transparent Proxying</string> + <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> + <string name="pref_transparent_all_title">Tor Everything</string> + <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> <string name="pref_transparent_port_title">Port List</string> @@ -45,148 +45,152 @@ <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 با موفقیت نصب شدند!</string> - <string name="status_install_fail">نصب فایل های دوتایی Tor ممکن نبود. لطفن قطعه را وارسی کنید و به tor-assistance(a)torproject.org اطلاع دهید.</string> - <string name="title_error">خطای اپلیکیشین</string> - <string name="wizard_title">به اوربات خوش آمدید</string> - <string name="wizard_btn_tell_me_more">درباره اوربات</string> - <string name="btn_next">بعدی</string> - <string name="btn_back">بازگشت</string> - <string name="btn_finish">پایان</string> - <string name="btn_okay">لغو</string> - <string name="btn_cancel">لغو</string> - <string name="wizard_details">برخی جزئیات در مورد اوربات</string> - <string name="wizard_details_msg">اوربات اپلیکیشنی با متن-باز است که شامل Tor, LibEvent و Privoxy. این اپلیکیشن، HTTP پروکسی (8118) محلی و SOCKS پروکسی (9050) را در شبکه Tor در دسترس قرار می دهد. اوربات همچنین قادر است بر روی ابزار root شده، تمام ترافیک اینترنت را از Tor ارسال کند.</string> - <string name="wizard_permissions_root">مجوز صادر گردید</string> - <string name="wizard_permissions_stock">مجوزهای اوربات</string> - <string name="wizard_premissions_msg_root">بسیار عالی! اینطور که معلوم است شما دارای مجوز root برای فعال کردن اوربات هستید. این امکان را بخوبی مورد استفاده قرار خواهیم داد. </string> - <string name="wizard_permissions_msg_stock">هرچند ضرورت ندارد اما اگر سیستم شما دارای دسترسی root باشد اوربات با ظرفیت بسیار بیشتری عمل خواهد کرد. دکمه زیر را فشار دهید تا اوربات دارای ظرفیت حداکثری بشود.</string> - <string name="wizard_permissions_no_root">اگر سیستم شما دارای دسترسی root نیست و یا اصلن چیزی از این عبارت متوجه نمی شوید، حتمن سعی کنید از اپلکیشن هایی استفاده کنید که ویژه اوربات تهیه شده اند. </string> - <string name="wizard_permissions_consent">متوجه هستم و ترجیح می دهم بدون root ادامه بدهم.</string> - <string name="wizard_permission_enable_root">واگذاری root برای اوربات</string> - <string name="wizard_configure">تنظیمات تبدیل به Tor</string> - <string name="wizard_configure_msg">اوربات به شما امکان می دهد که تمام اپلیکشین ها را از طریق Tor منتقل کنید و یا اپلیکیشن مورد نظر خود را شخصن انتخاب کنید.</string> - <string name="wizard_configure_all">تمام اپلیکیشن ها را از طریق Tor منتقل کنید.</string> - <string name="wizard_configure_select_apps">اپلیکیشن های منفرد برای Tor انتخاب کنید.</string> - <string name="wizard_tips_tricks">اپلیکیشن هایی که برای اوربات تنظیم شده اند</string> - <string name="wizard_tips_msg">توصیه می کنیم داون لود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربات وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود. </string> + <string name="status_install_success">Tor binaries successfully installed!</string> + <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> + <string name="title_error">Application Error</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">About Orbot</string> + <string name="btn_next">Next</string> + <string name="btn_back">Back</string> + <string name="btn_finish">Finish</string> + <string name="btn_okay">Okay</string> + <string name="btn_cancel">Cancel</string> + <string name="wizard_details">Some Orbot Details</string> + <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, 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">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">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربات</string> - <string name="wizard_proxy_help_info">تنظیمات پروکسی</string> - <string name="wizard_proxy_help_msg">اگر اپلیکشین آندرونوید مورد استفاده شما قابلیت کار با HTTP و یا SOCKS پروکسی دارد می توانید تنظیمش کنید تا به اوربات وصل شود و از Tor استفاده کند. تنظیمات سرویس دهنده 127.0.0.1 و یا \"سرویس-ده محلی\" است. برای HTTP تنظیمات درگاه (port) 8118 است. برای SOCKS، پروکسی مناسب، 9050 است. شما می بایست SOCKS4A و یا در صورت امکان از socks5 استفاده کنید. در صورت نیاز به اطلاعات بیشتر در مورد انتقالده آندروید، می توانید به FAQ (سوالهای معمول) در http://tinyurl.com/proxyandroid مراجعه کنید.</string> - <string name="wizard_final">اوربات آماده استفاده میباشد!</string> - <string name="wizard_final_msg">صدها هزار نفر در سراسر جهان به دلایل گوناگون از Tor استفاده می کنند: روزنامه نویسها و بلاگرها، کارکنان حقوق بشر، ماموران انتظامی، سربازان، شرکتها، شهروندان دولتهای سرکوبگر، و شهروندان عادی، و حالا شما نیز آماده استفاده از آن هستید!</string> - <string name="connect_first_time">اکنون با موفقیت به شبکه Tor وصل شده اید اما به آن معنا نیست که سیستم شما ایمن است. می توانید از منیو گزینه /\"Check/\" را برای آزمایش مرورگر انتخاب کنید. به ما در صفحه https://guardianproject.info/apps/orbot مراجعه کنید و به آدرس help(a)guardianproject.info ایمیلی بفرستید تا اطلاعات بیشتری دریافت کنید. </string> - <string name="tor_check">با این قدم پیشفرض مرورگر وب شما به صفحه https://check.torproject.org باز می شود تا شما مشاهده کنید آیا اوربات تنظیم شده است و آیا شما به Tor وصل شده اید یا نه.</string> - <string name="pref_hs_group">سرويس هاي مخفي</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 + 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 + You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid + </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 Services</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"></string> - <string name="wizard_warning_title">هشدار</string> - <string name="wizard_warning_msg"></string> - <string name="wizard_permissions_title">دسترسی‌ها</string> - <string name="wizard_permissions_root_msg1"></string> - <string name="wizard_permissions_root_msg2"></string> - <string name="wizard_permissions_no_root_msg"></string> - <string name="wizard_tips_title"></string> - <string name="wizard_tips_gibberbot"></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"></string> - <string name="wizard_transproxy_msg"></string> - <string name="wizard_transproxy_hint">(اگر هیچ ایده‌ای ندارید که راجع به چه چیزی حرف میزنیم این گزینه را انتخاب کنید)</string> - <string name="wizard_transproxy_none"></string> - <string name="pref_transparent_tethering_title"></string> - <string name="pref_transparent_tethering_summary"></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"></string> - <string name="pref_node_configuration_summary"></string> - <string name="pref_entrance_node"></string> - <string name="pref_entrance_node_summary"></string> - <string name="pref_entrance_node_dialog"></string> - <string name="pref_use_whispercore"></string> - <string name="pref_use_whispercore_summary"></string> - <string name="pref_proxy_type_title">نوع پروکسی</string> - <string name="pref_proxy_type_summary"></string> - <string name="pref_proxy_type_dialog">نوع پروکسی را وارد کنید</string> - <string name="pref_proxy_host_title">میزبان پروکسی</string> - <string name="pref_proxy_host_summary">نام سرور میزبان پروکسی</string> - <string name="pref_proxy_host_dialog">نام میزبان پروکسی را وارد کنید</string> - <string name="pref_proxy_port_title">پورت پروکسی</string> - <string name="pref_proxy_port_summary">پورت سرور پروکسی</string> - <string name="pref_proxy_port_dialog">پورت پروکسی را وارد کنید</string> - <string name="status">وضعیت</string> - <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_"></string> - <string name="warning_error_starting_transparent_proxying_">هشدار: خطا در هنگام راه اندازی پروکسی شفاف!</string> - <string name="transproxy_rules_cleared"></string> - <string name="couldn_t_start_tor_process_"></string> - <string name="privoxy_is_running_on_port_">پروکسی، روی پورت مقابل درحال اجراست:</string> - <string name="setting_up_port_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر پورت...</string> - <string name="bridge_error">خطای پل</string> - <string name="bridge_requires_ip">برای استفاده از ویژگی پل، باید حداقل آدرس IP یک پل را وارد کنید.</string> - <string name="send_email_for_bridges"></string> - <string name="error"></string> - <string name="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"></string> - <string name="enter_exit_nodes"></string> - <string name="exclude_nodes"></string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> - <string name="enter_exclude_nodes"></string> - <string name="strict_nodes"></string> - <string name="use_only_these_specified_nodes"></string> - <string name="bridges"></string> - <string name="use_bridges"></string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> - <string name="ip_address_and_port_of_bridges"></string> - <string name="enter_bridge_addresses"></string> - <string name="relays"></string> - <string name="relaying"></string> - <string name="enable_your_device_to_be_a_non_exit_relay"></string> - <string name="relay_port"></string> - <string name="listening_port_for_your_tor_relay"></string> - <string name="enter_or_port"></string> - <string name="relay_nickname"></string> - <string name="the_nickname_for_your_tor_relay">نام مستعار بازپخش کننده شما</string> - <string name="enter_a_custom_relay_nickname"></string> - <string name="reachable_addresses">آدرس های قابل دسترس</string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> - <string name="reachable_ports">پورت‌های قابل دسترس</string> - <string name="ports_reachable_behind_a_restrictive_firewall">پورت‌های قابل دسترس پشت یک فایروال محدودکننده</string> - <string name="enter_ports">پورت‌ها را وارد کنید</string> - <string name="enable_hidden_services">سرویس‌های مخفی را فعال کن</string> - <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_"></string> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> - <string name="project_home"></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_use_whispercore">Use WhisperCore</string> + <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> + <string name="pref_proxy_type_title">Proxy Type</string> + <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_dialog">Enter Proxy Type</string> + <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_summary">Proxy server hostname</string> + <string name="pref_proxy_host_dialog">Enter Proxy Host</string> + <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_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="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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">Enable Hidden Services</string> + <string name="run_servers_accessible_via_the_tor_network">run servers 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"></string> + <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> - <string name="third_party_software"></string> + <string name="third_party_software">3rd-Party-Software: </string> <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="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"></string> - <string name="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> - <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string> - <string name="pref_use_sys_iptables_title">از Iptables پیشفرض استفاده کن</string> - <string name="pref_use_sys_iptables_summary"></string> - <string name="error_installing_binares"></string> - <string name="pref_use_persistent_notifications"></string> - <string name="pref_use_persistent_notifications_title"></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> </resources> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index b260e9b..144db09 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -5,191 +5,192 @@ <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">启动和停止 Tor</string> - <string name="tor_proxy_service_process">Tor 代理服务</string> - <string name="status_starting_up">Orbot 正在启动...</string> - <string name="status_activated">已连接到 Tor 网络</string> - <string name="status_disabled">Orbot 已停用</string> - <string name="status_shutting_down">Orbot 正在关闭</string> - <string name="tor_process_starting">开启Tor客户端...</string> - <string name="tor_process_complete">完成。</string> - <string name="tor_process_waiting">等待。</string> - <string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器 127.0.0.1:8118 或者 SOCKS4A 或者 SOCKS5 代理服务器 127.0.0.1:9050</string> - <string name="menu_home">首页</string> - <string name="menu_browse">浏览</string> - <string name="menu_settings">设置</string> - <string name="menu_log">日志</string> - <string name="menu_info">帮助</string> - <string name="menu_apps">应用</string> - <string name="menu_start">启动</string> - <string name="menu_stop">停止</string> - <string name="menu_about">关于</string> + <string name="control_permission_label">start and stop Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot is starting...</string> + <string name="status_activated">Connected to the Tor network</string> + <string name="status_disabled">\"Orbot is Deactivated</string> + <string name="status_shutting_down">Orbot is shutting down</string> + <string name="tor_process_starting">Starting Tor client...</string> + <string name="tor_process_complete">complete.</string> + <string name="tor_process_waiting">waiting.</string> + <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> + <string name="menu_home">Home</string> + <string name="menu_browse">Browse</string> + <string name="menu_settings">Settings</string> + <string name="menu_log">Log</string> + <string name="menu_info">Help</string> + <string name="menu_apps">Apps</string> + <string name="menu_start">Start</string> + <string name="menu_stop">Stop</string> + <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> - <string name="button_help">帮助</string> - <string name="button_close">关闭</string> - <string name="button_about">关于</string> + <string name="button_help">Help</string> + <string name="button_close">Close</string> + <string name="button_about">About</string> <string name="button_clear_log">Clear Log</string> - <string name="menu_verify">检查</string> - <string name="menu_exit">退出</string> - <string name="powered_by">由 Tor 项目强力驱动</string> - <string name="press_to_start">- 长按以启动 -</string> - <string name="pref_trans_proxy_group">透明代理(需要 root)</string> - <string name="pref_trans_proxy_title">透明代理</string> - <string name="pref_trans_proxy_summary">自动对应用程序使用 Tor</string> - <string name="pref_transparent_all_title">对所有应用使用 Tor</string> - <string name="pref_transparent_all_summary">使用 Tor 代理所有程序的流量</string> + <string name="menu_verify">Check</string> + <string name="menu_exit">Exit</string> + <string name="powered_by">powered by the Tor Project</string> + <string name="press_to_start">- long press to start -</string> + <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> + <string name="pref_trans_proxy_title">Transparent Proxying</string> + <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> + <string name="pref_transparent_all_title">Tor Everything</string> + <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> - <string name="pref_transparent_port_title">端口列表</string> + <string name="pref_transparent_port_title">Port List</string> <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> <string name="pref_has_root">Request Root Access</string> <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor 二进制程序安装成功！</string> - <string name="status_install_fail">Tor 二进制程序无法安装。请查看日志 tor-assistants(a)torproject.org</string> - <string name="title_error">应用程序错误</string> - <string name="wizard_title">欢迎使用 Orbot</string> - <string name="wizard_btn_tell_me_more">关于 Orbot</string> - <string name="btn_next">下一步</string> - <string name="btn_back">上一步</string> - <string name="btn_finish">完成</string> - <string name="btn_okay">确定</string> - <string name="btn_cancel">取消</string> - <string name="wizard_details">一些 Orbot 详情</string> - <string name="wizard_details_msg">Orbot 是包含 Tor、LibEvent 和 Privoxy 的开源软件。它包含了一个本地 HTTP 代理(8118)和 SOCKS 代理(9050)，使您接入 Tor 网络。Orbot 在可以获得 root 权限的设备上接管所有流量经由 Tor 网络。</string> - <string name="wizard_permissions_root">已赋予权限</string> - <string name="wizard_permissions_stock">Orbot 权限</string> - <string name="wizard_premissions_msg_root">非常好！我们检测到您已经为 Orbot 配置了 root 权限。我们会聪明地使用这个特权。</string> - <string name="wizard_permissions_msg_stock">虽然并非必须，如果你的设备有 root 权限，Orbot 可以表现得更为强大。使用以下按钮来赋予 Orbot 超级能力！</string> - <string name="wizard_permissions_no_root">如果你没有 root 权限，或不明白上面说的是什么，那么只需使用可与 Orbot 工作的应用程序。</string> - <string name="wizard_permissions_consent">我明白并会以非 root 继续</string> - <string name="wizard_permission_enable_root">为 Orbot 赋予 root 权限</string> - <string name="wizard_configure">配置 Tor 使用</string> - <string name="wizard_configure_msg">Orbot 给予您路由所有应用程序流量通过 Tor 或者为单个程序设置选择的选项。</string> - <string name="wizard_configure_all">通过 Tor 代理全部应用程序</string> - <string name="wizard_configure_select_apps">选择使用 Tor 的单个应用程序</string> - <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string> - <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string> + <string name="status_install_success">Tor binaries successfully installed!</string> + <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> + <string name="title_error">Application Error</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">About Orbot</string> + <string name="btn_next">Next</string> + <string name="btn_back">Back</string> + <string name="btn_finish">Finish</string> + <string name="btn_okay">Okay</string> + <string name="btn_cancel">Cancel</string> + <string name="wizard_details">Some Orbot Details</string> + <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, 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">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">代理设置 - 学习如何配置应用程序使用 Orbot</string> - <string name="wizard_proxy_help_info">代理设置</string> - <string name="wizard_proxy_help_msg">如果您正在使用的 Android 应用程序支持使用 HTTP 或 SOCKS 代理，您可以配置它连接到 Orbot 并使用 Tor。\n\n - 主机设置为 127.0.0.1 或 localhost。对于 HTTP，端口为 8118，对于 SOCKS 端口为 9050。如果可能，应当使用 SOCKS4A 或 SOCKS5。 + <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 + 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 - 您可以通过 http://tinyurl.com/proxyandroid 了解更多 Android 上使用代理的知识。</string> - <string name="wizard_final">Orbot 已就绪！</string> - <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor：记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民，当然也有普通的市民。现在你也即将成为其中的一员！</string> - <string name="connect_first_time">您已成功连接至 Tor 网络 - 但这并不意味着您的设备安全。您可以使用“检查”选项测试您的浏览器。\n\n访问 https://guardianproject.info/apps/orbot 或发送邮件到 help(a)guardianproject.info 以了解更多信息。</string> - <string name="tor_check">这将启动默认浏览器并访问 https://check.torproject.org 以测试是否正确配置了 Orbot 并确认您是否已经连接到 Tor。</string> - <string name="pref_hs_group">隐藏服务</string> + You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid + </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 Services</string> <string name="pref_general_group">General</string> - <string name="pref_start_boot_title">开机启动Orbot</string> - <string name="pref_start_boot_summary">当您的 Android 设备开机时自动启动 Orbot 并连接至 Tor 网络</string> - <string name="wizard_title_msg"></string> - <string name="wizard_warning_title">警告</string> - <string name="wizard_warning_msg"></string> - <string name="wizard_permissions_title">允许</string> - <string name="wizard_permissions_root_msg1"></string> - <string name="wizard_permissions_root_msg2"></string> - <string name="wizard_permissions_no_root_msg"></string> - <string name="wizard_tips_title"></string> - <string name="wizard_tips_gibberbot"></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 (仅 Android 1.x) - 着重隐私设计的浏览器</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> - <string name="wizard_transproxy_title"></string> - <string name="wizard_transproxy_msg"></string> - <string name="wizard_transproxy_hint"></string> - <string name="wizard_transproxy_none"></string> - <string name="pref_transparent_tethering_title"></string> - <string name="pref_transparent_tethering_summary"></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"></string> - <string name="pref_node_configuration_summary"></string> - <string name="pref_entrance_node"></string> - <string name="pref_entrance_node_summary"></string> - <string name="pref_entrance_node_dialog"></string> - <string name="pref_use_whispercore"></string> - <string name="pref_use_whispercore_summary"></string> - <string name="pref_proxy_type_title"></string> - <string name="pref_proxy_type_summary"></string> - <string name="pref_proxy_type_dialog"></string> - <string name="pref_proxy_host_title"></string> - <string name="pref_proxy_host_summary"></string> - <string name="pref_proxy_host_dialog"></string> - <string name="pref_proxy_port_title"></string> - <string name="pref_proxy_port_summary"></string> - <string name="pref_proxy_port_dialog"></string> - <string name="status">状态</string> - <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_"></string> - <string name="warning_error_starting_transparent_proxying_"></string> - <string name="transproxy_rules_cleared"></string> - <string name="couldn_t_start_tor_process_"></string> - <string name="privoxy_is_running_on_port_"></string> - <string name="setting_up_port_based_transparent_proxying_"></string> - <string name="bridge_error">网桥错误</string> - <string name="bridge_requires_ip"></string> - <string name="send_email_for_bridges"></string> - <string name="error">错误</string> - <string name="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"></string> - <string name="enter_exit_nodes"></string> - <string name="exclude_nodes"></string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> - <string name="enter_exclude_nodes"></string> - <string name="strict_nodes"></string> - <string name="use_only_these_specified_nodes"></string> - <string name="bridges">网桥</string> - <string name="use_bridges">使用网桥</string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> - <string name="ip_address_and_port_of_bridges">网桥的IP地址和端口</string> - <string name="enter_bridge_addresses"></string> - <string name="relays"></string> - <string name="relaying"></string> - <string name="enable_your_device_to_be_a_non_exit_relay"></string> - <string name="relay_port"></string> - <string name="listening_port_for_your_tor_relay"></string> - <string name="enter_or_port"></string> - <string name="relay_nickname"></string> - <string name="the_nickname_for_your_tor_relay"></string> - <string name="enter_a_custom_relay_nickname"></string> - <string name="reachable_addresses"></string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> - <string name="reachable_ports"></string> - <string name="ports_reachable_behind_a_restrictive_firewall"></string> - <string name="enter_ports"></string> - <string name="enable_hidden_services"></string> - <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_"></string> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> - <string name="project_home"></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_use_whispercore">Use WhisperCore</string> + <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> + <string name="pref_proxy_type_title">Proxy Type</string> + <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_dialog">Enter Proxy Type</string> + <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_summary">Proxy server hostname</string> + <string name="pref_proxy_host_dialog">Enter Proxy Host</string> + <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_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="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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">Enable Hidden Services</string> + <string name="run_servers_accessible_via_the_tor_network">run servers 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">Tor许可证</string> + <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> - <string name="third_party_software"></string> + <string name="third_party_software">3rd-Party-Software: </string> <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version"></string> + <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> - <string name="hidden_service_request"></string> - <string name="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> - <string name="unable_to_start_tor"></string> - <string name="pref_use_sys_iptables_title"></string> - <string name="pref_use_sys_iptables_summary"></string> - <string name="error_installing_binares"></string> - <string name="pref_use_persistent_notifications"></string> - <string name="pref_use_persistent_notifications_title"></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> </resources>

1 0

[torbrowser/master] unrecommend linux 2.2.35-7 now that 2.2.35-7.2 is up
by sebastian＠torproject.org 20 Feb '12

20 Feb '12

commit 330d9a6cde0835cd373df7cc12f798ab4470f5f3 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 20 15:39:50 2012 +0100 unrecommend linux 2.2.35-7 now that 2.2.35-7.2 is up --- build-scripts/recommended-versions | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 387deb2..e85e602 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,6 +1,4 @@ [ -"2.2.35-7-Linux-i686", -"2.2.35-7-Linux-x86_64", "2.2.35-7-MacOS-i386", "2.2.35-7.1-MacOS-x86_64", "2.2.35-7.1-Windows",

1 0

[torbrowser/maint-2.3] unrecommend linux 2.2.35-7 now that 2.2.35-7.2 is up
by sebastian＠torproject.org 20 Feb '12

20 Feb '12

commit 330d9a6cde0835cd373df7cc12f798ab4470f5f3 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 20 15:39:50 2012 +0100 unrecommend linux 2.2.35-7 now that 2.2.35-7.2 is up --- build-scripts/recommended-versions | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 387deb2..e85e602 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,6 +1,4 @@ [ -"2.2.35-7-Linux-i686", -"2.2.35-7-Linux-x86_64", "2.2.35-7-MacOS-i386", "2.2.35-7.1-MacOS-x86_64", "2.2.35-7.1-Windows",

1 0

[torbrowser/maint-2.2] unrecommend linux 2.2.35-7 now that 2.2.35-7.2 is up
by sebastian＠torproject.org 20 Feb '12

20 Feb '12

commit 330d9a6cde0835cd373df7cc12f798ab4470f5f3 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 20 15:39:50 2012 +0100 unrecommend linux 2.2.35-7 now that 2.2.35-7.2 is up --- build-scripts/recommended-versions | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 387deb2..e85e602 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,6 +1,4 @@ [ -"2.2.35-7-Linux-i686", -"2.2.35-7-Linux-x86_64", "2.2.35-7-MacOS-i386", "2.2.35-7.1-MacOS-x86_64", "2.2.35-7.1-Windows",

1 0

r25457: {website} Bump the tbb linux version to 0.2.2.35-7.2 (website/trunk/include)
by Sebastian Hahn 20 Feb '12

20 Feb '12

Author: sebastian Date: 2012-02-20 14:24:42 +0000 (Mon, 20 Feb 2012) New Revision: 25457 Modified: website/trunk/include/versions.wmi Log: Bump the tbb linux version to 0.2.2.35-7.2 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-02-19 12:54:52 UTC (rev 25456) +++ website/trunk/include/versions.wmi 2012-02-20 14:24:42 UTC (rev 25457) @@ -37,8 +37,8 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-7</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-7</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-7.2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-7.2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.2</define-tag>

1 0