- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 20426: Build libevent for osx using faketime
by boklm＠torproject.org 14 Apr '17

14 Apr '17

commit d2c018a26ec61f85a2fa7a0f9a7360025ff0fb24 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 14 15:56:53 2017 +0200 Bug 20426: Build libevent for osx using faketime --- projects/libevent/build | 4 ++++ projects/libevent/config | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/projects/libevent/build b/projects/libevent/build index 2bed816..0e4e074 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -7,6 +7,10 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir +[% IF c("var/osx") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" +[% END -%] make -j4 make install cd /var/tmp/dist diff --git a/projects/libevent/config b/projects/libevent/config index 8bd4b4e..15ada11 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -7,6 +7,12 @@ gpg_keyring: libevent.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 +targets: + osx-x86_64: + var: + arch_deps: + - faketime + input_files: - project: docker-image - name: '[% c("var/compiler") %]'

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit cd299eea7451d92fc7d47374d42080ec7b9712b1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 20:30:03 2017 +0000 Translations update --- src/chrome/locale/ar/network-settings.dtd | 2 +- src/chrome/locale/bn/network-settings.dtd | 2 +- src/chrome/locale/da/network-settings.dtd | 52 +++++++++++++------------- src/chrome/locale/da/progress.dtd | 8 ++-- src/chrome/locale/da/torlauncher.properties | 18 ++++----- src/chrome/locale/es-MX/network-settings.dtd | 2 +- src/chrome/locale/es/network-settings.dtd | 28 +++++++------- src/chrome/locale/es/torlauncher.properties | 4 +- src/chrome/locale/fil/progress.dtd | 2 +- src/chrome/locale/fil/torlauncher.properties | 8 ++-- src/chrome/locale/fr-CA/network-settings.dtd | 4 +- src/chrome/locale/fr/network-settings.dtd | 28 +++++++------- src/chrome/locale/fr/torlauncher.properties | 6 +-- src/chrome/locale/hr-HR/network-settings.dtd | 4 +- src/chrome/locale/hr-HR/torlauncher.properties | 6 +-- src/chrome/locale/it/network-settings.dtd | 2 +- src/chrome/locale/lt/network-settings.dtd | 22 +++++------ src/chrome/locale/lt/torlauncher.properties | 20 +++++----- src/chrome/locale/nb/network-settings.dtd | 2 +- src/chrome/locale/pt/network-settings.dtd | 14 +++---- src/chrome/locale/pt/progress.dtd | 2 +- src/chrome/locale/pt/torlauncher.properties | 8 ++-- src/chrome/locale/ru/network-settings.dtd | 2 +- src/chrome/locale/sv/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/network-settings.dtd | 2 +- 25 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 73be5a2..a20acd8 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "إعدادات الشبكة"> +<!ENTITY torsettings.dialog.title "إعدادات شبكة تور">  <!ENTITY torlauncher.localePicker.title "لغة متصفح تور"> diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index a674a2c..5ebd2d0 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index aa32a1f..2851032 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -1,75 +1,75 @@ <!ENTITY torsettings.dialog.title "Tor netværksindstillinger">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Sprog"> +<!ENTITY torlauncher.localePicker.title "Tor Browser sprog"> <!ENTITY torlauncher.localePicker.prompt "Vælg venligst et sprog.">  -<!ENTITY torsettings.prompt "Før du forbinder til Tor netværket, skal du indtaste information om denne computers Internetforbindelse."> +<!ENTITY torsettings.prompt "Før du opretter forbindelse til Tor-netværket, skal du indtaste information om denne computers internetforbindelse."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nej"> <!ENTITY torSettings.firstQuestion "Hvilke af de følgende beskriver bedst din situation?"> <!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret eller er etableret gennem en proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Jeg skal konfigurerer bro- og lokal proxyindstillinger før jeg opretter forbindelse til Tor-netværket."> <!ENTITY torSettings.configure "Indstil"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Jeg vil foretage en direkte forbindelse til Tor-netværket."> <!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer"> <!ENTITY torSettings.connect "Tilslut"> <!ENTITY torSettings.proxyPageTitle "Lokale proxy indstillinger"> -<!ENTITY torSettings.proxyQuestion "Behøver denne computer bruge en lokal proxy for at tilgå Internettet?"> +<!ENTITY torSettings.proxyQuestion "Behøver denne computer bruge en lokal proxy for at tilgå internettet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfælde er en lokal proxy ikke nødvendig, men det kan være krævet når der oprettes forbindelse gennem netværket i en virksomhed, skole eller universitet."> +<!ENTITY torSettings.proxyExplanation2 "Hvis du ikke er sikker på hvad du skal svare til dette spørgsmål, så kig i internetindstillingerne i en anden browser og tjek dit systems netværksindstillinger, for at se hvorvidt det er nødvendigt med en lokal proxy."> <!ENTITY torSettings.enterProxy "Indtast proxy-indstillinger."> <!ENTITY torSettings.bridgePageTitle "Tor bridge konfiguration"> -<!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor netværket?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "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.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor-netværket?"> +<!ENTITY torSettings.bridgeExplanation1 "Hvis du ikke er sikker på hvad du skal svare til dette spørgsmål, så vælg Nej (hvis du ikke er i stand til at oprette forbindelse til Tor-netværket gennem en bro, så kan du tilføje en senere)."> +<!ENTITY torSettings.bridgeExplanation2 "Hvis du vælger Ja, så vil du blive spurgt om at konfigurere Tor-broer, hvilket er ulistede relæer som gøre det svære at blokere forbindelser til Tor-netværket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruge det tildelte sæt broer eller du kan hente og indtaste et skræddersyet sæt broer.">  <!ENTITY torsettings.startingTor "Venter på at Tor starter..."> <!ENTITY torsettings.restartTor "Genstart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Genkonfigurer"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Du har konfigureret Tor-broer eller du har indtastet lokale proxyindstillinger.  For at kunne foretage direkte forbindelse til Tor-netværket, skal disse indstillinger fjernes."> +<!ENTITY torsettings.discardSettings.proceed "Fjern indstillinger og opret forbindelse"> <!ENTITY torsettings.optional "Valgfri"> -<!ENTITY torsettings.useProxy.checkbox "Denne computer skal bruge en lokal proxy for at tilgå Internettet"> +<!ENTITY torsettings.useProxy.checkbox "Denne computer skal bruge en lokal proxy for at tilgå internettet"> <!ENTITY torsettings.useProxy.type "Proxy type:"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresse eller værtsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Brugernavn:"> -<!ENTITY torsettings.useProxy.password "Kodeord:"> +<!ENTITY torsettings.useProxy.password "Adgangskode:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne computer går gennem en firewall som kun tillader forbindelse til specifikke porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> -<!ENTITY torsettings.useBridges.checkbox "Min udbyder (ISP) blokerer forbindelse til Tor netværket"> +<!ENTITY torsettings.useBridges.checkbox "Min internetudbyder (ISP) blokerer forbindelser til Tor-netværket"> <!ENTITY torsettings.useBridges.default "Forbind med tildelte broer"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.note "Hver type bro bruger forskellige metoder for at undgå censurering.  Hvis en bro ikke virker, så prøv igen med en anden."> +<!ENTITY torsettings.useBridges.type "Transporttype:"> <!ENTITY torsettings.useBridges.custom "Indtast skræddersyede broer"> -<!ENTITY torsettings.useBridges.label "Indtast et eller flere bro-relæer (et per linie)"> +<!ENTITY torsettings.useBridges.label "Indtast et eller flere bro-relæer (et pr. linje)"> <!ENTITY torsettings.useBridges.placeholder "type adresse:port"> <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen"> <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> -<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan forbinde dig til Tor netværket er det muligt at din internet udbyder (ISP) eller anden myndighed blokerer Tor.   Det er ofte muligt at komme rundt om en blokade ved at bruge en Tor bro. En bro er et relæ som ikke er på den offentliggjorte liste og som derfor er sværere at blokkere."> -<!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 methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "På nettet"> +<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan oprette forbindelse til Tor-netværket er det muligt at din internetudbyder (ISP) eller anden myndighed blokerer Tor.   Det er ofte muligt at omgå problemet ved at bruge Tor-broer. En bro er et relæ som ikke er på den offentliggjorte liste og som derfor er sværere at blokkere."> +<!ENTITY torsettings.bridgeHelp1B "Du kan bruge de prækonfigurerede, tildelte sæt af broadresser eller du kan få fat i et tilpasset sæt af adresser, ved at bruge en af disse metoder:"> +<!ENTITY torsettings.bridgeHelp2Heading "Gennem webbet"> <!ENTITY torsettings.bridgeHelp2 "Brug en browser og besøg https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske email service"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send e-mail til bridges(a)torproject.org med linjen 'get bridges' som det eneste i beskedteksten.  Men, for at gøre det sværere for en angriber at få kendskab til en masse broadresser, skal du sende din forespørgsel fra en af de følgende e-mailudbydere (i foretrukket rækkefølge):"> +<!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske e-mailservice"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send e-mail til bridges(a)torproject.org med linjen "get bridges" som det eneste i beskedteksten.  Men, for at gøre det sværere for en angriber at få kendskab til en masse broadresser, skal du sende din forespørgsel fra en af de følgende e-mailudbydere (i foretrukket rækkefølge):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig email to help(a)rt.torproject.org.  Bemærk venligst at alle emails besvares manuelt."> +<!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig e-mail to help(a)rt.torproject.org.  Bemærk venligst at alle e-mails besvares manuelt."> diff --git a/src/chrome/locale/da/progress.dtd b/src/chrome/locale/da/progress.dtd index 2a8a41a..063ad85 100644 --- a/src/chrome/locale/da/progress.dtd +++ b/src/chrome/locale/da/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Åben Indstillinger"> -<!ENTITY torprogress.heading "Forbinder til Tor netværket"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.dialog.title "Tor status"> +<!ENTITY torprogress.openSettings "Åbn indstillinger"> +<!ENTITY torprogress.heading "Opretter forbindelse til Tor-netværket"> +<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.  Det kan tage flere minutter."> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 2ca0df2..e18d62f 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -4,31 +4,31 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited_during_startup=Tor lukkede under opstart. Det kan skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program på dit system, eller hardwarefejl. Tor Browser vil ikke starte, før du løser det underliggende problem og genstarter Tor. -torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor-browseren vil ikke være i stand til at forbinde til noget som helst website før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter. +torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor-browseren vil ikke være i stand til at forbinde til noget som helst websted før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter. torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket ved af at du genstarter Tor. torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. -torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor netværket +torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor-netværket 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.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 kodeordet. +torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af adgangskode. torlauncher.failed_to_get_settings=Kunne ikke læse Tor indstillingerne..⏎\n⏎\n%S torlauncher.failed_to_save_settings=Kunne ikke gemme Tor indstillingerne.⏎\n⏎\n%S torlauncher.ensure_tor_is_running=Kontroller venligst at Tor kører. -torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at indstille Tor til at bruge en proxy som forbindelse til Internettet. +torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at indstille Tor til at bruge en proxy som forbindelse til internettet. torlauncher.error_proxy_type_missing=Du skal vælge proxy-typen: torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. -torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Venligst justér dine indstillinger. +torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. -torlauncher.recommended_bridge=(Anbefalet) +torlauncher.recommended_bridge=(anbefalet) torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor @@ -46,11 +46,11 @@ torlauncher.bootstrapStatus.handshake_dir=Opretter en krypteret mappe forbindels torlauncher.bootstrapStatus.requesting_status=Henter netværk status torlauncher.bootstrapStatus.loading_status=Henter netværk status torlauncher.bootstrapStatus.loading_keys=Henter nøglecentercertifikater -torlauncher.bootstrapStatus.requesting_descriptors=Beder om relæ information +torlauncher.bootstrapStatus.requesting_descriptors=Anmoder om relæ information torlauncher.bootstrapStatus.loading_descriptors=Henter relæ information -torlauncher.bootstrapStatus.conn_or=Forbinder til Tor netværk +torlauncher.bootstrapStatus.conn_or=Opretter forbindelse til Tor-netværket torlauncher.bootstrapStatus.handshake_or=Opretter et Tor kredsløb -torlauncher.bootstrapStatus.done=Forbundet til Tor netværket! +torlauncher.bootstrapStatus.done=Forbundet til Tor-netværket! torlauncher.bootstrapWarning.done=færdig torlauncher.bootstrapWarning.connectrefused=forbindelse afvist diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 6dca5f8..ad001f4 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -40,7 +40,7 @@ <!ENTITY torsettings.discardSettings.prompt "Has configurado los puentes Tor o has introducido un proxy local settings.  Para hacer una conexión directa a la red Tor, esta configuración debe removerse. "> <!ENTITY torsettings.discardSettings.proceed "Remover configuración y conectarse"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Opcional"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 91a356a..dc01bb3 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -13,9 +13,9 @@ <!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes opciones describe mejor su situación?"> <!ENTITY torSettings.configurePrompt1 "La conexión a Internet de este equipo está censurada o proxificada."> -<!ENTITY torSettings.configurePrompt2 "Necesito configurar los ajustes de puente de red o proxy local antes de conectar a la red Tor. "> +<!ENTITY torSettings.configurePrompt2 "Necesito configurar puentes de red o proxy local antes de conectar a la red Tor. "> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Quisiera hacer una conexión directa a la red Tor."> +<!ENTITY torSettings.connectPrompt2 "Me gustaría conectar directamente a la red Tor."> <!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> <!ENTITY torSettings.connect "Conectar"> @@ -23,13 +23,13 @@ <!ENTITY torSettings.proxyQuestion "¿Necesita mi computadora utilizar un proxy local para acceder a Internet?">  <!ENTITY torSettings.proxyExplanation1 "En la mayoría de los casos no se requiere un proxy (interpuesto) local, pero puede ser necesario al realizar una conexión a través de una red de empresa, de escuela, o universitaria. "> -<!ENTITY torSettings.proxyExplanation2 "Si no está seguro de cómo responder a esta pregunta, mire la configuración de Internet en otro navegador o compruebe la configuración de red de su sistema para ver si un proxy local es necesario."> -<!ENTITY torSettings.enterProxy "Introduzca los ajustes del proxy."> +<!ENTITY torSettings.proxyExplanation2 "Si no estás seguro de cómo responder a esta pregunta mira la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema para ver si necesitas un proxy local."> +<!ENTITY torSettings.enterProxy "Introduce los ajustes del proxy."> <!ENTITY torSettings.bridgePageTitle "Configuración de puentes de red Tor"> <!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si no está seguro de cómo responder a esta pregunta, elija No (si no puede conectarse a la red Tor sin un puente de red (bridge), puede añadir uno más adelante)."> -<!ENTITY torSettings.bridgeExplanation2 "Si elige Sí, se le pedirá que configure los puentes de red (bridges) de Tor, que son repetidores no listados que dificultan el bloqueo de conexiones hacia la red Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Puede utilizar el conjunto de puentes de red (bridges) proporcionado, o puede obtener e introducir un juego de puentes personalizado."> +<!ENTITY torSettings.bridgeExplanation1 "Si no estás seguro de cómo responder a esta pregunta elige No (si no puedes conectarte a la red Tor sin un puente de red o bridge, puedes añadir uno más adelante)."> +<!ENTITY torSettings.bridgeExplanation2 "Si eliges Sí se te pedirá que configures los puentes de red (bridges) de Tor, que son repetidores no listados que dificultan el bloqueo de conexiones hacia la red Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Puedes utilizar el grupo de puentes de red (bridges) proporcionado, o puedes obtener e introducir un grupo de puentes propio.">  @@ -37,8 +37,8 @@ <!ENTITY torsettings.restartTor "Reiniciar Tor"> <!ENTITY torsettings.reconfigTor "Configurar de nuevo"> -<!ENTITY torsettings.discardSettings.prompt "Ha configurado los puentes de red (bridges) de Tor o ha introducido los ajustes para proxy (interpuesto) local.  Para realizar una conexión directa a la red Tor, estos ajustes deben ser borrados."> -<!ENTITY torsettings.discardSettings.proceed "Eliminar ajustes y conectar"> +<!ENTITY torsettings.discardSettings.prompt "Has configurado los puentes de red (bridges) de Tor o has introducido los ajustes para proxy (interpuesto) local.  Para realizar una conexión directa a la red Tor, estos ajustes se deben borrar."> +<!ENTITY torsettings.discardSettings.proceed "Elimina ajustes y conecta"> <!ENTITY torsettings.optional "Opcional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:"> <!ENTITY torsettings.useBridges.checkbox "Mi Proveedor de Servicios de Internet (ISP) bloquea las conexiones a la red Tor"> <!ENTITY torsettings.useBridges.default "Conectar con los puentes proporcionados"> -<!ENTITY torsettings.useBridges.note "Cada tipo de puente de red usa un método diferente para evitar la censura.  Si un puente no funciona, inténtelo de nuevo utilizando otro distinto."> +<!ENTITY torsettings.useBridges.note "Cada tipo de puente de red usa un método diferente para evitar la censura.  Si un puente no funciona, inténtalo de nuevo utilizando otro."> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> <!ENTITY torsettings.useBridges.custom "Introducir puentes personalizados"> <!ENTITY torsettings.useBridges.label "Introduzca uno o más repetidores puente(uno por línea)."> @@ -65,12 +65,12 @@ <!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles"> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')"> <!ENTITY torsettings.bridgeHelp1 "Si no puede conectarse a la red Tor, podría ser que su proveedor de servicios de Internet (ISP) u otra agencia, esté bloqueando Tor.  A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son públicos, y es más difícil que sean bloqueados."> -<!ENTITY torsettings.bridgeHelp1B "Puede usar el juego preajustado de direcciones de puentes de red proporcionado, o puede obtener un juego personalizado de direcciones usando uno de estos métodos:"> +<!ENTITY torsettings.bridgeHelp1B "Puedes usar grupo de direcciones de puentes de red proporcionado aquí, o puedes obtener un nuevo grupo de direcciones usando uno de estos métodos:"> <!ENTITY torsettings.bridgeHelp2Heading "Mediante la web"> <!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envíe un correo electrónico a bridges(a)torproject.org únicamente con la línea 'get bridges' en el cuerpo del mensaje.  Sin embargo, para ponerle más difícil a un atacante el poder adquirir muchas direcciones de puentes, tiene que enviar esta petición desde uno de los siguientes proveedores de correo electrónico (listados en orden de preferencia):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envía un correo electrónico a bridges(a)torproject.org únicamente con la línea 'get bridges' en el cuerpo del mensaje.  Para que sea más difícil para un atacante adquirir muchas direcciones de puentes, tienes que enviar esta petición desde uno de los siguientes proveedores de correo electrónico (listados en orden de preferencia):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Mediante el soporte de usuario"> -<!ENTITY torsettings.bridgeHelp4 "Como último recurso, puede pedir direcciones de repetidores puente enviando un cortés mensaje de correo a help(a)rt.torproject.org .  -Por favor tenga en cuenta que es una persona la que tendrá que responder a cada petición."> +<!ENTITY torsettings.bridgeHelp4 "Como último recurso, puedes pedir direcciones de repetidores puente enviando un mensaje de correo amable a help(a)rt.torproject.org .  +Por favor ten en cuenta que es una persona la que tendrá que responder a cada petición."> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 00bada5..d414c01 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Arranque de Tor -torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto se podría deber a un error en su fichero torrc, un fallo en Tor o en otro programa de su sistema, o a hardware defectuoso. Hasta que solucione el problema subyacente y reinice Tor, el Navegador Tor no se iniciará. +torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto se podría deber a un error en tu fichero torrc, un fallo en Tor o en otro programa de tu sistema, o a hardware defectuoso. Hasta que soluciones el problema subyacente y reinices Tor, el Navegador Tor no se iniciará. torlauncher.tor_exited=Tor se cerró inesperadamente. Esto podría deberse a un fallo con el propio Tor, con otro programa de su sistema, o por hardware defectuoso. Hasta que reinicie Tor, el Navegador Tor no podrá abrir ningún sitio web. Si el problema persiste, por favor envíe una copia de su Registro de Tor (log) al equipo de soporte. torlauncher.tor_exited2=Al reiniciar Tor no se cerrarán las pestañas de su navegador. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor @@ -37,7 +37,7 @@ torlauncher.quit_win=Salir torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S -torlauncher.forAssistance2=Para asistencia, visite %S +torlauncher.forAssistance2=Para asistencia, visita %S torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico. diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd index b8256ea..c73883b 100644 --- a/src/chrome/locale/fil/progress.dtd +++ b/src/chrome/locale/fil/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Buksan ang Settings"> <!ENTITY torprogress.heading "Nakikipag-ugnayan sa network ng Tor."> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto."> diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index c00fa3a..120c7d7 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tagapaglunsad ng Tor -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor exited during startup. Maaring ang dahilan nito ay ang an error sa torrc file, bug sa Tor o iba pang program sa iyong system, or sirang hardware. Hanggat di mo na fix ang underlying problem at mag-restart ng Tor, ang Tor Browser ay hindi gagana. torlauncher.tor_exited=Ang Tor ay nagsara ng hindi sinasadya. Ito ay marahil sa isang bug sa Tor, ibang programa sa iyong sistema, o depektibong hardware. Hanggang ma-restart mo ang Tor, ang Tor Browser ay hindi makakapagabot sa kahit anong mga website. Kung ang problema ay nagpapatuloy, mag-sumite ng isang kopya ng iyong Tor Log sa support team. torlauncher.tor_exited2=Ang pag-restart sa Tor ay hindi magsasara ng mga tab sa browser. torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port. @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S nabigo (%2$S). torlauncher.unable_to_start_tor=Hindi magawang simulan ang Tor.\n\n%S torlauncher.tor_missing=Ang Tor executable ay nawawala. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=Ang torrc file ay missing at hindi ma create. +torlauncher.datadir_missing=Ang Tor data directory ay not exist at could not be created. torlauncher.password_hash_missing=Nabigong makakuha ng na-hash na password. torlauncher.failed_to_get_settings=Hindi nabawi ang mga setting ng Tor.\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=Lumabas torlauncher.done=Tapos na torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Para sa gabay o tulong, bisitahin ang %S torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message. diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index a4056e0..212b983 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -27,7 +27,7 @@ <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> <!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> <!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, pour pourrez en ajouter un ultérieurement)."> +<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, vous pourrez en ajouter un ultérieurement)."> <!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l'on vous demandera de configurer des ponts Tor, qui sont des relais non répertoriés rendant le blocage des connexions au réseau Tor plus difficile."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> @@ -58,7 +58,7 @@ <!ENTITY torsettings.useBridges.default "Se connecter avec les ponts fournis"> <!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> <!ENTITY torsettings.useBridges.type "Type de transport :"> -<!ENTITY torsettings.useBridges.custom "Saisir les ponts personnalisés"> +<!ENTITY torsettings.useBridges.custom "Saisir des ponts personnalisés"> <!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (un par ligne)."> <!ENTITY torsettings.useBridges.placeholder "type adresse:port"> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 078424e..5aae7f3 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Laquelle des suivantes décrit le mieux votre situation ?javascript:;"> <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> -<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau Tor."> +<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont (Bridge) ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> @@ -25,11 +25,11 @@ <!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> <!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> -<!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> +<!ENTITY torSettings.bridgePageTitle "Configuration des ponts (Bridges) Tor"> <!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, pour pourrez en ajouter un ultérieurement)."> -<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer des ponts Tor, qui sont des relais non répertoriés et qui rendent plus difficile le blocage du réseau Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> +<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont (Bridge), vous pourrez en ajouter un ultérieurement)."> +<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer des ponts (Bridges) Tor, qui sont des relais non répertoriés et qui rendent plus difficile le blocage du réseau Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts (Bridges) fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé.">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Redémarrer Tor"> <!ENTITY torsettings.reconfigTor "Reconfigurer"> -<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré des ponts Tor ou vous avez saisi des paramètres de mandataire local.  Pour établir une connexion directe vers le réseau Tor, ces paramètres doivent être supprimés."> +<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré des ponts Tor (Bridges) ou vous avez saisi des paramètres de mandataire local.  Pour établir une connexion directe vers le réseau Tor, ces paramètres doivent être supprimés."> <!ENTITY torsettings.discardSettings.proceed "Supprimer les paramètres et se connecter"> <!ENTITY torsettings.optional "Facultatif"> @@ -55,21 +55,21 @@ <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon fournisseur d'accès à Internet (FAI) bloque les connexions vers le réseau Tor"> -<!ENTITY torsettings.useBridges.default "Se connecter avec les ponts fournis"> -<!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> +<!ENTITY torsettings.useBridges.default "Se connecter avec les ponts (Bridges) fournis"> +<!ENTITY torsettings.useBridges.note "Chaque type de pont (Bridge) utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> <!ENTITY torsettings.useBridges.type "Type de transport :"> -<!ENTITY torsettings.useBridges.custom "Saisir les ponts personnalisés"> -<!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (un par ligne)."> +<!ENTITY torsettings.useBridges.custom "Saisir des ponts (Bridges) personnalisés"> +<!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (Bridge Relays) (un par ligne)."> <!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> -<!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> +<!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts ((Bridges Relays)"> +<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts (Bridges) Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts (Bridges) fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu'il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d'un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> -<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> +<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 1b25457..93b11a8 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -24,9 +24,9 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port afin de configurer Tor pour qu'il utilise un mandataire pour accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. -torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. -torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. -torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts (Bridges). +torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts (Bridges) fournis. +torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. torlauncher.recommended_bridge=(recommandé) diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 902c4f0..0e4d96a 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor mrežne postavke"> +<!ENTITY torsettings.dialog.title "Postavke Tor mreže">  <!ENTITY torlauncher.localePicker.title "Jezik Tor Browsera"> @@ -13,7 +13,7 @@ internetskoj vezi ovog računala."> <!ENTITY torSettings.no "Ne"> <!ENTITY torSettings.firstQuestion "Koje od sljedećeg najbolje opisuje Vašu situaciju?"> -<!ENTITY torSettings.configurePrompt1 "Veza ovog računal s Internetom je cenzurirana ili iza proxy-a."> +<!ENTITY torSettings.configurePrompt1 "Veza ovog računala s Internetom je cenzurirana ili iza proxya."> <!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati postavke mosta ili lokalnog proxya prije nego se spojim na Tor mrežu."> <!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connectPrompt2 "Želim direktnu vezu s Tor mrežom."> diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties index 175e7b4..108f29e 100644 --- a/src/chrome/locale/hr-HR/torlauncher.properties +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -1,9 +1,9 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Pokretač Tora +torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u Vašoj torrc datoteci, greške u Tor-u ili drugom programu u Vašem sustavu ili zbog neispravnog hardware-a. Dok ne popravite inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti. +torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u Vašoj torrc datoteci, greške u Toru ili drugom programu u Vašem sustavu ili zbog neispravnog hardwarea. Dok ne popravite inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti. torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog greške u samom Toru, drugog programa na Vašem sustavu ili neispravnog hardwarea. Dok ne pokrenete Tor ponovno, Tor Browser neće biti u mogućnosti pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju Vašeg Tor zapisa timu za podršku. torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti Vaše kartice u pregledniku. torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port. @@ -60,4 +60,4 @@ torlauncher.bootstrapWarning.identity=nepodudaranje identiteta torlauncher.bootstrapWarning.timeout=vrijeme čekanja veze isteklo torlauncher.bootstrapWarning.noroute=nema rute do domaćina torlauncher.bootstrapWarning.ioerror=greška čitanja/pisanja -torlauncher.bootstrapWarning.pt_missing=nedostaje transport koji se može priključiti +torlauncher.bootstrapWarning.pt_missing=nedostaje priključni transport diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index beaabf6..b7a4411 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.proxyQuestion "Questo computer richiede l'uso di un proxy locale per accedere ad Internet?">  <!ENTITY torSettings.proxyExplanation1 "Nella maggior parte dei casi un proxy locale non è necessario, ma può essere richiesto quando ci si connette da una rete scolastica, universitaria o aziendale."> -<!ENTITY torSettings.proxyExplanation2 "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni di Rete in un altro browser o nelle impostazioni del tuo sistema per vedere se è necessario un proxy locale."> +<!ENTITY torSettings.proxyExplanation2 "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni Internet di un altro browser web per vedere se sia configurato l'uso di un proxy."> <!ENTITY torSettings.enterProxy "Inserisci le impostazioni del proxy."> <!ENTITY torSettings.bridgePageTitle "Configurazione Bridge di Tor"> <!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?"> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index ad55643..0da969f 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -1,17 +1,17 @@ <!ENTITY torsettings.dialog.title "Tor tinklo nustatymai">  -<!ENTITY torlauncher.localePicker.title "Tor Browser kalba"> +<!ENTITY torlauncher.localePicker.title "Tor naršyklės kalba"> <!ENTITY torlauncher.localePicker.prompt "Prašome pasirinkti kalbą.">  -<!ENTITY torsettings.prompt "Prieš tai, kaip prisijungsite prie Tor tinklo, jūs turite pateikti informaciją apie šio kompiuterio interneto ryšį."> +<!ENTITY torsettings.prompt "Prieš tai, kai prisijungsite prie Tor tinklo, jūs turite pateikti informaciją apie šio kompiuterio interneto ryšį."> <!ENTITY torSettings.yes "Taip"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Kuris iš žemiau pateiktų apibrėžimų labiausiai atspindi Jūsų padėtį?"> +<!ENTITY torSettings.firstQuestion "Kuris iš žemiau pateiktų apibrėžimų labiausiai atspindi jūsų padėtį?"> <!ENTITY torSettings.configurePrompt1 "Šio kompiuterio interneto ryšys yra cenzūruojamas arba jungiamas per įgaliotąjį serverį."> <!ENTITY torSettings.configurePrompt2 "Prieš jungiantis prie Tor tinklo, man reikia sukonfigūruoti tinklų tiltą ar vietinius įgaliotojo serverio nustatymus."> <!ENTITY torSettings.configure "Konfigūruoti"> @@ -25,17 +25,17 @@ <!ENTITY torSettings.proxyExplanation1 "Daugeliu atveju, vietinis įgaliotasis serveris yra nereikalingas, tačiau jo gali prireikti, jungiantis per kompanijos, mokyklos ar universiteto tinklą."> <!ENTITY torSettings.proxyExplanation2 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pažiūrėkite interneto nustatymus kitoje naršyklėje arba patikrinkite savo sistemos tinklo nustatymus, kad pamatytumėte ar vietinis įgaliotasis serveris yra reikalingas."> <!ENTITY torSettings.enterProxy "Įrašykite įgaliotojo serverio nustatymus."> -<!ENTITY torSettings.bridgePageTitle "Tor tiltų konfigūracija"> +<!ENTITY torSettings.bridgePageTitle "Tor tinklų tiltų konfigūracija"> <!ENTITY torSettings.bridgeQuestion "Ar jūsų interneto paslaugų tiekėjas (ISP) blokuoja ar kitaip cenzūruoja prisijungimus prie Tor tinklo?"> <!ENTITY torSettings.bridgeExplanation1 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pasirinkite Ne (jeigu negalėsite prisijungti prie Tor tinklo be tinklų tilto, tuomet galėsite jį pridėti vėliau)."> -<!ENTITY torSettings.bridgeExplanation2 "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.bridgeExplanation2 "Jeigu pasirinksite Taip, jūsų bus paprašyta sukonfigūruoti Tor tinklų tiltus, kurie yra neišvardyti retransliavimai, trukdantys blokuoti ryšius su Tor tinklu."> <!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.startingTor "Laukiama, kol Tor bus paleistas…"> <!ENTITY torsettings.restartTor "Pakartotinai paleisti Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Konfigūruoti iš naujo"> <!ENTITY torsettings.discardSettings.prompt "Jūs esate sukofigūravę Tor tinklų tiltus arba esate įrašę vietinio įgaliotojo serverio nustatymus.  Tam, kad galėtumėte tiesiogiai prisijungti prie Tor tinklo, šie nustatymai privalo būti pašalinti."> <!ENTITY torsettings.discardSettings.proceed "Šalinti nustatymus ir prisijungti"> @@ -55,11 +55,11 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai:"> <!ENTITY torsettings.useBridges.checkbox "Mano interneto paslaugų tiekėjas (ISP) blokuoja prisijungimus prie Tor tinklo"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.default "Prisijungti, naudojant pateiktus tinklų tiltus"> +<!ENTITY torsettings.useBridges.note "Kiekvienas tinklų tilto tipas, tam, kad išvengtų cenzūros, naudoja skirtingą metodą.  Jeigu vienas tinklų tiltas neveikia, bandykite dar kartą, naudodami kitą tinklų tiltą."> +<!ENTITY torsettings.useBridges.type "Perdavimo tipas:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.label "Įveskite vieną ar daugiau tinklų tilto retransliavimus (kiekvieną atskiroje eilutėje)."> <!ENTITY torsettings.useBridges.placeholder "įrašykite adresą:prievadą"> <!ENTITY torsettings.copyLog "Kopijuoti Tor žurnalą į iškarpinę"> diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index ccdb8a8..19e97d8 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -4,8 +4,8 @@ torlauncher.error_title=Tor Leistuvas torlauncher.tor_exited_during_startup=Tor nustojo veikti paleisties metu. Taip galėjo nutikti dėl klaidos jūsų torrc faile, klaidos Tor ar kitoje jūsų sistemos programoje, arba dėl aparatinės įrangos kaltės. Tor naršyklė nepasileis tol, kol neištaisysite slypinčios problemos ir iš naujo nepaleisite Tor. -torlauncher.tor_exited=Tor netikėtai nustojo veikti. Taip galėjo atsitikti arba dėl klaidos Tor arba kitoje programoje, Jūsų sistemoje arba dėl sugedusios techninės įrangos. Kol iš naujo nepaleisite Tor, Tor Naršyklė negalės prisijungti prie jokių interneto tinklalapių. Jei problema kartojasi, prašome išsiųsti Tor įvykių žurnalo kopiją paramos grupei. -torlauncher.tor_exited2=Pakartotinai paleidus Tor naršyklės kortelės nebus uždarytos. +torlauncher.tor_exited=Tor netikėtai nustojo veikti. Taip galėjo atsitikti arba dėl klaidos Tor, arba dėl klaidos kitoje jūsų sistemos programoje, arba dėl sugedusios aparatinės įrangos. Kol iš naujo nepaleisite Tor, Tor naršyklė negalės prisijungti prie jokių interneto tinklalapių. Jei problema išlieka, prašome išsiųsti Tor įvykių žurnalo kopiją Tor palaikymo komandai. +torlauncher.tor_exited2=Paleidus Tor iš naujo, jūsų naršyklės kortelės nebus užvertos. torlauncher.tor_controlconn_failed=Nepavyko prisijungti prie Tor valdymo prievado. torlauncher.tor_failed_to_start=Tor nepavyko paleisti. torlauncher.tor_control_failed=Nepavyko perimti Tor valdymo @@ -24,9 +24,9 @@ torlauncher.ensure_tor_is_running=Įsitikinkite, kad Tor yra vykdomas. torlauncher.error_proxy_addr_missing=Jei norite, kad Tor prie interneto jungtųsi per įgaliotąjį serverį, turite nurodyti ir prievado numerį, ir serverio IP adresą arba serverio vardą. torlauncher.error_proxy_type_missing=Turite pasirinkti įgaliotojo serverio tipą. -torlauncher.error_bridges_missing=Turite nurodyti bent vieną tinklų tiltą -torlauncher.error_default_bridges_type_missing=Turite pasirinkti perdavimo būdą nurodytiems tinklų tiltams -torlauncher.error_bridge_bad_default_type=Nepasiekiamas nei vienas tinklų tiltas, kurio perdavimo tipas būtų %S. Prašome pakoreguoti nustatymo parametrus. +torlauncher.error_bridges_missing=Privalote nurodyti bent vieną tinklų tiltą. +torlauncher.error_default_bridges_type_missing=Privalote nurodytiems tinklų tiltams pasirinkti perdavimo tipą. +torlauncher.error_bridge_bad_default_type=Neprieinamas nei vienas tinklų tiltas, kurio perdavimo tipas būtų %S. Prašome sureguliuoti savo nustatymus. torlauncher.recommended_bridge=(rekomenduojama) @@ -41,13 +41,13 @@ torlauncher.forAssistance2=Norėdami gauti pagalbos, apsilankykite %S torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą. -torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo taškų +torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo katalogo torlauncher.bootstrapStatus.handshake_dir=Užmezgiamas ryšys torlauncher.bootstrapStatus.requesting_status=Nuskaitoma tinklo būklė torlauncher.bootstrapStatus.loading_status=Įkeliama tinklo būklė -torlauncher.bootstrapStatus.loading_keys=Įkeliami prieigos sertifikatai -torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliacijos taškų informacija -torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliacijos taško informacija +torlauncher.bootstrapStatus.loading_keys=Įkeliami liudijimų įstaigos liudijimai +torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliavimo informacija +torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliavimo informacija torlauncher.bootstrapStatus.conn_or=Jungiamasi prie Tor tinklo torlauncher.bootstrapStatus.handshake_or=Užmezgiamas sujungimas torlauncher.bootstrapStatus.done=Prisijungta prie Tor tinklo! @@ -60,4 +60,4 @@ torlauncher.bootstrapWarning.identity=tapatybės neatitiktis torlauncher.bootstrapWarning.timeout=per nustatytą laiką nepavyko prisijungti torlauncher.bootstrapWarning.noroute=nėra maršruto iki pagrindinio kompiuterio torlauncher.bootstrapWarning.ioerror=skaitymo/rašymo klaida -torlauncher.bootstrapWarning.pt_missing=Trūksta įterpiamojo perdavimo +torlauncher.bootstrapWarning.pt_missing=trūksta prijungiamo perdavimo diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 51e6e52..56f41f1 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor">  -<!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleser"> +<!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleseren"> <!ENTITY torlauncher.localePicker.prompt "Velg språk">  diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index eb93ba8..5c0ae5c 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -22,13 +22,13 @@ <!ENTITY torSettings.proxyPageTitle "Configuração do Proxy Local"> <!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos não é necessário um proxy local, mas este poderá ser necessário quando ligar através da rede de uma empresa, escola ou universidade."> +<!ENTITY torSettings.proxyExplanation2 "Se não tem a certeza de como responder a esta pergunta, consulte as definições da Internet noutro navegador ou verifique as definições da rede do seu sistema para verificar se é necessário ou não um proxy local."> <!ENTITY torSettings.enterProxy "Insira as definições do proxy."> <!ENTITY torSettings.bridgePageTitle "Configuração das Pontes Tor"> <!ENTITY torSettings.bridgeQuestion "O seu Provedor de Serviços da Internet (ISP) bloqueia ou então censura as ligações à Rede Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "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.bridgeExplanation1 "Se não tem a certeza sobre como responder a esta pergunta, escolha Não (se não consegue ligar-se à rede Tor sem uma ponte, pode adicionar uma mais tarde)."> +<!ENTITY torSettings.bridgeExplanation2 "Se escolher 'Sim', ser-lhe-á pedido para configurar as Pontes do Tor, que são retransmissões não listadas o que torna mais difícil o bloqueio das ligações à Rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Poderá utilizar o conjunto de pontes fornecido ou poderá obter um conjunto de pontes personalizadas.">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Reiniciar Tor"> <!ENTITY torsettings.reconfigTor "Reconfigurar"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Configurou as pontes do Tor ou inseriu as definições do proxy local.  Para efetuar uma ligação direta à rede Tor, estas definições devem ser removidas."> <!ENTITY torsettings.discardSettings.proceed "Remover Definições e Ligar"> <!ENTITY torsettings.optional "Opcional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "O meu Provedor de Serviço da Internet (ISP) bloqueia as ligações à rede Tor"> <!ENTITY torsettings.useBridges.default "Ligar com as pontes fornecidas"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Cada tipo de ponte utiliza um método diferente para evitar a censura.  Se uma ponte não funcionar, tente novamente utilizando uma diferente."> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> <!ENTITY torsettings.useBridges.custom "Insira as pontes personalizadas"> <!ENTITY torsettings.useBridges.label "Insira uma ou mais retransmissões de ponte (uma por linha)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte"> <!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu Provedor de Serviço de Internet (ISP) ou outra agência está a bloquear o Tor.  Frequentemente, pode contornar este problema utilizando Tor Bridges, o qual são pontos de passagem não listados que são mais difíceis de bloquear."> -<!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 methods:"> +<!ENTITY torsettings.bridgeHelp1B "Poderá utilizar o conjunto de pontes pré-configurado fornecido ou poderá obter um conjunto de endereços personalizados, utilizando um deste métodos:"> <!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> <!ENTITY torsettings.bridgeHelp2 "Utilize um navegador da Web para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor Automático de Correio Eletrónico"> diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd index 6ed4a63..f3a6922 100644 --- a/src/chrome/locale/pt/progress.dtd +++ b/src/chrome/locale/pt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações"> <!ENTITY torprogress.heading "A conetar à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor aguarde enquanto estabelecemos a ligação à rede Tor.  Isto pode levar alguns minutos."> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 41a235a..bd6085d 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -1,10 +1,10 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Executor Tor +torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=O Tor encerrou inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Navegador Tor não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte. +torlauncher.tor_exited_during_startup=O Tor fechou-se durante o arranque. Isto pode ter acontecido devido a erro no seu ficheiro torrc, um erro no Tor ou outro programa no seu sistema, ou falha de hardware. Até que corrija o problema em causa reinicie o Tor, o Tor Browser não irá iniciar. +torlauncher.tor_exited=O Tor encerrou inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Tor Browser não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte. torlauncher.tor_exited2=Ao reiniciar o Tor não irá fechar os separadores do seu navegador. torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. torlauncher.tor_failed_to_start=O Tor não foi iniciado. @@ -37,7 +37,7 @@ torlauncher.quit_win=Fechar torlauncher.done=Concluído torlauncher.forAssistance=Para assistência, contacte %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Para assistência, visite %S torlauncher.copiedNLogMessages=Cópia completa. Estão prontas %S mensagens do registo de eventos do Tor para serem coladas num editor de texto ou numa mensagem de correio eletrónico. diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index b2663e7..ed79f3c 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Сетевые настройки Tor"> +<!ENTITY torsettings.dialog.title "Настройки сети Tor">  <!ENTITY torlauncher.localePicker.title "Язык браузера Tor"> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index aab93e0..5975310 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -58,7 +58,7 @@ <!ENTITY torsettings.useBridges.default "Anslut med tillgängliga bryggor"> <!ENTITY torsettings.useBridges.note "Varje typ av brygga använder en egen metod för att undvika censur.  Om en brygga inte fungerar, försök igen genom att använda en annan."> <!ENTITY torsettings.useBridges.type "Transport-typ:"> -<!ENTITY torsettings.useBridges.custom "Fyll i anpassade bryggor"> +<!ENTITY torsettings.useBridges.custom "Ange egna bryggor"> <!ENTITY torsettings.useBridges.label "Ange en eller flera Tor-bryggor (en per rad)."> <!ENTITY torsettings.useBridges.placeholder "typ adress:port"> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 167a597..fe39f0f 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> -<!ENTITY torsettings.bridgeHelp1B "您可以使用集成的网桥，也可以以下列方式获取一些网桥并手动输入："> +<!ENTITY torsettings.bridgeHelp1B "您可以使用预先配置好的默认设置的网桥地址集成，也可以以下列方式获取一些自定的网桥地址："> <!ENTITY torsettings.bridgeHelp2Heading "网页方式"> <!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式">

