November 2019 - tor-commits - lists.torproject.org

[torbutton/master] Bug 30783 - Use mobile EOY links on Android
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit 9ea41dcdc38c79368a0909f4a64fcb865bd39af2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 31 17:07:30 2019 +0000 Bug 30783 - Use mobile EOY links on Android --- chrome/content/aboutTor/aboutTor-content.js | 18 ++++++++++++------ chrome/content/aboutTor/aboutTor.xhtml | 1 + chrome/skin/aboutTor.css | 10 ++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js index 23f22406..18bc40f9 100644 --- a/chrome/content/aboutTor/aboutTor-content.js +++ b/chrome/content/aboutTor/aboutTor-content.js @@ -18,7 +18,6 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); let { bindPrefAndInit, show_torbrowser_manual } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); - var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", @@ -129,12 +128,19 @@ var AboutTorListener = { + tbbVersion)); } catch (e) {} + let ey2019_elem_id = "ey2019_donate"; + let ey2019_locale_url = + `https://www.torproject.org/donate/donate-tbi-${aLocale}`; + + if (content.document.body.getAttribute("mobile")) { + ey2019_elem_id = "ey2019_donate_mobile"; + ey2019_locale_url = + `https://www.torproject.org/donate/donate-tbi-mobile-${aLocale}`; + } + content.document - .getElementById("ey2019_donate") - .setAttribute( - "href", - `https://www.torproject.org/donate/donate-tbi-${aLocale}` - ); + .getElementById(ey2019_elem_id) + .setAttribute("href", ey2019_locale_url); } }; diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 5f4b2bf7..e668b34e 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -59,6 +59,7 @@ window.addEventListener("pageshow", function() { </div> <div id="ey2019_3"> <a id="ey2019_donate" href="https://www.torproject.org/donate/donate-tbi-default">&aboutTor.donationBanner.buttonA;</a> + <a id="ey2019_donate_mobile" href="https://www.torproject.org/donate/donate-tbi-mobile-default">&aboutTor.donationBanner.buttonA;</a> <p id="ey2019_mozilla">&aboutTor.ey2019.mozilla;</p> </div> </div> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 6c7276f0..28291d16 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -396,6 +396,7 @@ body[ey2019] .torcontent-logo { text-align: left; } +#ey2019_donate_mobile, #ey2019_donate { border: 3px solid blueViolet; background: black; @@ -411,6 +412,7 @@ body[ey2019] .torcontent-logo { vertical-align: super; } +#ey2019_donate_mobile, #ey2019_donate:hover { background: blueViolet; color: black; @@ -444,3 +446,11 @@ body:not([ey2019]) .showIfEY2019, body[ey2019] .hideIfEY2019 { display: none; } + +body:not([mobile]) #ey2019_donate_mobile { + display: none; +} + +body[mobile] #ey2019_donate { + display: none; +}

1 0

