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

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 16 Mar '12

16 Mar '12

commit 2667ffe0c7fb88f7f8a1a9aca5d6d663932f5a20 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 16 09:15:24 2012 +0000 Update translations for orbot_completed --- values-ar/strings.xml | 22 +++++ values-de/strings.xml | 24 +++++- values-es/strings.xml | 225 ++++++++++++++++++++++++++++++++++++++++++++++ values-fr/strings.xml | 28 +++++- values-it/strings.xml | 26 +++++- values-nl/strings.xml | 24 +++++- values-pt_BR/strings.xml | 22 +++++ values/strings.xml | 22 +++++ 8 files changed, 386 insertions(+), 7 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 01a6a12..fd4592a 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -55,6 +55,7 @@ <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">أوربوت هو تطبيق مفتوح المصدر والذي يضم تور, LibEvent وPrixovy. يعمل على توفير وكيل HTTP محلي (8118) ووكيل SOCKS (9050) إلى شبكة تور. يتوفر لدى أوربوت القدرة على إرسال جميع حركات مرور الانترنت من خلال تور على الجهاز ذات حقوق المسؤول (root). </string> <string name="wizard_permissions_root">تم منح الإذن</string> @@ -84,6 +85,7 @@ </string> <string name="wizard_final">أوربوت جاهز!</string> <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string> +  <string name="connect_first_time"> لقد قمت بإتصال ناجح الى شبكة تور - لكن هذا لا يعني بأن جهازك في مأمن. يمكنك استخدام خيار \'تحقق\' من القائمة لإختبار المتصفح الخاص بك. قم بزيارتنا على https://guardianproject.info/apps/orbot او ارسل رسالة الكترونية الى help(a)guardianproject.info لمعرفة المزيد.</string> @@ -92,18 +94,30 @@ <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">لا يوجد روت أو صلاحيات خارقة على جهازك و لذلك لتستفيد من من تور عليك استخدام برامج صممت لتعمل مع أوربوت أو التي تدعم بروكسي HTTP أو SOCKS .</string> +  <string name="wizard_tips_title">برامج معدة لتشتغل مع أوربوت</string> <string name="wizard_tips_gibberbot">جيبربوت: محادثات آمنة باستخدام التشفير خارج السجل.</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> @@ -155,7 +169,9 @@ <string name="use_only_these_specified_nodes">فقط استخدم هذه النقاط المحددة</string> <string name="bridges">الجسور</string> <string name="use_bridges">استخدم الجسور</string> + <string name="bridges_obfuscated">الجسور المخفية</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسمح باستخدام نقاط دخول بديلة على شبكة تور</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">تفعيل هذا الخيار اذا كانت الجسور مخفية</string> <string name="ip_address_and_port_of_bridges">عناوين الانترنت و منافذ الجسور</string> <string name="enter_bridge_addresses">أدخل عنوان الجسر</string> <string name="relays">نقاط التحويل</string> @@ -199,4 +215,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">تم تفعيل الجسور!</string> + <string name="default_bridges"></string> + <string name="set_locale_title">تغيير اللغة</string> + <string name="set_locale_summary">غير اللغة و الاعدادات الاقليمية لأوربوت</string> + <string name="wizard_locale_title">اختيار اللغة</string> + <string name="wizard_locale_msg">اختر اللغة الافتراضية</string> </resources> diff --git a/values-de/strings.xml b/values-de/strings.xml index 9b75c7f..39e48ba 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Fertigstellen</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Abbrechen</string> +  <string name="wizard_details">Nähere Informationen zu Orbot</string> <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string> <string name="wizard_permissions_root">Berechtigung erteilt</string> @@ -84,6 +85,7 @@ Erfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter </string> <string name="wizard_final">Orbot ist bereit!</string> <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und jetzt können Sie das auch!</string> +  <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass Ihr Gerät sicher ist. Sie können die \'Überprüfen\'-Option aus dem Menü benutzen, um Ihren Browser zu testen. Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail an help(a)guardianproject.info um mehr darüber zu erfahren.</string> @@ -92,19 +94,31 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="pref_general_group">Allgemein</string> <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string> <string name="pref_start_boot_summary">Automatisches Starten von Orbot und Verbinden von Tor beim Start des Android-Gerätes</string> +  +  <string name="wizard_title_msg">Orbot sorgt dafür, dass Sie Tor mit Android nutzen können. Tor schützt vor Filterung von Inhalten, Traffic Analysen und Netzwerk-Überwachung, die Ihre Privatsphäre, vertrauliche Informationen und persönliche Verhältnisse gefährdet. Dieser Assistent wird Ihnen dabei helfen, Orbot und Tor auf Ihrem Gerät zu konfigurieren.</string> +  <string name="wizard_warning_title">Warnung</string> <string name="wizard_warning_msg">Die reine Installation von Orbot wird Ihren Datenverkehr nicht anonymisieren. Tor muss korrekt konfiguriert sein, damit ihr Gerät Tor erfolgreich verwenden kann.</string> +  <string name="wizard_permissions_title">Rechte</string> <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise \'Administrator\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen.</string> <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, dann verwenden Sie bitte Apps, die mit Orbot zusammen arbeiten können.</string> <string name="wizard_permissions_no_root_msg">Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen. </string> +  <string name="wizard_tips_title">Apps die Orbot unterstützt</string> <string name="wizard_tips_gibberbot">Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp; Orbot entworfener Browser</string> + <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Benutze transparenten Proxy</string> <string name="wizard_transproxy_msg">Dies ermöglicht Ihnen Apps, automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen.</string> <string name="wizard_transproxy_hint">(Klicken Sie dieses Kästchen an wenn Sie nicht wissen wovon wir reden)</string> @@ -156,7 +170,9 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="use_only_these_specified_nodes">Benutze *ausschließlich* diese angegebenen Nodes</string> <string name="bridges">Bridges</string> <string name="use_bridges">Benutze Bridges</string> + <string name="bridges_obfuscated">Verschleierte Brücken</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Benutze alternative Eingangs-Nodes in das TOR-Netzwerk</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls konfigurierte Brücken verschleierte Brücken sind.</string> <string name="ip_address_and_port_of_bridges">IP Adresse und Port der Bridges</string> <string name="enter_bridge_addresses">Geben Sie die Bridge_Adressen ein</string> <string name="relays">Relays</string> @@ -200,4 +216,10 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="error_installing_binares">Die Tor-Binarys konnten nicht installiert oder aktualisiert werden.</string> <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar) wenn Orbot verbunden ist.</string> <string name="pref_use_persistent_notifications_title">Immer-eingeschaltet Benachrichtigungen</string> + <string name="notification_using_bridges">Brücke aktiviert!</string> + <string name="default_bridges"></string> + <string name="set_locale_title">Gebietsschema festlegen</string> + <string name="set_locale_summary">Gebietsschema und Sprache wählen</string> + <string name="wizard_locale_title">Sprache wählen</string> + <string name="wizard_locale_msg">Grundeinstellung beibehalten oder Sprache ändern</string> </resources> diff --git a/values-es/strings.xml b/values-es/strings.xml new file mode 100644 index 0000000..258084f --- /dev/null +++ b/values-es/strings.xml @@ -0,0 +1,225 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <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">iniciar y detener Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot está iniciando...</string> + <string name="status_activated">Conectado a la Red de Tor</string> + <string name="status_disabled">\"Orbot está desactivado</string> + <string name="status_shutting_down">Orbot se está cerrando</string> + <string name="tor_process_starting">Lanzando cliente Tor ...</string> + <string name="tor_process_complete">Completado</string> + <string name="tor_process_waiting">En espera</string> + <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Por favor, configure sus aplicaciones para usar el Proxy HTTP 127.0.0.1:8118, el SOCKS4A o el Proxy SOCKS5 127.0.0.1:9050</string> + <string name="menu_home">Principal</string> + <string name="menu_browse">Examinar</string> + <string name="menu_settings">Configuración</string> + <string name="menu_log">Historial</string> + <string name="menu_info">Ayuda</string> + <string name="menu_apps">Aplicaciones</string> + <string name="menu_start">Iniciar</string> + <string name="menu_stop">Detener</string> + <string name="menu_about">Acerca de</string> + <string name="menu_wizard">Wizard</string> + <string name="button_help">Ayuda</string> + <string name="button_close">Cerrar</string> + <string name="button_about">Acerca de</string> + <string name="button_clear_log">Limpiar Historial</string> + <string name="menu_verify">Comprobar</string> + <string name="menu_exit">Salir</string> + <string name="powered_by">potenciado por Tor Project</string> + <string name="press_to_start">- long press to start -</string> + <string name="pref_trans_proxy_group">Proxy transparente (Requiere ser Administrador)</string> + <string name="pref_trans_proxy_title">Proxy transparente</string> + <string name="pref_trans_proxy_summary">Torificado automático de las Aplicaciones</string> + <string name="pref_transparent_all_title">Pasar todo el tráfico por Tor</string> + <string name="pref_transparent_all_summary">Tráfico Proxy para todas las aplicaciones mediante Tor</string> + <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> + <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> + <string name="pref_transparent_port_title">Port List</string> + <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> + <string name="pref_transparent_port_dialog">Enter ports to proxy</string> + <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">¡Binarios de Tor instalados con éxito!</string> + <string name="status_install_fail">Los archivos binarios de Tor no se han podido instalar. Por favor, verifique el Historial y notifique a: tor-assistants(a)torproject.org</string> + <string name="title_error">Error de aplicación</string> + <string name="wizard_title">Bienvenido a Orbot</string> + <string name="wizard_btn_tell_me_more">Acerca de Orbot</string> + <string name="btn_next">Siguiente</string> + <string name="btn_back">Atrás</string> + <string name="btn_finish">Finalizar</string> + <string name="btn_okay">OK</string> + <string name="btn_cancel">Cancelar</string> +  + <string name="wizard_details">Algunos detalles de Orbot</string> + <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, LibEvent y Privoxy. Provee un Proxy HTTP local (8118) y un Proxy SOCKS (9050) en la red Tor. Orbot también tiene la habilidad, en un dispositivo enrutador, de enviar todo el tráfico de Internet a través de Tor.</string> + <string name="wizard_permissions_root">Permiso Concedido</string> + <string name="wizard_permissions_stock">Permisos de Orbot</string> + <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que usted tiene permisos administravitos activados para Orbot. Utilizaremos estos poderes sabiamente.</string> + <string name="wizard_permissions_msg_stock">Mientras no sea requerido, Orbot puede convertirse en una herramienta aún más poderosa si su dispositivo tiene acceso de administrador. Utilice el botón a continuación para conceder superpoderes a Orbot</string> + <string name="wizard_permissions_no_root">Si no tiene acceso de admnistrador o no tiene idea de qué estamos hablando, sólo asegúrese de utilizar aplicaciones hechas para trabajar con Orbot.</string> + <string name="wizard_permissions_consent">Comprendo y quiero continuar sin poderes administrativos</string> + <string name="wizard_permission_enable_root">Conceder poderes administrativos a Orbot</string> + <string name="wizard_configure">Configurar Torificación</string> + <string name="wizard_configure_msg">Orbot le da la opción de dirigir todo el tráfico de las aplicaciones a través de Tor O de seleccionar sus aplicaciones individualmente.</string> + <string name="wizard_configure_all">Configurar Proxy para todas las aplicaciones a través de Tor</string> + <string name="wizard_configure_select_apps">Seleccionar aplicaciones individualmente para Tor</string> + <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string> + <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string> + <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> + <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string> + <string name="wizard_proxy_help_info">Configuraciones Proxy</string> + <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un Proxy HTTP o SOCKS, entonces puede configurarla para conectar a Orbot y utilizar Tor. + + +La configuración del dominio es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy es 9050. Puede utilizar SOCKS4A o SOCKS5 si es posible. + + + +Puede aprender más acerca de los proxys en Android a través de las Preguntas Frecuentes ubicadas en: http://tinyurl.com/proxyandroid + </string> + <string name="wizard_final">¡Orbot está listo!</string> + <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string> +  + <string name="connect_first_time">Se ha conectado con éxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opción \'Comprobar\' desde el menú para probar su navegador. + +Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help(a)guardianproject.info para aprender más.</string> + <string name="tor_check">Esto abrirá https://check.torproject.org en su navegador predeterminado con el fin de comprobar si Orbot está configurado y si está conectado a Tor.</string> + <string name="pref_hs_group">Servicios Ocultados</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 activa el acceso a la red Tor, en su Android! \n\nTor le ayuda a defenderse del filtrado de contenido, análisis de tráfico y la vigilancia que amenaza su privacidad, su información confidencial y sus relaciones personales. \n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo Android.</string> +  + <string name="wizard_warning_title">Advertencia</string> + <string name="wizard_warning_msg">Simplemente instalando Orbort, no automatiza de por si, la proteccion anonima del trafico generado por su dispositivo \n\nPara anonimizar su trafico con garantias, debe configurar adecuadamente Orbot, el dispositivo y las aplicaciones que utilize en su conexion.</string> +  + <string name="wizard_permissions_title">Permisos</string> + <string name="wizard_permissions_root_msg1">Si lo desea, puede conceder acceso \'superusuario\' a Orbot para habilitar las características avanzadas de configuracion y acceso a la red Tor, tales como los proxys transparentes.</string> + <string name="wizard_permissions_root_msg2">Si no desea habilitar esta opcion, por favor asegúrese de utilizar aplicaciones compatibles con Orbot</string> + <string name="wizard_permissions_no_root_msg">Su dispositivo se esta ejecutando en modo estándar, y no admite el acceso root o \"superusuario\".\n\nPara que pueda beneficiarse de todo el potencial de Tor, tendrá que utilizar aplicaciones creadas para trabajar con Orbot, o compatibles con la configuracion proxy basada en los protocolos HTTP o SOCKS\n\n</string> +  + <string name="wizard_tips_title">Aplicaciones habilitadas para utilizar con Orbot</string> + <string name="wizard_tips_gibberbot">Gibberbot: Asegure su aplicación de chat con nuestro sistema de cifrado </string> + <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  + <string name="wizard_transproxy_title">conexion proxy transparente activada </string> + <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string> + <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string> + <string name="wizard_transproxy_none">Ninguno</string> + <string name="pref_transparent_tethering_title">Tor, como pasarela de acceso</string> + <string name="pref_transparent_tethering_summary">Habilitar Tor como proxy cuando este dispositivo movil se utilize, a traves de conexiones WI-FI o USB como pasarela de acceso a internet (requiere reinicio)</string> + <string name="button_grant_superuser">Solicitud de acceso como superusuario root</string> + <string name="pref_select_apps">Seleccion de Aplicaciones</string> + <string name="pref_select_apps_summary">Elija las Aplicaciones que utilizaran Tor</string> + <string name="pref_node_configuration">Configuración de nodo</string> + <string name="pref_node_configuration_summary">Estas son las configuraciones avanzadas que pueden reducir su anonimato</string> + <string name="pref_entrance_node">Los nodos de entrada</string> + <string name="pref_entrance_node_summary">Las llaves publicas, apodos, países y direcciones para el primer salto, o nodo (primer servidor que se conectara para acceder a la red Tor)</string> + <string name="pref_entrance_node_dialog">Introduzca los nodos de entrada</string> + <string name="pref_use_whispercore">Utilizar plataforma de seguridad WhisperCore</string> + <string name="pref_use_whispercore_summary">Utilizar las API de NetFilter proporcionada por WhisperSystems (es necesario que su dispositivo tenga WhisperCore instalado)</string> + <string name="pref_proxy_type_title">Tipo de proxy</string> + <string name="pref_proxy_type_summary">Protocolo que se utilizará para la configuracion del servidor proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string> + <string name="pref_proxy_type_dialog">Introduzca el Tipo de Proxy</string> + <string name="pref_proxy_host_title">Servidor Proxy</string> + <string name="pref_proxy_host_summary">Nombre para el Servidor Proxy</string> + <string name="pref_proxy_host_dialog">Introduzca el servidor anfitrion Proxy</string> + <string name="pref_proxy_port_title">Puerto proxy</string> + <string name="pref_proxy_port_summary">Puerto del servidor proxy</string> + <string name="pref_proxy_port_dialog">Introducir el puerto proxy</string> + <string name="status">Estado</string> + <string name="setting_up_full_transparent_proxying_">Configuración completa, aplicando y arrancando el proxy ...</string> + <string name="setting_up_app_based_transparent_proxying_">Configurando las aplicaciones que utilizaran el proxy ...</string> + <string name="transparent_proxying_enabled">Servicio Proxy -- HABILITADO Y ACTIVO</string> + <string name="transproxy_enabled_for_tethering_">Pasarela proxy habilitado para, los dispositivos conectados, a su dispositivo movil!</string> + <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: vaya .. hemos tenido un error al iniciar el proxy !</string> + <string name="transproxy_rules_cleared">Reglas de pasarela proxy, Borradas</string> + <string name="couldn_t_start_tor_process_">ADVERTENCIA: No se pudo iniciar el proceso Tor:</string> + <string name="privoxy_is_running_on_port_">Privoxy se está ejecutando en el puerto:</string> + <string name="setting_up_port_based_transparent_proxying_">Configuración de puerto proxy ...</string> + <string name="bridge_error">ADVERTENCIA: Error al establecer el Bridge ( dispositivo puente )</string> + <string name="bridge_requires_ip">Para utilizar la función Brigde (dispositivo puente), se debe introducir al menos una dirección IP del Bridge.</string> + <string name="send_email_for_bridges">Enviar un correo electrónico a bridges(a)torproject.org desde una cuenta de gmail , con el siguiente texto en el cuerpo del mensaje \"get bridges\" </string> + <string name="error">Error</string> + <string name="your_reachableaddresses_settings_caused_an_exception_">La configuración de ReachableAddresses (Reglas, sobre listas de rangos ip) ha producido una excepción!</string> + <string name="your_relay_settings_caused_an_exception_">La configuración de la transmision ha producido una excepción!</string> + <string name="exit_nodes">Los nodos de salida</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Llaves publicas, alias, países y las direcciones para el último nodo de salto</string> + <string name="enter_exit_nodes">Introduzca los nodos de salida</string> + <string name="exclude_nodes">Nodos de exclusion</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Llaves publicas, alias, países y las direcciones a excluir</string> + <string name="enter_exclude_nodes">Introduzca los nodos a excluir</string> + <string name="strict_nodes">Nodos Obligatorios</string> + <string name="use_only_these_specified_nodes">Usar * sólamente * los nodos especificados</string> + <string name="bridges">Puentes/Bridges</string> + <string name="use_bridges">Utilizar Puentes/Bridges</string> + <string name="bridges_obfuscated">Puentes ofuscados</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activar nodos de entrada alternativos en la red Tor</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar si puentes configurados estan ofuscados</string> + <string name="ip_address_and_port_of_bridges">Dirección IP y el puerto del puente/Bridge</string> + <string name="enter_bridge_addresses">Introduzca la dirección del puente/Bridge</string> + <string name="relays">Retransmisores de trafico</string> + <string name="relaying">Retransmitiendo Trafico</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Desactivar su dispositivo, como repetidor de salida</string> + <string name="relay_port">Puerto del Repetidor</string> + <string name="listening_port_for_your_tor_relay">Puerto de escucha de su servidor Tor</string> + <string name="enter_or_port">Introduzca el Puerto OR</string> + <string name="relay_nickname">Alias para referirse al Repetidor</string> + <string name="the_nickname_for_your_tor_relay">Alias de su servidor Tor</string> + <string name="enter_a_custom_relay_nickname">Introduzca un alias personalizado para el repetidor de trafico</string> + <string name="reachable_addresses">Listado de ips, accesibles</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar como cliente, situado tras un cortafuegos con politicas restrictivas</string> + <string name="reachable_ports">Puertos accesibles</string> + <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo</string> + <string name="enter_ports">Introduzca los puertos</string> + <string name="enable_hidden_services">Activar los servicios ocultos</string> + <string name="run_servers_accessible_via_the_tor_network">Ejecutar servidores accesibles a través de la red de Tor</string> + <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de los servicios ocultos activados</string> + <string name="hidden_service_ports">Ocultar puertos de servicio</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nombre direccionable para su servicio oculto (generado automáticamente)</string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">permitir el registro de depuración de la aplicacion (debe utilizar adb o aLogCat para poder verlos)</string> + <string name="project_home">Localizacion del proyecto: </string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">Licencia de uso Tor</string> + <string name="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">Software de terceras partes</string> + <string name="tor_version">Tor v0.2.3.7-alfa: 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">Una aplicación esta intentando abrir el siguiente puerto %S a la red Tor. Esto es seguro, si confía en la aplicación, que lo esta intentando abrir.</string> + <string name="found_existing_tor_process">Se ha encontrado proceso activo de Tor ...</string> + <string name="something_bad_happened">Algo ha ocurrido con el normal funcionamiento de la aplicacion. Compruebe el log de registro del sistema Tor</string> + <string name="hidden_service_on">Servicio oculto en:</string> + <string name="unable_to_read_hidden_service_name">No se puede leer el nombre del servicio oculto</string> + <string name="unable_to_start_tor">ADVERTENCIA: No Puedo iniciar la Red Tor:</string> + <string name="pref_use_sys_iptables_title">Usar Iptables por defecto</string> + <string name="pref_use_sys_iptables_summary">Usar built-in iptables binario en lugar del paquete con Orbot</string> + <string name="error_installing_binares">Los binario de Tor no se pudieron instalar o actualizar</string> + <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string> + <string name="pref_use_persistent_notifications_title">Notificaciones siempre encendidas</string> + <string name="notification_using_bridges">Puentes activados!</string> + <string name="default_bridges"></string> + <string name="set_locale_title">Establecer configuración regional</string> + <string name="set_locale_summary">Elija la configuración regional y de idioma para Orbot</string> + <string name="wizard_locale_title">Escoja lenguaje +</string> + <string name="wizard_locale_msg">Dejar por defecto o cambiar el lenguaje actual</string> +</resources> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index ee3d796..f121914 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -14,7 +14,7 @@ <string name="tor_process_starting">Lancement du client Tor</string> <string name="tor_process_complete">Terminé</string> <string name="tor_process_waiting">Attente...</string> - <string name="not_anonymous_yet">AVERTISSEMENT: Votre traffic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string> + <string name="not_anonymous_yet">AVERTISSEMENT: Votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string> <string name="menu_home">Accueil</string> <string name="menu_browse">Parcourir</string> <string name="menu_settings">Paramètres</string> @@ -55,6 +55,7 @@ <string name="btn_finish">Fin</string> <string name="btn_okay">Valider</string> <string name="btn_cancel">Annuler</string> +  <string name="wizard_details">Quelques détails sur Orbot</string> <string name="wizard_details_msg">Orbot est une application logicielle libre qui contient Tor, LibEvent et Privoxy. Il fournit un proxy local HTTP (8118) et un proxy SOCKS (9050) dans le réseau Tor. Orbot a aussi la capacité, avec les droits administrateurs, d\'envoyer tout le trafic Internet à travers Tor.</string> <string name="wizard_permissions_root">Permission accordée</string> @@ -69,7 +70,7 @@ <string name="wizard_configure_all">Toutes les applications par Tor</string> <string name="wizard_configure_select_apps">Choisir les applications utilisant Tor</string> <string name="wizard_tips_tricks">Applications avec Orbot</string> - <string name="wizard_tips_msg">Nous vous encouragons à télécharger &amp; utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string> + <string name="wizard_tips_msg">Nous vous encouragons à télécharger & utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string> <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string> <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> @@ -80,25 +81,38 @@ </string> <string name="wizard_final">Orbot est prêt!</string> <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string> +  <string name="connect_first_time"> Vous êtes connectés avec succès au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\' du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help(a)guardianproject.info pour en savoir plus.</string> <string name="tor_check">Ceci va ouvrir la page https://check.torproject.org avec le navigateur web par défaut pour vérifier si Orbot est suffisamment configuré pour vous connecter à Tor.</string> <string name="pref_hs_group">Services cachés</string> <string name="pref_general_group">Général</string> <string name="pref_start_boot_title">Exécuter Orbot automatiquement</string> <string name="pref_start_boot_summary">Démarrer automatiquement Orbot et se connecter à Tor quand votre périphérique Android démarre</string> +  +  <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\n Tor vous aide à vous protéger du filtrage de contenu, de l\'analyse de trafic et de la surveillance des réseaux qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCe assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string> +  <string name="wizard_warning_title">Attention</string> <string name="wizard_warning_msg">Installer Orbot ne suffit pas à anonymiser automatiquement le trafic de votre mobile.\n\nVous devez configurer correctement Orbot, votre appareil et d\'autres applications pour utiliser adéquatement Tor.</string> +  <string name="wizard_permissions_title">Permissions</string> <string name="wizard_permissions_root_msg1">Vous pouvez aussi, optionnellement donner l\'accès \"Super Utilisateur\" à Orbot pour activer les options avancées, comme le Proxy Transparent</string> <string name="wizard_permissions_root_msg2">Si vous ne voulez pas faire ça, merci de vous assurer que les applications que vous utilisez ont été faites pour fonctionner avec Orbot.</string> <string name="wizard_permissions_no_root_msg">Votre appareil est en mode standard et ne supporte pas l\'accès root ou «super-utilisateur».\n\nPour bénéficier de Tor, vous avez besoin d\'utiliser des applications conçues pour fonctionner avec Orbot ou permettant de définir un proxy de type HTTP ou SOCKS.\n\n </string> +  <string name="wizard_tips_title">Applications Orbot</string> <string name="wizard_tips_gibberbot">Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record</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 seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string> + <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Proxy transparent</string> <string name="wizard_transproxy_msg">Cela permet à vos applications d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string> <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string> @@ -150,7 +164,9 @@ <string name="use_only_these_specified_nodes">Utiliser * uniquement * les nœuds spécifiés</string> <string name="bridges">Ponts</string> <string name="use_bridges">Utiliser des ponts</string> + <string name="bridges_obfuscated">Ponts Obscurci</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activer des nœuds alternatifs d\'entrée dans le réseau Tor</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts obscurcies</string> <string name="ip_address_and_port_of_bridges">Adresse IP et port des ponts</string> <string name="enter_bridge_addresses">Entrez les adresses de passerelle</string> <string name="relays">Relais</string> @@ -194,4 +210,10 @@ <string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installé ou mis à jour.</string> <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string> <string name="pref_use_persistent_notifications_title">Toujours activé les Notifications</string> + <string name="notification_using_bridges">Les ponts sont activés!</string> + <string name="default_bridges"></string> + <string name="set_locale_title">Fixer le Lieu</string> + <string name="set_locale_summary">Choisir le lieu and la langue pour Orbot</string> + <string name="wizard_locale_title">Choisir la langue</string> + <string name="wizard_locale_msg">Laisser aux défaut ou changer la langue actuel</string> </resources> diff --git a/values-it/strings.xml b/values-it/strings.xml index 4e50aa2..23a3dd7 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -32,7 +32,7 @@ <string name="menu_verify">Controlla</string> <string name="menu_exit">Esci</string> <string name="powered_by">powered by the Tor Project</string> - <string name="press_to_start">-pressione prolungata per avviare-</string> + <string name="press_to_start">- tieni premuto per avviare -</string> <string name="pref_trans_proxy_group">Proxying trasparente (Richiede root)</string> <string name="pref_trans_proxy_title">Proxying trasparente</string> <string name="pref_trans_proxy_summary">Torifying automatico delle app</string> @@ -55,6 +55,7 @@ <string name="btn_finish">Fine</string> <string name="btn_okay">Ok</string> <string name="btn_cancel">Annulla</string> +  <string name="wizard_details">Alcuni dettagli su Orbot</string> <string name="wizard_details_msg">Orbot è un\' applicazione open-source che contiene Tor, LibEvent and Privoxy. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) verso la rete Tor. Orbot ha anche la capacità, su dispositivi con root, di far passare tutto il traffico internet attraverso Tor.</string> <string name="wizard_permissions_root">Permesso concesso</string> @@ -69,7 +70,7 @@ <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string> <string name="wizard_configure_select_apps">Seleziona singole app per Tor</string> <string name="wizard_tips_tricks">App abilitate per Orbot</string> - <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string> + <string name="wizard_tips_msg">Ti invitiamo a scaricare & usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string> <string name="wizard_tips_otrchat">Gibberbot - Client sicuro di instant messaging per Android</string> <string name="wizard_tips_proxy">Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot</string> <string name="wizard_proxy_help_info">Impostazioni proxy</string> @@ -80,6 +81,7 @@ Ulteriori informazioni sul proxying per Android nelle FAQ all\' indirizzo: http: </string> <string name="wizard_final">Orbot è pronto!</string> <string name="wizard_final_msg">Centinaia di migliaia di persone nel mondo usano Tor per una varietà di motivi: giornalisti e bloggers, lavoratori per i diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string> +  <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il dispositivo è sicuro. È possibile utilizzare l\'opzione \'Controlla\' dal menù per testare il browser. \n\n Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help(a)guardianproject.info per saperne di più.</string> <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string> @@ -87,19 +89,31 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="pref_general_group">Generale</string> <string name="pref_start_boot_title">Avvia Orbot al boot</string> <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string> +  +  <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string> +  <string name="wizard_warning_title">Attenzione</string> <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor.</string> +  <string name="wizard_permissions_title">Permessi</string> <string name="wizard_permissions_root_msg1">Opzionalmente, è possibile concedere ad Orbot l\'accesso da superutente per abilitare funzionalità avanzate come il proxying trasparente.</string> <string name="wizard_permissions_root_msg2">Se non si vuole intraprendere questa scelta, ci si assicuri di utilizzare applicazioni fatte per funzionare con Orbot</string> <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da superutente.\n\nAl fine di beneficiare dell\'uso di Tor, sarà necessario utilizzare applicazioni costruite per funzionare con Orbot, o che supportino configurazioni proxy HTTP o SOCKS.\n\n </string> +  <string name="wizard_tips_title">Orbot-App abilitate</string> <string name="wizard_tips_gibberbot">Gibberbot: un applicazione per chat sicura con crittografia Off-the-Record</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Proxying trasparente</string> <string name="wizard_transproxy_msg">Questo permette alle tue applicazioni di passare automaticamente attraverso la rete Tor senza necessità di ulteriore configurazione.</string> <string name="wizard_transproxy_hint">(Seleziona questa casella se non hai idea di quello di cui stiamo parlando)</string> @@ -151,7 +165,9 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="use_only_these_specified_nodes">Utilizza *solo* i nodi specificati</string> <string name="bridges">Ponti</string> <string name="use_bridges">Utilizza i bridge</string> + <string name="bridges_obfuscated">Bridge mascherati</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Abilita nodi alternati in entrata nella rete Tor</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Attiva se i Bridge configurati sono mascherati</string> <string name="ip_address_and_port_of_bridges">Indirizzo IP e porta dei bridge</string> <string name="enter_bridge_addresses">Inserire gli indirizzi dei bridge</string> <string name="relays">Relays</string> @@ -195,4 +211,10 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="error_installing_binares">Non è stato possibile installare o aggiornare i binari di Tor.</string> <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string> <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string> + <string name="notification_using_bridges">Bridge attivati!</string> + <string name="default_bridges"></string> + <string name="set_locale_title">Configura le impostazioni internazionali.</string> + <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string> + <string name="wizard_locale_title">Scegli Lingua</string> + <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string> </resources> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 9daf30a..bce8f07 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Einde</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Annuleren</string> +  <string name="wizard_details">Enkele Orbot Details</string> <string name="wizard_details_msg">Orbot is een open-source applicatie die Tor, LibEvent en Privoxy bevat. Het creëert een lokale HTTP proxy (8118) en een SOCKS proxy (9050) naar het Tor netwerk. Orbot heeft ook de mogelijkheid om al het internet verkeer over het Tor netwerk te sturen.</string> <string name="wizard_permissions_root">Rechten toegewezen</string> @@ -83,6 +84,7 @@ Je kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyu </string> <string name="wizard_final">Orbot is klaar!</string> <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, voor verschillende redenen. Zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu ben jij er ook klaar voor!</string> +  <string name="connect_first_time">Je bent succesvol verbonden met het Tor netwerk, maar dit betekent NIET dat je apparaat volledig veilig is. Gebruik te \'Check\' optie vanuit het menu om je browser te testen. Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een email naar help(a)guardianproject.info voor vragen.</string> @@ -91,19 +93,31 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="pref_general_group">Algemeen</string> <string name="pref_start_boot_title">Start Orbot bij boot</string> <string name="pref_start_boot_summary">Start Orbot automatisch en verbind metTor wanneer je Android apparaat opstart.</string> +  +  <string name="wizard_title_msg">Orbot brengt Tor naar Android!\n\nTor helpt je verdedigen tegen filtering, verkeersanalyse en netwerktoezicht dat privacy, vertrouwelijke informatie en persoonlijke relaties bedreigt.\n\n Deze wizard helpt je met configureren van Orbot en Tor op jouw apparaat.</string> +  <string name="wizard_warning_title">Waarschuwing</string> <string name="wizard_warning_msg">Alleen Orbot installeren zal niet automatisch alle je mobiele verkeer anonimiseren.\n\nJe moet Orbot, je apparaat en andere apps juist instellen om succesvol Tor te gebruiken.</string> +  <string name="wizard_permissions_title">Rechten</string> <string name="wizard_permissions_root_msg1">Je kan optioneeel Orbot \'superuser\' toegang geven om geavanceerde functies beschikbaar te stellen, zoals Tranparante Proxy.</string> <string name="wizard_permissions_root_msg2">Als je dit niet wilt doen, zorg er dan voor dat je apps gebruikt die gemaakt zijn om te werken met Orbot</string> <string name="wizard_permissions_no_root_msg">Je apparaat draait in standaard modus en ondersteunt geen root of \'superuser\' toegang.\n\nOm voordeel te hebben van Tor moet je gebruik maken van apps die gemaakt zijn om te werken met Tor, of die HTTP of SOCKS proxy instellingen ondersteunen.\n\n </string> +  <string name="wizard_tips_title">Orbot geschikte Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Veilige chat app met Off-the-Record encryptie</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp; voor Orbot</string> + <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Tranparante Proxy</string> <string name="wizard_transproxy_msg">Dit maakt het mogelijk voor jouw apps om automatisch via het Tor netwerk te draaien zonder enige configuratie.</string> <string name="wizard_transproxy_hint">(Vink dit aan al je geen idee hebt waar we het over hebben)</string> @@ -155,7 +169,9 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="use_only_these_specified_nodes">Gebruik *alleen* deze nodes</string> <string name="bridges">Bridges</string> <string name="use_bridges">Gebruik bridges</string> + <string name="bridges_obfuscated">Versluierde bridges</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Gebruik alternatieve toegangsnodes naar het Tor Netwerk</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Schakel in als de geconfigureerde bridges versluierde bridges zijn</string> <string name="ip_address_and_port_of_bridges">IP-adres en poort van bridges</string> <string name="enter_bridge_addresses">Voer bridge adres in</string> <string name="relays">Relays</string> @@ -199,4 +215,10 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string> <string name="pref_use_persistent_notifications">Houd icoon in toolbar zolang Orbot verbonden is</string> <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string> + <string name="notification_using_bridges">Bridges ingeschakeld!</string> + <string name="default_bridges"></string> + <string name="set_locale_title">Stel landsinstellingen in</string> + <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string> + <string name="wizard_locale_title">Kies taal</string> + <string name="wizard_locale_msg">Laat standaard of schakel over naar huidige taal</string> </resources> diff --git a/values-pt_BR/strings.xml b/values-pt_BR/strings.xml index 42c6c8c..0bfad06 100644 --- a/values-pt_BR/strings.xml +++ b/values-pt_BR/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Terminar</string> <string name="btn_okay">Okay</string> <string name="btn_cancel">Cancelar</string> +  <string name="wizard_details">Alguns detalher do Orbot</string> <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém o Tor, LibEvent e Privoxy. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a habilidade, num dispositivo roteado, enviar todo o tráfego da Internet através do Tor</string> <string name="wizard_permissions_root">Permissão Concedida</string> @@ -80,26 +81,39 @@ </string> <string name="wizard_final">Orbot está pronto!</string> <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões.\n\nJornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string> +  <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto NÃO significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador.\n\nVisite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help(a)guardianproject.info para saber mais.</string> <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string> <string name="pref_hs_group">Serviços Ocultos</string> <string name="pref_general_group">Geral</string> <string name="pref_start_boot_title">Iniciar Orbot no Boot</string> <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string> +  +  <string name="wizard_title_msg">Orbot trouxe Tor para Android!!\n\nTor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais.\n\nEste assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string> +  <string name="wizard_warning_title">Aviso</string> <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel.\n\nVocê deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string> +  <string name="wizard_permissions_title">Permissões</string> <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string> <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string> <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'.\n\nDe maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS. </string> +  <string name="wizard_tips_title">Apps Orbot Habilitadas</string> <string name="wizard_tips_gibberbot">Gibberbot: App segura para chat com encriptação sem gravação </string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Proxy Transparente</string> <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string> <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string> @@ -151,7 +165,9 @@ <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string> <string name="bridges">Pontes</string> <string name="use_bridges">Usar pontes</string> + <string name="bridges_obfuscated">Pontes Ofuscadas</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nós de entrada alternativos dentro da rede Tor</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se pontes configuradas forem pontes ofuscadas</string> <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string> <string name="enter_bridge_addresses">Insira os Endereços das Pontes</string> <string name="relays">Retransmissores</string> @@ -195,4 +211,10 @@ <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string> <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string> <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string> + <string name="notification_using_bridges">Pontes habilitadas!</string> + <string name="default_bridges"></string> + <string name="set_locale_title">Selecionar Local</string> + <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string> + <string name="wizard_locale_title">Escolha o Idioma</string> + <string name="wizard_locale_msg">Deixe o padrão ou troque o idioma atual</string> </resources> diff --git a/values/strings.xml b/values/strings.xml index 144db09..590f4a2 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -55,6 +55,7 @@ <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> @@ -80,24 +81,37 @@ </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">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> @@ -149,7 +163,9 @@ <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> @@ -193,4 +209,10 @@ <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> + <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> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 16 Mar '12