1 0

[torbutton/master] Version bump, and CHANGELOG update
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit cb0b9fda68ad2c02aeea49856114dbdae0fffe27 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 19:58:27 2017 +0000 Version bump, and CHANGELOG update --- src/CHANGELOG | 10 ++++++++++ src/install.rdf | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index bc1092b..9de9989 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,13 @@ +1.9.7.2 + * Bug 21865: Update our JIT preferences in the security slider + * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52 + * Bug 21745: Fix handling of catch-all circuit + * Bug 21547: Fix circuit display under e10s + * Bug 21268: e10s compatibility for New Identity + * Bug 21267: Remove window resize implementation for now + * Bug 21201: Make Torbutton multiprocess compatible + * Translation updates + 1.9.7.1 * Bug 21396: Allow leaking of resource/chrome URIs (off by default) * Bug 21574: Add link for zh manual and create manual links dynamically diff --git a/src/install.rdf b/src/install.rdf index 5a698b3..670dbb6 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.1</em:version> + <em:version>1.9.7.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 8bef7336ccc10aac408aeb0e88099fc42baa0757 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 17:04:18 2017 +0000 Translation updates --- src/chrome/locale/fr/torbutton.properties | 2 +- src/chrome/locale/vi/aboutTor.dtd | 2 +- src/chrome/locale/zh-CN/aboutDialog.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 51421c9..907babc 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -3,7 +3,7 @@ torbutton.circuit_display.ip_unknown = IP inconnue torbutton.circuit_display.onion_site = Site Oignon torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relayer -torbutton.circuit_display.tor_bridge = Pont +torbutton.circuit_display.tor_bridge = Pont (Bridge) torbutton.circuit_display.unknown_country = Pays inconnu torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l'on vous suive à la trace en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index d47d73a..4bc3ad5 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -30,7 +30,7 @@ <!ENTITY aboutTor.whatnext.label "Gợi ý cho việc ẩn danh »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn sử dụng Trình duyệt Tor"> <!ENTITY aboutTor.helpInfo1.label "Bạn có thể giúp đỡ!"> <!ENTITY aboutTor.helpInfo2.label "Có nhiều cách mà bạn có thể giúp mạng Tor nhanh hơn và tốt hơn."> <!ENTITY aboutTor.helpInfo3.label "Chạy một đầu mối tiếp sức Tor »"> diff --git a/src/chrome/locale/zh-CN/aboutDialog.dtd b/src/chrome/locale/zh-CN/aboutDialog.dtd index 0f6da79..4e7c254 100644 --- a/src/chrome/locale/zh-CN/aboutDialog.dtd +++ b/src/chrome/locale/zh-CN/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; 的开发者为">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end "，一个捍卫您的隐私和自由上网权的非营利组织。"> +<!ENTITY project.end "，一个捍卫您的隐私和自由上网权利的非营利组织。"> <!ENTITY help.start "需要得到帮助？">  diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 86c18bf..0977b3d 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -43,7 +43,7 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会暂缓执行。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会缓执行。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "禁用 MathML。"> <!ENTITY torbutton.prefs.sec_medium "中等"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 52484d7..398b639 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -21,7 +21,7 @@ torbutton.popup.dontask = 以后自动下载文件 torbutton.popup.prompted_language = 为了更好地保护隐私， Torbutton 可以请求网页的英语版本。这可能导致您希望浏览的本土语言的网页以英语显示。\n\n为了更好地保护隐私，是否请求网页以英语显示？ torbutton.popup.no_newnym = Torbutton 无法安全地为您切换一个新身份。它无法访问 Tor 的控制端口。\n\n您目前正在使用 Tor 浏览器套件吗？ torbutton.title.prompt_torbrowser = Torbutton 重要信息 -torbutton.popup.prompt_torbrowser = Torbutton 工作方式有所改变：它不再支持临时关闭。\n\n做出这种改变是因为在非匿名浏览的浏览器中，同时使用 Torbutton 并不安全。有太多无法克服的错误。\n\n如果您希望正常使用 Firefox ，请卸载 Torbutton 插件，下载 Tor 浏览器套件。Tor 浏览器的隐私特性优于普通的 Firefox ，即使Firefox中使用了Torbutton。\n\n移除 Torbutton，请到工具Tools->附加组件Addons->扩展Extensions 中，在 Torbutton 旁点击卸载。 +torbutton.popup.prompt_torbrowser = Torbutton 工作方式有所改变：它不再能够关闭。\n\n做出这种改变是因为在非匿名浏览的浏览器中，同时使用 Torbutton 并不安全。有太多无法克服的错误。\n\n如果您希望正常使用 Firefox ，请卸载 Torbutton 插件，下载 Tor 浏览器套件。Tor 浏览器的隐私特性优于普通的 Firefox ，即使Firefox中使用了Torbutton。\n\n移除 Torbutton，请到工具Tools->附加组件Addons->扩展Extensions 中，在 Torbutton 旁点击卸载。 torbutton.popup.short_torbrowser = Torbutton 重要信息！\n\nTorbutton 目前已知处于启用状态。\n\n点击 Torbutton 获取更多信息。 torbutton.popup.confirm_plugins = Flash 之类的插件可对用户的隐私与匿名性造成危害。\n\n它们还可能绕过 Tor 而泄漏用户的当前位置和 IP 地址。\n\n是否确定启用插件？\n\n

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21795: Fix github.com crashes on Windows
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit c90a0868540a9771cc10bdc1cf91b8f6a8f37603 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 16:14:00 2017 +0000 Bug 21795: Fix github.com crashes on Windows This is https://bugzilla.mozilla.org/show_bug.cgi?id=1351278 --- js/src/jit/IonBuilder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 0413b11..1d3377b 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -6592,7 +6592,12 @@ IonBuilder::jsop_funapply(uint32_t argc) if (argument->type() != MIRType::MagicOptimizedArguments) { // Optimize fun.apply(self, array) if the length is sane and there are no holes. TemporaryTypeSet* objTypes = argument->resultTypeSet(); - if (native && native->isNative() && native->native() == fun_apply && +#ifdef XP_WIN + bool opt = false; +#else + bool opt = true; +#endif + if (opt && native && native->isNative() && native->native() == fun_apply && objTypes && objTypes->getKnownClass(constraints()) == &ArrayObject::class_ && !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW) &&

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 5e44400548a9fd480e6715771c75dad75796f1e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 13 16:54:08 2017 +0200 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: change update URL from update_2 to update_3 --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index d8bfeac..6b3385e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -134,7 +134,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser-bundle/maint-6.5] Picking up missing SSE2-related update patch
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 8b029dbb4394446afa0b157e18fe0014966c3dfd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 15:18:21 2017 +0000 Picking up missing SSE2-related update patch --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 82f7e6e..7bde308 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14

