tor-commits
Threads by month
- ----- 2025 -----
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
April 2015
- 19 participants
- 1110 discussions
commit 02a42e425ea91623b540d98f8c00857fdf2e331c
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Wed Apr 8 16:33:48 2015 -0400
update translated strings
---
res/values-bg/strings.xml | 3 ++
res/values-de/strings.xml | 50 ++++++++++++++++++++++++++++
res/values-es/strings.xml | 74 +++++++++++++++++++++++++++++++++++++++++
res/values-fa/strings.xml | 58 ++++++++++++++++++++++++++++++++
res/values-fr-rFR/strings.xml | 74 +++++++++++++++++++++++++++++++++++++++++
res/values-zh/strings.xml | 62 ++++++++++++++++++++++++++++++++++
6 files changed, 321 insertions(+)
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e65fb0f..e5a79cb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Орбот</string>
+ <string name="app_description">Orbot е безплатна прокси програма, която дава възможноста на други програми да използват интерент по-сигурно. Orbot използва Tor, за да криптира Интернет трафика и след това го скрива като препраща през няколко компютъра по целия свят. Tor е безплатен софтуер и отворена мрежа, която ти помага да се предпазиш от шпиониране по мрежата, което заплашва твоята свобода и лично пространство, конфиденциални бизнес отношение и връзки, и от вид правителствено следене наречено трафик анализ.</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>
@@ -33,6 +34,8 @@
<string name="button_clear_log">Изчисти лог</string>
<string name="menu_verify">Check</string>
<string name="menu_exit">Изход</string>
+ <string name="menu_scan">Сканирай BridgeQR</string>
+ <string name="menu_share_bridge">Сподели BridgeQR</string>
<string name="press_to_start">- за старт натисни и задръж -</string>
<string name="pref_trans_proxy_group">Прозрачно прокси (Изисква Root)</string>
<string name="pref_trans_proxy_title">Прозрачно прокси</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 972d7ca..85259d7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -75,10 +75,14 @@
<string name="wizard_tips_proxy">Vermittlungseinstellungen - Lernen, wie Sie Anwendungen so konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
<string name="wizard_tips_duckgo">Duckduckgo-Suchmaschinen-App</string>
<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+ <string name="wizard_tips_firefox">Proxy Mobile Add-on für Firefox (https://guardianproject.info/apps/firefoxprivacy)</string>
+ <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
<string name="wizard_tips_twitter">Twitter-Proxy auf den Rechner »localhost« und Port 8118 einstellen</string>
+ <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
<string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
<string name="wizard_proxy_help_info">Vermittlungseinstellungen</string>
<string name="wizard_final">Orbot ist bereit!</string>
+ <string name="wizard_exit_at_first_screen_toast">Bitte konfigurieren Sie Orbot, bevor Sie es verwenden können!</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="tor_check">Durch das Bestätigen mit »OK« wird die Seite https://check.torproject.org in Ihrem Webbrowser geöffnet, sodass Sie überprüfen können, ob Orbot richtig konfiguriert ist und Sie mit Tor verbunden sind.</string>
<string name="pref_hs_group">Versteckter Rechnerdienst</string>
@@ -120,6 +124,9 @@
<string name="pref_entrance_node">Eingangsnetzknoten</string>
<string name="pref_entrance_node_summary">Fingerabdrücke, Spitznamen, Länder und Adressen für den ersten Knotenpunkt.</string>
<string name="pref_entrance_node_dialog">Eingangsnetzknoten eingeben</string>
+ <string name="button_proxy_all">Alles über Proxy</string>
+ <string name="button_proxy_none">Nichts über Proxy</string>
+ <string name="button_invert_selection">Auswahl umkehren</string>
<string name="pref_proxy_title">Ausgehender Netzwerk-Proxy (Optional)</string>
<string name="pref_proxy_type_title">Ausgehender Vermittlungstyp</string>
<string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers: HTTP, HTTPS, Socks4, Socks5</string>
@@ -144,6 +151,7 @@
<string name="warning_error_starting_transparent_proxying_">WARNUNG: Fehler beim Starten der transparenten Vermittlung!</string>
<string name="transproxy_rules_cleared">TransProxy Regeln gelöscht</string>
<string name="couldn_t_start_tor_process_">Tor-Prozess konnte nicht gestartet werden:</string>
+ <string name="privoxy_is_running_on_port_">Polipo läuft auf Port: </string>
<string name="setting_up_port_based_transparent_proxying_">Anschlussbasierte transparente Vermittlung wird eingestellt …</string>
<string name="bridge_error">Brückenfehler</string>
<string name="bridge_requires_ip">Um die Brückenfunktion nutzen zu können, müssen Sie mindestens eine Brücken-IP-Adresse eingeben.</string>
@@ -187,9 +195,15 @@
<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Ihren versteckten Dienst (wird automatisch generiert)</string>
<string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ausgabe des Fehlerdiagnoseprotokolls aktivieren (benötigt adb oder alogcat zur Ansicht)</string>
<string name="project_home">Internetseite(n) des Projektes:</string>
+ <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string>
<string name="the_tor_license">Die Tor-Lizenz</string>
<string name="https_torproject_org">https://torproject.org</string>
<string name="third_party_software">Drittanbieteranwendungen:</string>
+ <string name="tor_version">Tor: https://www.torproject.org</string>
+ <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+ <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+ <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+ <string name="openssl_version">OpenSSL v1.0.1i: http://www.openssl.org</string>
<string name="hidden_service_request">Eine Anwendungen möchte den versteckten Server-Anschluss %S öffnen. Das ist sicher wenn Sie der Anwendung vertrauen.</string>
<string name="found_existing_tor_process">existierender Tor Prozess gefunden …</string>
<string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll prüfen</string>
@@ -201,12 +215,15 @@
<string name="error_installing_binares">Die Tor-Programmdateien konnten nicht installiert oder aktualisiert werden.</string>
<string name="pref_use_persistent_notifications">Wenn Orbot verbunden ist immer das Orbot-Symbol in der Werkzeugleiste anzeigen</string>
<string name="pref_use_persistent_notifications_title">Aktivitätsbenachrichtigungen</string>
+ <string name="pref_use_expanded_notifications">Erweiterte Benachrichtigung mit Tor-Austrittsland und -IP anzeigen</string>
+ <string name="pref_use_expanded_notifications_title">Erweiterte Benachrichtigungen</string>
<string name="notification_using_bridges">Brücken aktiviert!</string>
<string name="default_bridges"></string>
<string name="set_locale_title">Standorteinstellungen festlegen</string>
<string name="set_locale_summary">Standorteinstellungen und Sprache für Orbot auswählen</string>
<string name="wizard_locale_title">Sprache auswählen</string>
<string name="wizard_locale_msg">Vorgabe beibehalten oder Sprache ändern</string>
+ <string name="powered_by">betrieben mit Tor</string>
<string name="btn_save_settings">Einstellungen speichern</string>
<string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist in Bereitschaft …</string>
<string name="bandwidth_">Bandbreite:</string>
@@ -221,4 +238,37 @@
<string name="permission_manage_tor_description">Diese Anwendung aktivieren, um den Tor-Dienst zu kontrollieren</string>
<string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Es sieht nicht so aus, als ob Sie Orweb installiert haben. Möchten Sie Hilfe dabei, oder sollen wir einfach den Browser öffnen?</string>
<string name="install_apps_">Anwendungen installieren?</string>
+ <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string>
+ <string name="pref_socks_title">Tor SOCKS</string>
+ <string name="pref_socks_dialog">SOCKS-Portkonfiguration</string>
+ <string name="pref_transport_title">Tor TransProxy-Port</string>
+ <string name="pref_transport_dialog">TransProxy-Portkonfiguration</string>
+ <string name="pref_dnsport_title">Tor DNS-Port</string>
+ <string name="pref_dnsport_dialog">DNS-Portkonfiguration</string>
+ <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string>
+ <string name="pref_torrc_summary">NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string>
+ <string name="pref_torrc_dialog">Benutzerdefinierte Torrc</string>
+ <string name="wizard_tips_martus">Mobile Martus - Benetech-Anwendung zur Menschenrechtsdokumentierung</string>
+ <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string>
+ <string name="your_tor_public_ips_">Ihre öffentlichen IPs für Tor:</string>
+ <string name="app_conflict">Anwendungskonflikt</string>
+ <string name="pref_transproxy_refresh_title">Automatische Transproxy-Aktualisierung</string>
+ <string name="pref_transproxy_refresh_summary">Transproxy-Regeln erneut anwenden, wenn sich der Netzwerkstatus ändert</string>
+ <string name="pref_transproxy_flush_title">Transproxy ENTFERNEN ERZWINGEN</string>
+ <string name="transparent_proxy_rules_flushed_">Transparente Proxy-Regeln geleert!</string>
+ <string name="you_do_not_have_root_access_enabled">Sie haben keinen aktivierten ROOT-Zugang</string>
+ <string name="menu_vpn">Anwendungen</string>
+ <string name="kbps">kbit/s</string>
+ <string name="mbps">Mbit/s</string>
+ <string name="kb">KB</string>
+ <string name="mb">MB</string>
+ <string name="restart_orbot_to_use_this_bridge_">Bitte starten Sie Orbot zum Aktivieren der Änderungen neu</string>
+ <string name="menu_qr">QR-Codes</string>
+ <string name="get_bridges_email">E-Mail</string>
+ <string name="get_bridges_web">Web</string>
+ <string name="activate">Aktivieren</string>
+ <string name="apps_mode">Anwendungenmodus</string>
+ <string name="send_email">E-Mail senden</string>
+ <string name="install_orweb">Orweb installieren</string>
+ <string name="standard_browser">Standard-Browser</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dd11a6e..c902488 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Orbot</string>
+ <string name="app_description">Orbot es una aplicación libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma más segura. Orbot utiliza Tor para cifrar su tráfico de Internet, y luego lo oculta rebotándolo a través de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como análisis de tráfico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">https://check.torproject.org/?lang=es</string>
<string name="secure_default_web_url">https://check.torproject.org/?lang=es</string>
@@ -33,6 +34,8 @@
<string name="button_clear_log">Limpiar registro (log)</string>
<string name="menu_verify">Verificar</string>
<string name="menu_exit">Salir</string>
+ <string name="menu_scan">Escanear QR de bridge</string>
+ <string name="menu_share_bridge">Compartir QR de bridge</string>
<string name="press_to_start">- mantega pulsado para iniciar -</string>
<string name="pref_trans_proxy_group">Proxyficación transparente (requiere root)</string>
<string name="pref_trans_proxy_title">Proxyficación transparente</string>
@@ -58,6 +61,7 @@
<string name="btn_cancel">Cancelar</string>
<!--Welcome Wizard strings (DJH)-->
<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 Polipo. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) locales hacia la red Tor. Orbot también tiene la capacidad, en un dispositivo rooteado, 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 ha concedido a Orbot permisos de root. Utilizaremos estos poderes sabiamente.</string>
@@ -75,11 +79,19 @@
<string name="wizard_tips_proxy">Preferencias para proxy - aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
<string name="wizard_tips_duckgo">Aplicación del motor de búsqueda DuckDuckGo</string>
<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+ <string name="wizard_tips_firefox">Complemento Proxy Mobile para Firefox (https://guardianproject.info/apps/firefoxprivacy)</string>
+ <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
<string name="wizard_tips_twitter">Configure por proxy la aplicación de Twitter en localhost:8118</string>
+ <string name="wizard_tips_story_maker">StoryMaker - ¡Elabore una historia y déjesela a Tor por seguridad!</string>
+ <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp&am…</string>
<string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
<string name="wizard_proxy_help_info">Preferencias para proxy</string>
+ <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un proxy (interpuesto) HTTP o SOCKS, entonces puede configurarla para que conecte a Orbot y use Tor.\n\n\nLa configuración del servidor es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy está en el 9050. Debe utilizar la configuración para SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de proxyficación en Android a través de las preguntas frecuentes (FAQ) en: http://tinyurl.com/proxyandroid\n </string>
<string name="wizard_final">¡Orbot está listo!</string>
+ <string name="wizard_final_msg">Millones de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y blogueros, defensores de los derechos humanos, funcionarios judiciales, corporaciones, ciudadanos bajo regímenes represivos, y simples ciudadanos corrientes... ¡y ahora usted también está listo!</string>
+ <string name="wizard_exit_at_first_screen_toast">¡Por favor, configure Orbot antes para poder comenzar a usarlo!</string>
<!--END Welcome Wizard strings (DJH)-->
+ <string name="connect_first_time">Ha conectado con éxito a la red Tor - pero esto NO significa que su dispositivo sea seguro. Puede usar la opción \'Comprobar\' del menú para poner a prueba su navegador. \n\nVisítenos en https://guardianproject.info/apps/orbot o envíenos un correo a help(a)guardianproject.info para aprender más.</string>
<string name="tor_check">Esto abrirá https://check.torproject.org/?lang=es en su navegador predeterminado para comprobar que Orbot esté configurado y que esté conectado a Tor.</string>
<string name="pref_hs_group">Alojamiento de servicios ocultos (dentro de la red Tor)</string>
<string name="pref_general_group">General</string>
@@ -87,12 +99,15 @@
<string name="pref_start_boot_summary">Inicia Orbot y conecta a Tor automáticamente cuando arranca su dispositivo Android</string>
<!--New Wizard Strings-->
<!--Title Screen-->
+ <string name="wizard_title_msg">¡Orbot trae Tor a Android!\n\nTor le ayuda a defenderse contra el filtrado de contenido, el análisis de tráfico y la vigilancia de la red, que amenazan la privacidad, la información confidencial y las relaciones personales.\n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo.</string>
<!--Warning screen-->
<string name="wizard_warning_title">Advertencia</string>
+ <string name="wizard_warning_msg">Simplemente instalando Orbot no anonimizará automáticamente su tráfico móvil/celular.\n\nPara usar Tor con éxito tiene que configurar adecuadamente Orbot, su dispositivo, y otras aplicaciones.</string>
<!--Permissions screen-->
<string name="wizard_permissions_title">Permisos</string>
<string name="wizard_permissions_root_msg1">Opcionalmente puede conceder permisos de \'Superusuario\' a Orbot para habilitar las características avanzadas, como la proxyficación transparente.</string>
<string name="wizard_permissions_root_msg2">Si no desea hacer esto, asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o configurables para ello)</string>
+ <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar rooteado o proporcionar acceso de \'Superusuario\'.\n\nPara que usted se beneficie de Tor, tendrá que utilizar aplicaciones que funcionen con Orbot o que soporten configuraciones para proxy (interpuesto) HTTP o SOCKS.\n\n</string>
<!--TipsAndTricks screen-->
<string name="wizard_tips_title">Aplicaciones habilitadas para Orbot</string>
<string name="wizard_tips_gibberbot">ChatSecure: Aplicación de chat segura con cifrado Off-The-Record (OTR)</string>
@@ -121,6 +136,9 @@
<string name="pref_entrance_node_summary">Reglas de identificación de repetidores de entrada a la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y
direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de nodos, y las configuraciones de bridges.</string>
<string name="pref_entrance_node_dialog">Introduzca nodos de entrada</string>
+ <string name="button_proxy_all">Proxyficar todo</string>
+ <string name="button_proxy_none">No proxyficar nada</string>
+ <string name="button_invert_selection">Invertir selección</string>
<string name="pref_proxy_title">Proxy de salida a la red (opcional)</string>
<string name="pref_proxy_type_title">Tipo de proxy saliente</string>
<string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, Socks4, Socks5.</string>
@@ -145,6 +163,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
<string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente!</string>
<string name="transproxy_rules_cleared">Reglas de TransProxy (proxyficación transparente) borradas</string>
<string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
+ <string name="privoxy_is_running_on_port_">Polipo se está ejecutando en el puerto:</string>
<string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string>
<string name="bridge_error">Error de bridge (repetidor puente)</string>
<string name="bridge_requires_ip">Para utilizar la función bridge (repetidor puente, acceso a Tor de publicitación restringida), debe introducir al menos una dirección IP de bridge.</string>
@@ -188,9 +207,15 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">El nombre direccionable (sin DNS, .onion generado automáticamente) para su servicio oculto</string>
<string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Habilitar el registro de depuración (debug log) a la salida (debe utilizar adb o aLogCat para verlo)</string>
<string name="project_home">Página(s) principal(es) 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 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: https://www.torproject.org</string>
+ <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+ <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+ <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+ <string name="openssl_version">OpenSSL v1.0.1i: http://www.openssl.org</string>
<string name="hidden_service_request">Una aplicación está intentando abrir el puerto %S de servicio oculto hacia la red Tor. Esto es seguro si su aplicación es de su confianza.</string>
<string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
<string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
@@ -202,12 +227,15 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
<string name="error_installing_binares">No fue posible instalar o actualizar los binarios de Tor.</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 activadas</string>
+ <string name="pref_use_expanded_notifications">Mostrar notificación expandida con el país de salida de Tor y la IP</string>
+ <string name="pref_use_expanded_notifications_title">Notificaciones expandidas</string>
<string name="notification_using_bridges">¡Bridges habilitados! </string>
<string name="default_bridges"></string>
<string name="set_locale_title">Configuración regional</string>
<string name="set_locale_summary">Elija la configuración regional y el idioma para Orbot</string>
<string name="wizard_locale_title">Escoja idioma</string>
<string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string>
+ <string name="powered_by">impulsado por Tor</string>
<string name="btn_save_settings">Guardar configuración</string>
<string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en espera...</string>
<string name="bandwidth_">Ancho de banda:</string>
@@ -222,4 +250,50 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
<string name="permission_manage_tor_description">Habilita esta aplicación para controlar el servicio Tor</string>
<string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">No parece que tenga Orweb instalado. ¿Quiere ayuda con eso, o simplemente deberíamos abrir el navegador?</string>
<string name="install_apps_">¿Instalar aplicaciones?</string>
+ <string name="no_network_connectivity_putting_tor_to_sleep_">Sin conectividad a la red. Poniendo Tor a dormir...</string>
+ <string name="network_connectivity_is_good_waking_tor_up_">La conectividad a la red es buena. Despertando Tor...</string>
+ <string name="updating_settings_in_tor_service">actualizando la configuración en el servicio Tor</string>
+ <string name="pref_socks_title">SOCKS de Tor</string>
+ <string name="pref_socks_summary">Puerto sobre el que Tor ofrece su proxy SOCKS (por defecto: 9050 o 0 para deshabilitarlo)</string>
+ <string name="pref_socks_dialog">Configuración del puerto SOCKS</string>
+ <string name="pref_transport_title">Puerto de TransProxy de Tor</string>
+ <string name="pref_transport_summary">Puerto sobre el que Tor ofrece su Proxy Transparente (por defecto: 9040 o 0 para deshabilitarlo)</string>
+ <string name="pref_transport_dialog">Configuración del puerto de TransProxy</string>
+ <string name="pref_dnsport_title">Puerto DNS de Tor</string>
+ <string name="pref_dnsport_summary">Puerto sobre el que Tor ofrece su DNS (por defecto: 5400 o 0 para deshabilitarlo)</string>
+ <string name="pref_dnsport_dialog">Configuración del puerto DNS</string>
+ <string name="pref_torrc_title">Configuración personalizada de torrc</string>
+ <string name="pref_torrc_summary">SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string>
+ <string name="pref_torrc_dialog">torrc personalizado</string>
+ <string name="wizard_tips_martus">Martus Móvil - Aplicación de documentación de derechos humanos de Benetech</string>
+ <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android&hl=es</string>
+ <string name="your_tor_public_ips_">Las IPs públicas de su Tor:</string>
+ <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Por favor, deshabilite esta aplicación en Android->Configuración->Aplicaciones si está teniendo problemas con Orbot:</string>
+ <string name="app_conflict">Conflicto de la aplicación</string>
+ <string name="pref_transproxy_refresh_title">Auto-refresco de transproxy</string>
+ <string name="pref_transproxy_refresh_summary">Reaplica las reglas de transproxy cuando el estado de la red cambia</string>
+ <string name="pref_transproxy_flush_title">Transproxy FORZAR ELIMINACIÓN</string>
+ <string name="pref_transproxy_flush_summary">Pulse aquí para desechar AHORA todas las reglas de red de transproxy </string>
+ <string name="transparent_proxy_rules_flushed_">¡Reglas de proxy transparente desechadas!</string>
+ <string name="you_do_not_have_root_access_enabled">No tiene habilitado el acceso como ROOT</string>
+ <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Puede que tenga que detener e iniciar Orbot para que el cambio de configuración se habilite.</string>
+ <string name="menu_vpn">Aplicaciones</string>
+ <string name="kbps">kbps</string>
+ <string name="mbps">mbps</string>
+ <string name="kb">KB</string>
+ <string name="mb">MB</string>
+ <string name="bridges_updated">Bridges actualizados</string>
+ <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para habilitar los cambios</string>
+ <string name="menu_qr">Códigos QR</string>
+ <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Si su red móvil/celular bloquea activamente Tor, puede usar un bridge Tor (repetidor puente) para acceder a la red.\n\nPor favor, seleccione uno de los tipos de puente de arriba para habilitar esta característica.</string>
+ <string name="bridge_mode">Modo bridge</string>
+ <string name="get_bridges_email">Correo electrónico</string>
+ <string name="get_bridges_web">Página web</string>
+ <string name="activate">Activar</string>
+ <string name="apps_mode">Modo aplicaciones</string>
+ <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puede habilitar que todas las aplicaciones de su dispositivo transiten a través de la red Tor usando la función VPN de Android.\n\n*ADVERTENCIA* Esta es una característica experimental nueva, y en algunos casos puede que no se inicie automáticamente, o puede que se detenga. NO debe usarse para anonimato, SÓLO para atravesar cortafuegos (firewalls) y filtros.</string>
+ <string name="send_email">Enviar correo</string>
+ <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Puede obtener una dirección de bridge (repetidor puente) a través de correo electrónico, la web, o escaneando un código QR de bridge. Seleccione \'Correo\' o \'Web\' debajo para solicitar una dirección de bridge.\n\nUna vez tenga una dirección, copie y péguela en la opción \"Bridges\" de la configuración de Orbot, y reinicie.</string>
+ <string name="install_orweb">Instalar Orweb</string>
+ <string name="standard_browser">Navegador estándar</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6b1ec8e..580265e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -33,6 +33,8 @@
<string name="button_clear_log">پاکسازی گزارش</string>
<string name="menu_verify">بررسی</string>
<string name="menu_exit">خروج</string>
+ <string name="menu_scan">اسکن BridgeQR</string>
+ <string name="menu_share_bridge">اشتراک BridgeQR</string>
<string name="press_to_start">- نگهدارید برای شروع -</string>
<string name="pref_trans_proxy_group">پروکسیدن شفاف (نیاز به Root دارد)</string>
<string name="pref_trans_proxy_title">پروکسیدن شفاف</string>
@@ -75,10 +77,15 @@
<string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با ربات پیازی</string>
<string name="wizard_tips_duckgo">اپلیکیشن موتور جستجوی داک داک گو</string>
<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+ <string name="wizard_tips_firefox">افزوده پروکسی موبایل برای فایرفاکس (https://guardianproject.info/apps/firefoxprivacy)</string>
+ <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
<string name="wizard_tips_twitter">توییتر از \"http proxy \"localhost:8118 پشتیبانی می کند</string>
+ <string name="wizard_tips_story_maker">StoryMaker - ساختن یک داستان و ترک آن به Tor برای امنیت!</string>
+ <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
<string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
<string name="wizard_proxy_help_info">تنظیمات پروکسی</string>
<string name="wizard_final">ربات پیازی آماده استفاده میباشد!</string>
+ <string name="wizard_exit_at_first_screen_toast">لطفا پیکربندی کنید Orbot را قبل از اینکه شما شروع به استفاده از آن کنید!</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="tor_check">با این قدم پیشفرض مرورگر وب شما به صفحه https://check.torproject.org باز می شود تا شما مشاهده کنید آیا ربات پیازی تنظیم شده است و آیا شما به تور وصل شده اید یا نه.</string>
<string name="pref_hs_group">سرويس های مخفی</string>
@@ -120,6 +127,9 @@
<string name="pref_entrance_node">گره های ورودی</string>
<string name="pref_entrance_node_summary">اثرانگشت ها، اسامی مستعار، کشورها و آدرسهای جهش اول</string>
<string name="pref_entrance_node_dialog">گره های ورودی را وارد کنید</string>
+ <string name="button_proxy_all">همه پروکسی ها</string>
+ <string name="button_proxy_none">هیچ پروکسی</string>
+ <string name="button_invert_selection">انتخاب برعکس شود</string>
<string name="pref_proxy_title">پراکسی شبکه خروجی</string>
<string name="pref_proxy_type_title">نوع پروکسی</string>
<string name="pref_proxy_type_summary">پروتکل مورد استفاده برای پراکسی سرور: HTTP, HTTPS, Socks4, Socks5</string>
@@ -144,6 +154,7 @@
<string name="warning_error_starting_transparent_proxying_">هشدار: خطا در هنگام راه اندازی پروکسی شفاف!</string>
<string name="transproxy_rules_cleared">قوانین TransProxy پاک شدند</string>
<string name="couldn_t_start_tor_process_"> تور نتواست اجرا شود:</string>
+ <string name="privoxy_is_running_on_port_">Polipo در حال اجرا است در پورت:</string>
<string name="setting_up_port_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر پورت...</string>
<string name="bridge_error">خطای پل</string>
<string name="bridge_requires_ip">برای استفاده از ویژگی پل، باید حداقل آدرس IP یک پل را وارد کنید.</string>
@@ -187,9 +198,15 @@
<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">نام نشانی پذیر برای سرویس مخفی شما (بصورت خودکار تولید شده است)</string>
<string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ثبت گزارش اشکال زدایی را به خروجی فعال کن (برای نمایش باید از adb یا aLogCat استفاده کنید)</string>
<string name="project_home">صفحه (های) اصلی پروژه:</string>
+ <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string>
<string name="the_tor_license">گواهی تور</string>
<string name="https_torproject_org">https://torproject.org</string>
<string name="third_party_software">3rd-Party-Software:</string>
+ <string name="tor_version">Tor: https://www.torproject.org</string>
+ <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+ <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+ <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+ <string name="openssl_version">OpenSSL v1.0.1i: http://www.openssl.org</string>
<string name="hidden_service_request">یک اپلیکیشن میخواهد پورت %S سرویس مخفی را به شبکه تور باز کند. اگر به این اپلیکیشن اعتماد دارید این بی خطر است.</string>
<string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
<string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
@@ -201,12 +218,15 @@
<string name="error_installing_binares">فایلهای باینری تور قادر به نصب و یا ارتقا نبودند</string>
<string name="pref_use_persistent_notifications">وقتی ربات پیازی متصل است، همیشه آیکون مربوط را در نوار ابزار نگه دار.</string>
<string name="pref_use_persistent_notifications_title">آگاهسازی همیشه روشن</string>
+ <string name="pref_use_expanded_notifications">نمایش اطلاع رسانی گسترده با کشور خروجی Tor و IP</string>
+ <string name="pref_use_expanded_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>
+ <string name="powered_by">طراحی شده توسط Tor</string>
<string name="btn_save_settings">ذخیره تنظیمات</string>
<string name="no_internet_connection_tor">بدون اتصال اینترنت: تور در حالت انتظار</string>
<string name="bandwidth_">پهنای باند:</string>
@@ -221,4 +241,42 @@
<string name="permission_manage_tor_description">این برنامه بتواند سرویس تور را مدیریت کند</string>
<string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">بنظر میرسد برنامه Orweb نصب نشده است. آیا کمکی برای نصب میخواهید یا فقط مرورگر باز شود؟</string>
<string name="install_apps_">برنامه نصب شود؟</string>
+ <string name="no_network_connectivity_putting_tor_to_sleep_">بدون اتصال به شبکه می باشد. قرار دادن Tor در خواب ...</string>
+ <string name="network_connectivity_is_good_waking_tor_up_">اتصال به شبکه خوب است. بیداری Tor تا ...</string>
+ <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string>
+ <string name="pref_socks_title">Tor SOCKS</string>
+ <string name="pref_socks_dialog">پیکربندی پورت SOCKS</string>
+ <string name="pref_transport_title">Tor TransProxy Port</string>
+ <string name="pref_transport_dialog">پیکربندی پورت Transproxy</string>
+ <string name="pref_dnsport_title">پورت Tor DNS</string>
+ <string name="pref_dnsport_summary">پورتی که Tor ارائه می دهد آن DNS روی (به طور پیش فرض: 5400 یا 0 برای غیر فعال کردن)</string>
+ <string name="pref_dnsport_dialog">پیکربندی پورت DNS</string>
+ <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string>
+ <string name="pref_torrc_dialog">سفارشی Torrc</string>
+ <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string>
+ <string name="your_tor_public_ips_">IP های عمومی Tor شما:</string>
+ <string name="app_conflict">تعارض برنامه</string>
+ <string name="pref_transproxy_refresh_title">خودکار تازه کردن Transproxy</string>
+ <string name="pref_transproxy_flush_title">حذف اجباری Transproxy</string>
+ <string name="you_do_not_have_root_access_enabled">شما دسترسی روت را فعال نکردید. </string>
+ <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_"> برای اعمال تنظیمات جدید باید اوربات را خاموش و روشن کنید.</string>
+ <string name="menu_vpn">برنامه ها</string>
+ <string name="kbps">kbps</string>
+ <string name="mbps">mbps</string>
+ <string name="kb">KB</string>
+ <string name="mb">MB</string>
+ <string name="bridges_updated">پل ها به روز شدند</string>
+ <string name="restart_orbot_to_use_this_bridge_">برای فعال کردن تغییرات لطفا Orbot را راه اندازی مجدد کنید</string>
+ <string name="menu_qr">کدهای QR</string>
+ <string name="bridge_mode">حالت پل</string>
+ <string name="get_bridges_email">ایمیل</string>
+ <string name="get_bridges_web">وب</string>
+ <string name="activate">فعال کردن</string>
+ <string name="apps_mode">حالت برنامه</string>
+ <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">با استفاده از امکان وی پی ان اندروید٬ اوربات ترافیک تمام اپلیکیشن های موبایل شما را از طریق شبکه تور انتقال میدهد.
+\n\n*هشدار*
+امکان تونل تمام گوشی هنوز جدید و در حال آزمایش است. به همین دلیل امکان دارد که به صورت خودکار فعال نشود یا هنگام استفاده قطع شود. از این امکان برای ناشناس بودن در وب هرگز نباید استفاده کنید و باید فقط از آن برای عبور از فایروال ها و دور زدن فیلترینگ استفاده شود.</string>
+ <string name="send_email">ایمیل بفرست</string>
+ <string name="install_orweb">نصب Orweb</string>
+ <string name="standard_browser">مرورگر استاندارد</string>
</resources>
diff --git a/res/values-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml
index 48fd3a2..760614e 100644
--- a/res/values-fr-rFR/strings.xml
+++ b/res/values-fr-rFR/strings.xml
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Orbot</string>
+ <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis d\'utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers d\'ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et l\'analyse du trafic des gouvernements.</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>
@@ -33,6 +34,8 @@
<string name="button_clear_log">Effacer le journal</string>
<string name="menu_verify">Vérifier</string>
<string name="menu_exit">Quitter</string>
+ <string name="menu_scan">Balayer un code QR de pont</string>
+ <string name="menu_share_bridge">Partager un code QR de pont</string>
<string name="press_to_start">- appuyer longuement pour démarrer -</string>
<string name="pref_trans_proxy_group">Relayage transparent (root exigé)</string>
<string name="pref_trans_proxy_title">Relayage transparent</string>
@@ -58,6 +61,7 @@
<string name="btn_cancel">Annuler</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Quelques détails sur Orbot</string>
+ <string name="wizard_details_msg">Orbot est une application à code source ouvert incluant Tor, LibEvent et Polipo. Elle fournit un mandataire local HTTP (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Orbot a aussi la capacité, sur un appareil rooté, d\'envoyer tout le trafic Internet par Tor.</string>
<string name="wizard_permissions_root">Permission accordée</string>
<string name="wizard_permissions_stock">Permissions d\'Orbot</string>
<string name="wizard_premissions_msg_root">Excellent ! Nous avons détecté les permissions root sont activées pour Orbot. Nous utiliserons ce pouvoir avec discernement.</string>
@@ -75,11 +79,19 @@
<string name="wizard_tips_proxy">Paramètres du relais - Apprendre à configurer des applis pour qu\'elles fonctionnent avec Orbot</string>
<string name="wizard_tips_duckgo">Appli du moteur de recherche DuckDuckgo</string>
<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+ <string name="wizard_tips_firefox">Module *Mandataire mobile* pour Firefox (https://guardianproject.info/apps/firefoxprivacy)</string>
+ <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
<string name="wizard_tips_twitter">Configurer le mandataire Twitter sur l\'hôte « localhost:8118 » et le port 8118</string>
+ <string name="wizard_tips_story_maker">Faiseur d\'histoires - Rédigez une histoire et laissez Tor s\'occuper de la sécurité !</string>
+ <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
<string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
<string name="wizard_proxy_help_info">Paramètres du mandataire</string>
+ <string name="wizard_proxy_help_msg">Si l\'appli Android que vous utilisez peut prendre en charge un mandataire HTTP ou SOCKS, vous pouvez alors la configurer pour se connecter à Orbot et utiliser Tor.\n\n\n Le paramètre de l\'hôte est 127.0.0.1 or « localhost ». Pour HTTP, le paramètre de port est 8118. Pour SOCKS, le mandataire est 9050. Vous devriez utiliser SOCKS4A ou SOCKS5 si possible.\n \n\n\n Vous pouvez en apprendre davantage sur l\'utilisation d\'un serveur mandataire sur Android dans la FAQ sur : http://tinyurl.com/proxyandroid\n </string>
<string name="wizard_final">Orbot est prêt !</string>
+ <string name="wizard_final_msg">Des millions de personnes de par le monde utilisent Tor pour une grande variété de raisons.\n\nDes journalistes et des blogueurs, des défenseurs des droits humains, des officiers des forces de l\'ordre, des soldats, des sociétés, des citoyens de régimes répressifs, et de simples citoyens... et maintenant vous êtes aussi prêt à l\'utiliser !</string>
+ <string name="wizard_exit_at_first_screen_toast">Veuillez configurer Orbot avant de pouvoir commencer à l\'utiliser !</string>
<!--END Welcome Wizard strings (DJH)-->
+ <string name="connect_first_time">Vous êtes connecté 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 tester votre navigateur.\n\n Rendez-nous visite sur https://guardianproject.info/apps/orbot ou envoyez un courriel à help(a)guardianproject.info pour en savoir plus.</string>
<string name="tor_check">Ceci ouvrira votre navigateur Web sur https://check.torproject.org afin de déterminer si Orbot est convenablement configuré et si vous êtes connecté à Tor.</string>
<string name="pref_hs_group">Hébergement de services cachés</string>
<string name="pref_general_group">Général</string>
@@ -87,12 +99,15 @@
<string name="pref_start_boot_summary">Démarrer Orbot automatiquement et se connecter à Tor lors de l\'amorçage de votre appareil Android</string>
<!--New Wizard Strings-->
<!--Title Screen-->
+ <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\nTor vous aide à vous défendre contre le filtrage du contenu, l\'analyse du trafic et la surveillance du réseau qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCet assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string>
<!--Warning screen-->
<string name="wizard_warning_title">Avertissement</string>
+ <string name="wizard_warning_msg">La simple installation d\'Orbot n\'anonymisera pas automatiquement votre trafic mobile.\n\nVous devez configurer Orbot adéquatement, ainsi que votre appareil et les autres applis pour utiliser Tor avec succès.</string>
<!--Permissions screen-->
<string name="wizard_permissions_title">Permissions</string>
<string name="wizard_permissions_root_msg1">Vous pouvez optionnellement accorder à Orbot un accès « superutilisateur » pour activer des options avancées, comme le relayage transparent.</string>
<string name="wizard_permissions_root_msg2">Si vous ne voulez pas le faire, veuillez vous assurer d\'utiliser des applis conçues pour fonctionner avec Orbot</string>
+ <string name="wizard_permissions_no_root_msg">Votre appareil ne semble pas être rooté ou ne fournit pas l’accès « superutilisateur ».\n\nAfin que vous puissiez bénéficier de Tor, vous devrez utiliser des applis conçues pour fonctionner avec Orbot, ou qui prennent en charge un mandataire HTTP ou SOCKS.\n\n</string>
<!--TipsAndTricks screen-->
<string name="wizard_tips_title">Applis conçues pour Orbot</string>
<string name="wizard_tips_gibberbot">Chatsecure : appli sécurisée de clavardage avec chiffrement confidentiel </string>
@@ -120,6 +135,9 @@
<string name="pref_entrance_node">Nœuds d\'entrée</string>
<string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string>
<string name="pref_entrance_node_dialog">Saisir les nœuds d\'entrée</string>
+ <string name="button_proxy_all">Tout relayer</string>
+ <string name="button_proxy_none">Ne rien relayer</string>
+ <string name="button_invert_selection">Inverser la sélection</string>
<string name="pref_proxy_title">Mandataire pour le réseau sortant (optionnel)</string>
<string name="pref_proxy_type_title">Type de mandataire sortant</string>
<string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur mandataire : HTTP, HTTPS, Socks4, Socks5</string>
@@ -144,6 +162,7 @@
<string name="warning_error_starting_transparent_proxying_">AVERTISSEMENT : erreur lors du démarrage du relayage transparent !</string>
<string name="transproxy_rules_cleared">Règles du relais transparent effacées</string>
<string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </string>
+ <string name="privoxy_is_running_on_port_">Polipo tourne sur le port : </string>
<string name="setting_up_port_based_transparent_proxying_">Configuration du relayage transparent par port...</string>
<string name="bridge_error">Erreur de pont</string>
<string name="bridge_requires_ip">Afin de pouvoir utiliser la fonction pont, vous devez au moins saisir l\'adresse IP d\'un pont.</string>
@@ -187,9 +206,15 @@
<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">le nom adressable pour votre service caché (généré automatiquement)</string>
<string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activer le journal de débogage vers la sortie (vous devez utiliser adb ou aLogCat pour le visualiser)</string>
<string name="project_home">Page(s) d\'accueil du projet :</string>
+ <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string>
<string name="the_tor_license">La licence de Tor</string>
<string name="https_torproject_org">https://torproject.org</string>
<string name="third_party_software">Logiciels tiers :</string>
+ <string name="tor_version">Tor : https://www.torproject.org</string>
+ <string name="libevent_version">LibEvent v2.0.21 : http://www.monkey.org/~provos/libevent/</string>
+ <string name="polipo_version">Polipo v1.1.9 : https://github.com/jech/polipo</string>
+ <string name="iptables_version">IPtables v1.4.21 : http://www.netfilter.org</string>
+ <string name="openssl_version">OpenSSL v1.0.1i : http://www.openssl.org</string>
<string name="hidden_service_request">Une appli veut ouvrir le port %S du serveur caché au réseau Tor. ceci est sécuritaire si vous faites confiance à l\'appli.</string>
<string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
<string name="something_bad_happened">Quelque chose n\'a pas été. Vérifiez le journal</string>
@@ -201,12 +226,15 @@
<string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installés ou mis à niveau.</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 activer les notifications</string>
+ <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l\'IP</string>
+ <string name="pref_use_expanded_notifications_title">Notifications étendues</string>
<string name="notification_using_bridges">Les ponts sont activés !</string>
<string name="default_bridges"></string>
<string name="set_locale_title">Définir les paramètres régionaux</string>
<string name="set_locale_summary">Choisir les paramètres régionaux pour Orbot</string>
<string name="wizard_locale_title">Choisir la langue</string>
<string name="wizard_locale_msg">Laisser à la valeur par défaut ou changer la langue actuelle</string>
+ <string name="powered_by">propulsé par Tor</string>
<string name="btn_save_settings">Enregistrer les paramètres</string>
<string name="no_internet_connection_tor">Aucune connexion Internet. Tor est en attente...</string>
<string name="bandwidth_">Bande passante :</string>
@@ -221,4 +249,50 @@
<string name="permission_manage_tor_description">Autoriser cette appli à contrôler le service Tor</string>
<string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Il semble qu\'Orweb ne soit pas installé. Voulez-vous de l\'aide à ce sujet ou devrions-nous juste ouvrir le navigateur ?</string>
<string name="install_apps_">Installer les applis ?</string>
+ <string name="no_network_connectivity_putting_tor_to_sleep_">Aucune connectivité réseau. Mise au repos de Tor...</string>
+ <string name="network_connectivity_is_good_waking_tor_up_">La connectivité réseau est bonne. Réveil de Tor...</string>
+ <string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string>
+ <string name="pref_socks_title">SOCKS Tor</string>
+ <string name="pref_socks_summary">Port sur lequel Tor offre son mandataire SOCKS (par défaut : 9050 ou 0 pour le désactiver)</string>
+ <string name="pref_socks_dialog">Configuration du part SOCKS</string>
+ <string name="pref_transport_title">Port Transproxy de Tor</string>
+ <string name="pref_transport_summary">Port sur lequel Tor offre son mandataire transparent (par défaut : 9040 ou 0 pour le désactiver)</string>
+ <string name="pref_transport_dialog">Configuration du port TransProxy</string>
+ <string name="pref_dnsport_title">Port DNS de Tor</string>
+ <string name="pref_dnsport_summary">Port sur lequel Tor offre son DNS (par défaut : 5400 ou 0 pour le désactiver)</string>
+ <string name="pref_dnsport_dialog">Configuration du port DNS</string>
+ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string>
+ <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string>
+ <string name="pref_torrc_dialog">Personnaliser Torrc </string>
+ <string name="wizard_tips_martus">Martus mobile - Appli de documentation pour les droits humains de Benetech</string>
+ <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string>
+ <string name="your_tor_public_ips_">Vos IP publiques Tor :</string>
+ <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Veuillez désactiver cette appli dans Android->Paramètres->Applications si vous éprouvez des problèmes avec Orbot :</string>
+ <string name="app_conflict">Conflit d\'applis</string>
+ <string name="pref_transproxy_refresh_title">Rafraîchissement automatique de Transproxy</string>
+ <string name="pref_transproxy_refresh_summary">Appliquer de nouveau les règles de Transproxy lors des changements d\'état du réseau</string>
+ <string name="pref_transproxy_flush_title">Transproxy ENLEVER DE FORCE</string>
+ <string name="pref_transproxy_flush_summary">Toquer ici pour vider toutes les règles réseau de transproxy MAINTENANT</string>
+ <string name="transparent_proxy_rules_flushed_">Les règles du mandataire transparent ont été vidées !</string>
+ <string name="you_do_not_have_root_access_enabled">L\'accès ROOT n\'est pas activé</string>
+ <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Vous pourriez avoir à arrêter et démarrer Orbot pour que les changements de paramètres soient activés.</string>
+ <string name="menu_vpn">Applis</string>
+ <string name="kbps">kbps</string>
+ <string name="mbps">mbps</string>
+ <string name="kb">Ko</string>
+ <string name="mb">Mo</string>
+ <string name="bridges_updated">Ponts mis à jour</string>
+ <string name="restart_orbot_to_use_this_bridge_">Veuillez redémarrer Orbot pour activer les changements</string>
+ <string name="menu_qr">Codes QR</string>
+ <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Si votre réseau mobile bloque activement Tor, vous pouvez utiliser un pont Tor pour accéder au réseau.\n\nVeuillez choisir un des types de pont ci-dessus pour activer cette fonction.</string>
+ <string name="bridge_mode">Mode pont</string>
+ <string name="get_bridges_email">Courriel</string>
+ <string name="get_bridges_web">Web</string>
+ <string name="activate">Activer</string>
+ <string name="apps_mode">Mode applis</string>
+ <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Vous pouvez activer le relais de toutes les applis par le réseau Tor en utilisant la fonction de RPV d\'Android.\n\n*AVERTISSEMENT* Cette fonction est nouvelle et expérimentale et pourrait parfois ne pas démarrer automatiquement, et même s\'arrêter. Elle ne devrait PAS être utilisée pour l\'anonymat, et être SEULEMENT utilisée pour passer les pare-feu et les filtres.</string>
+ <string name="send_email">Envoyer un courriel</string>
+ <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Vous pouvez obtenir une adresse de pont par courriel, par le Web ou en balayant le code QR d\'un pont. Choisissez *Courriel* ou *Web* ci-dessous pour demander une adresse de pont.\n\nUne fois que vous avez une adresse, copiez & collez-la dans le champ « Ponts » des paramètres d\'Orbot et redémarrez.</string>
+ <string name="install_orweb">Installer Orweb</string>
+ <string name="standard_browser">Navigateur standard</string>
</resources>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 13eb6e0..2858d23 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -33,6 +33,8 @@
<string name="button_clear_log">清除日志</string>
<string name="menu_verify">检查</string>
<string name="menu_exit">退出</string>
+ <string name="menu_scan">扫描网桥QR码</string>
+ <string name="menu_share_bridge">分享网桥QR码</string>
<string name="press_to_start">- 长按启动 -</string>
<string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
<string name="pref_trans_proxy_title">透明代理</string>
@@ -58,6 +60,7 @@
<string name="btn_cancel">取消</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">更多 Orbot 信息</string>
+ <string name="wizard_details_msg">Orbot 是一个包含 Tor、LibEvent 和 Polipo 的开源应用程序。它提供了一个本地 HTTP 代理 (8118) 和一个 SOCKS 代理 (9050) 前往 Tor 网络。Orbot 也有能力在 root 过的设备上将所有互联网流量通过 Tor 发送。</string>
<string name="wizard_permissions_root">已获取权限</string>
<string name="wizard_permissions_stock">Orbot 权限</string>
<string name="wizard_premissions_msg_root">好极了!我们检测到 Orbot 已获取 Root 权限 。我们会谨慎地使用这一权限。</string>
@@ -75,10 +78,14 @@
<string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
<string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎应用程序</string>
<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+ <string name="wizard_tips_firefox">适用于移动版 Firefox 的代理扩展 (https://guardianproject.info/apps/firefoxprivacy)</string>
+ <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
<string name="wizard_tips_twitter">将 Twitter 代理的主机设置 localhost 并将端口设置为 8118</string>
+ <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
<string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
<string name="wizard_proxy_help_info">代理设置</string>
<string name="wizard_final">Orbot 已就绪!</string>
+ <string name="wizard_exit_at_first_screen_toast">请在您开始使用它前配置 Orbot!</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="tor_check">浏览器将启动并访问:https://check.torproject.org,以便检查 Orbot 配置是否正确以及是否可连接 Tor 网络。</string>
<string name="pref_hs_group">隐藏服务主机</string>
@@ -120,6 +127,9 @@
<string name="pref_entrance_node">入口节点</string>
<string name="pref_entrance_node_summary">用于首次跳转的密钥指纹、昵称、国家与地址</string>
<string name="pref_entrance_node_dialog">输入入口节点</string>
+ <string name="button_proxy_all">全部代理</string>
+ <string name="button_proxy_none">全不代理</string>
+ <string name="button_invert_selection">反选</string>
<string name="pref_proxy_title">出站网络代理(可选)</string>
<string name="pref_proxy_type_title">出站代理类型</string>
<string name="pref_proxy_type_summary">代理服务器使用的协议:HTTP、HTTPS、Socks4、Socks5</string>
@@ -144,6 +154,7 @@
<string name="warning_error_starting_transparent_proxying_">警告:启动透明代理时发生错误!</string>
<string name="transproxy_rules_cleared">已清除 TransProxy 规则</string>
<string name="couldn_t_start_tor_process_">无法启动 Tor 进程:</string>
+ <string name="privoxy_is_running_on_port_">Polipo 正运行在端口:</string>
<string name="setting_up_port_based_transparent_proxying_">正在对基于端口的透明代理进行设置...</string>
<string name="bridge_error">网桥错误</string>
<string name="bridge_requires_ip">为了需使用网桥,必须至少输入一个网桥 IP 地址。</string>
@@ -187,9 +198,15 @@
<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">隐藏服务的地址(自动生成)</string>
<string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">启用调试日志输出(必须使用 adb 或 aLongCat 查看)</string>
<string name="project_home">项目主页(s):</string>
+ <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string>
<string name="the_tor_license">Tor 许可证</string>
<string name="https_torproject_org">https://torproject.org</string>
<string name="third_party_software">第三方软件:</string>
+ <string name="tor_version">Tor: https://www.torproject.org</string>
+ <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+ <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+ <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+ <string name="openssl_version">OpenSSL v1.0.1i: http://www.openssl.org</string>
<string name="hidden_service_request">应用程序试图打开隐藏服务主机端口 %S 连接 Tor 网络。对于可信应用这是安全的。</string>
<string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
<string name="something_bad_happened">发生错误,请检查日志</string>
@@ -201,12 +218,15 @@
<string name="error_installing_binares">无法安装或更新 Tor 程序。</string>
<string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string>
<string name="pref_use_persistent_notifications_title">始终显示通知</string>
+ <string name="pref_use_expanded_notifications">显示扩展的通知,有关 Tor 出口的国家和 IP</string>
+ <string name="pref_use_expanded_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">选择 Orbot 的区域设置与语言</string>
<string name="wizard_locale_title">选择语言</string>
<string name="wizard_locale_msg">保持默认或切换为当前所用语言</string>
+ <string name="powered_by">由 Tor 提供</string>
<string name="btn_save_settings">保存设置</string>
<string name="no_internet_connection_tor">无网络连接;Tor 正处于待机状态...</string>
<string name="bandwidth_">宽带速度:</string>
@@ -221,4 +241,46 @@
<string name="permission_manage_tor_description">启用该应用可对 Tor 服务进行控制</string>
<string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">好像没有安装 Orweb。是否需要帮忙,还是直接打开浏览器?</string>
<string name="install_apps_">安装应用?</string>
+ <string name="no_network_connectivity_putting_tor_to_sleep_">没有网络连接。Tor 进入睡眠状态...</string>
+ <string name="network_connectivity_is_good_waking_tor_up_">网络连接良好。Tor 正在醒来...</string>
+ <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string>
+ <string name="pref_socks_title">Tor SOCKS</string>
+ <string name="pref_socks_summary">Tor 提供其 SOCKS 代理的端口 (默认: 9050, 0 禁用)</string>
+ <string name="pref_socks_dialog">SOCKS 端口配置</string>
+ <string name="pref_transport_title">Tor 透明代理端口</string>
+ <string name="pref_transport_summary">Tor 提供透明代理的端口 (默认: 9040, 0 禁用)</string>
+ <string name="pref_transport_dialog">透明代理配置</string>
+ <string name="pref_dnsport_title">Tor DNS 端口</string>
+ <string name="pref_dnsport_summary">Tor 提供 DNS 的端口 (默认: 5400, 0 禁用)</string>
+ <string name="pref_dnsport_dialog">DNS 端口配置</string>
+ <string name="pref_torrc_title">Torrc 自定义配置</string>
+ <string name="pref_torrc_summary">仅供专家:直接输入 torrc 配置行</string>
+ <string name="pref_torrc_dialog">自定义 Torrc</string>
+ <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string>
+ <string name="your_tor_public_ips_">您的 Tor 公网 IP:</string>
+ <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">如果您使用 Orbot 遇到问题,请在 Android->设置->应用 中禁用本应用:</string>
+ <string name="app_conflict">应用冲突</string>
+ <string name="pref_transproxy_refresh_title">透明代理自动刷新</string>
+ <string name="pref_transproxy_refresh_summary">在网络状态改变时重新应用透明代理规则</string>
+ <string name="pref_transproxy_flush_title">透明代理强制移除</string>
+ <string name="pref_transproxy_flush_summary">点按这里立即刷新所有透明代理的网络规则</string>
+ <string name="transparent_proxy_rules_flushed_">透明代理规则已刷新!</string>
+ <string name="you_do_not_have_root_access_enabled">您还没有 ROOT 访问权限</string>
+ <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">您可能需要停止并重新启动 Orbot 才能使设置更改生效。</string>
+ <string name="menu_vpn">应用</string>
+ <string name="kbps">kbps</string>
+ <string name="mbps">mbps</string>
+ <string name="kb">KB</string>
+ <string name="mb">MB</string>
+ <string name="bridges_updated">网桥已更新</string>
+ <string name="restart_orbot_to_use_this_bridge_">请重启 Orbot 以使变更生效</string>
+ <string name="menu_qr">QR码</string>
+ <string name="bridge_mode">网桥模式</string>
+ <string name="get_bridges_email">电子邮件</string>
+ <string name="get_bridges_web">网页</string>
+ <string name="activate">激活</string>
+ <string name="apps_mode">应用模式</string>
+ <string name="send_email">发送电子邮件</string>
+ <string name="install_orweb">安装 Orweb</string>
+ <string name="standard_browser">标准版浏览器</string>
</resources>
1
0
commit e6fe25267fbcb511aa0dd64a856bec934d5e6d2e
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Wed Apr 8 17:01:09 2015 -0400
auto-restart Tor when config changes
---
src/org/torproject/android/OrbotMainActivity.java | 57 ++++++++++++---------
1 file changed, 32 insertions(+), 25 deletions(-)
diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java
index 405e930..26abd58 100644
--- a/src/org/torproject/android/OrbotMainActivity.java
+++ b/src/org/torproject/android/OrbotMainActivity.java
@@ -822,6 +822,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
else if (request == REQUEST_VPN && response == RESULT_OK)
{
startService(TorServiceConstants.CMD_VPN);
+ restartTor ();
}
IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data);
@@ -1005,30 +1006,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
String bridgeList = mPrefs.getString(OrbotConstants.PREF_BRIDGES_LIST,null);
if (bridgeList != null && bridgeList.length() > 0)
{
- try
- {
- //do auto restart
- stopTor ();
-
- mHandler.postDelayed(new Runnable () {
-
- public void run ()
- {
- try
- {
- startTor();
- }
- catch (Exception e)
- {
- Log.e(TAG,"can't start orbot",e);
- }
- }
- }, 2000);
- }
- catch (Exception e)
- {
- Log.e(TAG,"can't stop orbot",e);
- }
+ restartTor ();
}
}
@@ -1036,6 +1014,34 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
}
+ private void restartTor ()
+ {
+ try
+ {
+ //do auto restart
+ stopTor ();
+
+ mHandler.postDelayed(new Runnable () {
+
+ public void run ()
+ {
+ try
+ {
+ startTor();
+ }
+ catch (Exception e)
+ {
+ Log.e(TAG,"can't start orbot",e);
+ }
+ }
+ }, 2000);
+ }
+ catch (Exception e)
+ {
+ Log.e(TAG,"can't stop orbot",e);
+ }
+ }
+
public void promptStartVpnService ()
{
LayoutInflater li = LayoutInflater.from(this);
@@ -1086,13 +1092,14 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
else
{
startService(TorServiceConstants.CMD_VPN);
-
+ restartTor ();
}
}
public void stopVpnService ()
{
startService(TorServiceConstants.CMD_VPN_CLEAR);
+ restartTor ();
}
private boolean flushTransProxy ()
1
0
commit 280f69dfa10c38d880e98e71954526c68f1b3df5
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Wed Apr 8 17:02:16 2015 -0400
update to 15.0.0-RC-1
---
AndroidManifest.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5038fbe..d317b3d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.torproject.android"
- android:versionName="15.0.0-beta-2"
- android:versionCode="15102"
+ android:versionName="15.0.0-RC-1"
+ android:versionCode="15103"
android:installLocation="auto"
>
1
0
commit 23a28f5a6f27778a6b98e046572fd3cf5c209229
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Wed Apr 8 17:03:24 2015 -0400
update changelog
---
CHANGELOG | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 4f62ed9..eec1e76 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,15 @@
NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
+/** 15.0.0 RC 1 / 8-Apr-2015 / 280f69dfa10c38d880e98e71954526c68f1b3df5 **/
+776b7af use loopback address
+e6fe252 auto-restart Tor when config changes
+384fe1c fix handling of network connectivity state management
+02a42e4 update translated strings
+628c9d8 update tor to 0.2.6.7
+906ec7f v15-beta-2 small fixes for VPN
+d6eb1dc fixes for network switching with VPN enabled
+f37b935 modifications to bridge setup strings
+
/** 15.0.0 Beta 1 / 3-Apr-2015 / 989d43aca7d999c413ba23ae4ebdcac72fb0f9c5 **/
6fd6a5a tune first-time experience (No more wizard!)
1
0

08 Apr '15
commit 40588786aabba77c8aac5b5d1590e6488502af48
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Wed Apr 8 11:26:03 2015 -0700
Revert public release TBB version to 4.0.6.
---
include/versions.wmi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/versions.wmi b/include/versions.wmi
index 4a26934..dd84254 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -19,10 +19,10 @@
<define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag>
<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag>
-<define-tag version-torbrowserbundledir whitespace=delete>4.0.7</define-tag>
+<define-tag version-torbrowserbundledir whitespace=delete>4.0.6</define-tag>
<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5a5</define-tag>
-<define-tag version-torbrowserbundle whitespace=delete>4.0.7</define-tag>
+<define-tag version-torbrowserbundle whitespace=delete>4.0.6</define-tag>
<define-tag version-torbrowserbundlebeta whitespace=delete>4.5a5</define-tag>
<define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag>
@@ -32,8 +32,8 @@
<define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
<define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag>
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.7</define-tag>
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.7</define-tag>
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.6</define-tag>
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.6</define-tag>
<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5a5</define-tag>
<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5a5</define-tag>
<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
@@ -41,7 +41,7 @@
<define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
-<define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.7</define-tag>
+<define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.6</define-tag>
<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag>
<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5a5</define-tag>
<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
1
0
commit 83a99998a98165df00d03d8a325a2d614c7ce1e4
Author: Harmony <harmony(a)torproject.org>
Date: Tue Apr 7 13:45:57 2015 +0000
Include updated manual text
---
C/about-tor-browser.page | 68 +++++++++++++
C/bridges.page | 163 +++++++++----------------------
C/circumvention.page | 69 +++++++++-----
C/first-time.page | 68 +++++++++++++
C/known-issues.page | 8 +-
C/managing-identities.page | 129 +++++++++++++++++++++++++
C/onionsites.page | 67 +++++++++++++
C/plugins.page | 70 ++++++++++++++
C/secure-connections.page | 118 +++++++++++++++++++++++
C/security-slider.page | 76 +++++++++++++++
C/tor.page | 228 --------------------------------------------
C/transports.page | 112 ++++++++++++++++++++++
C/troubleshooting.page | 101 ++++++++++++++++----
C/uninstalling.page | 18 ++--
C/updating.page | 73 ++++++++++++++
15 files changed, 966 insertions(+), 402 deletions(-)
diff --git a/C/about-tor-browser.page b/C/about-tor-browser.page
new file mode 100644
index 0000000..654eebe
--- /dev/null
+++ b/C/about-tor-browser.page
@@ -0,0 +1,68 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="about-tor-browser">
+
+ <info>
+ <link type="guide" xref="index" group="#first"/>
+ <desc>Learn what Tor Browser can do to protect your privacy and anonymity.</desc>
+ </info>
+
+ <title>About Tor Browser</title>
+
+ <p>
+ Tor Browser uses the Tor network to protect your privacy and
+ anonymity. Using the Tor network has two main properties:
+ </p>
+ <list>
+ <item>
+ <p>
+ Your internet activity, including the names and addresses of
+ the websites you visit, will be hidden from your Internet
+ service provider and from anyone watching your connection
+ locally.
+ </p>
+ </item>
+ <item>
+ <p>
+ The operators of the websites and services that you use, and
+ anyone watching them, will see a connection coming from the
+ Tor network instead of your real Internet (IP) address, and
+ will not know who you are unless you explicitly identify
+ yourself.
+ </p>
+ </item>
+ </list>
+ <p>
+ In addition, Tor Browser is designed to prevent websites from
+ “fingerprinting” or identifying you based on your browser
+ configuration.
+ </p>
+ <p>
+ By default, Tor Browser does not keep any browsing history.
+ Cookies are only valid for a single session (until Tor Browser
+ is exited or a <link xref='managing-identities#new-identity'>New
+ Identity</link> is requested).
+ </p>
+
+ <!-- XXX: ask Tor Browser team/mikeperry about things that are worth
+ adding here. -->
+
+ <section id="how-tor-works">
+ <title>How Tor works</title>
+
+ <p>
+ Tor is a network of virtual tunnels that allows you to improve your
+ privacy and security on the Internet. Tor works by sending your
+ traffic through three random servers (also known as <em>relays</em>)
+ in the Tor network. The last relay in the circuit (the “exit relay”)
+ then sends the traffic out onto the public Internet.
+ </p>
+ <media type="image" src="media/how-tor-works.png" />
+ <p>
+ The image above illustrates a user browsing to different websites
+ over Tor. The green monitors represent relays in the Tor network,
+ while the three keys represent the layers of encryption between the
+ user and each relay.
+ </p>
+ </section>
+</page>
diff --git a/C/bridges.page b/C/bridges.page
index 6c4cc57..96aeb16 100644
--- a/C/bridges.page
+++ b/C/bridges.page
@@ -1,151 +1,78 @@
-
<page xmlns="http://projectmallard.org/1.0/"
type="topic"
id="bridges">
<info>
- <desc>What bridges are and how to use them.</desc>
- <link type="guide" xref="index" />
+ <desc>Learn what bridges are and how to get them</desc>
+ <link type="topic" xref="circumvention" />
</info>
<title>Bridges</title>
<p>
-Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run
-by volunteers. Unlike relays, they are not listed publicly. Using bridges
-disguise the fact that one is using Tor.
+ Most <link xref='transports'>Pluggable Transports</link>, such as obfs3
+ and obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges
+ are run by volunteers; unlike ordinary relays, however, they are not listed
+ publicly, so an adversary cannot identify them easily. Using bridges in
+ combination with pluggable transports helps to disguise the fact that you
+ are using Tor.
</p>
<p>
-Currently there are five bridge types, or transports, available. More are
-being developed.
+Other pluggable transports, like meek and Flashproxy, use different
+anti-censorship techniques that do not rely on bridges. You do not need
+to obtain bridge addresses in order to use these transports.
</p>
-<table frame='all' rules='all'>
- <tr>
- <td>
- <p>
- ORPort
- </p>
- </td>
- <td>
- <p>
- Requesting 'bridges' without specifying the bridge type, will return
- ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT
- reliable for circumventing censorship or national firewalls. ORPort
- bridges can be useful as trusted entry points into the Tor network.
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <p>
- obfs2
- </p>
- </td>
- <td>
- <p>
- Censors have learned how to identify obfs2 bridges. This transport
- is being deprecated.
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <p>
- obfs3
- </p>
- </td>
- <td>
- <p>
- Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work
- almost everywhere. A few obfs3 bridges have been blocked.
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <p>
- Scramblesuit
- </p>
- </td>
- <td>
- <p>
- Scramblesuit is an additional tool for the obfsproxy transport.
- Scramblesuit bridges are designed to be hard to identify and hard to
- block.
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <p>
- FTE
- </p>
- </td>
- <td>
- <p>
- Format-Transforming Encryption disguises Tor traffic as web (HTTP)
- traffic or other types of internet traffic. FTE bridges are
- effective, but in limited supply.
- </p>
- </td>
- </tr>
-</table>
-<p>
-(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)
-</p>
+<section id="getting-bridges">
+ <title>Getting bridge addresses</title>
+ <p>
+ Because bridge addresses are not public, you will need to request them
+ yourself. You have three options:
+ </p>
-<p>
-There are four ways to get a bridge.
-</p>
-
-<steps>
- <item>
- <p>
- Visit <link href='https://bridges.torproject.org/'>https://bridges.torproject.org/</link> and follow the instructions.
- </p>
- </item>
+<list>
<item>
<p>
- Email bridges(a)bridges.torproject.org from a gmail or yahoo
- email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges
- or <cmd>transport=obfs3</cmd> for obfs3 bridges.
+ Visit <link href='https://bridges.torproject.org/'>https://bridges.torproject.org/</link>
+ and follow the instructions, or
</p>
</item>
<item>
<p>
- Politely ask a human at help(a)rt.torproject.org if you cannot access
- either of the first two methods.
+ Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email
+ address, or
</p>
</item>
<item>
<p>
- Install and configure a Tor instance to be bridge
- for yourself. The computer acting as a bridge must have uncensored internet
- access to the Tor network. A full installation guide can be found at
- <link href='https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en'>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>
+ Politely ask a human at help(a)rt.torproject.org if neither of the first
+ two methods works for you.
</p>
</item>
-</steps>
+</list>
+</section>
-<p>
-Enter the bridge information you get from any of the above steps in
-Tor-launcher.
-</p>
+<section id="entering-bridges">
+ <title>Entering bridge addresses</title>
+ <p>
+ Once you have obtained some bridge addresses, you will need to enter them
+ into Tor Launcher.
+ </p>
-<p>
-Choose yes when asked if your Internet Service Provider blocks connections to
-the Tor network. Select 'Use custom bridges' and enter each bridge identifier
-on its own line.
-</p>
+ <p>
+ Choose “yes” when asked if your Internet Service Provider blocks connections to
+ the Tor network. Select “Use custom bridges” and enter each bridge address
+ on a separate line.
+ </p>
-<media type="image" src="media/tor-launcher-custom-bridges_en-US.png" />
-
-<p>
-Click Connect. Using bridges slow down the connection. If the connection fails,
-the bridges you received may be down. Get more and try again.
-</p>
+ <media type="image" src="media/tor-launcher-custom-bridges_en-US.png" />
+ <p>
+ Click “Connect”. Using bridges may slow down the connection compared to
+ using ordinary Tor relays. If the connection fails, the bridges you
+ received may be down. Please use one of the above methods to obtain
+ more bridge addresses, and try again.
+ </p>
+</section>
</page>
-
diff --git a/C/circumvention.page b/C/circumvention.page
index 5fc1f03..de0ba04 100644
--- a/C/circumvention.page
+++ b/C/circumvention.page
@@ -1,4 +1,3 @@
-
<page xmlns="http://projectmallard.org/1.0/"
type="topic"
id="circumvention">
@@ -11,35 +10,61 @@
<title>Circumvention</title>
<p>
-Some firewalls can detect and block connections to Tor. The Tor Browser
-includes some circumvention tools for getting around blocking firewalls.
-These circumvention tools are called Pluggable Transports. To turn them on,
-click "Configure" in the Tor launcher window.
+Direct access to the Tor network may sometimes be blocked by your Internet
+Service Provider or by a government. Tor Browser includes some
+circumvention tools for getting around these blocks. These tools are called
+“pluggable transports”. See the <link xref='transports'>Pluggable
+Transports</link> page for more information on the types of transport
+that are currently available.
</p>
-<media type="image" src="media/tor-launcher-configure_en-US.png" />
+<section id="using-transports">
+<title>Using pluggable transports</title>
+<steps>
+ <item>
+ <p>
+ To use pluggable transports, click "Configure" in the Tor Launcher
+ window that appears when you first run Tor Browser.
+ </p>
-<p>
-Select yes when asked if your internet service provider blocks connections
-to Tor."
-</p>
+ <media type="image" src="media/tor-launcher-configure_en-US.png" />
-<media type="image" src="media/tor-launcher-wizard_en-US.png" />
+ <p>
+ You can also configure pluggable transports while Tor Browser is
+ running, by clicking on the Torbutton menu and selecting “Tor Network
+ Settings”.
+ </p>
-<p>
-Select "Connect with provided bridges". Tor Browser has three Pluggable
-Transports to choose from. If one fails to get you online, try selecting a
-different transport.
-</p>
+ <!-- XXX: insert screenshot of Torbutton menu -->
+ </item>
-<media type="image" src="media/tor-launcher-provided-bridges_en-US.png" />
+ <item>
+ <p>
+ Select “yes” when asked if your Internet Service Provider blocks
+ connections to the Tor network.
+ </p>
+
+ <media type="image" src="media/tor-launcher-wizard_en-US.png" />
+ </item>
+
+ <item>
+ <p>
+ Select “Connect with provided bridges”. Tor Browser currently has nine
+ pluggable transport options to choose from. If one fails to get you
+ online, try selecting a different transport.
+ </p>
+
+ <!-- XXX: Update this image -->
+ <media type="image" src="media/tor-launcher-provided-bridges_en-US.png" />
+ </item>
+</steps>
<p>
-If you try all three transports, and none of them get you online, select
-"Enter custom bridges", and enter bridges manually. Read the <link
-xref='bridges'>Getting Bridges</link> section for instructions on getting
-custom bridges.
+If you try all of these options, and none of them gets you online,
+you will need to enter bridge addresses manually. Read the <link
+xref='bridges'>Bridges</link> section to learn what bridges are and how
+to obtain them.
</p>
+</section>
</page>
-
diff --git a/C/first-time.page b/C/first-time.page
new file mode 100644
index 0000000..095380b
--- /dev/null
+++ b/C/first-time.page
@@ -0,0 +1,68 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="first-time">
+
+ <info>
+ <link type="guide" xref="index" group="#first" />
+ <desc>Learn how to use Tor Browser for the first time</desc>
+ </info>
+
+ <title>Running Tor Browser for the First Time</title>
+
+ <p>
+ When you run Tor Browser for the first time, you will see the Tor
+ Launcher window. This offers you the option to connect directly to the
+ Tor network, or to configure Tor Browser for your connection.
+ </p>
+
+ <section id="connect">
+ <title>Connect</title>
+ <p>
+ In most cases, this option will allow you to connect to the Tor network
+ without any further configuration. Once clicked, a status bar will
+ appear, showing Tor’s connection progress. If you are on a relatively
+ fast connection, but this bar seems to get stuck at a certain point,
+ see the <link xref='troubleshooting'>Troubleshooting</link> page for
+ help solving the problem.
+ </p>
+ </section>
+ <section id="configure">
+ <title>Configure</title>
+ <p>
+ If you know that your connection is censored, or uses a proxy, you should
+ select this option. Tor Launcher will take you through a series of
+ configuration options.
+ </p>
+ <steps>
+ <item>
+ <p>
+ The first screen asks if access to the Tor network is blocked or
+ censored on your connection. If you do not believe this is the case,
+ select “No”. If you know your connection is censored, or you have
+ tried and failed to connect to the Tor network and no other solutions
+ have worked, select “Yes”. You will then be taken to the <link
+ xref='circumvention'>Circumvention</link> screen to configure
+ a pluggable transport.
+ </p>
+ </item>
+ <item>
+ <p>
+ The next screen asks if your connection uses a proxy. In most cases,
+ this is not necessary. You will usually know if you need to answer
+ “Yes”, as the same settings will be used for other browsers on your
+ system. If possible, ask your network administrator for guidance. If
+ your connection does not use a proxy, answer “No”.
+ </p>
+ </item>
+ <item>
+ <p>
+ The final screen asks if your connection is behind a firewall that
+ only allows certain ports. If the answer is “Yes”, enter all the
+ allowed ports, separated by a comma but no spaces. If the answer is
+ “No”, click “Connect”.
+ </p>
+ </item>
+ </steps>
+ </section>
+
+</page>
diff --git a/C/known-issues.page b/C/known-issues.page
index 327b8be..d4b87b8 100644
--- a/C/known-issues.page
+++ b/C/known-issues.page
@@ -1,11 +1,10 @@
-
<page xmlns="http://projectmallard.org/1.0/"
type="topic"
id="known-issues">
<info>
<desc>A list of known issues.</desc>
- <link type="guide" xref="index" group="#last" />
+ <link type="topic" xref="troubleshooting" />
</info>
<title>Known Issues</title>
@@ -67,9 +66,4 @@
</p>
</item>
</list>
-<p>
-If you have an issue with Tor Browser that isn't on this list, feel free to
-email help(a)rt.torproject.org.
-</p>
</page>
-
diff --git a/C/managing-identities.page b/C/managing-identities.page
new file mode 100644
index 0000000..eb86ed6
--- /dev/null
+++ b/C/managing-identities.page
@@ -0,0 +1,129 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="managing-identities">
+
+<info>
+ <desc>Learn how to control personally-identifying information in Tor Browser</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Managing Identities</title>
+
+<p>
+When you connect to a website, it is not only the operators
+of that website who can record information about your visit. Most
+websites now use numerous third-party services, including social networking
+“Like” buttons, analytics trackers, and advertising beacons, all of which
+can link your activity across different sites.
+</p>
+
+<p>
+Using the Tor network stops observers from being able to
+discover your exact location and IP address, but even without this
+information they might be able to link different areas of
+your activity together. For this reason, Tor Browser includes some additional
+features that help you control what information can be tied to your identity.
+</p>
+
+<section id="url-bar">
+<title>The URL bar</title>
+<p>
+Tor Browser centers your web experience around your relationship with
+the website in the URL bar. Even if you connect to two different sites
+that use the same third-party tracking service, Tor Browser will force
+the content to be served over two different Tor circuits, so the tracker will
+not know that both connections originate from your browser.
+</p>
+
+<p>
+On the other hand, all connections to a single website address will be
+made over the same Tor circuit, meaning you can browse different pages
+of a single website in separate tabs or windows, without any loss of
+functionality.
+</p>
+</section>
+
+<section id="logins">
+<title>Logging in over Tor</title>
+<p>
+Although Tor Browser is designed to enable total user anonymity on the web,
+there may be situations in which it makes sense to use Tor with websites
+that require usernames, passwords, or other identifying information.
+</p>
+
+<p>
+If you log into a website using a regular browser, you also reveal your
+IP address and geographical location in the process. The same is often
+true when you send an email. Logging into your social networking or
+email accounts using Tor Browser allows you to choose exactly which
+information you reveal to the websites you browse. Logging in using Tor
+Browser is also useful if the website you are trying to reach is
+censored on your network.
+</p>
+
+<p>
+When you log in to a website over Tor, there are several points you
+should bear in mind:
+</p>
+
+<list>
+ <item>
+ <p>
+ See the <link
+ xref='secure-connections'>Secure Connections</link> page
+ for important information on how to secure your connection when
+ logging in.
+ </p>
+ </item>
+ <item>
+ <p>
+ Tor Browser often makes your connection appear as though it is coming
+ from an entirely different part of the world. Some websites, such as
+ banks or email providers, might interpret this as a sign that your
+ account has been hacked or compromised, and lock you out. The only
+ way to resolve this is by following the site’s recommended procedure
+ for account recovery, or contacting the operators and explaining the
+ situation.
+ </p>
+ </item>
+</list>
+</section>
+
+<section id="new-identity">
+<title>Changing identities and circuits</title>
+<p>
+Tor Browser features “New Identity” and “New Tor Circuit for this Site”
+options, located in the Torbutton menu.
+</p>
+
+<terms>
+ <item>
+ <title>New Identity</title>
+ <p>
+ This option is useful if you want to prevent your subsequent browser
+ activity from being linkable to what you
+ were doing before. Selecting it will close all your open tabs and
+ windows, clear all private information such as cookies and browsing
+ history, and use new Tor circuits for all connections. Make sure you
+ have completely finished all activity and downloads before clicking
+ “New Identity”, as you will not be able to resume them in the new
+ browser window without starting all over again.
+ </p>
+ </item>
+ <item>
+ <title>New Tor Circuit for this Site</title>
+ <p>
+ This option is useful if the <link
+ xref='about-tor-browser#how-tor-works'>exit relay</link> you are
+ using is unable to connect to the website you require, or is not
+ loading it properly. Selecting it will cause the currently-active
+ tab or window to be reloaded over a new Tor circuit. Other open tabs
+ and windows from the same website will use the new circuit as well
+ once they are reloaded. This option does not clear any private
+ information or unlink your activity, nor does it affect your current
+ connections to other websites.
+ </p>
+ </item>
+ </terms>
+</section>
+</page>
diff --git a/C/onionsites.page b/C/onionsites.page
new file mode 100644
index 0000000..809f099
--- /dev/null
+++ b/C/onionsites.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="onionsites">
+
+<info>
+ <desc>Websites hosted in the Tor network</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Onionsites</title>
+<p>
+Onionsites (also known as “hidden services”) are websites that are only
+accessible through the Tor network.
+</p>
+
+<p>
+Onionsites offer several advantages over ordinary sites on the
+non-private web:
+</p>
+
+<list>
+ <item>
+ <p>
+ An onionsite’s location and IP address are hidden, making it difficult
+ for adversaries to censor it or identify its operators.
+ </p>
+ </item>
+ <item>
+ <p>
+ All traffic between Tor users and onionsites is end-to-end encrypted,
+ so you do not need to worry about <link
+ xref='secure-connections'>connecting over HTTPS</link>.
+ </p>
+ </item>
+ <item>
+ <p>
+ The address of an onionsite is automatically generated, so the
+ operators do not need to purchase a domain name; the .onion URL also
+ helps Tor ensure that it is connecting to the right location and that
+ the connection is not being tampered with.
+ </p>
+ </item>
+</list>
+
+<section id="access">
+<title>How to access an onionsite</title>
+<p>
+Just like any other website, you will need to know the address of an
+onionsite in order to connect to it. An onion address is a string of
+sixteen mostly random letters and numbers, followed by “.onion”.
+</p>
+</section>
+
+<section id="troubleshooting">
+<title>Troubleshooting</title>
+<p>
+If you cannot reach the onionsite you require, make sure that you have
+entered the 16-character onion address correctly: even a small mistake
+will stop Tor Browser from being able to reach the site.
+</p>
+<p>
+If you are still unable to connect to the onionsite, please try again
+later. There may be a temporary connection issue, or the site operators
+may have allowed it to go offline without warning.
+</p>
+</section>
+</page>
diff --git a/C/plugins.page b/C/plugins.page
new file mode 100644
index 0000000..9d7e9c2
--- /dev/null
+++ b/C/plugins.page
@@ -0,0 +1,70 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="plugins">
+
+<info>
+ <desc>How Tor Browser handles browser plugins and add-ons</desc>
+ <link type="guide" xref="index" group="#last" />
+</info>
+
+<title>Flash, JavaScript, and other add-ons</title>
+
+<section id="flash">
+<title>Flash Player</title>
+ <p>
+ Video websites, such as YouTube and Vimeo, make use of the
+ Flash Player plugin to display video content. Unfortunately, this
+ software operates independently of Tor Browser and cannot easily be
+ made to obey Tor Browser’s proxy settings. It can therefore reveal your
+ real location and IP address to the website operators, or to an outside
+ observer. For this reason, Flash is disabled by default in Tor Browser,
+ and enabling it is not recommended.
+ </p>
+ <p>
+ Some video websites offer alternative video delivery methods that do
+ not use Flash. These methods may be compatible with Tor Browser.
+ </p>
+</section>
+
+<section id="javascript">
+<title>JavaScript</title>
+<p>
+JavaScript is a programming language that websites use to offer
+interactive elements such as video, animation, audio, and status
+timelines. Unfortunately, JavaScript can also enable attacks on the
+security of the browser, which might lead to deanonymization.
+</p>
+
+<p>
+Tor Browser includes an add-on called NoScript, accessed through the
+“S” icon at the top-left of the window, which allows you to control the
+JavaScript that runs on individual web pages, or to block it entirely.
+</p>
+
+<p>
+Users who require a high degree of security in their web browsing should
+select “Forbid Scripts Globally” from the NoScript drop-down menu. This
+setting is also activated by default when Tor Browser’s <link
+xref='security-slider'>Security Slider</link> is set to “Medium-High”
+(for non-HTTPS websites) or “High” (for all websites). However, disabling
+JavaScript will prevent many websites from displaying correctly, so Tor
+Browser’s default setting is to allow all websites to run scripts.
+</p>
+</section>
+
+<section id="add-ons">
+<title>Browser Add-ons</title>
+<p>
+Tor Browser is based on Firefox, and any browser add-ons or themes that
+are compatible with Firefox can also be installed in Tor Browser.
+</p>
+
+<p>
+However, the only add-ons that have been tested for use with Tor Browser
+are those included by default. Installing any other browser
+add-ons may break functionality in Tor Browser or cause more serious
+problems that affect your privacy and security, and is done at your own
+risk.
+</p>
+</section>
+</page>
diff --git a/C/secure-connections.page b/C/secure-connections.page
new file mode 100644
index 0000000..bc95244
--- /dev/null
+++ b/C/secure-connections.page
@@ -0,0 +1,118 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:its="http://www.w3.org/2005/11/its"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ type="topic"
+ id="secure-connections">
+
+ <info>
+ <desc>Learn how to protect your data using Tor Browser and HTTPS</desc>
+ <link type="guide" xref="index" />
+ </info>
+
+ <title>Secure Connections</title>
+
+ <p>
+ If personal information such as a login password travels
+ unencrypted over the Internet, it can very easily be intercepted by an
+ eavesdropper. If you are logging into any website, you should
+ make sure that the site offers HTTPS encryption, which protects against
+ this kind of eavesdropping. You can verify this in the URL bar: if your
+ connection is encrypted, the address will begin with “https://”, rather
+ than “http://”.
+ </p>
+
+ <p>
+ The following visualization shows what information is visible to
+ eavesdroppers with and without Tor Browser and HTTPS encryption:
+ </p>
+
+ <xi:include href="media/tor-and-https.svg" />
+
+ <list>
+ <item>
+ <p>
+ Click the “Tor” button to see what data is visible to
+ observers when you're using Tor. The button will turn green to
+ indicate that Tor is on.
+ </p>
+ </item>
+ <item>
+ <p>
+ Click the “HTTPS” button to see what data is visible to
+ observers when you're using HTTPS. The button will turn green to
+ indicate that HTTPS is on.
+ </p>
+ </item>
+ <item>
+ <p>
+ When both buttons are green, you see the data that is visible to
+ observers when you are using both tools.
+ </p>
+ </item>
+ <item>
+ <p>
+ When both buttons are grey, you see the data that is visible
+ to observers when you don't use either tool.
+ </p>
+ </item>
+ </list>
+ <terms>
+ <title>Potentially visible data</title>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-site']/text())">
+ <xi:fallback>site.com</xi:fallback>
+ </xi:include>
+ </title>
+ <p>
+ The site being visited.
+ </p>
+ </item>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-login']/text())">
+ <xi:fallback>user / pw</xi:fallback>
+ </xi:include>
+ </title>
+ <p>
+ Username and password used for authentication.
+ </p>
+ </item>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-data']/text())">
+ <xi:fallback>data</xi:fallback>-->
+ </xi:include>
+ </title>
+ <p>
+ Data being transmitted.
+ </p>
+ </item>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-location']/text())">
+ <xi:fallback>location</xi:fallback>
+ </xi:include>
+ </title>
+ <p>
+ Network location of the computer used to visit the website (the public
+ IP address).
+ </p>
+ </item>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-tor']/text())">
+ <xi:fallback>Tor</xi:fallback>
+ </xi:include>
+ </title>
+ <p>
+ Whether or not Tor is being used.
+ </p>
+ </item>
+ </terms>
+</page>
diff --git a/C/security-slider.page b/C/security-slider.page
new file mode 100644
index 0000000..17abe9d
--- /dev/null
+++ b/C/security-slider.page
@@ -0,0 +1,76 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="security-slider">
+
+<info>
+ <desc>Configuring Tor Browser for security and usability</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Security Slider</title>
+<p>
+Tor Browser includes a “Security Slider” that lets you
+increase your security by disabling certain web features that can be
+used to attack your security and anonymity. Increasing Tor Browser’s
+security level will stop some web pages from functioning properly, so
+you should weigh your security needs against the degree of usability
+you require.
+</p>
+
+<section id="access">
+<title>Accessing the Security Slider</title>
+<p>
+The Security Slider is located in Torbutton’s “Privacy and Security
+Settings” menu.
+</p>
+</section>
+
+<section id="levels">
+<title>Security Levels</title>
+<p>
+Increasing the level of the Security Slider will disable or partially
+disable certain browser features to protect against possible attacks.
+</p>
+
+<terms>
+ <item>
+ <title>Low</title>
+ <p>
+ At this level, all browser features are enabled. This is the most
+ usable option.
+ </p>
+ </item>
+ <item>
+ <title>Medium-Low</title>
+ <p>
+ At this level, HTML5 video and audio media become click-to-play via
+ NoScript; some <link xref='plugins'>JavaScript</link> performance
+ optimizations are disabled, causing some websites to run more slowly;
+ and some mathematical equations may not display properly.
+ </p>
+ </item>
+ <item>
+ <title>Medium-High</title>
+ <p>
+ At this level, HTML5 video and audio media become click-to-play via
+ NoScript; all JavaScript performance optimizations are disabled; some
+ mathematical equations may not display properly; some font rendering
+ features are disabled; some types of image are disabled; and
+ JavaScript is disabled by default on all non-<link
+ xref='secure-connections'>HTTPS</link> sites.
+ </p>
+ </item>
+ <item>
+ <title>High</title>
+ <p>
+ At this level, HTML5 video and audio media become click-to-play via
+ NoScript; all JavaScript performance optimizations are disabled; some
+ mathematical equations may not display properly; some font rendering
+ features are disabled; some types of image are disabled; Javascript
+ is disabled by default on all sites; most video and audio formats are
+ disabled; and some fonts and icons may not display correctly.
+ </p>
+ </item>
+</terms>
+</section>
+</page>
diff --git a/C/tor.page b/C/tor.page
deleted file mode 100644
index 2e86158..0000000
--- a/C/tor.page
+++ /dev/null
@@ -1,228 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
- xmlns:its="http://www.w3.org/2005/11/its"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- type="topic"
- id="tor">
-
- <info>
- <link type="guide" xref="index" group="#first"/>
- <desc>Learn what Tor can do to protect your privacy and anonymity.</desc>
- </info>
-
- <title>Tor</title>
-
- <section id="what-tor-will-do">
- <title>What Tor will do</title>
-
- <p>
- The <app its:translate="no">Tor Browser</app> uses the <app
- its:translate="no">Tor</app> network to protect your privacy
- and anonymity. Using the <app its:translate="no">Tor</app> network has two
- main properties:
- </p>
-
- <list>
- <item>
- <p>
- The Internet access provider will not be able to learn the sites
- being visited and will not be able to monitor the content of
- the communication.
- </p>
- </item>
- <item>
- <p>
- The sites will see a connection coming from the <app
- its:translate="no">Tor</app> network and will not learn
- the actual Internet connection used to visit them.
- </p>
- </item>
- </list>
-
- <p>
- On top of that, the <app its:translate="no">Tor Browser</app> is designed
- to minimize the ability of websites to fingerprint the browser.
- </p>
- <p>
- The Tor Browser does not keep any browsing history. <em>Cookies</em>
- are only valid for a single session: until the <app its:translate="no">Tor
- Browser</app> is exited or a <!-- XXX: add link --><gui>New Identity</gui>
- is requested.
- </p>
-
- <!-- XXX: add Tor Browser team/mikeperry about things that are worth
- adding here. -->
- </section>
-
- <section id="what-tor-will-not-do">
- <title>What Tor will <em>not</em> do</title>
-
- <p>
- <app its:translate="no">Tor</app> and the <app its:translate="no">Tor
- Browser</app> will protect your privacy and anonymity only if used
- appropriately.
- </p>
-
- <list>
- <item>
- <p>
- <app its:translate="no">Tor</app> will not encrypt the whole
- communication. What is sent to the <app its:translate="no">Tor</app>
- network is what leaves the <app its:translate="no">Tor</app> network.
- For web browsing, this means that any confidential information
- should be sent using the HTTPS protocol.
- <!-- XXX: add a link to another topic page / document HTTPS Everywhere
- -->
- <!-- XXX: mention hidden services? -->
- </p>
- </item>
- <item>
- <p>
- If you give a website identifying information (e.g. a name, a
- <em>login</em>), you will no longer be an anonymous visitor of this
- website.
- </p>
- </item>
- <item>
- <p>
- If you transfer files, they can contain identifying information in their
- metadata, like the camera serial number.
- </p>
- </item>
- <item>
- <p>
- Only connections made through the <app its:translate="no">Tor
- Browser</app> will go through the <app its:translate="no">Tor</app>
- network. Unless specific steps are taken, other applications on your
- computer will continue to do direct Internet connections and can
- reveal your location.
- <!-- XXX: add topic page on how to deal with external documents? /
- mention Tails? -->
- </p>
- </item>
- </list>
-
- <p>
- If loosing control over some information might have problematic
- consequences, it is sometimes better to leave it off computers entirely.
- </p>
- </section>
-
- <section id="how-tor-works">
- <title>How Tor works</title>
-
- <p>
- Tor is a network of virtual tunnels that allows you to improve your
- privacy and security on the Internet. Tor works by sending your
- traffic through three random servers (also known as <em>relays</em>)
- in the Tor network, before the traffic is sent out onto the public
- Internet
- </p>
- <media type="image" src="media/how-tor-works.png" />
- <p>
- The image above illustrates a user browsing to different websites
- over Tor. The green monitors represent relays in the Tor network,
- while the three keys represent the layers of encryption between the
- user and each relay.
- </p>
- </section>
-
- <section id="tor-and-https">
- <title>Tor and HTTPS</title>
-
- <p>
- The following visualization helps understanding what data are visible to
- eavesdroppers with or without the <app its:translate="no">Tor Browser</app>
- and when encrypted connections (HTTPS) or not:
- </p>
-
- <xi:include href="media/tor-and-https.svg" />
-
- <list>
- <item>
- <p>
- Click the <gui>Tor</gui> button to see what data is visible to
- eavesdroppers when you're using Tor. The button will turn green to
- indicate that Tor is on.
- </p>
- </item>
- <item>
- <p>
- Click the <gui>HTTPS</gui> button to see what data is visible to
- eavesdroppers when you're using HTTPS. The button will turn green to
- indicate that HTTPS is on.
- </p>
- </item>
- <item>
- <p>
- When both buttons are green, you see the data that is visible to
- eavesdroppers when you are using both tools.
- </p>
- </item>
- <item>
- <p>
- When both buttons are grey, you see the data that is visible
- to eavesdroppers when you don't use either tool.
- </p>
- </item>
- </list>
- <terms>
- <title>Potentially visible data</title>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-site']/text())">
- <xi:fallback>site.com</xi:fallback>
- </xi:include>
- </title>
- <p>
- The site being visited.
- </p>
- </item>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-login']/text())">
- <xi:fallback>user / pw</xi:fallback>
- </xi:include>
- </title>
- <p>
- Username and password used for authentication.
- </p>
- </item>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-data']/text())">
- <xi:fallback>data</xi:fallback>-->
- </xi:include>
- </title>
- <p>
- Data being transmited.
- </p>
- </item>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-location']/text())">
- <xi:fallback>location</xi:fallback>
- </xi:include>
- </title>
- <p>
- Network location of the computer used to visit the website (the public
- IP address).
- </p>
- </item>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-tor']/text())">
- <xi:fallback>Tor</xi:fallback>
- </xi:include>
- </title>
- <p>
- Whether or not Tor is being used.
- </p>
- </item>
- </terms>
- </section>
-</page>
diff --git a/C/transports.page b/C/transports.page
new file mode 100644
index 0000000..03dc89b
--- /dev/null
+++ b/C/transports.page
@@ -0,0 +1,112 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="transports">
+
+<info>
+ <desc>Types of pluggable transport</desc>
+ <link type="topic" xref="circumvention" />
+</info>
+
+<title>Pluggable Transports</title>
+
+<p>
+Pluggable transports are tools that Tor can use to disguise the
+traffic it sends out. This can be useful in situations where an Internet
+Service Provider or other authority is actively blocking connections to
+the Tor network.
+</p>
+
+<section id="types">
+<title>Types of pluggable transport</title>
+<p>
+Currently there are six pluggable transports available, but more are
+being developed.
+</p>
+<table frame='all' rules='all'>
+ <tr>
+ <td>
+ <p>
+ obfs2
+ </p>
+ </td>
+ <td>
+ <p>
+ Censors have learned how to identify obfs2 bridges. This transport
+ is deprecated, and you should not use it.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ obfs3
+ </p>
+ </td>
+ <td>
+ <p>
+ obfs3 disguises Tor traffic as random noise. obfs3 bridges work
+ almost everywhere, though some may have been identified and
+ blocked by censors.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ Scramblesuit
+ </p>
+ </td>
+ <td>
+ <p>
+ Scramblesuit is an additional tool for the obfs3 transport that
+ tries to stop censors from identifying bridges through active
+ probing.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ obfs4
+ </p>
+ </td>
+ <td>
+ <p>
+ obfs4 offers the same features as Scramblesuit, but uses different
+ cryptographic and authentication methods that result in improved
+ speed.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ meek
+ </p>
+ </td>
+ <td>
+ <p>
+ Rather than using bridges, meek works by making your Tor traffic
+ seem as though it is destined for a major website that a censor
+ cannot block without disrupting a lot of other activity on the
+ network.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ FTE
+ </p>
+ </td>
+ <td>
+ <p>
+ Format-Transforming Encryption disguises Tor traffic as web (HTTP)
+ traffic or other types of internet traffic. FTE bridges are
+ effective, but in limited supply.
+ </p>
+ </td>
+ </tr>
+</table>
+</section>
+</page>
diff --git a/C/troubleshooting.page b/C/troubleshooting.page
index d1cda52..952a0a5 100644
--- a/C/troubleshooting.page
+++ b/C/troubleshooting.page
@@ -1,54 +1,119 @@
-
<page xmlns="http://projectmallard.org/1.0/"
type="topic"
id="troubleshooting">
<info>
- <desc>What to do if Tor Browser doesn't work.</desc>
+ <desc>What to do if Tor Browser doesn’t work.</desc>
<link type="guide" xref="index" group="#last" />
</info>
<title>Troubleshooting</title>
<p>
-The Tor Browser should get you online automatically after clicking the
-"Connect" button on the start up screen.
+You should be able to start browsing the web using Tor Browser shortly
+after running the program, and clicking the “Connect” button if you are
+using it for the first time.
</p>
<media type="image" src="media/tor-launcher-connect_en-US.png" />
+<section id="no-connection">
+<title>Quick fixes</title>
<p>
-If it doesn't connect, there may be a simple fix. Try each of the following:
+If Tor Browser doesn’t connect, there may be a simple solution. Try each
+of the following:
</p>
<list>
<item>
- <p>Make sure another Tor Browser is not already running. If you're
- not sure if Tor Browser is running, restart your computer.</p>
+ <p>
+ Your computer’s system clock must be set correctly, or Tor will not
+ be able to connect.
+ </p>
+ </item>
+ <item>
+ <p>
+ Make sure another Tor Browser is not already running. If you’re
+ not sure if Tor Browser is running, restart your computer.
+ </p>
</item>
<item>
- <p>'Allow' Tor in your antivirus program.</p>
+ <p>
+ Make sure that any antivirus program you have installed is not
+ preventing Tor from running. You may need to consult the
+ documentation for your antivirus software if you do not know how to
+ do this.
+ </p>
</item>
<item>
- <p>Temporarily disable your firewall.</p>
+ <p>
+ Temporarily disable your firewall.
+ </p>
</item>
<item>
- <p>Delete Tor Browser and install it again. If updating, do not overwrite
- your previous Tor Browser files.</p>
+ <p>
+ Delete Tor Browser and install it again. If updating, do not just
+ overwrite your previous Tor Browser files; ensure they are fully
+ deleted beforehand.
+ </p>
</item>
</list>
+</section>
+<section id="blocked">
+<title>Is your connection censored?</title>
<p>
-If you still can't connect, your internet service provider might be censoring
-connections to Tor. Follow the instructions in the <link
-xref='circumvention'>Circumvention</link> section.
+If you still can’t connect, your Internet Service Provider might be
+censoring connections to the Tor network. Read the <link
+xref='circumvention'>Circumvention</link> section for possible
+solutions.
</p>
+</section>
+<section id="known-issues">
+<title>Known issues</title>
<p>
-If the above steps do not address your problem, email help(a)rt.torproject.org
-with your operating system, the details of your problem, and what you've
-already tried.
+Tor Browser is under constant development, and some issues are known
+about but not yet fixed. Please check the <link
+xref='known-issues'>Known Issues</link> page to see if the problem you
+are experiencing is already listed there.
</p>
+</section>
-</page>
+<section id="helpdesk">
+<title>Contacting the Tor Help Desk</title>
+<p>
+If the above steps do not help you solve the problem, you can contact
+Tor’s help desk. Send an email to help(a)rt.torproject.org with exact
+details of the problem, your operating system, and the steps you have
+already tried. Please only contact the help desk if you cannot find the
+answer to your question in this manual.
+</p>
+
+<p>
+If possible, you should also include the “Tor log”, an
+automatically-generated list of Tor’s activity that can help diagnose
+the problem. To copy the Tor log, either:
+</p>
+<list>
+ <item>
+ <p>
+ click the button labelled “Copy Tor Log To Clipboard” that appears in
+ the dialog window while Tor Browser is connecting to the network, or
+ </p>
+ </item>
+ <item>
+ <p>
+ if Tor Browser is already open, click on the Torbutton icon (the small
+ green onion at the top left of the screen), then “Open Network
+ Settings”, then “Copy Tor Log To Clipboard”.
+ </p>
+ </item>
+</list>
+<p>
+You can now paste the Tor log into your support request.
+</p>
+<!-- XXX: Include a screenshot of this -->
+</section>
+</page>
diff --git a/C/uninstalling.page b/C/uninstalling.page
index 5c8ca62..4deef86 100644
--- a/C/uninstalling.page
+++ b/C/uninstalling.page
@@ -1,29 +1,29 @@
-
<page xmlns="http://projectmallard.org/1.0/"
type="topic"
id="uninstalling">
<info>
<desc>How to remove Tor Browser from your system.</desc>
- <link type="guide" xref="index"/>
+ <link type="guide" xref="index" group="#last" />
</info>
<title>Uninstalling</title>
<p>
-The Tor Browser does not affect any of the existing software
-or settings on your computer. Uninstalling Tor Browser will not affect your
-system's software or settings either.
+Tor Browser does not affect any of the existing software or settings on
+your computer. Uninstalling Tor Browser will not affect your system’s
+software or settings.
</p>
<p>
-Removing the Tor Browser from your system is simple:
+Removing Tor Browser from your system is simple:
</p>
<steps>
<item>
<p>Locate your Tor Browser folder. The default location is your Desktop.</p>
- </item>
+ <!-- is that true? -->
+ </item>
<item>
<p>Delete the Tor Browser folder.</p>
</item>
@@ -33,8 +33,8 @@ Removing the Tor Browser from your system is simple:
</steps>
<p>
-Note that your operating system's standard "Uninstall" utility is not used.
+Note that your operating system’s standard “Uninstall” utility is not
+used.
</p>
</page>
-
diff --git a/C/updating.page b/C/updating.page
new file mode 100644
index 0000000..1298893
--- /dev/null
+++ b/C/updating.page
@@ -0,0 +1,73 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="updating">
+
+<info>
+ <desc>How to update Tor Browser</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Updating</title>
+
+<p>
+Tor Browser must be kept updated at all times. If you continue to use an
+outdated version of the software, you may be vulnerable to serious
+security flaws that compromise your privacy and anonymity.
+</p>
+
+<p>
+Tor Browser will prompt you to update the software once a new version
+has been released: the Torbutton icon will display a yellow triangle,
+and you may see a written update indicator when Tor Browser opens. You
+can update either automatically or manually.
+</p>
+
+<!-- XXX: Screenshot of update warning, plus screenshots for all the steps below -->
+
+<section id="automatic">
+<title>Updating Tor Browser automatically</title>
+<steps>
+ <item>
+ <p>
+ When you are prompted to update Tor Browser, click on the Torbutton
+ icon, then select “Check for Tor Browser Update”.
+ </p>
+ </item>
+ <item>
+ <p>
+ When Tor Browser has finished checking for updates, click on the
+ “Update” button and wait for the update to download and install.
+ </p>
+ </item>
+ <item>
+ <p>
+ Restart Tor Browser. You will now be running the latest version.
+ </p>
+ </item>
+</steps>
+</section>
+<section id="manual">
+<title>Updating Tor Browser manually</title>
+<steps>
+ <item>
+ <p>
+ When you are prompted to update Tor Browser, finish the browsing
+ session and close the program.
+ </p>
+ </item>
+ <item>
+ <p>
+ Remove Tor Browser from your system by deleting the folder that
+ contains it (see the <link xref='uninstalling'>Uninstalling</link>
+ section for more information).
+ </p>
+ </item>
+ <item>
+ <p>
+ Visit https://www.torproject.org and download a copy of the latest Tor
+ Browser release, then install it as before.
+ </p>
+ </item>
+</steps>
+</section>
+</page>
1
0

[tor-browser-bundle/maint-4.0] 4.0.8 will be incremental from 4.0.6 only, since 4.0.7 thinks its 4.0.6.
by mikeperry@torproject.org 08 Apr '15
by mikeperry@torproject.org 08 Apr '15
08 Apr '15
commit d4e10e98af5237ed21796a4d48c3e09db6994959
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Wed Apr 8 11:27:06 2015 -0700
4.0.8 will be incremental from 4.0.6 only, since 4.0.7 thinks its 4.0.6.
---
tools/update-responses/config.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 7d5c391..3470616 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -6,13 +6,13 @@ build_targets:
osx32: Darwin_x86-gcc3
osx64: Darwin_x86_64-gcc3
channels:
- release: 4.0.7
+ release: 4.0.8
alpha: 4.5-alpha-2
versions:
- 4.0.7:
+ 4.0.8:
platformVersion: 31.6.0
detailsURL: https://www.torproject.org/projects/torbrowser.html.en
- download_url: https://www.torproject.org/dist/torbrowser/4.0.7
+ download_url: https://www.torproject.org/dist/torbrowser/4.0.8
incremental_from:
- 4.0.6
4.5-alpha-2:
1
0

[tor-browser-bundle/maint-4.0] Update changelog and versions for 4.0.8.
by mikeperry@torproject.org 08 Apr '15
by mikeperry@torproject.org 08 Apr '15
08 Apr '15
commit 41f93db41d60f7ecc036e9916c9af1dbcda7c7d5
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Wed Apr 8 11:18:31 2015 -0700
Update changelog and versions for 4.0.8.
---
Bundle-Data/Docs/ChangeLog.txt | 4 ++++
gitian/versions | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index c0630a0..9df5a76 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tor Browser 4.0.8 -- Apr 10 2015
+ * All Platforms
+ * Bug 15637: Fix update loop
+
Tor Browser 4.0.7 -- Apr 9 2015
* All Platforms
* Update Tor to 0.2.5.12
diff --git a/gitian/versions b/gitian/versions
index 121fc41..78e5414 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -1,4 +1,4 @@
-TORBROWSER_VERSION=4.0.7
+TORBROWSER_VERSION=4.0.8
BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
BUILD_PT_BUNDLES=1
1
0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation@torproject.org 08 Apr '15
by translation@torproject.org 08 Apr '15
08 Apr '15
commit ac228ee829a41c734666f878635177f90e173e3d
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 8 17:45:15 2015 +0000
Update translations for torcheck_completed
---
eu/torcheck.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eu/torcheck.po b/eu/torcheck.po
index 34eb30e..146538a 100644
--- a/eu/torcheck.po
+++ b/eu/torcheck.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-04-08 15:09+0000\n"
+"PO-Revision-Date: 2015-04-08 17:18+0000\n"
"Last-Translator: Antxon Baldarra <baldarra(a)bitmessage.ch>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n"
"MIME-Version: 1.0\n"
1
0
commit c759ed2c62f27a490dc78a07e62d87705dd785a9
Author: Roger Dingledine <arma(a)torproject.org>
Date: Wed Apr 8 13:44:56 2015 -0400
update url in HACKING file
---
doc/HACKING | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/HACKING b/doc/HACKING
index 2cf9f3a..c74e293 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -374,7 +374,7 @@ do your own profiling to determine otherwise.
Log conventions
~~~~~~~~~~~~~~~
-https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ#loglevel
+https://www.torproject.org/docs/faq#LogLevel
No error or warning messages should be expected during normal OR or OP
operation.
1
0