16 Mar '12

commit 2ab79c6167964be601ab623f54b45d6574085f39 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 16 09:15:19 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 14 ++++++++++++++ values-ca/strings.xml | 18 ++++++++++++++++-- values-cs/strings.xml | 14 ++++++++++++++ values-de/strings.xml | 16 +++++++++++++++- values-el/strings.xml | 14 ++++++++++++++ values-es/strings.xml | 14 ++++++++++++++ values-eu/strings.xml | 14 ++++++++++++++ values-fa/strings.xml | 14 ++++++++++++++ values-fr/strings.xml | 14 ++++++++++++++ values-hu/strings.xml | 14 ++++++++++++++ values-it/strings.xml | 14 ++++++++++++++ values-ja/strings.xml | 14 ++++++++++++++ values-mk/strings.xml | 14 ++++++++++++++ values-nb/strings.xml | 16 +++++++++++++++- values-nl/strings.xml | 16 +++++++++++++++- values-pl/strings.xml | 14 ++++++++++++++ values-pt/strings.xml | 16 +++++++++++++++- values-pt_BR/strings.xml | 14 ++++++++++++++ values-ru/strings.xml | 14 ++++++++++++++ values-sv/strings.xml | 16 +++++++++++++++- values-zh/strings.xml | 14 ++++++++++++++ values/strings.xml | 14 ++++++++++++++ 22 files changed, 315 insertions(+), 7 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 057e0ba..fd4592a 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -55,6 +55,7 @@ <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">أوربوت هو تطبيق مفتوح المصدر والذي يضم تور, LibEvent وPrixovy. يعمل على توفير وكيل HTTP محلي (8118) ووكيل SOCKS (9050) إلى شبكة تور. يتوفر لدى أوربوت القدرة على إرسال جميع حركات مرور الانترنت من خلال تور على الجهاز ذات حقوق المسؤول (root). </string> <string name="wizard_permissions_root">تم منح الإذن</string> @@ -84,6 +85,7 @@ </string> <string name="wizard_final">أوربوت جاهز!</string> <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string> +  <string name="connect_first_time"> لقد قمت بإتصال ناجح الى شبكة تور - لكن هذا لا يعني بأن جهازك في مأمن. يمكنك استخدام خيار \'تحقق\' من القائمة لإختبار المتصفح الخاص بك. قم بزيارتنا على https://guardianproject.info/apps/orbot او ارسل رسالة الكترونية الى help(a)guardianproject.info لمعرفة المزيد.</string> @@ -92,18 +94,30 @@ <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">لا يوجد روت أو صلاحيات خارقة على جهازك و لذلك لتستفيد من من تور عليك استخدام برامج صممت لتعمل مع أوربوت أو التي تدعم بروكسي HTTP أو SOCKS .</string> +  <string name="wizard_tips_title">برامج معدة لتشتغل مع أوربوت</string> <string name="wizard_tips_gibberbot">جيبربوت: محادثات آمنة باستخدام التشفير خارج السجل.</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> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index 007ed1a..c228f3d 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Fi</string> <string name="btn_okay">D\'acord</string> <string name="btn_cancel">Cancel·la</string> +  <string name="wizard_details">Alguns detalls d\'Orbot...</string> <string name="wizard_details_msg">Orbot és una aplicació de codi lliure que conté Tor, LibEvent i Privoxy. Proporciona un Proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. Orbot també té capacitat d\'enviar tot el trànsit de dades d\'internet a través de Tor.</string> <string name="wizard_permissions_root">Permís concedit</string> @@ -69,7 +70,7 @@ <string name="wizard_configure_all">Connecta totes les aplicacions per Proxy per Tor.</string> <string name="wizard_configure_select_apps">Selecciona aplicacions individuals per a funcionar amb Tor</string> <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string> - <string name="wizard_tips_msg">T\'animem a descarregar-te &amp; utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string> + <string name="wizard_tips_msg">T\'animem a descarregar-te & utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string> <string name="wizard_proxy_help_info">Configuració de Proxy</string> @@ -84,6 +85,7 @@ Pots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://ti </string> <string name="wizard_final">Orbot és a punt!</string> <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string> +  <string name="connect_first_time">T\'has connectat correctament a la xarxa Tor, però això NO vol dir que el teu dispositiu sigui segur. Pots utilitzar la opció \'Comprova\' del menú per provar el teu navegador. Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help(a)guardianproject.info per a saber-ne més.</string> @@ -92,18 +94,30 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <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 (Només Android 1.x) - Navegador dissenyat per la privacitat &amp; per a Orbot</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> diff --git a/values-cs/strings.xml b/values-cs/strings.xml index 23395ac..111d7a3 100644 --- a/values-cs/strings.xml +++ b/values-cs/strings.xml @@ -55,6 +55,7 @@ <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> @@ -80,24 +81,37 @@ </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">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> diff --git a/values-de/strings.xml b/values-de/strings.xml index 9723dad..39e48ba 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Fertigstellen</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Abbrechen</string> +  <string name="wizard_details">Nähere Informationen zu Orbot</string> <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string> <string name="wizard_permissions_root">Berechtigung erteilt</string> @@ -84,6 +85,7 @@ Erfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter </string> <string name="wizard_final">Orbot ist bereit!</string> <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und jetzt können Sie das auch!</string> +  <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass Ihr Gerät sicher ist. Sie können die \'Überprüfen\'-Option aus dem Menü benutzen, um Ihren Browser zu testen. Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail an help(a)guardianproject.info um mehr darüber zu erfahren.</string> @@ -92,19 +94,31 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="pref_general_group">Allgemein</string> <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string> <string name="pref_start_boot_summary">Automatisches Starten von Orbot und Verbinden von Tor beim Start des Android-Gerätes</string> +  +  <string name="wizard_title_msg">Orbot sorgt dafür, dass Sie Tor mit Android nutzen können. Tor schützt vor Filterung von Inhalten, Traffic Analysen und Netzwerk-Überwachung, die Ihre Privatsphäre, vertrauliche Informationen und persönliche Verhältnisse gefährdet. Dieser Assistent wird Ihnen dabei helfen, Orbot und Tor auf Ihrem Gerät zu konfigurieren.</string> +  <string name="wizard_warning_title">Warnung</string> <string name="wizard_warning_msg">Die reine Installation von Orbot wird Ihren Datenverkehr nicht anonymisieren. Tor muss korrekt konfiguriert sein, damit ihr Gerät Tor erfolgreich verwenden kann.</string> +  <string name="wizard_permissions_title">Rechte</string> <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise \'Administrator\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen.</string> <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, dann verwenden Sie bitte Apps, die mit Orbot zusammen arbeiten können.</string> <string name="wizard_permissions_no_root_msg">Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen. </string> +  <string name="wizard_tips_title">Apps die Orbot unterstützt</string> <string name="wizard_tips_gibberbot">Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp; Orbot entworfener Browser</string> + <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Benutze transparenten Proxy</string> <string name="wizard_transproxy_msg">Dies ermöglicht Ihnen Apps, automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen.</string> <string name="wizard_transproxy_hint">(Klicken Sie dieses Kästchen an wenn Sie nicht wissen wovon wir reden)</string> diff --git a/values-el/strings.xml b/values-el/strings.xml index 83ae607..ecbbf2b 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Τέλος</string> <string name="btn_okay">Okay</string> <string name="btn_cancel">Άκυρο</string> +  <string name="wizard_details">Μερικές λεπτομέρειες για το Orbot</string> <string name="wizard_details_msg">Το Orbot είναι μια εφαρμογή ανοικτού λογισμικού που περιέχει τα Tor, LibEvent και Privoxy. Διαθέτει τοπικούς πληρεξούσιους διακομιστές (proxies) HTTP (8118) και SOCKS (9050) για το δίκτυο Tor. Σε συσκευές που έχουν διαμορφωθεί για ριζική χρήση (rooted devices), το Orbot μπορεί να μεταδίδει όλη την διαδυκτιακή κυκλοφορία μέσω Tor.</string> <string name="wizard_permissions_root">Η άδεια παραχωρήθηκε</string> @@ -80,24 +81,37 @@ </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">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> diff --git a/values-es/strings.xml b/values-es/strings.xml index 14941c9..258084f 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Finalizar</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Cancelar</string> +  <string name="wizard_details">Algunos detalles de Orbot</string> <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, LibEvent y Privoxy. Provee un Proxy HTTP local (8118) y un Proxy SOCKS (9050) en la red Tor. Orbot también tiene la habilidad, en un dispositivo enrutador, de enviar todo el tráfico de Internet a través de Tor.</string> <string name="wizard_permissions_root">Permiso Concedido</string> @@ -84,6 +85,7 @@ Puede aprender más acerca de los proxys en Android a través de las Preguntas F </string> <string name="wizard_final">¡Orbot está listo!</string> <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string> +  <string name="connect_first_time">Se ha conectado con éxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opción \'Comprobar\' desde el menú para probar su navegador. Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help(a)guardianproject.info para aprender más.</string> @@ -92,18 +94,30 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <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 activa el acceso a la red Tor, en su Android! \n\nTor le ayuda a defenderse del filtrado de contenido, análisis de tráfico y la vigilancia que amenaza su privacidad, su información confidencial y sus relaciones personales. \n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo Android.</string> +  <string name="wizard_warning_title">Advertencia</string> <string name="wizard_warning_msg">Simplemente instalando Orbort, no automatiza de por si, la proteccion anonima del trafico generado por su dispositivo \n\nPara anonimizar su trafico con garantias, debe configurar adecuadamente Orbot, el dispositivo y las aplicaciones que utilize en su conexion.</string> +  <string name="wizard_permissions_title">Permisos</string> <string name="wizard_permissions_root_msg1">Si lo desea, puede conceder acceso \'superusuario\' a Orbot para habilitar las características avanzadas de configuracion y acceso a la red Tor, tales como los proxys transparentes.</string> <string name="wizard_permissions_root_msg2">Si no desea habilitar esta opcion, por favor asegúrese de utilizar aplicaciones compatibles con Orbot</string> <string name="wizard_permissions_no_root_msg">Su dispositivo se esta ejecutando en modo estándar, y no admite el acceso root o \"superusuario\".\n\nPara que pueda beneficiarse de todo el potencial de Tor, tendrá que utilizar aplicaciones creadas para trabajar con Orbot, o compatibles con la configuracion proxy basada en los protocolos HTTP o SOCKS\n\n</string> +  <string name="wizard_tips_title">Aplicaciones habilitadas para utilizar con Orbot</string> <string name="wizard_tips_gibberbot">Gibberbot: Asegure su aplicación de chat con nuestro sistema de cifrado </string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">conexion proxy transparente activada </string> <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string> <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string> diff --git a/values-eu/strings.xml b/values-eu/strings.xml index 8b148af..66c543e 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Amaitu</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> @@ -80,24 +81,37 @@ </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">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">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-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> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 0db30bb..df919b8 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -55,6 +55,7 @@ <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> @@ -76,28 +77,41 @@ <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="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">! را به اندروید می آورد tor قدرت orbot به شما کمک میکند تا در مقابل سانسور مطالب، آنالیز ترافیک و نظارت بر شبکه که حریم خصوصی افراد، اطلاعات محرمانه و روابط خصوصیتان را تهدید می کند از خود دفاع کنید. Tor را بر روی دستگاه خودتان انجام دهید Tor و orbot این راهنما به شما کمک میکند تا تنظیمات</string> +  <string name="wizard_warning_title">هشدار</string> <string name="wizard_warning_msg"> را نصب کنید بطور خودکار نمی تواند جریان اطلاعات موبایل شما را بصورت گمنام درآورد Orbot اگر فقط باید آنرا به درستی تنظیم کنید، همچنین تنظیمات را بر روی دستگاه خودتان و دیگر برنامه هایی که از استفاده کنیدTor اینترنت استفاده میکنند انجام دهید تا بتوانید با موفقیت از </string> +  <string name="wizard_permissions_title">دسترسی‌ها</string> <string name="wizard_permissions_root_msg1">اجازه دسترسی بدهید تا ویژگیهای پیشرفته مانند پروکسی شفاف را فعال کند Orbot اگر بخواهید میتوانید به سوپر یوزر </string> <string name="wizard_permissions_root_msg2">اگر نمیخواهید این کار را انجام دهید ، لطفا مطمئن شوید که از اپلیکیشنهایی استفاده می کنید که با اوربات کار می کنند</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 لیکیشنهایی که </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> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index fa67d91..f121914 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Fin</string> <string name="btn_okay">Valider</string> <string name="btn_cancel">Annuler</string> +  <string name="wizard_details">Quelques détails sur Orbot</string> <string name="wizard_details_msg">Orbot est une application logicielle libre qui contient Tor, LibEvent et Privoxy. Il fournit un proxy local HTTP (8118) et un proxy SOCKS (9050) dans le réseau Tor. Orbot a aussi la capacité, avec les droits administrateurs, d\'envoyer tout le trafic Internet à travers Tor.</string> <string name="wizard_permissions_root">Permission accordée</string> @@ -80,25 +81,38 @@ </string> <string name="wizard_final">Orbot est prêt!</string> <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string> +  <string name="connect_first_time"> Vous êtes connectés avec succès au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\' du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help(a)guardianproject.info pour en savoir plus.</string> <string name="tor_check">Ceci va ouvrir la page https://check.torproject.org avec le navigateur web par défaut pour vérifier si Orbot est suffisamment configuré pour vous connecter à Tor.</string> <string name="pref_hs_group">Services cachés</string> <string name="pref_general_group">Général</string> <string name="pref_start_boot_title">Exécuter Orbot automatiquement</string> <string name="pref_start_boot_summary">Démarrer automatiquement Orbot et se connecter à Tor quand votre périphérique Android démarre</string> +  +  <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\n Tor vous aide à vous protéger du filtrage de contenu, de l\'analyse de trafic et de la surveillance des réseaux qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCe assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string> +  <string name="wizard_warning_title">Attention</string> <string name="wizard_warning_msg">Installer Orbot ne suffit pas à anonymiser automatiquement le trafic de votre mobile.\n\nVous devez configurer correctement Orbot, votre appareil et d\'autres applications pour utiliser adéquatement Tor.</string> +  <string name="wizard_permissions_title">Permissions</string> <string name="wizard_permissions_root_msg1">Vous pouvez aussi, optionnellement donner l\'accès \"Super Utilisateur\" à Orbot pour activer les options avancées, comme le Proxy Transparent</string> <string name="wizard_permissions_root_msg2">Si vous ne voulez pas faire ça, merci de vous assurer que les applications que vous utilisez ont été faites pour fonctionner avec Orbot.</string> <string name="wizard_permissions_no_root_msg">Votre appareil est en mode standard et ne supporte pas l\'accès root ou «super-utilisateur».\n\nPour bénéficier de Tor, vous avez besoin d\'utiliser des applications conçues pour fonctionner avec Orbot ou permettant de définir un proxy de type HTTP ou SOCKS.\n\n </string> +  <string name="wizard_tips_title">Applications Orbot</string> <string name="wizard_tips_gibberbot">Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record</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 seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Proxy transparent</string> <string name="wizard_transproxy_msg">Cela permet à vos applications d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string> <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index a017a2c..70f3e4c 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Befejezés</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Mégsem</string> +  <string name="wizard_details">Néhány Orbot Tudnivaló</string> <string name="wizard_details_msg">Az Orbot egy nyílt forrás alkalmazás, ami a Tor, a LibEvent és Privoxy csomagot tartalmazza. Szolgáltatása egy helyi HTTP proxy (8118) és egy SOCKS proxy (9050) a Tor hálózat felé. Az Orbot további tulajdonsága, hogy rootolt készülék esetén képes a teljes internet forgalom Tor hálózaton keresztül küldésére.</string> <string name="wizard_permissions_root">Jogosultság megadva</string> @@ -80,24 +81,37 @@ </string> <string name="wizard_final">Az Orbot kész!</string> <string name="wizard_final_msg">Több száezren használják szerte a világon a Tor-t különböző okokból: újságírók, bloggerek, emberi jogi aktivisták, rendvédelmi szervek dolgozói, katonák, vállalatok, elnyomó rezsimek polgárai, vagy csak egyszerű polgárok... és most készen áll erre Ön is!</string> +  <string name="connect_first_time"> Sikeresen csatlakozott a Tor hálózathoz - de ez NEM azt jelenti, hogy a készüléke biztonságos. Ellenőrizze az \'Ellenőrzés\' opcióval a menüből a böngészőjét.\n\nLátogassa meg a https://guardianproject.info/apps/orbot oldalt vagy küldjön emailt a help(a)guardianproject.info címre a további információkért.</string> <string name="tor_check">Ez megnyitja az alapértelmezett böngészőt, és elnavigálja a https://check.torproject.orgoldalra, hogy ellenőrizze, hogy az Orbot helyesen konfigurált-e, és hogy csatlakozott-e a Tor hálózathoz.</string> <string name="pref_hs_group">Rejtett szolgáltatások</string> <string name="pref_general_group">Általános</string> <string name="pref_start_boot_title">Az Orbot indítása bekapcsoláskor</string> <string name="pref_start_boot_summary">Automatikusan elindítja az Orbot-ot, és csatlakozik a hálózathoz, amikor az Android eszköz elindul</string> +  +  <string name="wizard_title_msg">Az Orbot elhozta a Tor-t Androidra!\n\n\A Tor megvédi a tartalomszűréstől, forgalomelemzéstől és hálózatanalízistól, amely a sértheti magánéletét, titkos üzleti információt vagy személyes kapcsolatait.\n\nEz a varázsló segít az Orbot és a Tor bekonfigurálásában az eszközén.</string> +  <string name="wizard_warning_title">Figyelem</string> <string name="wizard_warning_msg">Az Orbot telepítése nem fogja automatikusan névtelenné tenni a mobil forgalmát.\n\nMegfelelően konfigurálnia kell az Orbot-ot az eszközt és az alkalmazásokat a sikeres Tor használathoz.</string> +  <string name="wizard_permissions_title">Jogosultságok</string> <string name="wizard_permissions_root_msg1">Opcionálisan adhat az Orbot részére \'Superuser\' hozzáférést, amellyel bekapcsolhatja az olyan speciális szolgáltatásokat, mint például az Átlátszó Proxyzás.</string> <string name="wizard_permissions_root_msg2">Ha nem szeretné ezt, akkor legen biztos abban, hogy olyan alkalmazásokat használ, amiket az Orbot-tal együttműködésre terveztek.</string> <string name="wizard_permissions_no_root_msg">Az eszköze alap módban fut, nem támogatja a root vagy \'Superuser\' hozzáférést.\n\nAhhoz, hogy részesüljön a Tor előnyeiből, olyan alkalmazást kell használnia, amely úgy készült, hogy együtt használható legyen az Orbot-tal, vagy legyen lehetőség HTTP vagy SOCKS proxy beállítására.\n\n</string> +  <string name="wizard_tips_title">Orbot-engedélyezett Alkalmazások</string> <string name="wizard_tips_gibberbot">Gibberbot: Biztonságos csevegő alkalmazás Off-the-Record titkosítással</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - Böngésző, kifejezetten adatvédelemre és az Orbot-hoz</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Átlátszó proxyzás</string> <string name="wizard_transproxy_msg">Ez lehetővé teszi az alkalmazások számára a Tor-on keresztül kommunikálást, bármilyen konfiguráció nélkül.</string> <string name="wizard_transproxy_hint">(Jelölje ezt négyzetet, ha halvány lila fogalma sincs miről van itt szó.)</string> diff --git a/values-it/strings.xml b/values-it/strings.xml index b2bc668..23a3dd7 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Fine</string> <string name="btn_okay">Ok</string> <string name="btn_cancel">Annulla</string> +  <string name="wizard_details">Alcuni dettagli su Orbot</string> <string name="wizard_details_msg">Orbot è un\' applicazione open-source che contiene Tor, LibEvent and Privoxy. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) verso la rete Tor. Orbot ha anche la capacità, su dispositivi con root, di far passare tutto il traffico internet attraverso Tor.</string> <string name="wizard_permissions_root">Permesso concesso</string> @@ -80,6 +81,7 @@ Ulteriori informazioni sul proxying per Android nelle FAQ all\' indirizzo: http: </string> <string name="wizard_final">Orbot è pronto!</string> <string name="wizard_final_msg">Centinaia di migliaia di persone nel mondo usano Tor per una varietà di motivi: giornalisti e bloggers, lavoratori per i diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string> +  <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il dispositivo è sicuro. È possibile utilizzare l\'opzione \'Controlla\' dal menù per testare il browser. \n\n Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help(a)guardianproject.info per saperne di più.</string> <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string> @@ -87,19 +89,31 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="pref_general_group">Generale</string> <string name="pref_start_boot_title">Avvia Orbot al boot</string> <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string> +  +  <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string> +  <string name="wizard_warning_title">Attenzione</string> <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor.</string> +  <string name="wizard_permissions_title">Permessi</string> <string name="wizard_permissions_root_msg1">Opzionalmente, è possibile concedere ad Orbot l\'accesso da superutente per abilitare funzionalità avanzate come il proxying trasparente.</string> <string name="wizard_permissions_root_msg2">Se non si vuole intraprendere questa scelta, ci si assicuri di utilizzare applicazioni fatte per funzionare con Orbot</string> <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da superutente.\n\nAl fine di beneficiare dell\'uso di Tor, sarà necessario utilizzare applicazioni costruite per funzionare con Orbot, o che supportino configurazioni proxy HTTP o SOCKS.\n\n </string> +  <string name="wizard_tips_title">Orbot-App abilitate</string> <string name="wizard_tips_gibberbot">Gibberbot: un applicazione per chat sicura con crittografia Off-the-Record</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Proxying trasparente</string> <string name="wizard_transproxy_msg">Questo permette alle tue applicazioni di passare automaticamente attraverso la rete Tor senza necessità di ulteriore configurazione.</string> <string name="wizard_transproxy_hint">(Seleziona questa casella se non hai idea di quello di cui stiamo parlando)</string> diff --git a/values-ja/strings.xml b/values-ja/strings.xml index 0008de2..e2e905c 100644 --- a/values-ja/strings.xml +++ b/values-ja/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">終了</string> <string name="btn_okay">Okay</string> <string name="btn_cancel">キャンセル</string> +  <string name="wizard_details">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">Permission Granted</string> @@ -80,24 +81,37 @@ </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">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">注意</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">許可</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> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 8086fb7..d20f457 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -55,6 +55,7 @@ <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">Орбот е апликација со отворен код којашто го содржи Тор, LibEvent и Privoxy. Таа Ви нуди локални проксиња за HTTP (порт 8118) и SOCKS (порт 9050) за поврзување со мрежата Тор. Орбот исто така нуди можност, на уреди со root пристап, целиот сообраќај да се пренасочи преку Тор.</string> <string name="wizard_permissions_root">Дозволата е издадена</string> @@ -80,24 +81,37 @@ </string> <string name="wizard_final">Орбот е спремен!</string> <string name="wizard_final_msg">Стотици илјади луѓе низ целиот Свет го користат Тор од многу различни причини: новинари и блогери, борци за човекови права, полицајци, војници, корпорации, граѓани на репресивни режими, и обични граѓани... а сега и Вие сте спремин да го користите!</string> +  <string name="connect_first_time"> Успешно се поврзавте на мрежата Тор - но ова НЕ значи дека важиот уред е сигурен. За да го проверите Вашиот браусер, изберете ја опцијата „Провери“ во менито. \n\nПосетете нѐ на https://guardianproject.info/apps/orbot или испратете порака на help(a)guardianproject.info за повеќе информации.</string> <string name="tor_check">Ова ќе ја отвори страницата https://check.torproject.org во Вашиот веб браусер за да видите дали Орбот е правилно конфигуриран и дали сте поврзани на Тор.</string> <string name="pref_hs_group">Скриени сервиси </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 (само Андроид 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> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index e5cca10..e4313a9 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -44,7 +44,7 @@ <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">&gt;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 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> @@ -55,6 +55,7 @@ <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> @@ -80,24 +81,37 @@ </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">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> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 5fe5628..bce8f07 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Einde</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Annuleren</string> +  <string name="wizard_details">Enkele Orbot Details</string> <string name="wizard_details_msg">Orbot is een open-source applicatie die Tor, LibEvent en Privoxy bevat. Het creëert een lokale HTTP proxy (8118) en een SOCKS proxy (9050) naar het Tor netwerk. Orbot heeft ook de mogelijkheid om al het internet verkeer over het Tor netwerk te sturen.</string> <string name="wizard_permissions_root">Rechten toegewezen</string> @@ -83,6 +84,7 @@ Je kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyu </string> <string name="wizard_final">Orbot is klaar!</string> <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, voor verschillende redenen. Zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu ben jij er ook klaar voor!</string> +  <string name="connect_first_time">Je bent succesvol verbonden met het Tor netwerk, maar dit betekent NIET dat je apparaat volledig veilig is. Gebruik te \'Check\' optie vanuit het menu om je browser te testen. Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een email naar help(a)guardianproject.info voor vragen.</string> @@ -91,19 +93,31 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="pref_general_group">Algemeen</string> <string name="pref_start_boot_title">Start Orbot bij boot</string> <string name="pref_start_boot_summary">Start Orbot automatisch en verbind metTor wanneer je Android apparaat opstart.</string> +  +  <string name="wizard_title_msg">Orbot brengt Tor naar Android!\n\nTor helpt je verdedigen tegen filtering, verkeersanalyse en netwerktoezicht dat privacy, vertrouwelijke informatie en persoonlijke relaties bedreigt.\n\n Deze wizard helpt je met configureren van Orbot en Tor op jouw apparaat.</string> +  <string name="wizard_warning_title">Waarschuwing</string> <string name="wizard_warning_msg">Alleen Orbot installeren zal niet automatisch alle je mobiele verkeer anonimiseren.\n\nJe moet Orbot, je apparaat en andere apps juist instellen om succesvol Tor te gebruiken.</string> +  <string name="wizard_permissions_title">Rechten</string> <string name="wizard_permissions_root_msg1">Je kan optioneeel Orbot \'superuser\' toegang geven om geavanceerde functies beschikbaar te stellen, zoals Tranparante Proxy.</string> <string name="wizard_permissions_root_msg2">Als je dit niet wilt doen, zorg er dan voor dat je apps gebruikt die gemaakt zijn om te werken met Orbot</string> <string name="wizard_permissions_no_root_msg">Je apparaat draait in standaard modus en ondersteunt geen root of \'superuser\' toegang.\n\nOm voordeel te hebben van Tor moet je gebruik maken van apps die gemaakt zijn om te werken met Tor, of die HTTP of SOCKS proxy instellingen ondersteunen.\n\n </string> +  <string name="wizard_tips_title">Orbot geschikte Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Veilige chat app met Off-the-Record encryptie</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp; voor Orbot</string> + <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Tranparante Proxy</string> <string name="wizard_transproxy_msg">Dit maakt het mogelijk voor jouw apps om automatisch via het Tor netwerk te draaien zonder enige configuratie.</string> <string name="wizard_transproxy_hint">(Vink dit aan al je geen idee hebt waar we het over hebben)</string> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index 4f9a129..73c77b4 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Koniec</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Anuluj</string> +  <string name="wizard_details">Niektóre szczegóły o Orbocie</string> <string name="wizard_details_msg">Orbot jest otwartą aplikacją zawierającą Tora, LibEvent i Privoxy. Dostarcza lokalnego pośrednika HTTP (8118) i SOCKS (9050) do sieci Tora. Orbot ma możliwość, na urządzeniu uruchomionym z prawami administratora, wysyłać cały ruch internetowy przez Tora.</string> <string name="wizard_permissions_root">Dostęp zezwolony</string> @@ -80,24 +81,37 @@ </string> <string name="wizard_final">Orbot jest gotowy!</string> <string name="wizard_final_msg">Setki tysięcy ludzi na całym świecie używają Tora z różnych powodów: dziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string> +  <string name="connect_first_time">Pomyślnie połaczono z siecią Tora - ale to NIE oznacza, że Twoje urządzenie jest bezpieczne. Możesz użyć opcji \'Sprawdź\' w menu, aby przetestować swoją przeglądarkę. \n\nOdwiedź nas na https://guardianproject.info/apps/orbot lub wyślij email na help(a)guardianproject.info, by dowiedzieć się więcej.</string> <string name="tor_check">To otworzy Twoją domyślną przeglądarkę na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest poąłczenie z Torem.</string> <string name="pref_hs_group">Usługi ukryte</string> <string name="pref_general_group">Ogólne</string> <string name="pref_start_boot_title">Uruchamiaj Orbota przy starcie</string> <string name="pref_start_boot_summary">Automatycznie uruchamiaj Orbota i łącz się z Torem, gdy Twoje urządzenie z Androidem się uruchomi</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 (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</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> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index e598ccd..1ca4bda 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -44,7 +44,7 @@ <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 portos para proxy</string> <string name="pref_has_root">Request Root Access</string> - <string name="pref_has_root_summary">&gt;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">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> @@ -55,6 +55,7 @@ <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> @@ -80,24 +81,37 @@ </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">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> diff --git a/values-pt_BR/strings.xml b/values-pt_BR/strings.xml index bf6c7f4..0bfad06 100644 --- a/values-pt_BR/strings.xml +++ b/values-pt_BR/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Terminar</string> <string name="btn_okay">Okay</string> <string name="btn_cancel">Cancelar</string> +  <string name="wizard_details">Alguns detalher do Orbot</string> <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém o Tor, LibEvent e Privoxy. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a habilidade, num dispositivo roteado, enviar todo o tráfego da Internet através do Tor</string> <string name="wizard_permissions_root">Permissão Concedida</string> @@ -80,26 +81,39 @@ </string> <string name="wizard_final">Orbot está pronto!</string> <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões.\n\nJornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string> +  <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto NÃO significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador.\n\nVisite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help(a)guardianproject.info para saber mais.</string> <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string> <string name="pref_hs_group">Serviços Ocultos</string> <string name="pref_general_group">Geral</string> <string name="pref_start_boot_title">Iniciar Orbot no Boot</string> <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string> +  +  <string name="wizard_title_msg">Orbot trouxe Tor para Android!!\n\nTor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais.\n\nEste assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string> +  <string name="wizard_warning_title">Aviso</string> <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel.\n\nVocê deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string> +  <string name="wizard_permissions_title">Permissões</string> <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string> <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string> <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'.\n\nDe maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS. </string> +  <string name="wizard_tips_title">Apps Orbot Habilitadas</string> <string name="wizard_tips_gibberbot">Gibberbot: App segura para chat com encriptação sem gravação </string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> +  +  <string name="wizard_transproxy_title">Proxy Transparente</string> <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string> <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index 821eefd..5b532b9 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -55,6 +55,7 @@ <string name="btn_finish">Завершить</string> <string name="btn_okay">Ok</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 также позволяет, из корня устройсва, пересылать весь интернет трафик через Tor.</string> <string name="wizard_permissions_root">Разрешение получено</string> @@ -80,25 +81,38 @@ </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> <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 позволяет использовать Tor в Android!\n\nTor позволяет вам защититься от фильтрации контента, анализа трафика и наблюдения за сетью, что ставит под угрозу приватность, конфиденциальную информацию и личные отношения.\n\nЭтот мастер поможет вам настроить Orbot и Tor на вашем устройстве.</string> +  <string name="wizard_warning_title">Предупреждение</string> <string name="wizard_warning_msg">Просто установка Orbot не будет автоматически анонимировать ваш мобильный трафик.\n\nВы должны правильно настроить Orbot, ваше устройство и другие приложения, что бы успешно использовать Tor.</string> +  <string name="wizard_permissions_title">Разрешения</string> <string name="wizard_permissions_root_msg1">Вы так же можете по желанию дать Orbot права \'Суперпользователь\' для доступа к продвинутым возможностям, типа Прозрачная Проксификация.</string> <string name="wizard_permissions_root_msg2">Если вы не хотите делать это, пожалуйста, удостоверьтесь, что используете приложения созданные для работы с Orbot.</string> <string name="wizard_permissions_no_root_msg">Похоже ваше устройство не имеет root прав и не предоставляет доступ \'Суперпользователь\'.\n\nЧто бы использовать Tor, вам надо использовать приложения построенные для работы с Orbot или те, которые поддерживают настройку HTTP или SOCKS прокси.\n\n </string> +  <string name="wizard_tips_title">Приложения, работающие с Orbot:</string> <string name="wizard_tips_gibberbot">Gibberbot: приложение для безопасной переписки с конфиденциальным шифрованием</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) - Браузер, разработанный для обеспечения безопасности и для Orbot</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">Это позволяет вашим приложениям автоматически работать по сети Tor без какого-либо конфигурирования.</string> <string name="wizard_transproxy_hint">(Отметьте данный пункт, если вы не знаете о чем идет речь)</string> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index 8312c3c..e09b5e2 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -44,7 +44,7 @@ <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">&gt;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 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> @@ -55,6 +55,7 @@ <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> @@ -80,24 +81,37 @@ </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">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> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 6a82dc0..7e3517e 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -55,6 +55,7 @@ <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> @@ -79,24 +80,37 @@ 您可以通过 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> <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">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">警告</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">允许</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">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> diff --git a/values/strings.xml b/values/strings.xml index 90ef6fd..590f4a2 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -55,6 +55,7 @@ <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> @@ -80,24 +81,37 @@ </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">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>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 16 Mar '12