1 0

[tor-browser/tor-browser-45.9.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 15cf08adee2d81031b12769e75edb02eab85042b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 13 16:54:08 2017 +0200 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: change update URL from update_2 to update_3 Change the update URL so that 6.5.1 users who don't have SSE available are not updated to 7.0 directly when it is avaible. --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ce16a75..c40c936 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -147,7 +147,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser-bundle/maint-6.5] Pick up a new tor-browser tag
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 652990244e81125aed75612a822eec86bb4c301c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 14:55:10 2017 +0000 Pick up a new tor-browser tag We want to be able to deal with the SSE2 requirement for ESR52 without shipping a Tor Browser 6.5.3 just for that. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1808047..8e186ce 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser 6.5.2 -- April 19 2017 * Update HTTPS-Everywhere to 5.2.14 * Update NoScript to 5.0.2 * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) + * Bug 19316: Make sure our Windows updates can deal with the SSE2 requirement * Bug 21917: Add new obfs4 bridges * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend * Windows diff --git a/gitian/versions b/gitian/versions index 1557a98..82f7e6e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14

1 0

[tor-browser/tor-browser-45.9.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit db3f92ed23e12a2a9b9eac5be773d475897edfca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 10 17:32:04 2017 +0100 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: add support for a minInstructionSet attribute in the update manifests. --- toolkit/mozapps/update/nsUpdateService.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 4ad5bb8..d098597 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1512,6 +1512,15 @@ function Update(update) { this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0); } catch (e) {} } + if (!this.unsupported && update.hasAttribute("minSupportedInstructionSet")) { + let minInstructionSet = update.getAttribute("minSupportedInstructionSet"); + if (['MMX', 'SSE', 'SSE2', 'SSE3', + 'SSE4A', 'SSE4_1', 'SSE4_2'].indexOf(minInstructionSet) >= 0) { + try { + this.unsupported = !Services.sysinfo.getProperty("has" + minInstructionSet); + } catch (e) {} + } + } if (this._patches.length == 0 && !this.unsupported) { throw Cr.NS_ERROR_ILLEGAL_VALUE;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1353765
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit db07e42c13b82aa62a6132be92974aca371546ac Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 14:25:03 2017 +0000 Backport of tjr's patch for bug 1353765 It's not clear if it is still needed but we take it to be on the safe side. This closes #21868. --- dom/filesystem/compat/FileSystemDirectoryReader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dom/filesystem/compat/FileSystemDirectoryReader.h b/dom/filesystem/compat/FileSystemDirectoryReader.h index d568990..391a793 100644 --- a/dom/filesystem/compat/FileSystemDirectoryReader.h +++ b/dom/filesystem/compat/FileSystemDirectoryReader.h @@ -10,6 +10,7 @@ #include "mozilla/Attributes.h" #include "mozilla/ErrorResult.h" #include "mozilla/dom/BindingDeclarations.h" +#include "mozilla/dom/FileSystemDirectoryEntry.h" #include "nsCycleCollectionParticipant.h" #include "nsWrapperCache.h"

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 3e531451125720e28f3b7fd113af19b5d02aad18 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 10 17:32:04 2017 +0100 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: add support for a minInstructionSet attribute in the update manifests. --- toolkit/mozapps/update/nsUpdateService.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 699632d..8abc55a 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1550,6 +1550,15 @@ function Update(update) { this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0); } catch (e) {} } + if (!this.unsupported && update.hasAttribute("minSupportedInstructionSet")) { + let minInstructionSet = update.getAttribute("minSupportedInstructionSet"); + if (['MMX', 'SSE', 'SSE2', 'SSE3', + 'SSE4A', 'SSE4_1', 'SSE4_2'].indexOf(minInstructionSet) >= 0) { + try { + this.unsupported = !Services.sysinfo.getProperty("has" + minInstructionSet); + } catch (e) {} + } + } if (this._patches.length == 0 && !this.unsupported) { throw Cr.NS_ERROR_ILLEGAL_VALUE;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1342887 - Detect and log failures to dispatch SetupMacCommandLine to the main thread. r=rstrong
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 4cec6538e51ac73c6a46ec582ee0b2794c7d81d9 Author: Matt Howell <mhowell(a)mozilla.com> Date: Mon Feb 27 13:57:11 2017 -0800 Bug 1342887 - Detect and log failures to dispatch SetupMacCommandLine to the main thread. r=rstrong MozReview-Commit-ID: LMoxF5yfXq2 --HG-- extra : rebase_source : c206e32bf8abf1aa225901ff5cde390a8a2ecec7 --- toolkit/xre/nsUpdateDriver.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index 7af085a..3abbf7f 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -108,14 +108,24 @@ UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart) // monitor to signal us when that happens, and block until then. Monitor monitor("nsUpdateDriver SetupMacCommandLine"); - NS_DispatchToMainThread( + nsresult rv = NS_DispatchToMainThread( NS_NewRunnableFunction([&argc, &argv, restart, &monitor]() -> void { CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); MonitorAutoLock(monitor).Notify(); })); - MonitorAutoLock(monitor).Wait(); + if (NS_FAILED(rv)) { + LOG(("Update driver error dispatching SetupMacCommandLine to main thread: %d\n", rv)); + return; + } + + // The length of this wait is arbitrary, but should be long enough that having + // it expire means something is seriously wrong. + rv = MonitorAutoLock(monitor).Wait(PR_SecondsToInterval(60)); + if (NS_FAILED(rv)) { + LOG(("Update driver timed out waiting for SetupMacCommandLine: %d\n", rv)); + } } #endif

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1335916 - Make sure the update driver only calls SetupMacCommandLine from the main thread. r=rstrong
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 899435e1997583bd01ab31e363fe3153486dd134 Author: Matt Howell <mhowell(a)mozilla.com> Date: Thu Feb 2 15:29:32 2017 -0800 Bug 1335916 - Make sure the update driver only calls SetupMacCommandLine from the main thread. r=rstrong MozReview-Commit-ID: 9nOgB6z8ooE --HG-- extra : rebase_source : 6a6a18f64297a0bd44e7d6f49b1812e035636e4c --- toolkit/xre/nsUpdateDriver.cpp | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index a9dbeff..7af085a 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -32,6 +32,7 @@ #include "nsCommandLineServiceMac.h" #include "MacLaunchHelper.h" #include "updaterfileutils_osx.h" +#include "mozilla/Monitor.h" #endif #if defined(XP_WIN) @@ -91,6 +92,33 @@ static const int kAppUpdaterIOPrioClassDefault = IOPRIO_CLASS_IDLE; static const int kAppUpdaterIOPrioLevelDefault = 0; // Doesn't matter for CLASS IDLE #endif +#ifdef XP_MACOSX +static void +UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart) +{ + if (NS_IsMainThread()) { + CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + return; + } + // Bug 1335916: SetupMacCommandLine calls a CoreFoundation function that + // asserts that it was called from the main thread, so if we are not the main + // thread, we have to dispatch that call to there. But we also have to get the + // result from it, so we can't just dispatch and return, we have to wait + // until the dispatched operation actually completes. So we also set up a + // monitor to signal us when that happens, and block until then. + Monitor monitor("nsUpdateDriver SetupMacCommandLine"); + + NS_DispatchToMainThread( + NS_NewRunnableFunction([&argc, &argv, restart, &monitor]() -> void + { + CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + MonitorAutoLock(monitor).Notify(); + })); + + MonitorAutoLock(monitor).Wait(); +} +#endif + static nsresult GetCurrentWorkingDir(char *buf, size_t size) { @@ -735,7 +763,7 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, } _exit(0); #elif defined(XP_MACOSX) - CommandLineServiceMac::SetupMacCommandLine(argc, argv, true); + UpdateDriverSetupMacCommandLine(argc, argv, true); LaunchChildMac(argc, argv); exit(0); #else @@ -1072,7 +1100,7 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, _exit(0); } #elif defined(XP_MACOSX) - CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + UpdateDriverSetupMacCommandLine(argc, argv, restart); #ifdef DEBUG dump_argv("ApplyUpdate after SetupMacCommandLine", argv, argc); #endif

