- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Checkout tor-browser-builder-3 during fetch-input.sh
by mikeperry＠torproject.org 27 May '14

27 May '14

commit a9233e60ea2f8b80c42998800cc9e7324a7dfc5d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 27 08:40:24 2014 -0700 Checkout tor-browser-builder-3 during fetch-input.sh This may have been causing issues with the nightlies. --- gitian/fetch-inputs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 77356d7..0eceaf7 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -289,8 +289,8 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout tor-browser-builder-2 -git merge origin/tor-browser-builder-2 +git checkout tor-browser-builder-3 +git merge origin/tor-browser-builder-3 cd inputs while read dir url tag; do

1 0

[tor-launcher/master] Bug #10425: geoip6 file is missing in TBB.
by brade＠torproject.org 27 May '14

27 May '14

commit 22ab705efb3fa112ad0e94d3792e23a508c71ace Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 27 11:27:25 2014 -0400 Bug #10425: geoip6 file is missing in TBB. When starting tor, pass the geoip6 file location (within the tor data dir) via the GeoIPv6File command line config option. --- src/components/tl-process.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 2efea99..4316a76 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -318,6 +318,9 @@ TorProcessService.prototype = var geoipFile = dataDir.clone(); geoipFile.append("geoip"); + var geoip6File = dataDir.clone(); + geoip6File.append("geoip6"); + var args = []; if (torrcDefaultsFile) { @@ -330,6 +333,8 @@ TorProcessService.prototype = args.push(dataDir.path); args.push("GeoIPFile"); args.push(geoipFile.path); + args.push("GeoIPv6File"); + args.push(geoip6File.path); args.push("HashedControlPassword"); args.push(hashedPassword);

1 0