16 Mar '12

commit 0c823aa388b4b4604e118b64b9dc20686c68359d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 16 08:15:04 2012 +0000 Update translations for gettor --- sr/gettor.po | 454 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 454 insertions(+), 0 deletions(-) diff --git a/sr/gettor.po b/sr/gettor.po new file mode 100644 index 0000000..2d554a1 --- /dev/null +++ b/sr/gettor.po @@ -0,0 +1,454 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <lajavi.krelacc(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2012-03-16 08:03+0000\n" +"Last-Translator: lajavi.krelac <lajavi.krelacc(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "" + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "Šta je TOR?" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "Ime \"Tor\" predstavlja nekoliko različitih komponenti." + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "Tor software je program koji možete pokrenuti na vašem računaru i koji vam pomaže da budete helps \nkeep you safe on the Internet. Tor protects you by bouncing your \ncommunications around a distributed network of relays run by volunteers \nall around the world: it prevents somebody watching your Internet connection \nfrom learning what sites you visit, and it prevents the sites you visit from \nlearning your physical location. This set of volunteer relays is called the \nTor network. Kako TOR radi možete pročitati više na adresi:\n\n https://www.torproject.org/about/overview.html.en" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit fdc017ba82079c5557a0e75f1153fcd7047b1b12 Merge: 464b80f 37575c4 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Mar 16 02:11:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...nents.interfaces-lookupMethod-from-conten.patch | 8 ++-- ...0002-Make-Permissions-Manager-memory-only.patch | 2 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 6 +- ...th-headers-before-the-modify-request-obse.patch | 10 ++-- .../firefox/0005-Add-a-string-based-cacheKey.patch | 8 ++-- ...6-Randomize-HTTP-pipeline-order-and-depth.patch | 41 ++++++++++---------- .../0007-Block-all-plugins-except-flash.patch | 12 +++--- ...ontent-pref-service-memory-only-clearable.patch | 8 ++-- ...owser-exit-when-not-launched-from-Vidalia.patch | 6 +- .../0010-Disable-SSL-Session-ID-tracking.patch | 6 +- ...observer-event-to-close-persistent-connec.patch | 8 ++-- ...e-client-values-only-to-CSS-Media-Queries.patch | 2 +- ...13-Limit-the-number-of-fonts-per-document.patch | 14 +++--- 13 files changed, 66 insertions(+), 65 deletions(-)

1 0

[torbrowser/maint-2.3] Rebase patches to Firefox 11.
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 37575c4a15d18362c8a68f8f74a4bffaa0b67611 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Mar 15 22:05:37 2012 -0700 Rebase patches to Firefox 11. --- ...nents.interfaces-lookupMethod-from-conten.patch | 8 ++-- ...0002-Make-Permissions-Manager-memory-only.patch | 2 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 6 +- ...th-headers-before-the-modify-request-obse.patch | 10 ++-- .../firefox/0005-Add-a-string-based-cacheKey.patch | 8 ++-- ...6-Randomize-HTTP-pipeline-order-and-depth.patch | 41 ++++++++++---------- .../0007-Block-all-plugins-except-flash.patch | 12 +++--- ...ontent-pref-service-memory-only-clearable.patch | 8 ++-- ...owser-exit-when-not-launched-from-Vidalia.patch | 6 +- .../0010-Disable-SSL-Session-ID-tracking.patch | 6 +- ...observer-event-to-close-persistent-connec.patch | 8 ++-- ...e-client-values-only-to-CSS-Media-Queries.patch | 2 +- ...13-Limit-the-number-of-fonts-per-document.patch | 14 +++--- 13 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch b/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch index ba0da28..bdc2f8d 100644 --- a/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch +++ b/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch @@ -1,4 +1,4 @@ -From 67b86f0c22070cbf86112174ae1e2ce6d6a36dee Mon Sep 17 00:00:00 2001 +From 7b56d6e4ae963f13bb7469d803be823e366ec00c Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:40:40 -0800 Subject: [PATCH 01/13] Block Components.interfaces,lookupMethod from content @@ -20,10 +20,10 @@ https://trac.torproject.org/projects/tor/ticket/2874 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp -index 3bcbf91..d5c020a 100644 +index ef3e5ac..e986db4 100644 --- a/js/xpconnect/src/XPCComponents.cpp +++ b/js/xpconnect/src/XPCComponents.cpp -@@ -4456,7 +4456,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) +@@ -4236,7 +4236,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) NS_IMETHODIMP nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval) { @@ -34,7 +34,7 @@ index 3bcbf91..d5c020a 100644 *_retval = xpc_CheckAccessList(methodName, allowed); return NS_OK; } -@@ -4465,7 +4467,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c +@@ -4245,7 +4247,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c NS_IMETHODIMP nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) { diff --git a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch index ecd1e32..1ff64e3 100644 --- a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch +++ b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch @@ -1,4 +1,4 @@ -From 193c50c03aa61eef5415d0476467c22941022a11 Mon Sep 17 00:00:00 2001 +From 4640f62becabf5adefd190ae119c93e486be9aed Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:45:16 -0800 Subject: [PATCH 02/13] Make Permissions Manager memory-only diff --git a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch index ec575bc..49ca58e 100644 --- a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,4 +1,4 @@ -From 5d72233faeba1745962f55fa09fe2f537eda93ec Mon Sep 17 00:00:00 2001 +From b24b0d0fdddb77692a1609109f4c7cfb4b6f11f8 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 19 Aug 2011 17:58:23 -0700 Subject: [PATCH 03/13] Make Intermediate Cert Store memory-only. @@ -12,10 +12,10 @@ https://trac.torproject.org/projects/tor/ticket/2949 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp -index a08c4ef..0ec3713 100644 +index 5abc0a5..22becca 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -1730,8 +1730,21 @@ nsNSSComponent::InitializeNSS(bool showWarningBox) +@@ -1738,8 +1738,21 @@ nsNSSComponent::InitializeNSS(bool showWarningBox) // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; diff --git a/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch b/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch index 44dfccc..2f0ef83 100644 --- a/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch +++ b/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch @@ -1,4 +1,4 @@ -From 6dc27a50e06bca139a07546f94a827f1fdb762b7 Mon Sep 17 00:00:00 2001 +From d09a2b089ef401b08a8668b55b42233c81cbc198 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 15:33:20 -0700 Subject: [PATCH 04/13] Add HTTP auth headers before the modify-request @@ -12,10 +12,10 @@ Thanks to Georg Koppen for spotting both the problem and this fix. 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index dec2a83..4c5e759 100644 +index 7c88d41..0cab7a4 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -316,9 +316,6 @@ nsHttpChannel::Connect(bool firstTime) +@@ -328,9 +328,6 @@ nsHttpChannel::Connect(bool firstTime) return NS_ERROR_DOCUMENT_NOT_CACHED; } @@ -25,7 +25,7 @@ index dec2a83..4c5e759 100644 if (mLoadFlags & LOAD_NO_NETWORK_IO) { return NS_ERROR_DOCUMENT_NOT_CACHED; } -@@ -3701,6 +3698,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) +@@ -3743,6 +3740,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) AddCookiesToRequest(); @@ -35,7 +35,7 @@ index dec2a83..4c5e759 100644 // notify "http-on-modify-request" observers gHttpHandler->OnModifyRequest(this); -@@ -4795,7 +4795,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) +@@ -4847,7 +4847,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) // this authentication attempt (bug 84794). // TODO: save cookies from auth response and send them here (bug 572151). AddCookiesToRequest(); diff --git a/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch b/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch index 822033a..c0b8be5 100644 --- a/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch +++ b/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch @@ -1,4 +1,4 @@ -From a06818f3a358e6c4502b944ecd264fd2ccaff5bf Mon Sep 17 00:00:00 2001 +From 76dfe3891b66f4a6ba352cf543ca52ff59aa65cd Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 20:47:02 -0700 Subject: [PATCH 05/13] Add a string-based cacheKey. @@ -29,10 +29,10 @@ index 2da46d6..4ee5774 100644 * may fail if the disk cache is not present. The value of this attribute * is usually only settable during the processing of a channel's diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 4c5e759..6205d62 100644 +index 0cab7a4..2c2803f 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -2389,6 +2389,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, +@@ -2408,6 +2408,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, cacheKey.Append(buf); } @@ -45,7 +45,7 @@ index 4c5e759..6205d62 100644 if (!cacheKey.IsEmpty()) { cacheKey.AppendLiteral("uri="); } -@@ -4695,6 +4701,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) +@@ -4747,6 +4753,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) } NS_IMETHODIMP diff --git a/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch b/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch index de40bfe..04a34ea 100644 --- a/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch +++ b/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch @@ -1,6 +1,6 @@ -From 755f71320538b0a813807cc3f4076dd20cbe9849 Mon Sep 17 00:00:00 2001 +From 39a9dab25c4ed3acc95009c0f44f4f6f2f1c5086 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Wed, 1 Feb 2012 16:05:22 -0800 +Date: Thu, 15 Mar 2012 20:05:07 -0700 Subject: [PATCH 06/13] Randomize HTTP pipeline order and depth. This is an experimental defense against @@ -9,18 +9,19 @@ http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf See also: https://blog.torproject.org/blog/experimental-defense-website-traffic-finge… --- - netwerk/protocol/http/nsHttpConnectionMgr.cpp | 78 ++++++++++++++++++++++++- + netwerk/protocol/http/nsHttpConnectionMgr.cpp | 79 ++++++++++++++++++++++++- netwerk/protocol/http/nsHttpConnectionMgr.h | 4 + - 2 files changed, 81 insertions(+), 1 deletions(-) + 2 files changed, 82 insertions(+), 1 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 23ef893..bba456d 100644 +index 17d897f..3200638 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -@@ -94,6 +94,11 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() - { +@@ -99,6 +99,12 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() LOG(("Creating nsHttpConnectionMgr @%x\n", this)); mCT.Init(); + mAlternateProtocolHash.Init(16); ++ + nsresult rv; + mRandomGenerator = do_GetService("@mozilla.org/security/random-generator;1", &rv); + if (NS_FAILED(rv)) { @@ -29,8 +30,8 @@ index 23ef893..bba456d 100644 } nsHttpConnectionMgr::~nsHttpConnectionMgr() -@@ -865,7 +870,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent, - nsHttpPipeline *pipeline = nsnull; +@@ -1227,7 +1233,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent, + if (conn->SupportsPipelining() && (caps & NS_HTTP_ALLOW_PIPELINING)) { LOG((" looking to build pipeline...\n")); - if (BuildPipeline(ent, trans, &pipeline)) @@ -38,7 +39,7 @@ index 23ef893..bba456d 100644 trans = pipeline; } -@@ -938,6 +943,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, +@@ -1300,6 +1306,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, return true; } @@ -117,26 +118,26 @@ index 23ef893..bba456d 100644 nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) { diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h -index cdf21a9..9647225 100644 +index bb605a1..47d01f6 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.h +++ b/netwerk/protocol/http/nsHttpConnectionMgr.h -@@ -48,6 +48,7 @@ - #include "nsAutoPtr.h" - #include "mozilla/ReentrantMonitor.h" - #include "nsISocketTransportService.h" -+#include "nsIRandomGenerator.h" - +@@ -54,6 +54,7 @@ #include "nsIObserver.h" #include "nsITimer.h" -@@ -276,6 +277,7 @@ private: - nsresult DispatchTransaction(nsConnectionEntry *, nsAHttpTransaction *, + #include "nsIX509Cert3.h" ++#include "nsIRandomGenerator.h" + + class nsHttpPipeline; + +@@ -312,6 +313,7 @@ private: + nsresult DispatchTransaction(nsConnectionEntry *, nsHttpTransaction *, PRUint8 caps, nsHttpConnection *); bool BuildPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); + bool BuildRandomizedPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); nsresult ProcessNewTransaction(nsHttpTransaction *); nsresult EnsureSocketThreadTargetIfOnline(); void ClosePersistentConnections(nsConnectionEntry *ent); -@@ -353,6 +355,8 @@ private: +@@ -405,6 +407,8 @@ private: PRUint64 mTimeOfNextWakeUp; // Timer for next pruning of dead connections. nsCOMPtr<nsITimer> mTimer; diff --git a/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch b/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch index ef83185..b850f62 100644 --- a/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch +++ b/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch @@ -1,4 +1,4 @@ -From 7d6e270e1a05e1fe57d069b9859c9b51904db33e Mon Sep 17 00:00:00 2001 +From 10873c626d038b520853539d45a170919d6d0361 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:50:15 -0800 Subject: [PATCH 07/13] Block all plugins except flash. @@ -17,10 +17,10 @@ on a better way. Until then, it is delta-darwinism for us. 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp -index 729c9ef..1f4652d 100644 +index 7fe18b2..d76c4ca 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp -@@ -1965,6 +1965,35 @@ bool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag) +@@ -1982,6 +1982,35 @@ bool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag) return false; } @@ -56,7 +56,7 @@ index 729c9ef..1f4652d 100644 typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, -@@ -2086,6 +2115,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, +@@ -2103,6 +2132,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, continue; } @@ -68,10 +68,10 @@ index 729c9ef..1f4652d 100644 if (!pluginTag) { nsPluginFile pluginFile(localfile); diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h -index 39a8891..c262abf 100644 +index 5630b8d..f54bd32 100644 --- a/dom/plugins/base/nsPluginHost.h +++ b/dom/plugins/base/nsPluginHost.h -@@ -278,6 +278,8 @@ private: +@@ -285,6 +285,8 @@ private: // Loads all cached plugins info into mCachedPlugins nsresult ReadPluginInfo(); diff --git a/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch index ac91170..b123321 100644 --- a/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch +++ b/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch @@ -1,4 +1,4 @@ -From 23a09d0a6def1e2f7190177a875ab5a85c5da7b7 Mon Sep 17 00:00:00 2001 +From 9a406718f9cb98f57de4649def8ef501ddbb9775 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu, 8 Sep 2011 08:40:17 -0700 Subject: [PATCH 08/13] Make content pref service memory-only + clearable @@ -11,10 +11,10 @@ other site prefs?). 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/components/contentprefs/nsContentPrefService.js b/toolkit/components/contentprefs/nsContentPrefService.js -index adfb650..1619d5f 100644 +index 17cac93..1f12609 100644 --- a/toolkit/components/contentprefs/nsContentPrefService.js +++ b/toolkit/components/contentprefs/nsContentPrefService.js -@@ -1240,7 +1240,7 @@ ContentPrefService.prototype = { +@@ -1242,7 +1242,7 @@ ContentPrefService.prototype = { var dbConnection; @@ -23,7 +23,7 @@ index adfb650..1619d5f 100644 dbConnection = this._dbCreate(dbService, dbFile); else { try { -@@ -1288,7 +1288,7 @@ ContentPrefService.prototype = { +@@ -1290,7 +1290,7 @@ ContentPrefService.prototype = { }, _dbCreate: function ContentPrefService__dbCreate(aDBService, aDBFile) { diff --git a/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch index 3dc98ed..1744772 100644 --- a/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch +++ b/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -1,4 +1,4 @@ -From b9c2e8d93cf62ea8f8fec63f0db955d8d0c4bc24 Mon Sep 17 00:00:00 2001 +From af562eedaa61f60241c4a73c2cac6a0a5821a66d Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun, 9 Oct 2011 22:50:07 -0700 Subject: [PATCH 09/13] Make Tor Browser exit when not launched from Vidalia @@ -16,10 +16,10 @@ actually be common. 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js -index a463fac..4480050 100644 +index 6abab20..21afee0 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -1217,6 +1217,21 @@ function BrowserStartup() { +@@ -1224,6 +1224,21 @@ function BrowserStartup() { prepareForStartup(); diff --git a/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch index 8722540..76ce1b6 100644 --- a/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch @@ -1,4 +1,4 @@ -From 8bfcf12fe59b7b9940830446bf331729f5c86b3d Mon Sep 17 00:00:00 2001 +From 33198fdb4467637fabf292e18530c89e8b6bad4e Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed, 7 Dec 2011 19:36:38 -0800 Subject: [PATCH 10/13] Disable SSL Session ID tracking. @@ -11,10 +11,10 @@ https://www.torproject.org/projects/torbrowser/design/#identifier-linkabili…. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c -index 2e6f9ed..c8a993b 100644 +index 22206f7..31086db 100644 --- a/security/nss/lib/ssl/sslsock.c +++ b/security/nss/lib/ssl/sslsock.c -@@ -172,7 +172,7 @@ static sslOptions ssl_defaults = { +@@ -173,7 +173,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* enableSSL2 */ /* now defaults to off in NSS 3.13 */ PR_TRUE, /* enableSSL3 */ PR_TRUE, /* enableTLS */ /* now defaults to on in NSS 3.0 */ diff --git a/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch b/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch index 7d91c66..f442982 100644 --- a/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch +++ b/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch @@ -1,4 +1,4 @@ -From befcfaff647b1e09722d100fbf2dadcc22cfdc2b Mon Sep 17 00:00:00 2001 +From a0c84e27f2c40d043c85ba3b794d3578e909f558 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:53:28 -0800 Subject: [PATCH 11/13] Provide an observer event to close persistent @@ -11,10 +11,10 @@ keep-alive connections. 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp -index f21598e..f3bf6af 100644 +index 727b5d6..87b55bc 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp -@@ -321,6 +321,7 @@ nsHttpHandler::Init() +@@ -329,6 +329,7 @@ nsHttpHandler::Init() mObserverService->AddObserver(this, "net:clear-active-logins", true); mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, true); mObserverService->AddObserver(this, "net:prune-dead-connections", true); @@ -22,7 +22,7 @@ index f21598e..f3bf6af 100644 } return NS_OK; -@@ -1481,6 +1482,12 @@ nsHttpHandler::Observe(nsISupports *subject, +@@ -1533,6 +1534,12 @@ nsHttpHandler::Observe(nsISupports *subject, mConnMgr->PruneDeadConnections(); } } diff --git a/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch b/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch index d3e636b..abed414 100644 --- a/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch +++ b/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch @@ -1,4 +1,4 @@ -From b5c42aa7668ac12b034cc1806ae1dc48732fa9b5 Mon Sep 17 00:00:00 2001 +From 10f26d027ba5413d7e26aaccd92cbc1c12b42d86 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue, 20 Dec 2011 21:02:49 -0800 Subject: [PATCH 12/13] Provide client values only to CSS Media Queries diff --git a/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch index 4ae2487..7f0f248 100644 --- a/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch +++ b/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch @@ -1,4 +1,4 @@ -From 4ed1e1c2372216cfcf377b369a9d44bb9f60ee14 Mon Sep 17 00:00:00 2001 +From 215f7088f53e25309ec5037c05a25ed9048a625b Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 16:01:21 -0800 Subject: [PATCH 13/13] Limit the number of fonts per document. @@ -23,7 +23,7 @@ https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp -index e1587db..9690d9c 100644 +index c7ad359..ac12dff 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -98,6 +98,8 @@ @@ -35,7 +35,7 @@ index e1587db..9690d9c 100644 #ifdef IBMBIDI #include "nsBidiPresUtils.h" -@@ -706,6 +708,10 @@ nsPresContext::GetUserPreferences() +@@ -731,6 +733,10 @@ nsPresContext::GetUserPreferences() // * use fonts? mUseDocumentFonts = Preferences::GetInt("browser.display.use_document_fonts") != 0; @@ -46,7 +46,7 @@ index e1587db..9690d9c 100644 // * replace backslashes with Yen signs? (bug 245770) mEnableJapaneseTransform = -@@ -1300,6 +1306,100 @@ nsPresContext::GetDefaultFont(PRUint8 aFontID) const +@@ -1332,6 +1338,100 @@ nsPresContext::GetDefaultFont(PRUint8 aFontID) const return font; } @@ -148,7 +148,7 @@ index e1587db..9690d9c 100644 nsPresContext::SetFullZoom(float aZoom) { diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h -index ecd01d8..552a69a 100644 +index 39f5b4a..a72d12e 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -548,6 +548,13 @@ public: @@ -165,7 +165,7 @@ index ecd01d8..552a69a 100644 PRInt32 MinFontSize() const { return NS_MAX(mMinFontSize, mMinimumFontSizePref); } -@@ -1117,6 +1124,8 @@ protected: +@@ -1125,6 +1132,8 @@ protected: PRUint32 mInterruptChecksToSkip; mozilla::TimeStamp mReflowStartTime; @@ -175,7 +175,7 @@ index ecd01d8..552a69a 100644 unsigned mHasPendingInterrupt : 1; unsigned mInterruptsEnabled : 1; diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp -index 27336bf..827585a 100644 +index 2918a54..5870693 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -3091,6 +3091,7 @@ nsRuleNode::ComputeFontData(void* aStartStruct,

1 0

[torbrowser/maint-2.3] mozilla changed their default branding strategy again. temporarily enforce official branding, until our icons are ready.
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 2d7cc73c208b0b3de88910e9feb9d3e4d1f03979 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Mar 16 02:17:29 2012 -0300 mozilla changed their default branding strategy again. temporarily enforce official branding, until our icons are ready. --- build-scripts/config/dot_mozconfig | 3 +++ build-scripts/config/mozconfig-osx-i386 | 3 +++ build-scripts/config/mozconfig-osx-x86_64 | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index 66196ae..c7eabd2 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -3,8 +3,11 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-official-branding ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 11a8789..e0d2187 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -1,6 +1,8 @@ # Options for client.mk. mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options AUTOCONF=autoconf213 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 # Options for cross-compilation on Snow Leopard. HOST_CC="gcc-4.2 -arch i386" @@ -19,6 +21,7 @@ ac_add_options --target=i386-apple-darwin$DARWIN_VERSION ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk ac_add_options --enable-macos-target=10.5 ac_add_options --enable-application=browser +ac_add_options --enable-official-branding ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-debug diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index febba50..5511829 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -14,6 +14,8 @@ CROSS_COMPILE=1 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk ac_add_options --target=x86_64-apple-darwin10.7.0 @@ -21,6 +23,7 @@ ac_add_options --enable-macos-target=10.6 # bug 491774. crashreporter won't build in cross compile ac_add_options --disable-crashreporter ac_add_options --enable-application=browser +ac_add_options --enable-official-branding ac_add_options --enable-libzul ac_add_options --enable-optimize ac_add_options --enable-strip

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 877c8de52623c195d9823065abb6acefa7189e8d Merge: fdc017b 2d7cc73 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Mar 16 02:17:58 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig | 3 +++ build-scripts/config/mozconfig-osx-i386 | 3 +++ build-scripts/config/mozconfig-osx-x86_64 | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] Rebase patches to Firefox 11.
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 37575c4a15d18362c8a68f8f74a4bffaa0b67611 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Mar 15 22:05:37 2012 -0700 Rebase patches to Firefox 11. --- ...nents.interfaces-lookupMethod-from-conten.patch | 8 ++-- ...0002-Make-Permissions-Manager-memory-only.patch | 2 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 6 +- ...th-headers-before-the-modify-request-obse.patch | 10 ++-- .../firefox/0005-Add-a-string-based-cacheKey.patch | 8 ++-- ...6-Randomize-HTTP-pipeline-order-and-depth.patch | 41 ++++++++++---------- .../0007-Block-all-plugins-except-flash.patch | 12 +++--- ...ontent-pref-service-memory-only-clearable.patch | 8 ++-- ...owser-exit-when-not-launched-from-Vidalia.patch | 6 +- .../0010-Disable-SSL-Session-ID-tracking.patch | 6 +- ...observer-event-to-close-persistent-connec.patch | 8 ++-- ...e-client-values-only-to-CSS-Media-Queries.patch | 2 +- ...13-Limit-the-number-of-fonts-per-document.patch | 14 +++--- 13 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch b/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch index ba0da28..bdc2f8d 100644 --- a/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch +++ b/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch @@ -1,4 +1,4 @@ -From 67b86f0c22070cbf86112174ae1e2ce6d6a36dee Mon Sep 17 00:00:00 2001 +From 7b56d6e4ae963f13bb7469d803be823e366ec00c Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:40:40 -0800 Subject: [PATCH 01/13] Block Components.interfaces,lookupMethod from content @@ -20,10 +20,10 @@ https://trac.torproject.org/projects/tor/ticket/2874 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp -index 3bcbf91..d5c020a 100644 +index ef3e5ac..e986db4 100644 --- a/js/xpconnect/src/XPCComponents.cpp +++ b/js/xpconnect/src/XPCComponents.cpp -@@ -4456,7 +4456,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) +@@ -4236,7 +4236,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) NS_IMETHODIMP nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval) { @@ -34,7 +34,7 @@ index 3bcbf91..d5c020a 100644 *_retval = xpc_CheckAccessList(methodName, allowed); return NS_OK; } -@@ -4465,7 +4467,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c +@@ -4245,7 +4247,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c NS_IMETHODIMP nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) { diff --git a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch index ecd1e32..1ff64e3 100644 --- a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch +++ b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch @@ -1,4 +1,4 @@ -From 193c50c03aa61eef5415d0476467c22941022a11 Mon Sep 17 00:00:00 2001 +From 4640f62becabf5adefd190ae119c93e486be9aed Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:45:16 -0800 Subject: [PATCH 02/13] Make Permissions Manager memory-only diff --git a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch index ec575bc..49ca58e 100644 --- a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,4 +1,4 @@ -From 5d72233faeba1745962f55fa09fe2f537eda93ec Mon Sep 17 00:00:00 2001 +From b24b0d0fdddb77692a1609109f4c7cfb4b6f11f8 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 19 Aug 2011 17:58:23 -0700 Subject: [PATCH 03/13] Make Intermediate Cert Store memory-only. @@ -12,10 +12,10 @@ https://trac.torproject.org/projects/tor/ticket/2949 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp -index a08c4ef..0ec3713 100644 +index 5abc0a5..22becca 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -1730,8 +1730,21 @@ nsNSSComponent::InitializeNSS(bool showWarningBox) +@@ -1738,8 +1738,21 @@ nsNSSComponent::InitializeNSS(bool showWarningBox) // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; diff --git a/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch b/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch index 44dfccc..2f0ef83 100644 --- a/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch +++ b/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch @@ -1,4 +1,4 @@ -From 6dc27a50e06bca139a07546f94a827f1fdb762b7 Mon Sep 17 00:00:00 2001 +From d09a2b089ef401b08a8668b55b42233c81cbc198 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 15:33:20 -0700 Subject: [PATCH 04/13] Add HTTP auth headers before the modify-request @@ -12,10 +12,10 @@ Thanks to Georg Koppen for spotting both the problem and this fix. 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index dec2a83..4c5e759 100644 +index 7c88d41..0cab7a4 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -316,9 +316,6 @@ nsHttpChannel::Connect(bool firstTime) +@@ -328,9 +328,6 @@ nsHttpChannel::Connect(bool firstTime) return NS_ERROR_DOCUMENT_NOT_CACHED; } @@ -25,7 +25,7 @@ index dec2a83..4c5e759 100644 if (mLoadFlags & LOAD_NO_NETWORK_IO) { return NS_ERROR_DOCUMENT_NOT_CACHED; } -@@ -3701,6 +3698,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) +@@ -3743,6 +3740,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) AddCookiesToRequest(); @@ -35,7 +35,7 @@ index dec2a83..4c5e759 100644 // notify "http-on-modify-request" observers gHttpHandler->OnModifyRequest(this); -@@ -4795,7 +4795,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) +@@ -4847,7 +4847,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) // this authentication attempt (bug 84794). // TODO: save cookies from auth response and send them here (bug 572151). AddCookiesToRequest(); diff --git a/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch b/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch index 822033a..c0b8be5 100644 --- a/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch +++ b/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch @@ -1,4 +1,4 @@ -From a06818f3a358e6c4502b944ecd264fd2ccaff5bf Mon Sep 17 00:00:00 2001 +From 76dfe3891b66f4a6ba352cf543ca52ff59aa65cd Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 20:47:02 -0700 Subject: [PATCH 05/13] Add a string-based cacheKey. @@ -29,10 +29,10 @@ index 2da46d6..4ee5774 100644 * may fail if the disk cache is not present. The value of this attribute * is usually only settable during the processing of a channel's diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 4c5e759..6205d62 100644 +index 0cab7a4..2c2803f 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -2389,6 +2389,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, +@@ -2408,6 +2408,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, cacheKey.Append(buf); } @@ -45,7 +45,7 @@ index 4c5e759..6205d62 100644 if (!cacheKey.IsEmpty()) { cacheKey.AppendLiteral("uri="); } -@@ -4695,6 +4701,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) +@@ -4747,6 +4753,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) } NS_IMETHODIMP diff --git a/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch b/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch index de40bfe..04a34ea 100644 --- a/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch +++ b/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch @@ -1,6 +1,6 @@ -From 755f71320538b0a813807cc3f4076dd20cbe9849 Mon Sep 17 00:00:00 2001 +From 39a9dab25c4ed3acc95009c0f44f4f6f2f1c5086 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Wed, 1 Feb 2012 16:05:22 -0800 +Date: Thu, 15 Mar 2012 20:05:07 -0700 Subject: [PATCH 06/13] Randomize HTTP pipeline order and depth. This is an experimental defense against @@ -9,18 +9,19 @@ http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf See also: https://blog.torproject.org/blog/experimental-defense-website-traffic-finge… --- - netwerk/protocol/http/nsHttpConnectionMgr.cpp | 78 ++++++++++++++++++++++++- + netwerk/protocol/http/nsHttpConnectionMgr.cpp | 79 ++++++++++++++++++++++++- netwerk/protocol/http/nsHttpConnectionMgr.h | 4 + - 2 files changed, 81 insertions(+), 1 deletions(-) + 2 files changed, 82 insertions(+), 1 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 23ef893..bba456d 100644 +index 17d897f..3200638 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -@@ -94,6 +94,11 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() - { +@@ -99,6 +99,12 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() LOG(("Creating nsHttpConnectionMgr @%x\n", this)); mCT.Init(); + mAlternateProtocolHash.Init(16); ++ + nsresult rv; + mRandomGenerator = do_GetService("@mozilla.org/security/random-generator;1", &rv); + if (NS_FAILED(rv)) { @@ -29,8 +30,8 @@ index 23ef893..bba456d 100644 } nsHttpConnectionMgr::~nsHttpConnectionMgr() -@@ -865,7 +870,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent, - nsHttpPipeline *pipeline = nsnull; +@@ -1227,7 +1233,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent, + if (conn->SupportsPipelining() && (caps & NS_HTTP_ALLOW_PIPELINING)) { LOG((" looking to build pipeline...\n")); - if (BuildPipeline(ent, trans, &pipeline)) @@ -38,7 +39,7 @@ index 23ef893..bba456d 100644 trans = pipeline; } -@@ -938,6 +943,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, +@@ -1300,6 +1306,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, return true; } @@ -117,26 +118,26 @@ index 23ef893..bba456d 100644 nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) { diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h -index cdf21a9..9647225 100644 +index bb605a1..47d01f6 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.h +++ b/netwerk/protocol/http/nsHttpConnectionMgr.h -@@ -48,6 +48,7 @@ - #include "nsAutoPtr.h" - #include "mozilla/ReentrantMonitor.h" - #include "nsISocketTransportService.h" -+#include "nsIRandomGenerator.h" - +@@ -54,6 +54,7 @@ #include "nsIObserver.h" #include "nsITimer.h" -@@ -276,6 +277,7 @@ private: - nsresult DispatchTransaction(nsConnectionEntry *, nsAHttpTransaction *, + #include "nsIX509Cert3.h" ++#include "nsIRandomGenerator.h" + + class nsHttpPipeline; + +@@ -312,6 +313,7 @@ private: + nsresult DispatchTransaction(nsConnectionEntry *, nsHttpTransaction *, PRUint8 caps, nsHttpConnection *); bool BuildPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); + bool BuildRandomizedPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); nsresult ProcessNewTransaction(nsHttpTransaction *); nsresult EnsureSocketThreadTargetIfOnline(); void ClosePersistentConnections(nsConnectionEntry *ent); -@@ -353,6 +355,8 @@ private: +@@ -405,6 +407,8 @@ private: PRUint64 mTimeOfNextWakeUp; // Timer for next pruning of dead connections. nsCOMPtr<nsITimer> mTimer; diff --git a/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch b/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch index ef83185..b850f62 100644 --- a/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch +++ b/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch @@ -1,4 +1,4 @@ -From 7d6e270e1a05e1fe57d069b9859c9b51904db33e Mon Sep 17 00:00:00 2001 +From 10873c626d038b520853539d45a170919d6d0361 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:50:15 -0800 Subject: [PATCH 07/13] Block all plugins except flash. @@ -17,10 +17,10 @@ on a better way. Until then, it is delta-darwinism for us. 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp -index 729c9ef..1f4652d 100644 +index 7fe18b2..d76c4ca 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp -@@ -1965,6 +1965,35 @@ bool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag) +@@ -1982,6 +1982,35 @@ bool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag) return false; } @@ -56,7 +56,7 @@ index 729c9ef..1f4652d 100644 typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, -@@ -2086,6 +2115,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, +@@ -2103,6 +2132,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, continue; } @@ -68,10 +68,10 @@ index 729c9ef..1f4652d 100644 if (!pluginTag) { nsPluginFile pluginFile(localfile); diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h -index 39a8891..c262abf 100644 +index 5630b8d..f54bd32 100644 --- a/dom/plugins/base/nsPluginHost.h +++ b/dom/plugins/base/nsPluginHost.h -@@ -278,6 +278,8 @@ private: +@@ -285,6 +285,8 @@ private: // Loads all cached plugins info into mCachedPlugins nsresult ReadPluginInfo(); diff --git a/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch index ac91170..b123321 100644 --- a/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch +++ b/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch @@ -1,4 +1,4 @@ -From 23a09d0a6def1e2f7190177a875ab5a85c5da7b7 Mon Sep 17 00:00:00 2001 +From 9a406718f9cb98f57de4649def8ef501ddbb9775 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu, 8 Sep 2011 08:40:17 -0700 Subject: [PATCH 08/13] Make content pref service memory-only + clearable @@ -11,10 +11,10 @@ other site prefs?). 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/components/contentprefs/nsContentPrefService.js b/toolkit/components/contentprefs/nsContentPrefService.js -index adfb650..1619d5f 100644 +index 17cac93..1f12609 100644 --- a/toolkit/components/contentprefs/nsContentPrefService.js +++ b/toolkit/components/contentprefs/nsContentPrefService.js -@@ -1240,7 +1240,7 @@ ContentPrefService.prototype = { +@@ -1242,7 +1242,7 @@ ContentPrefService.prototype = { var dbConnection; @@ -23,7 +23,7 @@ index adfb650..1619d5f 100644 dbConnection = this._dbCreate(dbService, dbFile); else { try { -@@ -1288,7 +1288,7 @@ ContentPrefService.prototype = { +@@ -1290,7 +1290,7 @@ ContentPrefService.prototype = { }, _dbCreate: function ContentPrefService__dbCreate(aDBService, aDBFile) { diff --git a/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch index 3dc98ed..1744772 100644 --- a/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch +++ b/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -1,4 +1,4 @@ -From b9c2e8d93cf62ea8f8fec63f0db955d8d0c4bc24 Mon Sep 17 00:00:00 2001 +From af562eedaa61f60241c4a73c2cac6a0a5821a66d Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun, 9 Oct 2011 22:50:07 -0700 Subject: [PATCH 09/13] Make Tor Browser exit when not launched from Vidalia @@ -16,10 +16,10 @@ actually be common. 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js -index a463fac..4480050 100644 +index 6abab20..21afee0 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -1217,6 +1217,21 @@ function BrowserStartup() { +@@ -1224,6 +1224,21 @@ function BrowserStartup() { prepareForStartup(); diff --git a/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch index 8722540..76ce1b6 100644 --- a/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch @@ -1,4 +1,4 @@ -From 8bfcf12fe59b7b9940830446bf331729f5c86b3d Mon Sep 17 00:00:00 2001 +From 33198fdb4467637fabf292e18530c89e8b6bad4e Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed, 7 Dec 2011 19:36:38 -0800 Subject: [PATCH 10/13] Disable SSL Session ID tracking. @@ -11,10 +11,10 @@ https://www.torproject.org/projects/torbrowser/design/#identifier-linkabili…. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c -index 2e6f9ed..c8a993b 100644 +index 22206f7..31086db 100644 --- a/security/nss/lib/ssl/sslsock.c +++ b/security/nss/lib/ssl/sslsock.c -@@ -172,7 +172,7 @@ static sslOptions ssl_defaults = { +@@ -173,7 +173,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* enableSSL2 */ /* now defaults to off in NSS 3.13 */ PR_TRUE, /* enableSSL3 */ PR_TRUE, /* enableTLS */ /* now defaults to on in NSS 3.0 */ diff --git a/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch b/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch index 7d91c66..f442982 100644 --- a/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch +++ b/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch @@ -1,4 +1,4 @@ -From befcfaff647b1e09722d100fbf2dadcc22cfdc2b Mon Sep 17 00:00:00 2001 +From a0c84e27f2c40d043c85ba3b794d3578e909f558 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:53:28 -0800 Subject: [PATCH 11/13] Provide an observer event to close persistent @@ -11,10 +11,10 @@ keep-alive connections. 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp -index f21598e..f3bf6af 100644 +index 727b5d6..87b55bc 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp -@@ -321,6 +321,7 @@ nsHttpHandler::Init() +@@ -329,6 +329,7 @@ nsHttpHandler::Init() mObserverService->AddObserver(this, "net:clear-active-logins", true); mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, true); mObserverService->AddObserver(this, "net:prune-dead-connections", true); @@ -22,7 +22,7 @@ index f21598e..f3bf6af 100644 } return NS_OK; -@@ -1481,6 +1482,12 @@ nsHttpHandler::Observe(nsISupports *subject, +@@ -1533,6 +1534,12 @@ nsHttpHandler::Observe(nsISupports *subject, mConnMgr->PruneDeadConnections(); } } diff --git a/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch b/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch index d3e636b..abed414 100644 --- a/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch +++ b/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch @@ -1,4 +1,4 @@ -From b5c42aa7668ac12b034cc1806ae1dc48732fa9b5 Mon Sep 17 00:00:00 2001 +From 10f26d027ba5413d7e26aaccd92cbc1c12b42d86 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue, 20 Dec 2011 21:02:49 -0800 Subject: [PATCH 12/13] Provide client values only to CSS Media Queries diff --git a/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch index 4ae2487..7f0f248 100644 --- a/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch +++ b/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch @@ -1,4 +1,4 @@ -From 4ed1e1c2372216cfcf377b369a9d44bb9f60ee14 Mon Sep 17 00:00:00 2001 +From 215f7088f53e25309ec5037c05a25ed9048a625b Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 16:01:21 -0800 Subject: [PATCH 13/13] Limit the number of fonts per document. @@ -23,7 +23,7 @@ https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp -index e1587db..9690d9c 100644 +index c7ad359..ac12dff 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -98,6 +98,8 @@ @@ -35,7 +35,7 @@ index e1587db..9690d9c 100644 #ifdef IBMBIDI #include "nsBidiPresUtils.h" -@@ -706,6 +708,10 @@ nsPresContext::GetUserPreferences() +@@ -731,6 +733,10 @@ nsPresContext::GetUserPreferences() // * use fonts? mUseDocumentFonts = Preferences::GetInt("browser.display.use_document_fonts") != 0; @@ -46,7 +46,7 @@ index e1587db..9690d9c 100644 // * replace backslashes with Yen signs? (bug 245770) mEnableJapaneseTransform = -@@ -1300,6 +1306,100 @@ nsPresContext::GetDefaultFont(PRUint8 aFontID) const +@@ -1332,6 +1338,100 @@ nsPresContext::GetDefaultFont(PRUint8 aFontID) const return font; } @@ -148,7 +148,7 @@ index e1587db..9690d9c 100644 nsPresContext::SetFullZoom(float aZoom) { diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h -index ecd01d8..552a69a 100644 +index 39f5b4a..a72d12e 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -548,6 +548,13 @@ public: @@ -165,7 +165,7 @@ index ecd01d8..552a69a 100644 PRInt32 MinFontSize() const { return NS_MAX(mMinFontSize, mMinimumFontSizePref); } -@@ -1117,6 +1124,8 @@ protected: +@@ -1125,6 +1132,8 @@ protected: PRUint32 mInterruptChecksToSkip; mozilla::TimeStamp mReflowStartTime; @@ -175,7 +175,7 @@ index ecd01d8..552a69a 100644 unsigned mHasPendingInterrupt : 1; unsigned mInterruptsEnabled : 1; diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp -index 27336bf..827585a 100644 +index 2918a54..5870693 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -3091,6 +3091,7 @@ nsRuleNode::ComputeFontData(void* aStartStruct,

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit fdc017ba82079c5557a0e75f1153fcd7047b1b12 Merge: 464b80f 37575c4 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Mar 16 02:11:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...nents.interfaces-lookupMethod-from-conten.patch | 8 ++-- ...0002-Make-Permissions-Manager-memory-only.patch | 2 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 6 +- ...th-headers-before-the-modify-request-obse.patch | 10 ++-- .../firefox/0005-Add-a-string-based-cacheKey.patch | 8 ++-- ...6-Randomize-HTTP-pipeline-order-and-depth.patch | 41 ++++++++++---------- .../0007-Block-all-plugins-except-flash.patch | 12 +++--- ...ontent-pref-service-memory-only-clearable.patch | 8 ++-- ...owser-exit-when-not-launched-from-Vidalia.patch | 6 +- .../0010-Disable-SSL-Session-ID-tracking.patch | 6 +- ...observer-event-to-close-persistent-connec.patch | 8 ++-- ...e-client-values-only-to-CSS-Media-Queries.patch | 2 +- ...13-Limit-the-number-of-fonts-per-document.patch | 14 +++--- 13 files changed, 66 insertions(+), 65 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 877c8de52623c195d9823065abb6acefa7189e8d Merge: fdc017b 2d7cc73 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Mar 16 02:17:58 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig | 3 +++ build-scripts/config/mozconfig-osx-i386 | 3 +++ build-scripts/config/mozconfig-osx-x86_64 | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-)

1 0