1 0

[tor-browser-bundle/maint-6.5] Fix typo in changelog
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 7974cac344e5610f4f1cec42b668251e62579ac2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 10:18:38 2017 +0000 Fix typo in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c8d6fcc..1808047 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.5.2 -- April 19 2017 * Update Firefox to 45.9.0esr * Update HTTPS-Everywhere to 5.2.14 * Update NoScript to 5.0.2 - * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) + * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) * Bug 21917: Add new obfs4 bridges * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend * Windows

1 0

[torbutton/master] Bug 21865: Update our JIT preferences in the slider
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit cb73494b177f0dcb595920090a81af5621083f8d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 09:24:04 2017 +0000 Bug 21865: Update our JIT preferences in the slider It turns out that the JIT *.content prefs are gone for a while now. This happened in https://bugzilla.mozilla.org/show_bug.cgi?id=939562 and the patch updates the security slider to take this into account. We got the tip to include `javascript.options.native_regexp` as well. `javascript.options.typeinference` is gone with https://bugzilla.mozilla.org/show_bug.cgi?id=972817 and we therefore remove it. And asm.js is disabled globally until we find a good solution for #19417. The tooltip text got updated accordingly. --- src/chrome/locale/en/torbutton.dtd | 2 +- src/modules/security-prefs.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 97a994f..6bc7141 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index 4a39ca8..3d3630b 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -19,12 +19,12 @@ let log = (level, msg) => logger.log(level, msg); // corresponding to the old 2-medium-high setting. const kSecuritySettings = { // Preference name : [0, 1-high 2-m 3-m 4-low] - "javascript.options.ion.content" : [, false, false, false, true ], - "javascript.options.typeinference" : [, false, false, false, true ], + "javascript.options.ion" : [, false, false, false, true ], + "javascript.options.baselinejit" : [, false, false, false, true ], + "javascript.options.native_regexp" : [, false, false, false, true ], "noscript.forbidMedia" : [, true, true, true, false], "media.webaudio.enabled" : [, false, false, false, true ], "mathml.disabled" : [, true, true, true, false], - "javascript.options.baselinejit.content" : [, false, false, false, true ], "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], "noscript.global" : [, false, false, false, true ], "noscript.globalHttpsWhitelist" : [, false, true, true, false],