[torbutton/master] Bug 11763: Fix race condition in pref dialog.
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 377bc3d2b64d1cffcb863b534077882e7ef9af68 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 21 20:46:29 2014 +0000 Bug 11763: Fix race condition in pref dialog. If a user is clicking on the Accept button on the preferences dialog more than once the code in torbutton_prefs_save() is executed more than once as well which may lead to unexpected and unintended behavior. We fix this thanks to a patch by a cypherpunk by disabling the Accept button after the first click. --- src/chrome/content/preferences.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index e1b2bf5..4c3c74d 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -189,6 +189,10 @@ function torbutton_prefs_init(doc) { } function torbutton_prefs_save(doc) { + // Disable the Accept button once the user clicked on it as clicking on + // our active Accept button more than once can lead to all sort of weird + // behavior. See bug 11763 for an example. + doc.documentElement.getButton("accept").disabled = true; torbutton_log(2, "called prefs_save()"); var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); var o_customprefs = torbutton_get_prefbranch('extensions.torbutton.custom.');

1 0

[torbutton/master] Bug 11722: Add hidden pref to force remote Tor check
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 9cc52477622b46fb76e0687a6d2f9770ccc8cf41 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 26 10:41:46 2014 -0700 Bug 11722: Add hidden pref to force remote Tor check Some users may not have access to their Tor control port, and would prefer a remote Tor check instead, even if they are not using a transproxy. This pref allows them to specify this. --- src/chrome/content/torbutton.js | 3 ++- src/defaults/preferences/preferences.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 79b01ce..43d5374 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1744,7 +1744,8 @@ function torbutton_do_tor_check() // If we have a tor control port and transparent torification is off, // perform a check via the control port. if (m_tb_control_port && - !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor")) { + !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") && + m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { if (torbutton_local_tor_check()) checkSvc.statusOfTorCheck = checkSvc.kCheckSuccessful; else { diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index bc63bb1..d2945c0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -26,6 +26,7 @@ pref("extensions.torbutton.socks_version",5); pref("extensions.torbutton.locked_mode",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__"); +pref("extensions.torbutton.local_tor_check",true); pref("extensions.torbutton.test_failed",false); pref("extensions.torbutton.no_proxies_on",""); pref("extensions.torbutton.versioncheck_url","https://check.torproject.org/RecommendedTBBVersions");

1 0

[torbutton/master] Bug 11783: Avoid double-clicking on New Identity.
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 0a2b0782af6e0d2608e2542542222764f31d9681 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 20 13:32:31 2014 +0000 Bug 11783: Avoid double-clicking on New Identity. It turns out that clicking several times on New Identity very quickly may lead to unexpected behavior, to errors like "TypeError: b.webProgress is undefined" and a somewhat broken browser: clicking on New Identity again after this error showed up shuts the browser down, for example. Thanks to a patch by a cypherpunk we disable the New Identity menuitem after the first click which resolves this issue. --- src/chrome/content/torbutton.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 43d5374..6161995 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1431,8 +1431,14 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New Identity. function torbutton_new_identity() { try { + // Make sure that we can only click once on New Identiy to avoid race + // conditions leading to failures (see bug 11783 for an example). + document.getElementById("torbutton-new-identity").disabled = true; torbutton_do_new_identity(); } catch(e) { + // If something went wrong make sure we have the New Identity button + // enabled (again). + document.getElementById("torbutton-new-identity").disabled = false; torbutton_log(5, "Unexpected error on new identity: "+e); window.alert("Torbutton: Unexpected error on new identity: "+e); }

1 0

[tor-browser/tor-browser-24.5.0esr-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 1bfe1ef04e14d677555db8009544736c24ddf299 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 26 10:19:36 2014 -0700 fixup! Tor Browser's Firefox preference overrides. Bug #11253: Turn on TLS 1.1 and 1.2. Also disable a deprecated Audio API for safety. --- browser/app/profile/000-tor-browser.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b6b9252..a6ff777 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -148,6 +148,13 @@ pref("javascript.options.baselinejit.content", false); pref("javascript.options.asmjs", false); pref("javascript.options.typeinference", false); +// Audio_data is deprecated in future releases, but still present +// in FF24. This is a dangerous combination (spotted by iSec) +pref("media.audio_data.enabled", false); + +// Enable TLS 1.1 and 1.2: +// https://trac.torproject.org/projects/tor/ticket/11253 +pref("security.tls.version.max", 3); // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[tor-launcher/master] Update translations.
by brade＠torproject.org 23 May '14

23 May '14

commit ed6e1481c83bfc692a719df583710a3ec45fda04 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri May 23 09:23:19 2014 -0400 Update translations. --- src/chrome/locale/bg/progress.dtd | 2 +- src/chrome/locale/ca/network-settings.dtd | 24 ++++++------ src/chrome/locale/ca/torlauncher.properties | 2 +- src/chrome/locale/cs/network-settings.dtd | 2 +- src/chrome/locale/el/torlauncher.properties | 2 +- src/chrome/locale/es-AR/torlauncher.properties | 50 ++++++++++++------------ src/chrome/locale/es-MX/network-settings.dtd | 2 +- src/chrome/locale/es-MX/torlauncher.properties | 18 ++++----- src/chrome/locale/es/torlauncher.properties | 4 +- src/chrome/locale/ko/network-settings.dtd | 18 ++++----- src/chrome/locale/ko/torlauncher.properties | 6 +-- src/chrome/locale/ms-MY/progress.dtd | 2 +- src/chrome/locale/pt-BR/torlauncher.properties | 8 ++-- src/chrome/locale/pt/torlauncher.properties | 2 +- src/chrome/locale/sv/torlauncher.properties | 2 +- src/chrome/locale/tr/network-settings.dtd | 22 +++++------ src/chrome/locale/tr/torlauncher.properties | 10 ++--- src/chrome/locale/zh-HK/network-settings.dtd | 2 +- src/chrome/locale/zh-HK/torlauncher.properties | 14 +++---- src/chrome/locale/zh-TW/network-settings.dtd | 2 +- src/chrome/locale/zh-TW/torlauncher.properties | 2 +- 21 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/chrome/locale/bg/progress.dtd b/src/chrome/locale/bg/progress.dtd index 26b2594..45a5ee3 100644 --- a/src/chrome/locale/bg/progress.dtd +++ b/src/chrome/locale/bg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Състояние на Тор"> <!ENTITY torprogress.openSettings "Отвори настройки"> <!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата."> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 51008c8..5cc6665 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -2,27 +2,27 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Abans de connectar-te a la xarxa Thor, necessites introduir informació sobre el ordinador que fas servir per la connexió a internet."> <!ENTITY torSettings.yes "Sí"> <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Quina de les següuens descriula teva situació?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Necessito configurar un pont, el tallafocs o els paràmetres del proxy."> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connectPrompt2 "M'agradaria conectar-me directament a la xarxa Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Això funciona en la majoria dels casos."> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyQuestion "Necessita aquest ordinador usar un proxy per accedir a internet?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.proxyHelp "Si no estas segur de com respondre a aquesta pregunta, observa els paràmetres d'Internet en un altre navegador per veure si està configurat per utilitzar un proxy."> <!ENTITY torSettings.enterProxy "Introdueix les opcions del proxy."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.firewallQuestion "La connexió d'aquest ordinador va a través d'un firewall que només permet les connexions per certs ports?"> +<!ENTITY torSettings.firewallHelp "Si no estas segur de com respondre a aquesta pregunta, selecciona no. Si tens problemes de connexió per la xarxa Tor, canvia aquest paràmetre."> +<!ENTITY torSettings.enterFirewall "Escriviu una llista separada per comes dels ports que estan permesos pel proxy."> +<!ENTITY torSettings.bridgeQuestion "El vostre proveïdor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -34,7 +34,7 @@ <!ENTITY torsettings.optional "Opcional "> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Aquest ordinador ha de fer servir un proxy per accedir a Internet"> <!ENTITY torsettings.useProxy.type "Tipus de Proxy:"> <!ENTITY torsettings.useProxy.address "Adreça:"> <!ENTITY torsettings.useProxy.address.placeholder "Direcció IP o nom del host"> @@ -44,21 +44,21 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un proxy que només permet connexions a certs ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> <!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor"> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Entra en un o més repetidors (un per linia)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "introdueix adreça:port"> <!ENTITY torsettings.copyLog "Copiar el Log al portapapers"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vés a: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index c423d03..d2e1d15 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=les identitats no coincideixen torlauncher.bootstrapWarning.timeout=S'ha excedit el temps d'espera de connexió torlauncher.bootstrapWarning.noroute=no hi ha ruta cap al servidor torlauncher.bootstrapWarning.ioerror=error de lectura/escriptura -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=falta de transport afegible diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 1e08971..d974db3 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -50,7 +50,7 @@ <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Zadejte jedno nebo více mostních relé (jedno na řádek)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "zadej adresu:port"> <!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index f112828..e3f52f0 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=η ταυτότητα δεν ταιριά torlauncher.bootstrapWarning.timeout=λήξη χρονικού ορίου σύνδεσης torlauncher.bootstrapWarning.noroute=δεν βρέθηκε διαδρομή προς σύνδεση torlauncher.bootstrapWarning.ioerror=σφάλμα ανάγνωσης/εγγραφής -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=Λείπει δυνατότητα σύνδεσης μεταφοράς. diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 6ff39de..2b293e8 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -7,9 +7,9 @@ torlauncher.tor_exited=Salida inesperada de Tor torlauncher.please_restart_app=Por favor, reinicie esta aplicación torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control torlauncher.tor_failed_to_start=Fallo al iniciar Tor -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_control_failed=Falló toma de control de Tor +torlauncher.tor_bootstrap_failed=Fallo al establecer una conexión con la red Tor +torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor @@ -24,10 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor, asegurese que Tor esta ejecutandose torlauncher.error_proxy_addr_missing=Debes especificar tu IP o el nombre de tu Host y un puerto para que Tor utilize un Proxy para acceder a internet. torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de Proxy. torlauncher.error_bridges_missing=Debes especificar uno o más puentes. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los puentes provistos. +torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajuste su configuración. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar torlauncher.quit=Quitar @@ -36,23 +36,23 @@ torlauncher.done=Hecho torlauncher.forAssistance=Para solicitar asistencia, contactese al %S -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio +torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión segura al directorio +torlauncher.bootstrapStatus.requesting_status=Regresando el estado de la red de trabajo +torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red de trabajo +torlauncher.bootstrapStatus.loading_keys=Cargando certificados de dominio +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión +torlauncher.bootstrapStatus.loading_descriptors=Cargando información de retransmisión torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapStatus.handshake_or=Estableciendo una ruta Tor +torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! + +torlauncher.bootstrapWarning.done=finalizado +torlauncher.bootstrapWarning.connectrefused=conexión rechazada +torlauncher.bootstrapWarning.misc=misceláneo +torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes +torlauncher.bootstrapWarning.identity=error de indentificación +torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión +torlauncher.bootstrapWarning.noroute=sin ruta al servidor +torlauncher.bootstrapWarning.ioerror=error de lectura/escritura +torlauncher.bootstrapWarning.pt_missing=Perdida de la conectividad\n diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 5ada2f1..4eba7d2 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type "Proxy Type:"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Puerto:"> <!ENTITY torsettings.useProxy.username "Username:"> <!ENTITY torsettings.useProxy.password "Password:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties index 3ca3453..577f9ea 100644 --- a/src/chrome/locale/es-MX/torlauncher.properties +++ b/src/chrome/locale/es-MX/torlauncher.properties @@ -15,7 +15,7 @@ torlauncher.unable_to_start_tor=No se ha podido iniciar Tor.\n\n%S torlauncher.tor_missing=Falta el ejecutable de Tor. torlauncher.torrc_missing=Falta el archivo torrc. torlauncher.datadir_missing=El diccionario de datos de Tor no existe. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.password_hash_missing=No se pudo obtener la contraseña cifrada. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S @@ -24,7 +24,7 @@ torlauncher.ensure_tor_is_running=Por favor asegúrese que Tor esté en funciona torlauncher.error_proxy_addr_missing=Debes especificar ambos, una dirección IP o un hostname y un número de puerto para configurar Tor para usar un proxy y acceder a Internet torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de proxy. torlauncher.error_bridges_missing=Debes especificar uno o más puentes -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_default_bridges_type_missing=Debes seleccionar un tipo de transporte para los puentes proporcionados. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(recomendado) @@ -34,25 +34,25 @@ torlauncher.quit=Abandonar torlauncher.quit_win=Salir torlauncher.done=Hecho -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Si necesitas ayuda, contacta a %S -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio de retransmisión torlauncher.bootstrapStatus.handshake_dir=Estableciendo conexión con un directorio encriptado. torlauncher.bootstrapStatus.requesting_status=Recuperando estado de la red torlauncher.bootstrapStatus.loading_status=Cargando estado de red. torlauncher.bootstrapStatus.loading_keys=Cargando certificados de autoridad. -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión +torlauncher.bootstrapStatus.loading_descriptors=Cargando información del relé torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! torlauncher.bootstrapWarning.done=hecho torlauncher.bootstrapWarning.connectrefused=Conexión rechazada -torlauncher.bootstrapWarning.misc=miscellaneous +torlauncher.bootstrapWarning.misc=miscelaneo torlauncher.bootstrapWarning.resourcelimit=Recursos insuficientes torlauncher.bootstrapWarning.identity=Identificar desajuste torlauncher.bootstrapWarning.timeout=Tiempo de conexión agotado -torlauncher.bootstrapWarning.noroute=no route to host +torlauncher.bootstrapWarning.noroute=no existe ruta al host torlauncher.bootstrapWarning.ioerror=error de lectura/escritura -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=Falta un transporte conectable diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 4c1fc30..c968541 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -11,8 +11,8 @@ torlauncher.tor_control_failed=Fallo al tomar control de Tor. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión a la red Tor. torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). -torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S -torlauncher.tor_missing=No se encuentra el fichero ejecutable de Tor. +torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S +torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo "torrc" torlauncher.datadir_missing=El directorio de datos de Tor no existe. torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 2af691c..4956dc5 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "브릿지, 방화벽, 프록시 설정 구성을 해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> <!ENTITY torSettings.connect "연결"> <!ENTITY torSettings.proxyQuestion "이 컴퓨터는 인터넷에 접속하는 데 프록시가 필요한가요?"> @@ -23,8 +23,8 @@ <!ENTITY torSettings.firewallHelp "이 질문에 어떻게 대답해야 할지 확신이 서지 않으면 아니오를 선택하세요. Tor 네트워크에 접속할 때 문제를 만났다면 이 설정을 변경해 주세요."> <!ENTITY torSettings.enterFirewall "방화벽에 따라 허가되고 있는 포트 목록 입력해 주세요. 포트 번호는 콤마로 구분됩니다."> <!ENTITY torSettings.bridgeQuestion "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단하거나 검열하고 있나요?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeHelp "이 질문에 어떻게 대답해야할지 잘 모르는 경우 아니오를 선택하십시오.  예를 선택하면 Tor 네트워크에 대한 연결을 차단하는 것을 더욱 어렵게하는 목록 화되지 않은 릴레이이고 Tor Bridges을 구성하는 것이 요구됩니다."> +<!ENTITY torSettings.bridgeSettingsPrompt "제공된 브릿지 세트를 사용하거나 사용자 지정 브릿지 세트를 취득하여 입력 할 수 있습니다.">  @@ -47,7 +47,7 @@ <!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> <!ENTITY torsettings.useBridges.checkbox "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단합니다."> <!ENTITY torsettings.useBridges.default "제공된 브릿지에 연결"> -<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.type "전송 유형:"> <!ENTITY torsettings.useBridges.custom "이용자 브릿지 접속"> <!ENTITY torsettings.useBridges.label "1개 이상의 브릿지 중계 서버를 입력해 주세요. (각 줄에 한 개씩)"> <!ENTITY torsettings.useBridges.placeholder "주소 입력 : 포트 번호"> @@ -55,10 +55,10 @@ <!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기"> <!ENTITY torsettings.bridgeHelpTitle "브릿지 중계 서버 도움말"> <!ENTITY torsettings.bridgeHelp1 "Tor 네트워크에 접속할 수 없는 경우, 귀하의 인터넷 서비스 공급자(ISP)나 별도의 기관이 Tor를 차단하고 있을 가능성이 있습니다.  그럴 때는 숨겨진 중계 서버를 통해 Tor 브릿지를 사용함으로써 이 문제를 해결할 수도 있습니다."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp1B "사전 설정되고 제공되어진 브릿지 주소 집합을 사용하거나 다음 세 가지 방법 중 하나를 사용하여 사용자 지정 주소의 집합을 검색 할 수 있습니다."> +<!ENTITY torsettings.bridgeHelp2Heading "웹을 통해"> <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org 를 방문하십시오."> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3Heading "메일 자동 응답 시스템을 통해"> <!ENTITY torsettings.bridgeHelp3 "공개 브릿지 주소를 찾는 또 하나의 방법은 본문에 'get bridges'라고 적은 E-mail을 bridges(a)torproject.org 앞으로 보내는 것입니다.  단, 브릿지 주소를 크래커들이 수집하기 어렵게 하기 위해 gmail.com 이나 yahoo.com 으로 보내주시면 감사하겠습니다."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "헬프 데스크를 통해"> +<!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중 한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의해주십시오"> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 8714f80..ed43d43 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시 torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=제공된 브리지의 전송 유형을 선택해야합니다. +torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공 한 브리지 유효한 것이 아닙니다. 설정을 조정하십시오. torlauncher.recommended_bridge=(권장함) @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=계정 불일치 torlauncher.bootstrapWarning.timeout=연결 타임아웃 torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음 torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류 -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=플러그가 가능한 전송을 찾을 수 없습니다 diff --git a/src/chrome/locale/ms-MY/progress.dtd b/src/chrome/locale/ms-MY/progress.dtd index fd2a975..f24ab09 100644 --- a/src/chrome/locale/ms-MY/progress.dtd +++ b/src/chrome/locale/ms-MY/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Buka tetapan."> <!ENTITY torprogress.heading "Menyambung ke rangkaian Tor."> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Sila tunggu sementara kami wujudkan sambung ke rangkaian Tor. "> diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 5ab5499..5e9b860 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -19,13 +19,13 @@ torlauncher.password_hash_missing=Falha ao obter a senha criptografada. torlauncher.failed_to_get_settings=Impossível recuperar as configurações de Tor. torlauncher.failed_to_save_settings=Impossível salvar as configurações de Tor. -torlauncher.ensure_tor_is_running=Por favor, verifique que Tor esteja rodando. +torlauncher.ensure_tor_is_running=Por favor, verifique que Tor está sendo executado. torlauncher.error_proxy_addr_missing=Você deve especificar um endereço IP ou um servidor, e um número de porta para configurar Tor para usar um proxy de acesso a Internet. torlauncher.error_proxy_type_missing=Você deve selecionar um tipo de proxy. torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. -torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para os bridges fornecidos. -torlauncher.error_bridge_bad_default_type=Nenhum dos bridges fornecidos tem disponível o tipo de transporte %S. Por favor ajuste suas configurações. +torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para as pontes fornecidas. +torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste suas configurações. torlauncher.recommended_bridge=(recomendado) @@ -37,7 +37,7 @@ torlauncher.done=Terminado torlauncher.forAssistance=Para assistência, contacte torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de servidores -torlauncher.bootstrapStatus.handshake_dir=Estabelecendo conexão de diretório criptografado +torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografada torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede torlauncher.bootstrapStatus.loading_status=Carregando estado da rede torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 87b8aeb..780e44c 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=identidade não correspondente torlauncher.bootstrapWarning.timeout=Tempo de ligação expirado torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro torlauncher.bootstrapWarning.ioerror=Erro de leitura/escrita -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=Transporte de ligacao ausente diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 375bd8c..1d89986 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=identitet felmatchad torlauncher.bootstrapWarning.timeout=tidsgränsen överskreds torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas torlauncher.bootstrapWarning.ioerror=läs-/skrivfel -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=Pluggable Transport saknas diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 9e0aff5..7ac52b6 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -8,11 +8,11 @@ <!ENTITY torSettings.no "Hayır"> <!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> -<!ENTITY torSettings.configurePrompt1 "İnternet bağlantınız sansürlenmiş,filtrelenmiş veyahut proxylenmiş."> -<!ENTITY torSettings.configurePrompt2 "Köprü, güvenlik duvarı ve vekil sunucu ayarlarının konfigürasyonunu yapmam lazım."> +<!ENTITY torSettings.configurePrompt1 "İnternet bağlantınız sansürlenmiş, filtrelenmiş veya vekil sunucu altında."> +<!ENTITY torSettings.configurePrompt2 "Köprü, güvenlik duvarı ve vekil sunucu ayarlarını yapılandırmam gerekli."> <!ENTITY torSettings.configure "Yapılandır"> <!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum"> -<!ENTITY torSettings.connectPrompt3 "Bu çoğu durumlarda çalışır."> +<!ENTITY torSettings.connectPrompt3 "Bu çoğu durumda çalışır."> <!ENTITY torSettings.connect "Bağlan"> <!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternete erişirken bir vekil kullanması gerekiyor mu?"> @@ -22,8 +22,8 @@ <!ENTITY torSettings.firewallQuestion "Bu bilgisayarın İnternet bağlantısı, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarından geçiyor mu?"> <!ENTITY torSettings.firewallHelp "Eğer bu soruya nasıl cevap vereceğinizden emin değilseniz, Hayır seçin. Eğer Tor ağına bağlanırken sorunla karşılaşırsanız, bu ayarı değiştirin."> <!ENTITY torSettings.enterFirewall "Güvenlik duvarı tarafından izin verilen bağlantı noktalarının virgülle ayrılmış bir listesini girin."> -<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınızı (ISS) engellesin veya ayrıcaTor Bağlantınızı sansürlesin mi?"> -<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır 'ı Secin.  Eğer Evet'i seçerseniz, Tor Ağ bağlantıları engellemek için, daha zor hale getirilip listelenmeyen aktarmalar için Tor Köprülerini yapılandırmanız istenecektir."> +<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına bağlantıları engelliyor veya sansürlüyor mu?"> +<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır'ı Seçin.  Eğer Evet'i seçerseniz, Tor Ağına bağlantıyı engellemeyi daha zor hale getiren listelenmeyen aynalar olan Tor Köprülerini yapılandırmanız istenecektir."> <!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprülerin kümesini kullanabilirsiniz veya özel bir köprü seti girebilir veya sağlayabilirsiniz.">  @@ -47,18 +47,18 @@ <!ENTITY torsettings.firewall.allowedPorts "İzin verilen portlar:"> <!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (İSS) Tor Ağı ile bağlantılarımı engelliyor"> <!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> -<!ENTITY torsettings.useBridges.type "Taşıma türü:"> +<!ENTITY torsettings.useBridges.type "Aktarım türü:"> <!ENTITY torsettings.useBridges.custom "Özel köprüler girin"> <!ENTITY torsettings.useBridges.label "Bir veya daha fazla köprü aynası girin (her satıra bir tane)."> -<!ENTITY torsettings.useBridges.placeholder "adresi yazın:port"> +<!ENTITY torsettings.useBridges.placeholder "adresi:port şeklinde yazın"> <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> <!ENTITY torsettings.bridgeHelpTitle "Köprü Ayna Yardımı"> -<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, nedeni kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor'u engelliyor olabilir.  Çoğunlukla bu problemi Tor köprüleri ile çözebilirisiniz bunlar engellenmesi daha zor olan listede olmayan aktarma noktalarıdır"> +<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor'u engelliyor olabilir.  Çoğunlukla bu problemi, engellenmesi daha zor listelenmeyen aynalar olan Tor Köprülerini kullanarak çözebilirsiniz."> <!ENTITY torsettings.bridgeHelp1B "Önceden yapılandırılan sağlanan köprü adresleri setini kullanabilirsiniz veya bu üç yöntemden birini kullanarak adres kümesinden özel bir set sağlayabilirsiniz:"> <!ENTITY torsettings.bridgeHelp2Heading "Web aracılığıyla."> <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org sitesini ziyaret etmek için web tarayıcısı kullanın."> -<!ENTITY torsettings.bridgeHelp3Heading "Eposta otomatik cevaplandırıcı aracılığıyla."> -<!ENTITY torsettings.bridgeHelp3 "bridges(a)torproject.org adresine, iletide sadece 'get bridges' satırını yazarak bir e-posta gönderin.  Ancak, bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu epostayı gmail.com veya yahoo.com adreslerinden yollamanız gerekmektedir."> +<!ENTITY torsettings.bridgeHelp3Heading "E-posta Otomatik Cevaplandırıcı Aracılığıyla"> +<!ENTITY torsettings.bridgeHelp3 "bridges(a)torproject.org adresine, iletide sadece 'get bridges' satırını yazarak bir e-posta gönderin.  Ancak, bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu e-postayı gmail.com veya yahoo.com adreslerinden yollamanız gerekmektedir."> <!ENTITY torsettings.bridgeHelp4Heading "Help Desk aracılığıyla."> -<!ENTITY torsettings.bridgeHelp4 "Son bir çare olarak köprü adres taleplerini help(a)rt.torproject.org adresine posta göndererek rica edebilirsiniz.&#160 Birisinin bu talebi cevaplayacağını unutmayın."> +<!ENTITY torsettings.bridgeHelp4 "Son bir çare olarak köprü adres taleplerini help(a)rt.torproject.org adresine posta göndererek rica edebilirsiniz.  Birisinin bu talebi cevaplayacağını unutmayın."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 1a0226b..a8773d5 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -21,11 +21,11 @@ torlauncher.failed_to_get_settings=Tor ayarlarına ulaşılamıyor.\n\n%S torlauncher.failed_to_save_settings=Tor ayarları kaydedilemiyor.\n\n%S torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun. -torlauncher.error_proxy_addr_missing=İnternet bağlanırken proxy kullanmak için IP adresi veya Sunucu ve port numarası girmeniz gerekiyor. +torlauncher.error_proxy_addr_missing=İnternet bağlanırken vekil sunucu kullanmak için IP adresi veya sunucu ve bağlantı noktası numarası girmeniz gerekiyor. torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da daha fazla köprü belirtmelisiniz. -torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir taşıma türü seçmelisiniz. -torlauncher.error_bridge_bad_default_type=%S taşıma türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı lütfen ayarlayın. +torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım türü seçmelisiniz. +torlauncher.error_bridge_bad_default_type=%S aktarım türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı lütfen ayarlayın. torlauncher.recommended_bridge=(önerilen) @@ -36,10 +36,10 @@ torlauncher.done=Tamamlandı torlauncher.forAssistance=Yardım için %S ile bağlantıya geçin. -torlauncher.bootstrapStatus.conn_dir=Aktarım klasörüne bağlanıyor +torlauncher.bootstrapStatus.conn_dir=Bir ayna dizinine bağlanıyor torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor torlauncher.bootstrapStatus.requesting_status=Ağ durumu güncelliyor -torlauncher.bootstrapStatus.loading_status=Ağ yükleniyor +torlauncher.bootstrapStatus.loading_status=Ağ durumu yükleniyor torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikalarını yüklüyor torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 3d7463a..c71c117 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "連接"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index d088f8d..278038e 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -1,10 +1,10 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor啟動器 torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=請重新啟動此程式。 torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -19,7 +19,7 @@ torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.ensure_tor_is_running=請確定Tor運作中。 torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=You must select the proxy type. @@ -27,12 +27,12 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(建議) -torlauncher.connect=Connect +torlauncher.connect=連接 torlauncher.quit=離開 torlauncher.quit_win=離開 -torlauncher.done=Done +torlauncher.done=完成 torlauncher.forAssistance=For assistance, contact %S @@ -47,7 +47,7 @@ torlauncher.bootstrapStatus.conn_or=連接上Tor的網絡 torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! -torlauncher.bootstrapWarning.done=done +torlauncher.bootstrapWarning.done=完成 torlauncher.bootstrapWarning.connectrefused=connection refused torlauncher.bootstrapWarning.misc=miscellaneous torlauncher.bootstrapWarning.resourcelimit=insufficient resources diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 6fcb103..6d66ac6 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.firewallHelp "若您無法確定如何回答這個問題，請選擇「否」。若您在連結至 Tor 網路時遭遇問題，請再改變此設定。"> <!ENTITY torSettings.enterFirewall "請輸入防火牆允許的連線埠（請以逗號分隔）。"> <!ENTITY torSettings.bridgeQuestion "您的網路供應商 (ISP) 阻擋或者審查 Tor 網路連線？"> -<!ENTITY torSettings.bridgeHelp "如果你不知道如何回答這個問題，請選擇「否」&#160；如果你選擇選擇「是」，你將被要求設定Tor網橋，這可以讓阻擋客戶端與Tor伺服器的連接更困難。"> +<!ENTITY torSettings.bridgeHelp "如果你不知道如何回答這個問題，請選擇「否」  如果你選擇選擇「是」，你將被要求設定Tor網橋，這可以讓阻擋客戶端與Tor伺服器的連接更困難。"> <!ENTITY torSettings.bridgeSettingsPrompt "您可以使用預設的網橋或者你可以使用自定義設置的網橋。">  diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 1abca51..433b0dd 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=身分不一致 torlauncher.bootstrapWarning.timeout=連線逾時 torlauncher.bootstrapWarning.noroute=無連結至 host 的路徑 torlauncher.bootstrapWarning.ioerror=讀寫錯誤 -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=缺少可插拔傳輸

1 0

[tor-launcher/master] Bug #11754: untranslated locales in Tor Launcher
by brade＠torproject.org 23 May '14

23 May '14

commit 486cf961965e724632b86d44623949458aaeffe2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri May 23 09:02:32 2014 -0400 Bug #11754: untranslated locales in Tor Launcher Remove locales that have been removed from Transifex. --- src/chrome/locale/af-ZA/network-settings.dtd | 64 -------------------- src/chrome/locale/am-ET/network-settings.dtd | 64 -------------------- src/chrome/locale/bg-BG/network-settings.dtd | 64 -------------------- src/chrome/locale/bn-BD/network-settings.dtd | 64 -------------------- src/chrome/locale/ca-ES/network-settings.dtd | 59 ------------------ src/chrome/locale/cs-CZ/network-settings.dtd | 64 -------------------- src/chrome/locale/el-GR/network-settings.dtd | 64 -------------------- src/chrome/locale/es-NI/network-settings.dtd | 64 -------------------- src/chrome/locale/sq-AL/network-settings.dtd | 64 -------------------- .../locale/zh-CN.GB2312/network-settings.dtd | 59 ------------------ src/chrome/locale/zh/network-settings.dtd | 59 ------------------ 11 files changed, 689 deletions(-) diff --git a/src/chrome/locale/af-ZA/network-settings.dtd b/src/chrome/locale/af-ZA/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/af-ZA/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/am-ET/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/bg-BG/network-settings.dtd b/src/chrome/locale/bg-BG/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/bg-BG/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/ca-ES/network-settings.dtd b/src/chrome/locale/ca-ES/network-settings.dtd deleted file mode 100644 index 3c3433e..0000000 --- a/src/chrome/locale/ca-ES/network-settings.dtd +++ /dev/null @@ -1,59 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.  If not, just click Connect."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Adreça:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/cs-CZ/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/el-GR/network-settings.dtd b/src/chrome/locale/el-GR/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/el-GR/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/es-NI/network-settings.dtd b/src/chrome/locale/es-NI/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/es-NI/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/sq-AL/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd deleted file mode 100644 index 899a543..0000000 --- a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd +++ /dev/null @@ -1,59 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.  If not, just click Connect."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/zh/network-settings.dtd b/src/chrome/locale/zh/network-settings.dtd deleted file mode 100644 index 899a543..0000000 --- a/src/chrome/locale/zh/network-settings.dtd +++ /dev/null @@ -1,59 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.  If not, just click Connect."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">

1 0

[tor-browser-bundle/master] Add support for scramblesuit, add in default bridge lines.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit ef80bcdfd15ba873de6c7a88382176b893770638 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:20:27 2014 -0700 Add support for scramblesuit, add in default bridge lines. --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++ Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f14cf07..8d2afed 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,3 +21,7 @@ pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); + +pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); +pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); +pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 87108bd..8327587 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec ./Tor/PluggableTransports/obfsproxy.bin managed ## flash proxy configuration # # Change the second number here (9000) to the number of a port that can diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 7c6e6a5..19fc8e0 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec PluggableTransports/obfsproxy.bin managed ## flash proxy configuration # diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 049d2ff..bc1399d 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec Tor\PluggableTransports\obfsproxy managed ## flash proxy configuration #

1 0

[tor-browser-bundle/master] Increase some component versions for 3.6.2.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit b428d32a7f014d53235750ec2a1634c6937fd5ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:33:46 2014 -0700 Increase some component versions for 3.6.2. We may also bump torbutton and tor launcher later. --- gitian/versions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions b/gitian/versions index a9e033f..6424316 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.1 +TORBROWSER_VERSION=3.6.2pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -7,10 +7,10 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 -TOR_TAG=tor-0.2.4.21 +TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -18,8 +18,8 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 -FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 +LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 +FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2

1 0