[torbutton/master] Bug 30783 - Use EOY URL for bottom link
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit ce795172f37ee2a43a8e7de0c0d06816143880ad Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Nov 1 00:30:04 2019 +0000 Bug 30783 - Use EOY URL for bottom link --- chrome/content/aboutTor/aboutTor-content.js | 4 ++++ chrome/content/aboutTor/aboutTor.xhtml | 3 ++- chrome/skin/aboutTor.css | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js index 18bc40f9..13aa39da 100644 --- a/chrome/content/aboutTor/aboutTor-content.js +++ b/chrome/content/aboutTor/aboutTor-content.js @@ -141,6 +141,10 @@ var AboutTorListener = { content.document .getElementById(ey2019_elem_id) .setAttribute("href", ey2019_locale_url); + + content.document + .getElementById(ey2019_elem_id + "_bottom") + .setAttribute("href", ey2019_locale_url); } }; diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index e668b34e..92a941ac 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -91,7 +91,8 @@ window.addEventListener("pageshow", function() { <div id="bottom"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.line2e; - <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a> + <a id="ey2019_donate_bottom" href="https://www.torproject.org/donate/donate-tbi-default">&aboutTor.donationBanner.buttonA;</a> + <a id="ey2019_donate_mobile_bottom" href="https://www.torproject.org/donate/donate-tbi-mobile-default">&aboutTor.donationBanner.buttonA;</a> </p> <p id="manual" class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label; <a id="manualLink" target="_blank">&aboutTor.torbrowser_user_manual_link.label;</a></p> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 28291d16..5da0e509 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -447,10 +447,12 @@ body[ey2019] .hideIfEY2019 { display: none; } -body:not([mobile]) #ey2019_donate_mobile { +body:not([mobile]) #ey2019_donate_mobile, +body:not([mobile]) #ey2019_donate_mobile_bottom { display: none; } -body[mobile] #ey2019_donate { +body[mobile] #ey2019_donate, +body[mobile] #ey2019_donate_bottom { display: none; }

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 01 Nov '19

01 Nov '19

commit d9e234ce14e8e7e740f7c295a253da0d1f0f7f7e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 1 09:53:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/contents+es.po b/contents+es.po index 1224fd9b5..2d63606a2 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1,7 +1,6 @@ # Translators: # Zuhualime Akoochimoya, 2019 # strel, 2019 -# 26 nothing <nothinguser(a)protonmail.com>, 2019 # David Figuera <dfb(a)fastmail.com>, 2019 # erinm, 2019 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019 @@ -259,7 +258,7 @@ msgid "" "can be tracked across the internet." msgstr "" "La mayoría de navegadores crean involuntariamente una huella dactilar " -"(fingerprint) única para cada usuario, que puede ser rastreado a través de " +"(fingerprint) única para cada usuario, que puede ser rastreada a través de " "internet." #: https//support.torproject.org/faq/faq-3/ @@ -2860,9 +2859,9 @@ msgid "" "you are. This feature reminds people of this fact." msgstr "" "Si realmente quieres ver Google en Español puedes clicar en el link " -"proporcionado. Pero consideramos esto una característica de Tor, no un bug " -"-- Internet no es nivelado, y ese hecho no se ve diferente dependiendo de " -"donde eres. Esta característica les recuerda a las personas este hecho" +"proporcionado. Pero consideramos esto una ventaja de Tor, no un bug -- el " +"Internet no es todo igual, y de hecho se ve diferente dependiendo de donde " +"estés. Esta característica les recuerda a las personas este hecho" #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description) @@ -2890,7 +2889,7 @@ msgid "" " can be google.be, google.de, google.us and so on." msgstr "" "Otro método es simplemente usar tu código local para accesar Google. Esto " -"puede ser google.es, google.be google.de, google.us y por ahí." +"puede ser google.es, google.be google.de, google.us y así." #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.title) @@ -2917,13 +2916,13 @@ msgid "" "relay you happened to pick) as somebody trying to \"crawl\" their website, " "so it slows down traffic from that IP address for a short time." msgstr "" -"Cuando usas Tor, esas enviando datos atraves de repetidores de salida que " -"son compartidos por miles de otros usuarios. Usuarios Tor ven este mensaje " -"en general cuando algunos usuarios Tor envian consultas a Google durante un " -"corto periodo de tiempo. Google interpreta el gran volumen de tráfico desde " +"Cuando usas Tor, estás enviando datos a través de repetidores de salida que " +"son compartidos por miles de otros usuarios. Los usuarios de Tor ven este " +"mensaje cuando otros usuarios de Tor envían consultas a Google durante un " +"corto período de tiempo. Google interpreta el gran volumen de tráfico desde " "una sola dirección IP (el repetidor de salida que fue elegido) como alguien " -"intentando \"crawl\" su pagina, entonces el tráfico se ralentiza desde la " -"dirección IP por un corto periodo" +"intentando \"crawlear\" su pagina, por lo que ralentizan el tráfico desde la" +" dirección IP por un corto periodo" #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description) @@ -2935,10 +2934,11 @@ msgid "" "those IP addresses that recent queries indicate an infection." msgstr "" "Una explicación alternativa es que Google intenta detectar ciertos tipos de " -"spywares o malwares que envian distintas requisiciones para Google Search. " -"Detecta la dirección IP de las consultas recibidas (No reconociendo que son " -"repetidores de salida Tor), y intenta barrar cualquier conexión viniendo de " -"la dirección IP de las recientes consultas indicadas como una infección. " +"spyware o virus que envían consultas parecidas a Google Search. Detecta la " +"dirección IP de las consultas recibidas (sin tener en cuenta que es un " +"repetidor de salida de Tor), e intenta alertar a las conexiones viniendo de " +"esa dirección IP que las últimas consultas indican la presencia de un virus." +" " #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description) @@ -2947,8 +2947,8 @@ msgid "" " deter or block Tor use. The error message about an infected machine should " "clear up again after a short time." msgstr "" -"Hasta donde nosostros sabemos, Google no está haciendo nada intencionado " -"para obstaculizar el uso de Tor. El mensaje de error sobre ordenadores " +"Hasta donde nosotros sabemos, Google no está haciendo nada intencionado para" +" obstaculizar el uso de Tor. El mensaje de error sobre ordenadores " "infectados debería de desaparecer al cabo de poco tiempo." #: https//support.torproject.org/tbb/tbb-45/

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 01 Nov '19

01 Nov '19

commit 4ed521d3d06aec4cce4bd5c40ee2cb38e985e0d9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 1 09:23:22 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/contents+es.po b/contents+es.po index f525a5330..1224fd9b5 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1354,7 +1354,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Verifying the signature" -msgstr "### Comprobando la firma" +msgstr "### Comprobar la firma" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1365,7 +1365,7 @@ msgid "" " that you downloaded." msgstr "" "Para comprobar la firma digital del paquete que has descargado, tienes que " -"descargar el archivo \".asc\" correspondiente además del instalador " +"descargar el archivo \".asc\" correspondiente, además del instalador " "propiamente dicho, y verificarla con un comando que usa GnuPG para ello." #: https//support.torproject.org/tbb/how-to-verify-signature/ @@ -2126,7 +2126,7 @@ msgid "" " so." msgstr "" "Puedes ayudar a mejorar la velocidad de la red con [tu propio " -"repetidor](https://community.torproject.org/es/relay), o animando a otros a " +"repetidor](https://community.torproject.org/es/relay), o animar a otros a " "hacerlo." #: https//support.torproject.org/tbb/tbb-22/ @@ -2251,8 +2251,8 @@ msgid "" "Please see the [Updating section](https://tb-" "manual.torproject.org/updating/) in the Tor Browser Manual." msgstr "" -"Por favor, consulte la [sección sobre actualizaciones](https://tb-" -"manual.torproject.org/updating/) en el manual del Navegador Tor." +"Por favor, consulta la [sección sobre actualizaciones](https://tb-" +"manual.torproject.org/es/updating/) en el manual del Navegador Tor." #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.title) @@ -2265,8 +2265,8 @@ msgid "" "Please see the [Uninstalling section](https://tb-" "manual.torproject.org/uninstalling/) in the Tor Browser Manual." msgstr "" -"Por favor, consulte la [sección sobre desinstalar](https://tb-" -"manual.torproject.org/uninstalling/) en el manual del Navegador Tor." +"Por favor, consulta la [sección sobre desinstalar](https://tb-" +"manual.torproject.org/es/uninstalling/) en el manual del Navegador Tor." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.title) @@ -7561,10 +7561,10 @@ msgid "" " observation network for detecting [censorship](#network-censorship), " "surveillance and [traffic](#traffic) manipulation on the internet." msgstr "" -"tráficoOONI significa \"Open Observatory of Network Interference\" " -"(Observatorio Abierto de Interferencia de Redes), es una red de observación " -"global para detectar [censorship](#network-censorship), vigilancia y " -"manipulación [traffic](#traffic) en Internet." +"OONI significa \"Open Observatory of Network Interference\" (Observatorio " +"Abierto de Interferencia de Redes), es una red de observación global para " +"detectar [censura](#network-censorship), vigilancia y manipulación [de " +"tráfico](#traffic) en Internet." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7642,9 +7642,9 @@ msgid "" "network status information to humans." msgstr "" "Onionoo es un protocolo basado en la web para aprender sobre la ejecución " -"actual de [Tor relays](#relay) y [puentes](#puente). Onionoo proporciona los" -" datos para otras aplicaciones y sitios web (brújula, atlas, etc.) que a su " -"vez presentan información sobre el estado de la red Tor a los humanos." +"actual de [relays](#relay) y [puentes](#puente) de Tor. Onionoo proporciona " +"los datos para otras aplicaciones y sitios web (brújula, atlas, etc.) que a " +"su vez presentan información sobre el estado de la red Tor a los humanos." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7943,7 +7943,7 @@ msgid "" "[bridges](#bridge)." msgstr "" "Scramblesuit es similar a obfs4 pero tiene un conjunto diferente de " -"[bridges](#bridge)." +"[puentes](#bridge)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8530,7 +8530,7 @@ msgid "" "and Safari." msgstr "" "Los navegadores web principales incluyen [Firefox](#firefox), Chrome, " -"Internet Explorer, and Safari." +"Internet Explorer, y Safari." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 01 Nov '19

01 Nov '19

commit 52cec1bdb790748381ec2deac24de39579ce49fd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 1 09:18:40 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index 38c122526..e5e39a56c 100644 --- a/es.po +++ b/es.po @@ -5,15 +5,15 @@ # Translators: # Edward Navarro, 2015 # Emma Peel, 2014,2017-2019 -# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2018 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2018-2019 # strel, 2013-2014,2016 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:17+0200\n" -"PO-Revision-Date: 2019-11-01 01:54+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-11-01 09:17+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -135,7 +135,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" -msgstr "" +msgstr "<b>Deberías hacer una actualización manual a %{name}s %{version}s.</b>\n\nPara más información sobre esta nueva versión, ve a %{details_url}\n\nNo es posible actualizar automáticamente tu dispositivo a esta nueva versión: %{explanation}.\n\nPara aprender cómo hacer una actualización manual, ve a https://tails.boum.org/doc/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available"

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit 34e9b0a7fda77ec996d5d9cbd6256e9bf7b938e4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 1 08:57:26 2019 +0000 Translations update --- src/chrome/locale/ca/network-settings.dtd | 28 +++++++++---------- src/chrome/locale/ca/torlauncher.properties | 2 +- src/chrome/locale/cs/network-settings.dtd | 22 +++++++-------- src/chrome/locale/da/torlauncher.properties | 2 +- src/chrome/locale/de/network-settings.dtd | 24 ++++++++--------- src/chrome/locale/es/network-settings.dtd | 2 +- src/chrome/locale/fa/network-settings.dtd | 22 +++++++-------- src/chrome/locale/fa/torlauncher.properties | 40 ++++++++++++++-------------- src/chrome/locale/fi/network-settings.dtd | 20 +++++++------- src/chrome/locale/hu/network-settings.dtd | 26 +++++++++--------- src/chrome/locale/it/network-settings.dtd | 26 +++++++++--------- src/chrome/locale/pt-PT/network-settings.dtd | 22 +++++++-------- src/chrome/locale/ru/network-settings.dtd | 14 +++++----- src/chrome/locale/sk/network-settings.dtd | 30 ++++++++++----------- src/chrome/locale/sq/network-settings.dtd | 2 +- src/chrome/locale/tr/network-settings.dtd | 2 +- src/chrome/locale/zh-TW/network-settings.dtd | 2 +- 17 files changed, 143 insertions(+), 143 deletions(-) diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 2579431..dbb28c1 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -20,7 +20,7 @@ <!ENTITY torsettings.restartTor "Reinicia Tor"> <!ENTITY torsettings.reconfigTor "Reconfigura"> -<!ENTITY torsettings.discardSettings.prompt "Heu configurat ponts Tor o heu introduit una configuració de servidor intermediari.  Per a connectar-se directament a la xarxa Tor, aquestes preferències s'han de treure. "> +<!ENTITY torsettings.discardSettings.prompt "Heu configurat ponts Tor o heu introduït una configuració de servidor intermediari local.  Per a connectar-vos directament a la xarxa Tor, cal eliminar aquestes preferències."> <!ENTITY torsettings.discardSettings.proceed "Elimina les preferències i connecta"> <!ENTITY torsettings.optional "Opcional @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un tallafoc que només permet connexions a certs ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Ports permesos"> <!ENTITY torsettings.useBridges.checkbox "Tor està censurat al meu país"> <!ENTITY torsettings.useBridges.default "Seleccioneu un pont predefinit"> <!ENTITY torsettings.useBridges.default.placeholder "seleccioneu un pont"> @@ -64,21 +64,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Configuració del Tor"> +<!ENTITY torPreferences.torSettingsDescription "El navegador Tor encamina el vostre trànsit cap a la xarxa Tor, gestionada per milers de voluntaris de tot el món." > <!ENTITY torPreferences.learnMore "Aprèn més"> <!ENTITY torPreferences.bridges "Ponts"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "Els ponts us ajuden a accedir a la xarxa Tor en llocs on Tor està bloquejat. Depenent d'on sigueu, un pont pot funcionar millor que un altre."> +<!ENTITY torPreferences.useBridge "Utilitza un pont"> <!ENTITY torPreferences.requestNewBridge "Sol·licita un pont nou..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Proporciona un pont"> <!ENTITY torPreferences.advanced "Avançat"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Configureu la manera en què el navegador Tor es connecta a Internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Valors separats per comes"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Sol·licita un pont"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "S'està contactant amb el BridgeDB. Espereu."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolgueu el CAPTCHA per a sol·licitar un pont."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solució no és correcta. Torneu a provar-ho."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Mostra els registres de Tor."> +<!ENTITY torPreferences.viewLogs "Mostra els registres…"> +<!ENTITY torPreferences.torLogsDialogTitle "Registres del Tor"> diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index 0def0ce..ea272d0 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -57,7 +57,7 @@ torlauncher.bootstrapStatus.conn_pt=Connectant a pont torlauncher.bootstrapStatus.conn_done_pt=Connectat a pont torlauncher.bootstrapStatus.conn_proxy=Connectant a proxy torlauncher.bootstrapStatus.conn_done_proxy=Connectat a proxy -torlauncher.bootstrapStatus.conn=Conncectant a un relé de Tor +torlauncher.bootstrapStatus.conn=S'està connectant a un relé de Tor torlauncher.bootstrapStatus.conn_done=Connectat a un relé de Tor torlauncher.bootstrapStatus.handshake=S'està negociant amb un repetidor de Tor torlauncher.bootstrapStatus.handshake_done=S'ha acabat de negociar amb un repetidor de Tor diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 4781945..f99a50a 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač používá firewall, který povoluje připojení pouze přes některé porty."> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Povolené porty"> <!ENTITY torsettings.useBridges.checkbox "Tor je v mé zemi cenzurován"> <!ENTITY torsettings.useBridges.default "Vyberte vestavěný most"> <!ENTITY torsettings.useBridges.default.placeholder "vyberte most"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Nastavení sítě Tor"> +<!ENTITY torPreferences.torSettingsDescription "Prohlížeč Tor vás připojí k síti Tor, provozované tisíci dobrovolníků po celém světě." > <!ENTITY torPreferences.learnMore "Zjistit více"> <!ENTITY torPreferences.bridges "Bridge"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.useBridge "Použít bridge"> <!ENTITY torPreferences.requestNewBridge "Požádat o nový most…"> <!ENTITY torPreferences.provideBridge "Provide a bridge"> <!ENTITY torPreferences.advanced "Pokročilé"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Nastavení, jak se prohlížeč Tor připojuje k internetu."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Hodnoty oddělené čárkou"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Požádat o most"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktování BridgeDB. Čekejte prosím."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Pro vyžádání mostu prosím opište kód CAPTCHA."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Neopsali jste kód správně. Zkuste to prosím znovu."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Zobrazit protokol sítě Tor"> +<!ENTITY torPreferences.viewLogs "Zobrazit protokol…"> +<!ENTITY torPreferences.torLogsDialogTitle "Protokol sítě Tor"> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index fd93c6d..8431069 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -13,7 +13,7 @@ torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere en forbindelse til Tor- torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S). torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S -torlauncher.tor_missing=Kunne ikke finde Tor programmet. +torlauncher.tor_missing=Kunne ikke finde Tor-programmet. torlauncher.torrc_missing=torrc-filen mangler og kunne ikke dannes. torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke dannes. torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af adgangskode. diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index da85d2d..47ba13d 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Rechner geht durch eine Firewall, die nur bestimmte Anschlüsse zulässt"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Erlaubte Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor wird in meinem Land blockiert."> <!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen"> <!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Tor-Einstellungen"> +<!ENTITY torPreferences.torSettingsDescription "Der Tor Browser leitet deinen Datenverkehr über das Tor-Netzwerk, das von Tausenden von Freiwilligen auf der ganzen Welt betrieben wird." > <!ENTITY torPreferences.learnMore "Mehr erfahren"> <!ENTITY torPreferences.bridges "Brücken"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "Brücken helfen dir beim Zugriff auf das Tor-Netzwerk an Orten, an denen Tor blockiert ist. Je nachdem, wo du dich befindest, kann eine Brücke besser funktionieren als eine andere."> +<!ENTITY torPreferences.useBridge "Eine Brücke verwenden"> <!ENTITY torPreferences.requestNewBridge "Neue Brücke anfordern..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Eine Brücke zur Verfügung stellen"> <!ENTITY torPreferences.advanced "Fortgeschritten"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Konfiguriere, wie sich der Tor Browser mit dem Internet verbindet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Kommagetrennte Werte"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Brücke anfordern"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktiere BridgeDB. Bitte warten."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Löse das CAPTCHA, um eine Brücke anzufordern."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewTorLogs "Tor logs ansehen."> +<!ENTITY torPreferences.viewLogs "Logs ansehen …"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 675b42c..cbdaba8 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resuelve el CAPTCHA para solicitar un puente."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor, inténtalo de nuevo."> <!ENTITY torPreferences.viewTorLogs "Ver los registros de Tor."> -<!ENTITY torPreferences.viewLogs "ver los registros"> +<!ENTITY torPreferences.viewLogs "Ver registros…"> <!ENTITY torPreferences.torLogsDialogTitle "Registros de Tor"> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 0aa4956..4be86b3 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -1,23 +1,23 @@ -<!ENTITY torsettings.dialog.title "تنظیمات شبکه تور"> -<!ENTITY torsettings.wizard.title.default "اتصال به تور"> +<!ENTITY torsettings.dialog.title "تنظیمات شبکه Tor"> +<!ENTITY torsettings.wizard.title.default "اتصال به Tor"> <!ENTITY torsettings.wizard.title.configure "تنظیمات شبکه Tor"> <!ENTITY torsettings.wizard.title.connecting "ارتباط پایدار است">  -<!ENTITY torlauncher.localePicker.title "زبان مرورگر تور"> +<!ENTITY torlauncher.localePicker.title "زبان مرورگر Tor"> <!ENTITY torlauncher.localePicker.prompt "لطفا یک زبان انتخاب کنید.">  -<!ENTITY torSettings.connectPrompt "برای اتصال به تور بر روی "اتصال" کلیک کنید."> -<!ENTITY torSettings.configurePrompt "اگر شما در کشورهایی هستید که سعی می کنند تور را سانسور کنند (مانند مصر، چین، ترکیه)، یا اگر از یک شبکه خصوصی که نیاز به یک پروکسی دارد استفاده کنید؛ برای اعمال تنظیمات شبکه روی "پیکربندی" کلیک کنید."> +<!ENTITY torSettings.connectPrompt "برای اتصال به Tor بر روی "اتصال" کلیک کنید."> +<!ENTITY torSettings.configurePrompt "اگر شما در کشورهایی هستید که سعی می کنند Tor را سانسور کنند (مانند مصر، چین، ترکیه)، یا اگر از یک شبکه خصوصی که نیاز به یک پروکسی دارد استفاده کنید؛ برای اعمال تنظیمات شبکه روی "پیکربندی" کلیک کنید."> <!ENTITY torSettings.configure "پیکربندی"> <!ENTITY torSettings.connect "اتصال">  -<!ENTITY torsettings.startingTor "در انتظار آغاز به کار تور..."> -<!ENTITY torsettings.restartTor "تور را دوباره شوروع کنید."> +<!ENTITY torsettings.startingTor "در انتظار آغاز به کار Tor..."> +<!ENTITY torsettings.restartTor "Tor را دوباره شوروع کنید."> <!ENTITY torsettings.reconfigTor "پیکربندی مجدد"> <!ENTITY torsettings.discardSettings.prompt "شما تنظیمات bridge تٌٌر را انجام داده اید و یا از پروکسی محلی استفاده می کنید.  برای برقراری ارتباط مستقیم با شبکه تٌر، این تنظیمات باید حذف گردند."> @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد."> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> -<!ENTITY torsettings.useBridges.checkbox "تور در کشور من فیلتر یا سانسور شده است"> +<!ENTITY torsettings.useBridges.checkbox "Tor در کشور من فیلتر یا سانسور شده است"> <!ENTITY torsettings.useBridges.default "پل ساخته شده را انتخاب کنید"> <!ENTITY torsettings.useBridges.default.placeholder "یک پل انتخاب کنید"> <!ENTITY torsettings.useBridges.bridgeDB "درخواست یک پل از torproject.org"> @@ -49,14 +49,14 @@ <!ENTITY torsettings.useBridges.label "اطلاعات پل را از یک منبع مورد اعتماد وارد کنید."> <!ENTITY torsettings.useBridges.placeholder "نوع آدرس: درگاه - پورت (هر کدام در یک خط)"> -<!ENTITY torsettings.copyLog "کپی گزارش وقایع تور"> +<!ENTITY torsettings.copyLog "کپی گزارش وقایع Tor"> <!ENTITY torsettings.proxyHelpTitle "کمک پروکسی"> <!ENTITY torsettings.proxyHelp1 "اگر از طریق شبکه‌ی یک شرکت، مدرسه، یا دانشگاه به اینترنت متصل می‌شوید، ممکن است احتیاج به یک پروکسی داخلی داشته باشید. اگر از احتیاج به پروکسی داخلی مطمئن نیستید، به تنظیمات شبکه یک مرورگر دیگر یا تنظیمات شبکه سیستم خود نگاه کنید."> <!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی"> -<!ENTITY torsettings.bridgeHelp1 "پل‌ها رله‌هایی فهرست نشده هستند که مسدودیت ارتباط به شبکه Tor را سخت‌تر می‌کنند.  هر نوعی از پل از روش مختلفی برای مقابله با سانسور استفاده می‌کند.  نوع obgs ترافیک شما را شبیه نویزهای راندوم نشان می‌دهند و نوع meek ترافیک شما را به جای اتصال به تور، در حال اتصال به آن خدمات نشان می‌دهد."> -<!ENTITY torsettings.bridgeHelp2 "به دلیل اینکه بعضی کشورها سعی بر مسدودسازی تور دارند، بعضی از پل‌ها فقط در این کشورها کار می‌کنند.  اگر مطمئن نیستید که کدام پل‌ها در کشور شما کار می‌کنند، اینجا را ببینید torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "پل‌ها رله‌هایی فهرست نشده هستند که مسدودیت ارتباط به شبکه Tor را سخت‌تر می‌کنند.  هر نوعی از پل از روش مختلفی برای مقابله با سانسور استفاده می‌کند.  نوع obgs ترافیک شما را شبیه نویزهای راندوم نشان می‌دهند و نوع meek ترافیک شما را به جای اتصال به Tor، در حال اتصال به آن خدمات نشان می‌دهد."> +<!ENTITY torsettings.bridgeHelp2 "به دلیل اینکه بعضی کشورها سعی بر مسدودسازی Tor دارند، بعضی از پل‌ها فقط در این کشورها کار می‌کنند.  اگر مطمئن نیستید که کدام پل‌ها در کشور شما کار می‌کنند، اینجا را ببینید torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "لطفا صبر کنید. در حال برقراری ارتباط با شبکه تٌر.&160; این پروسه ممکن است چند دقیقه به طول بینجامد."> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index b7e3946..df7893a 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -1,26 +1,26 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=اجراکننده تور +torlauncher.error_title=اجراکننده Tor torlauncher.tor_exited_during_startup=تُر در هنگام شروع بسته شد. ممکن است این بعلت خطایی در فایل torrc شما، خطایی در برنامه تُر تا برنامه دیگری روی کامپیوتر شما، و یا ایراد سخت افزاری باشد. تا زمانی که شما خطای رخ داده را بررسی رفع کنید و تُر را دوباره اجرا کنید، مرورگر تُر شروع نخواهد شد. torlauncher.tor_exited=Tor به طور غیر منتظره خارج شد که این ممکن است به علت یک اشکال در Tor و یا یک برنامه دیگر بر روی سیستم شما و یا یک سخت افزار معیوب اتفاق افتاده باشد، تا زمانی که دوباره Tor را اجرا نمائید مرورگر Tor قادر نخواهد بود به هیچ سایتی دسترسی داشته باشد. اگر این مشکل ادامه داشت، لطفا یک کپی از Log Tor خود را به تیم پشتیبانی ارسال کنید. torlauncher.tor_exited2=شروع مجدد، Tor نمی تواند زبانه های مرورگر را ببندد. -torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی‌باشد. +torlauncher.tor_controlconn_failed=اتصال به پورت کنترل Tor امکان پذیر نمی‌باشد. torlauncher.tor_failed_to_start=خطا در راه اندازی. -torlauncher.tor_control_failed=به‌دست گرفتن کنترل تور ناموفق بود. -torlauncher.tor_bootstrap_failed=تور در برقراری یک ارتباط با شبکه خود ناموفق بود. +torlauncher.tor_control_failed=به‌دست گرفتن کنترل Tor ناموفق بود. +torlauncher.tor_bootstrap_failed=Tor در برقراری یک ارتباط با شبکه خود ناموفق بود. torlauncher.tor_bootstrap_failed_details=%1$S ناموفق بود (%2$S). -torlauncher.unable_to_start_tor=تور قادر به اجرا شدن نیست\n\n%S -torlauncher.tor_missing=فایل اجرایی تور یافت نشد. +torlauncher.unable_to_start_tor=Tor قادر به اجرا شدن نیست\n\n%S +torlauncher.tor_missing=فایل اجرایی Tor یافت نشد. torlauncher.torrc_missing=فایل torrc پیدا نشد و ساخت فایل جدید ناموفق بود. torlauncher.datadir_missing=دایرکتوری اطلاعات تٌر وجود ندارد و ساخت آن نیز ناموفق بود. torlauncher.password_hash_missing=کلمهٔ عبور رمزشده دریافت نشد. -torlauncher.failed_to_get_settings=ناموفق در بازگردانی تنظیمات تور.\n\n%S -torlauncher.failed_to_save_settings=ناموفق در ذخیره تنظیمات تور.\n\n%S -torlauncher.ensure_tor_is_running=لطفا از فعال بودن تور اطمینان حاصل کنید. +torlauncher.failed_to_get_settings=ناموفق در بازگردانی تنظیمات Tor.\n\n%S +torlauncher.failed_to_save_settings=ناموفق در ذخیره تنظیمات Tor.\n\n%S +torlauncher.ensure_tor_is_running=لطفا از فعال بودن Tor اطمینان حاصل کنید. torlauncher.error_proxy_addr_missing=شما میبایست یک آدرس آی پی یا یک نام میزبان و یک شماره درگاه برای پیکربندی تُر مشخص کنید جهت استفاده ار یک پیشکار برای دسترسی به اینترنت. torlauncher.error_proxy_type_missing=شما باید نوع پراکسی را انتخاب کنید. @@ -42,7 +42,7 @@ torlauncher.no_meek=این مرورگر برای meek پیکربندی نشده torlauncher.no_bridges_available=متاسفم. در حال حاضر هیچ کدام از پل‌ها در دسترس نیستند. torlauncher.connect=اتصال -torlauncher.restart_tor=تور را ریستارت کنید. +torlauncher.restart_tor=Tor را ریستارت کنید. torlauncher.quit=خروج torlauncher.quit_win=خروج torlauncher.done=انجام شد @@ -57,10 +57,10 @@ torlauncher.bootstrapStatus.conn_pt=در حال اتصال به پل torlauncher.bootstrapStatus.conn_done_pt=اتصال به پل برقرار شد torlauncher.bootstrapStatus.conn_proxy=در حال اتصال به پراکسی torlauncher.bootstrapStatus.conn_done_proxy=اتصال به پراکسی برقرار شد -torlauncher.bootstrapStatus.conn=در حال اتصال به یک پل تور -torlauncher.bootstrapStatus.conn_done=به یک پل تور متصل شد -torlauncher.bootstrapStatus.handshake=در حال مذاکره با یک پل تور -torlauncher.bootstrapStatus.handshake_done=مذاکره با یک پل تور انجام شد +torlauncher.bootstrapStatus.conn=در حال اتصال به یک پل Tor +torlauncher.bootstrapStatus.conn_done=به یک پل Tor متصل شد +torlauncher.bootstrapStatus.handshake=در حال مذاکره با یک پل Tor +torlauncher.bootstrapStatus.handshake_done=مذاکره با یک پل Tor انجام شد torlauncher.bootstrapStatus.onehop_create=برپایی یک اتصال فهرست رمزبندی شده torlauncher.bootstrapStatus.requesting_status=بازیابی وضیعت شبکه torlauncher.bootstrapStatus.loading_status=بارگذاری وضیعت شبکه @@ -72,12 +72,12 @@ torlauncher.bootstrapStatus.ap_conn_pt=برقراری مسیریاب: در حا torlauncher.bootstrapStatus.ap_conn_done_pt=برقراری مسیریاب: به پل متصل شد torlauncher.bootstrapStatus.ap_conn_proxy=برقراری مسیریاب: در حال اتصال به پراکسی torlauncher.bootstrapStatus.ap_conn_done_proxy=برقراری مسیریاب: به پراکسی متصل شد -torlauncher.bootstrapStatus.ap_conn=برقراری مسیریاب: در حال اتصال به یک رله تور -torlauncher.bootstrapStatus.ap_conn_done=برقراری مسیریاب: به یک رله تور متصل شد -torlauncher.bootstrapStatus.ap_handshake=برقراری مسیریاب: در حال مذاکره با یک رله تور -torlauncher.bootstrapStatus.ap_handshake_done=برقراری مسیریاب: مذاکره با یک رله تور انجام شد -torlauncher.bootstrapStatus.circuit_create=برقراری مسیریاب: در حال برقراری مسیریاب تور -torlauncher.bootstrapStatus.done=به شبکه تور متصل شد! +torlauncher.bootstrapStatus.ap_conn=برقراری مسیریاب: در حال اتصال به یک رله Tor +torlauncher.bootstrapStatus.ap_conn_done=برقراری مسیریاب: به یک رله Tor متصل شد +torlauncher.bootstrapStatus.ap_handshake=برقراری مسیریاب: در حال مذاکره با یک رله Tor +torlauncher.bootstrapStatus.ap_handshake_done=برقراری مسیریاب: مذاکره با یک رله Tor انجام شد +torlauncher.bootstrapStatus.circuit_create=برقراری مسیریاب: در حال برقراری مسیریاب Tor +torlauncher.bootstrapStatus.done=به شبکه Tor متصل شد! torlauncher.bootstrapWarning.done=انجام شد torlauncher.bootstrapWarning.connectrefused=اتصال رد شد diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index e3887ba..fe9067e 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Vaihtoehtoinen"> <!ENTITY torsettings.useProxy.checkbox "Käytän välityspalvelinta yhdistääkseni internetiin"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "Välityspalvelimen tyyppi"> <!ENTITY torsettings.useProxy.type.placeholder "valitse välityspalvelintyyppi"> <!ENTITY torsettings.useProxy.address "Osoite"> <!ENTITY torsettings.useProxy.address.placeholder "IP-osoite tai palvelinnimi"> @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tämän tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Sallitut portit"> <!ENTITY torsettings.useBridges.checkbox "Maani sensuroi Tor'ia"> <!ENTITY torsettings.useBridges.default "Valitse sisäänrakennettu silta"> <!ENTITY torsettings.useBridges.default.placeholder "valitse silta"> @@ -64,21 +64,21 @@ Tässä saattaa kestää muutama minuutti.">  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> +<!ENTITY torPreferences.torSettings "Tor-asetukset"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > <!ENTITY torPreferences.learnMore "Opi lisää"> <!ENTITY torPreferences.bridges "Sillat"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.useBridge "Käytä siltaa"> <!ENTITY torPreferences.requestNewBridge "Pyydä uusi silta..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Tarjoa silta"> <!ENTITY torPreferences.advanced "Lisätietoja"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> +<!ENTITY torPreferences.advancedDescription "Määritä kuinka Tor-selain yhdistää internetiin."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Pyydä siltaa"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ratkaise CAPTCHA jotta voit pyytää sillan."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ratkaisu ei ollut oikein. Yritä uudelleen."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Katsele Tor-lokeja."> +<!ENTITY torPreferences.viewLogs "Näytä lokit…"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor-lokit"> diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 43c8b0c..4dd51db 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "A számítógép egy tűzfalon keresztül kommunikál, ami csak adott portokon keresztül engedélyezi a kapcsolatotokat."> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok"> <!ENTITY torsettings.useBridges.checkbox "A Tor cenzúrázva van az országomban"> <!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat"> <!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Tor beállítások"> +<!ENTITY torPreferences.torSettingsDescription "A Tor böngésző átroutolja forgalmát a Tor hálózaton, amit több ezer önkéntes tart fenn, szerte a világon." > <!ENTITY torPreferences.learnMore "Tudjon meg többet"> <!ENTITY torPreferences.bridges "Hidak"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "A hidak segíthetik a Tor hálózatok elérését olyan helyeken, ahol a Tor blokkolt. Attól függően, hogy hol van egyik híd jobban működhet, mint egy másik."> +<!ENTITY torPreferences.useBridge "Híd használata"> <!ENTITY torPreferences.requestNewBridge "Új híd kérése..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Híd megadása"> <!ENTITY torPreferences.advanced "Speciális"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Állítsa be a Tor Böngésző hogyan csatlakozzon az internethez."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Vesszővel elválasztott értékek"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Híd kérése"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kapcsolódás a hídadatbázishoz. Kérjük várjon."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Oldjon meg egy CAPTCHA-t a híd kéréséhez."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "A megoldás nem helyes. Kérjük próbálja újra."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Tor napló megtekintése."> +<!ENTITY torPreferences.viewLogs "Napló megtekintése..."> +<!ENTITY torPreferences.torLogsDialogTitle "Tor Napló"> diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 9f9925e..c1b2ff4 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Porte consentite"> <!ENTITY torsettings.useBridges.checkbox "Tor viene censurato nel mio Paese"> <!ENTITY torsettings.useBridges.default "Seleziona un bridge integrato"> <!ENTITY torsettings.useBridges.default.placeholder "seleziona un bridge"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Impostazioni di Tor"> +<!ENTITY torPreferences.torSettingsDescription "Tor Browser indirizza il tuo traffico nella rete Tor, gestita da migliaia di volontari in tutto il mondo." > <!ENTITY torPreferences.learnMore "Maggiori informazioni"> <!ENTITY torPreferences.bridges "Ponti"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "I bridge ti aiutano ad accedere alla rete Tor in luoghi dove Tor viene bloccato. A seconda di dove ti trovi, un bridge può funzionare meglio di un altro."> +<!ENTITY torPreferences.useBridge "Usa un bridge"> <!ENTITY torPreferences.requestNewBridge "Richiedi un nuovo bridge..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Fornisci un bridge"> <!ENTITY torPreferences.advanced "Avanzate"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Configura come Tor Browser si connette a internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Valori separati da una virgola"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Richiedi bridge"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contatto BridgeDB. Attendere, prego."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Risolvi il CAPTCHA per richiedere un bridge."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluzione è sbagliata. Riprova."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Visualizza i log di Tor."> +<!ENTITY torPreferences.viewLogs "Visualizza log..."> +<!ENTITY torPreferences.torLogsDialogTitle "Log di Tor"> diff --git a/src/chrome/locale/pt-PT/network-settings.dtd b/src/chrome/locale/pt-PT/network-settings.dtd index 64043f8..131cb4a 100644 --- a/src/chrome/locale/pt-PT/network-settings.dtd +++ b/src/chrome/locale/pt-PT/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas"> <!ENTITY torsettings.useBridges.checkbox "O Tor é censurado no meu país"> <!ENTITY torsettings.useBridges.default "Selecionar uma ponte integrada"> <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> @@ -67,17 +67,17 @@ <!ENTITY torPreferences.torSettingsDescription "O Tor Browse envia o seu tráfego pela Tor Network, operada por milhares de voluntários em todo o mundo." > <!ENTITY torPreferences.learnMore "Saber Mais"> <!ENTITY torPreferences.bridges "Pontes"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "Pontes ajudam-no a aceder à Tor Network em sítios onde o Tor está bloqueado. Dependendo de onde estiver, uma ponte pode funcionar melhor que outra."> +<!ENTITY torPreferences.useBridge "Use uma ponte"> <!ENTITY torPreferences.requestNewBridge "Solicitar uma Nova Ponte..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Forneça uma ponte"> <!ENTITY torPreferences.advanced "Avançado"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Configure como o Tor Browser se contecta à internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por vírgula"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Solicitar uma ponte"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "A contactar a BridgeDB. Por favor, aguarde."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Ver os registos do Tor."> +<!ENTITY torPreferences.viewLogs "Ver os registos..."> +<!ENTITY torPreferences.torLogsDialogTitle "Registos do Tor"> diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 6c890c2..5e950b0 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Необязательно"> <!ENTITY torsettings.useProxy.checkbox "Я использую прокси для подключения к интернету"> -<!ENTITY torsettings.useProxy.type "Тип Прокси"> +<!ENTITY torsettings.useProxy.type "Тип прокси"> <!ENTITY torsettings.useProxy.type.placeholder "выбор типа прокси"> <!ENTITY torsettings.useProxy.address "Адрес"> <!ENTITY torsettings.useProxy.address.placeholder "IP-адрес или имя узла"> @@ -36,9 +36,9 @@ <!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 "Мой сетевой экран позволяет мне подключиться только к определенным портам"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> -<!ENTITY torsettings.useBridges.checkbox "Tor запрещен в моей стране"> +<!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определённым портам"> +<!ENTITY torsettings.firewall.allowedPorts "Разрешённые порты"> +<!ENTITY torsettings.useBridges.checkbox "Tor запрещён в моей стране"> <!ENTITY torsettings.useBridges.default "Выбрать встроенный мост"> <!ENTITY torsettings.useBridges.default.placeholder "выбор моста"> <!ENTITY torsettings.useBridges.bridgeDB "Запросить мост от torproject.org"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> <!ENTITY torsettings.bridgeHelp1 "Мосты - это непубличные реле, которые затрудняют блокировку соединений с сетью Tor.&#160 Каждый тип моста использует отличный от других метод, чтобы избежать блокировки цезорами. Мосты типа obfs делают ваш трафик похожим на случайный шум, в то время, как мосты типа meed имитируют подключение к службе, отличной от Tor."> -<!ENTITY torsettings.bridgeHelp2 "Из-за того, как именно страны пытаются блокировать Tor, определенные мосты работают в одних странах, но не работают в других.  Если вы не уверены в том, какие мосты сработает в вашей стране, посетите torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp2 "Из-за того, как именно страны пытаются блокировать Tor, определённые мосты работают в одних странах, но не работают в других.  Если вы не уверены в том, какие мосты сработает в вашей стране, посетите torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> @@ -77,7 +77,7 @@ <!ENTITY torPreferences.requestBridgeDialogTitle "Запрос моста"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Обращение к BridgeDB. Пожалуйста, подождите."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решите CAPTCHA для запроса моста."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "Решение не является правильным. Попробуйте еще раз."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Решение не является правильным. Попробуйте ещё раз."> <!ENTITY torPreferences.viewTorLogs "Просмотр журналов Tor."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Просмотр журналов…"> <!ENTITY torPreferences.torLogsDialogTitle "Журналы Tor"> diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index 29bbbf1..fa1c371 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Voliteľné"> <!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu používam proxy"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "Typ Proxy"> <!ENTITY torsettings.useProxy.type.placeholder "vybrať typ proxy"> <!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa"> @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač ide cez firewall, ktorý povoľuje iba niektoré porty"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Povolené porty"> <!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovaný"> <!ENTITY torsettings.useBridges.default "Zvoľte zabudované premostenie"> <!ENTITY torsettings.useBridges.default.placeholder "zvoľte premostenie"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > -<!ENTITY torPreferences.learnMore "Learn More"> +<!ENTITY torPreferences.torSettings "Nastavenia Tor"> +<!ENTITY torPreferences.torSettingsDescription "Prehliadač Tor smeruje váš prenos cez sieť Tor, prevádzkovanú tisíckami dobrovoľníkov z celého sveta." > +<!ENTITY torPreferences.learnMore "Zistite viac"> <!ENTITY torPreferences.bridges "Mosty"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "Premostenia vám pomáhajú pripojiť sa k sieti Tor tam, kde je Tor blokovaný. V závislosti od toho, kde sa nachádzate niektoré premostenie môže fungovať lepšie ako iné."> +<!ENTITY torPreferences.useBridge "Použiť premostenie"> <!ENTITY torPreferences.requestNewBridge "Požiadať o nové premostenie."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Poskytnúť premostenie"> <!ENTITY torPreferences.advanced "Pokročilé"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Nastavte, akým spôsobom sa prehliadač Tor pripája na internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Hodnoty oddelené čiarkou"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Vyžiadať Premostenie"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Spájam sa s databázou Premostení. Prosím čakajte."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Vyrieš CAPTCHA na vyžiadanie premostenia."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Riešenie nie je správne. Prosím skúste znova."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Zobraziť záznamy Tor."> +<!ENTITY torPreferences.viewLogs "Zobraziť záznamy..."> +<!ENTITY torPreferences.torLogsDialogTitle "Záznamy Tor"> diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index 022c7bd..1250a78 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një muri mbrojtës, që i lejon lidhje vetëm me disa porta."> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara"> <!ENTITY torsettings.useBridges.checkbox "TOR është i çensuruar në vëndin tim"> <!ENTITY torsettings.useBridges.default "Zgjidh një urë të paracaktuar"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index af1e8dd..1d348c6 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -64,7 +64,7 @@  <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Tor Ayarları"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser sizi tüm dünyada binlerce gönüllü tarafından işletilen Tor Ağına bağlar." > +<!ENTITY torPreferences.torSettingsDescription "Tor Browser sizi dünyada binlerce gönüllü tarafından işletilen Tor Ağına bağlar." > <!ENTITY torPreferences.learnMore "Ayrıntılı Bilgi Alın"> <!ENTITY torPreferences.bridges "Köprüler"> <!ENTITY torPreferences.bridgesDescription "Köprüler Tor bağlantısının engellendiği yerlerden Tor Ağına erişmek için kullanılır.. Bulunduğunuz konuma göre bir köprü türü diğerinden daha uygun olabilir."> diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 5824833..05cbd95 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "解決驗證碼來請求橋接"> <!ENTITY torPreferences.requestBridgeErrorBadSolution "解答不正確。請再試一次。"> <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "查看日誌…"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">

1 0

[tor-launcher/master] Release preparations for 0.2.20.2
by gk＠torproject.org 01 Nov '19

01 Nov '19

commit fbf7da41d263f9db08932f9c532e4fc091f818f4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 1 08:58:31 2019 +0000 Release preparations for 0.2.20.2 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 7b456cd..99d4af3 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.20.1</em:version> + <em:version>0.2.20.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[metrics-lib/release] Make NetworkStatusEntryImpl#parseSLine thread-safe.
by karsten＠torproject.org 01 Nov '19

01 Nov '19

commit bde697f44702c3f93cfff7953ff8f5962582e2e1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 24 21:29:07 2019 +0200 Make NetworkStatusEntryImpl#parseSLine thread-safe. The bug was that we accessed static class members, namely the two maps NetworkStatusEntryImpl#flagIndexes and #flagStrings, during instance creation without synchronization. This worked just fine with a single thread creating instances, but it breaks with multiple threads doing that at the same time. The fix is to keep a separate map per NetworkStatusImpl instance and share that between all its NetworkStatusEntryImpl instances. This doesn't save as much memory as sharing maps between all NetworksStatusEntryImpl instances ever created, but it's a reasonable compromise between memory and runtime efficiency. In contrast to that, synchronizing map access would have put a major runtime performance penalty on parsing. Fixes #32194. --- CHANGELOG.md | 3 +++ .../descriptor/impl/NetworkStatusEntryImpl.java | 27 +++++++++++----------- .../descriptor/impl/NetworkStatusImpl.java | 8 ++++++- .../impl/RelayNetworkStatusConsensusImpl.java | 3 ++- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c7610a..73022cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes in version 2.?.? - 2019-??-?? + * Medium changes + - Make NetworkStatusEntryImpl#parseSLine thread-safe. + # Changes in version 2.8.0 - 2019-10-18 diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 2ddaaa0..e6a78f6 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -12,7 +12,6 @@ import org.torproject.descriptor.NetworkStatusEntry; import java.util.ArrayList; import java.util.BitSet; import java.util.EnumSet; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -48,13 +47,19 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { return lines; } + private Map<String, Integer> flagIndexes; + + private Map<Integer, String> flagStrings; + protected NetworkStatusEntryImpl(DescriptorImpl parent, int offset, - int length, boolean microdescConsensus) - throws DescriptorParseException { + int length, boolean microdescConsensus, Map<String, Integer> flagIndexes, + Map<Integer, String> flagStrings) throws DescriptorParseException { this.parent = parent; this.offset = offset; this.length = length; this.microdescConsensus = microdescConsensus; + this.flagIndexes = flagIndexes; + this.flagStrings = flagStrings; this.parseStatusEntryBytes(); this.clearAtMostOnceKeys(); } @@ -160,21 +165,17 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { this.orAddresses.add(parts[1]); } - private static Map<String, Integer> flagIndexes = new HashMap<>(); - - private static Map<Integer, String> flagStrings = new HashMap<>(); - private void parseSLine(String[] parts) throws DescriptorParseException { this.parsedAtMostOnceKey(Key.S); - BitSet flags = new BitSet(flagIndexes.size()); + BitSet flags = new BitSet(this.flagIndexes.size()); for (int i = 1; i < parts.length; i++) { String flag = parts[i]; - if (!flagIndexes.containsKey(flag)) { - flagStrings.put(flagIndexes.size(), flag); - flagIndexes.put(flag, flagIndexes.size()); + if (!this.flagIndexes.containsKey(flag)) { + this.flagStrings.put(this.flagIndexes.size(), flag); + this.flagIndexes.put(flag, this.flagIndexes.size()); } - flags.set(flagIndexes.get(flag)); + flags.set(this.flagIndexes.get(flag)); } this.flags = flags; } @@ -353,7 +354,7 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { if (this.flags != null) { for (int i = this.flags.nextSetBit(0); i >= 0; i = this.flags.nextSetBit(i + 1)) { - result.add(flagStrings.get(i)); + result.add(this.flagStrings.get(i)); } } return result; diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java index 0694aff..b763f30 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -10,7 +10,9 @@ import org.torproject.descriptor.NetworkStatusEntry; import java.io.File; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; @@ -19,6 +21,10 @@ import java.util.TreeMap; * delegate the specific parts to the subclasses. */ public abstract class NetworkStatusImpl extends DescriptorImpl { + protected Map<String, Integer> flagIndexes = new HashMap<>(); + + protected Map<Integer, String> flagStrings = new HashMap<>(); + protected NetworkStatusImpl(byte[] rawDescriptorBytes, int[] offsetAndLength, File descriptorFile, boolean containsDirSourceEntries, boolean blankLinesAllowed) throws DescriptorParseException { @@ -140,7 +146,7 @@ public abstract class NetworkStatusImpl extends DescriptorImpl { protected void parseStatusEntry(int offset, int length) throws DescriptorParseException { NetworkStatusEntryImpl statusEntry = new NetworkStatusEntryImpl( - this, offset, length, false); + this, offset, length, false, this.flagIndexes, this.flagStrings); this.statusEntries.put(statusEntry.getFingerprint(), statusEntry); List<String> unrecognizedStatusEntryLines = statusEntry .getAndClearUnrecognizedLines(); diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 904dc35..66b8eaa 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -119,7 +119,8 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl protected void parseStatusEntry(int offset, int length) throws DescriptorParseException { NetworkStatusEntryImpl statusEntry = new NetworkStatusEntryImpl(this, - offset, length, this.microdescConsensus); + offset, length, this.microdescConsensus, this.flagIndexes, + this.flagStrings); this.statusEntries.put(statusEntry.getFingerprint(), statusEntry); List<String> unrecognizedStatusEntryLines = statusEntry .getAndClearUnrecognizedLines();

1 0

[metrics-lib/release] Bump version to 2.8.0-dev.
by karsten＠torproject.org 01 Nov '19

01 Nov '19

commit 02e486d16d85d037caefbd2c776d720a7074e231 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 18 09:43:10 2019 +0200 Bump version to 2.8.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61d9e48..9c7610a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 2.?.? - 2019-??-?? + + # Changes in version 2.8.0 - 2019-10-18 * Medium changes diff --git a/build.xml b/build.xml index f131a75..29fbbb5 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.8.0" /> + <property name="release.version" value="2.8.0-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Prepare for 2.9.0 release.
by karsten＠torproject.org 01 Nov '19

01 Nov '19

commit 4bdfc62905e8e3bf7a88ef9ac7ff473ff41f366a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 1 09:10:25 2019 +0100 Prepare for 2.9.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- src/build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73022cf..ab5c711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.?.? - 2019-??-?? +# Changes in version 2.9.0 - 2019-11-01 * Medium changes - Make NetworkStatusEntryImpl#parseSLine thread-safe. diff --git a/build.xml b/build.xml index 29fbbb5..ff5db58 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.8.0-dev" /> + <property name="release.version" value="2.9.0" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" /> diff --git a/src/build b/src/build index d82fff9..eb16cb3 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit d82fff984634fe006ac7b0b102e7f48a52ca20d9 +Subproject commit eb16cb359db41722e6089bafb1e26808df4338df

1 0