1 0

[tor-browser-build/master] Bug 21930: NSS libraries are missing from mar-tools archive
by boklm＠torproject.org 13 Apr '17

13 Apr '17

commit 867176ff839bb0b7067ab2a8e237621a14c98616 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 13 10:30:47 2017 +0200 Bug 21930: NSS libraries are missing from mar-tools archive The Linux sigmar program needs libfreeblpriv3.so and libsoftokn3.so, so include them in the mar-tools archive. tor-browser-bundle.git commit: c2bae45c6a41923712bf176df6fb9bd1f773d887 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 3985aec..1cf9be1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -126,7 +126,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/

1 0

[tor-browser-build/master] Bug 21887: Fix broken error pages on higher security levels
by boklm＠torproject.org 13 Apr '17

13 Apr '17

commit 08a94190b79720466e092c9e98deaadc77ff39ce Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 14:05:16 2017 +0000 Bug 21887: Fix broken error pages on higher security levels We need to allow JavaScript on `about:neterror` pages explicitly. Otherwise are those pages on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/master] Bug 21930: NSS libraries are missing from mar-tools archive
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit c2bae45c6a41923712bf176df6fb9bd1f773d887 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 12 23:15:28 2017 -0400 Bug 21930: NSS libraries are missing from mar-tools archive The Linux sigmar program needs libfreeblpriv3.so and libsoftokn3.so, so include them in the mar-tools archive. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index d607f6a..c9ced44 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -119,7 +119,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/

1 0

[tor-browser-bundle/maint-6.5] Release preparations for 6.5.1
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 6e7d7a00118e4416f341ce0ff160a427f1319534 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 20:13:35 2017 +0000 Release preparations for 6.5.1 Version updates, changelog update, and config.yml changes --- Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ gitian/versions | 12 ++++++------ tools/update-responses/config.yml | 10 +++++----- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5438022..c8d6fcc 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 6.5.2 -- April 19 2017 + * All Platforms + * Update Firefox to 45.9.0esr + * Update HTTPS-Everywhere to 5.2.14 + * Update NoScript to 5.0.2 + * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) + * Bug 21917: Add new obfs4 bridges + * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend + * Windows + * Bug 21795: Fix Tor Browser crashing on github.com + Tor Browser 6.5.1 -- March 7 2017 * All Platforms * Update Firefox to 45.8.0esr diff --git a/gitian/versions b/gitian/versions index df49b55..1557a98 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14 -HTTPSE_TAG=5.2.11 +HTTPSE_TAG=5.2.14 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build3 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -68,7 +68,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -102,7 +102,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 2db2570..c43932f 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.5a6 - release: 6.5.1 + release: 6.5.2 versions: - 6.5.1: - platformVersion: 45.8.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-651-released + 6.5.2: + platformVersion: 45.9.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-652-released incremental_from: - - 6.5 + - 6.5.1 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-bundle/master] Bug 21887: Fix broken error pages on higher security levels
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 5d2f77c0c56a62199fab2034ba14686867808b82 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 14:05:16 2017 +0000 Bug 21887: Fix broken error pages on higher security levels We need to allow JavaScript on `about:neterror` pages explicitly. Otherwise are those pages on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser/tor-browser-45.8.0esr-6.5-2] Bug 21795: Fix github.com crashes on Windows
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit fd67e2869611a961893a868fa0891cf4ded173eb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 11:15:40 2017 +0000 Bug 21795: Fix github.com crashes on Windows This is https://bugzilla.mozilla.org/show_bug.cgi?id=1351278 --- js/src/jit/IonBuilder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 9e70e24..34520b3 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -6366,7 +6366,12 @@ IonBuilder::jsop_funapply(uint32_t argc) if (argument->type() != MIRType_MagicOptimizedArguments) { // Optimize fun.apply(self, array) if the length is sane and there are no holes. TemporaryTypeSet* objTypes = argument->resultTypeSet(); - if (native && native->isNative() && native->native() == fun_apply && +#ifdef XP_WIN + bool opt = false; +#else + bool opt = true; +#endif + if (opt && native && native->isNative() && native->native() == fun_apply && objTypes && objTypes->getKnownClass(constraints()) == &ArrayObject::class_ && !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW) &&

1 0

[tor-launcher/master] Bug 21920: Don't show locale selection dialog
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit afb9893b7626ce819d7b2b571a847d44277971f6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 10:23:38 2017 +0000 Bug 21920: Don't show locale selection dialog The locale selection dialog was one of the features we included in the hardened series. It is not needed on the alpha or stable channel. We therefore disable it, keeping the code as we might be able to resue it for #17400 later on. --- src/modules/tl-util.jsm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 2f8d14e..0d33267 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -290,7 +290,10 @@ let TorLauncherUtil = // Public get shouldPromptForLocale() { - const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; + // We are not supporting locale selection on the alpha/stable channel + // right now. Thus, no prompt for the user. + return false; + /* const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; try { const kEnvSkipLocalePrompt = "TOR_SKIP_LOCALE_PROMPT"; @@ -301,7 +304,7 @@ let TorLauncherUtil = // Public return ("1" != env.get(kEnvSkipLocalePrompt)); } catch(e) {} - return this.getBoolPref(kPrefPromptForLocale, true); + return this.getBoolPref(kPrefPromptForLocale, true); */ }, get shouldShowNetworkSettings()

1 0

[tor-browser-build/master] Update tor-browser.git commit
by boklm＠torproject.org 12 Apr '17

12 Apr '17

commit 2603af6dee70233dcc30f8717ee48a2b0121ff04 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 12 10:57:28 2017 +0200 Update tor-browser.git commit --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 7e685e7..0b8995b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' ## There is no signed tag yet, so we use a fixed commit -git_hash: 47fa36dc780f4962102205b390e18ce9ef74b1b9 +git_hash: 4c6219dc621d139cd39e8aaca578dd69b9c063d0 #git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' #tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21907: Fix runtime error on CentOS 6
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 4c6219dc621d139cd39e8aaca578dd69b9c063d0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 16:07:23 2017 +0200 Bug 21907: Fix runtime error on CentOS 6 In Mozilla bug 1324780, support for building with glib 2.28 (the version available in CentOS 6) was added. However we are building on Debian Wheezy which has glib 2.32. We fix that by backing out all glib > 2.28 code paths. --- gfx/harfbuzz/src/hb-glib.cc | 41 ----------------------------------------- gfx/harfbuzz/src/hb-glib.h | 5 ----- 2 files changed, 46 deletions(-) diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc index 2b91b5b..0971ca2 100644 --- a/gfx/harfbuzz/src/hb-glib.cc +++ b/gfx/harfbuzz/src/hb-glib.cc @@ -33,7 +33,6 @@ #include "hb-unicode-private.hh" -#if !GLIB_CHECK_VERSION(2,29,14) static const hb_script_t glib_script_to_script[] = { @@ -155,14 +154,10 @@ glib_script_to_script[] = HB_SCRIPT_SORA_SOMPENG, HB_SCRIPT_TAKRI }; -#endif hb_script_t hb_glib_script_to_script (GUnicodeScript script) { -#if GLIB_CHECK_VERSION(2,29,14) - return (hb_script_t) g_unicode_script_to_iso15924 (script); -#else if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) return glib_script_to_script[script]; @@ -170,15 +165,11 @@ hb_glib_script_to_script (GUnicodeScript script) return HB_SCRIPT_INVALID; return HB_SCRIPT_UNKNOWN; -#endif } GUnicodeScript hb_glib_script_from_script (hb_script_t script) { -#if GLIB_CHECK_VERSION(2,29,14) - return g_unicode_script_from_iso15924 (script); -#else unsigned int count = ARRAY_LENGTH (glib_script_to_script); for (unsigned int i = 0; i < count; i++) if (glib_script_to_script[i] == script) @@ -188,7 +179,6 @@ hb_glib_script_from_script (hb_script_t script) return G_UNICODE_SCRIPT_INVALID_CODE; return G_UNICODE_SCRIPT_UNKNOWN; -#endif } @@ -243,10 +233,6 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *ab, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_compose (a, b, ab); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -280,10 +266,6 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *b, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_decompose (ab, a, b); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -339,10 +321,6 @@ hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *decomposed, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_fully_decompose (u, true, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN); -#endif - /* If the user doesn't have GLib >= 2.29.12 we have to perform * a round trip to UTF-8 and the associated memory management dance. */ gchar utf8[6]; @@ -381,22 +359,3 @@ hb_glib_get_unicode_funcs (void) return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs); } - -#if GLIB_CHECK_VERSION(2,31,10) -/** - * hb_glib_blob_create: - * - * Since: 0.9.38 - **/ -hb_blob_t * -hb_glib_blob_create (GBytes *gbytes) -{ - gsize size = 0; - gconstpointer data = g_bytes_get_data (gbytes, &size); - return hb_blob_create ((const char *) data, - size, - HB_MEMORY_MODE_READONLY, - g_bytes_ref (gbytes), - (hb_destroy_func_t) g_bytes_unref); -} -#endif diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h index 5f04183..4adbd7c 100644 --- a/gfx/harfbuzz/src/hb-glib.h +++ b/gfx/harfbuzz/src/hb-glib.h @@ -46,11 +46,6 @@ hb_glib_script_from_script (hb_script_t script); HB_EXTERN hb_unicode_funcs_t * hb_glib_get_unicode_funcs (void); -#if GLIB_CHECK_VERSION(2,31,10) -HB_EXTERN hb_blob_t * -hb_glib_blob_create (GBytes *gbytes); -#endif - HB_END_DECLS #endif /* HB_GLIB_H */

1 0