- tbb-commits - lists.torproject.org

[torbutton/master] Bug 29768: Introduce new features to users
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit de2b60ea51bf0c5e3be720c84ef1c121a00b4f1d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 9 14:25:04 2019 -0400 Bug 29768: Introduce new features to users Add an additional string for the onboarding tour that is displayed in new installations: a note about the possibility of adding NoScript and HTTPS Everywhere to the browser toolbar. --- src/chrome/locale/en-US/browserOnboarding.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en-US/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties index e2036832..e529a9b9 100644 --- a/src/chrome/locale/en-US/browserOnboarding.properties +++ b/src/chrome/locale/en-US/browserOnboarding.properties @@ -26,6 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Security onboarding.tour-tor-security.title=Choose your experience. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. onboarding.tour-tor-security-level.button=See Your Security Level onboarding.tour-tor-security-level.next-button=Go to Experience Tips

1 0

[rbm/master] Bug 30039: Add the target_append and target_prepend input_files options
by gk＠torproject.org 09 Apr '19

09 Apr '19

commit 87adfb7b7be7e7e0f437020dbf8a119673133412 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 4 19:11:56 2019 +0200 Bug 30039: Add the target_append and target_prepend input_files options --- NEWS | 2 ++ doc/rbm_input_files.asc | 11 ++++++++++- lib/RBM.pm | 23 ++++++++++++++++++++--- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 256cad9..e54f988 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the target_append and target_prepend input_files options + - Add the build_log_append option - Add the rbm_tmp_dir option diff --git a/doc/rbm_input_files.asc b/doc/rbm_input_files.asc index 2716b23..d56f125 100644 --- a/doc/rbm_input_files.asc +++ b/doc/rbm_input_files.asc @@ -77,7 +77,16 @@ project:: target:: An array defining the build targets for the selected project. If this - option is not set, the current build target is forwarded. + option is not set, the current build target is forwarded. If set, + this replaces the current targets. + +target_append:: + The same as +target+, but instead of replacing the current targets, + the new targets are appended. + +target_prepend:: + The same as +target+, but instead of replacing the current targets, + the new targets are prepended. enable:: The files are enabled by default. If this option is set to diff --git a/lib/RBM.pm b/lib/RBM.pm index 1400700..4416a0c 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -784,10 +784,27 @@ sub input_files { if ($input_file->{enable} && !$t->('enable')) { next; } - if ($input_file->{target}) { + if ($input_file->{target} || $input_file->{target_append} + || $input_file->{target_prepend}) { $input_file = { %$input_file }; - $input_file->{target} = process_template_opt($project, - $input_file->{target}, $options); + if (ref $input_file->{target} eq 'ARRAY') { + $input_file->{target} = process_template_opt($project, + $input_file->{target}, $options); + } else { + $input_file->{target} = $config->{run}{target}; + } + if (ref $input_file->{target_prepend} eq 'ARRAY') { + $input_file->{target} = [ @{ process_template_opt($project, + $input_file->{target_prepend}, + $options) }, + @{$input_file->{target}} ]; + } + if (ref $input_file->{target_append} eq 'ARRAY') { + $input_file->{target} = [ @{$input_file->{target}}, + @{ process_template_opt($project, + $input_file->{target_append}, + $options) } ]; + } } if ($action eq 'getfnames') { my $getfnames_name;

1 0

[torbutton/master] Bug 29943: Use locales in AB-CD scheme to match Mozilla
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit ad0f608cba44dc8be382b380b844cfd66dedecba Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 29 09:39:56 2019 +0000 Bug 29943: Use locales in AB-CD scheme to match Mozilla --- src/chrome.manifest | 8 ++++---- src/chrome/locale/{es => es-ES}/aboutDialog.dtd | 0 src/chrome/locale/{es => es-ES}/aboutTBUpdate.dtd | 2 +- src/chrome/locale/{es => es-ES}/aboutTor.dtd | 0 src/chrome/locale/{es => es-ES}/brand.dtd | 0 src/chrome/locale/{es => es-ES}/brand.properties | 0 .../locale/{es => es-ES}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{es => es-ES}/securityLevel.properties | 0 src/chrome/locale/{es => es-ES}/torbutton.dtd | 0 src/chrome/locale/{es => es-ES}/torbutton.properties | 0 src/chrome/locale/{ga => ga-IE}/aboutDialog.dtd | 0 src/chrome/locale/{ga => ga-IE}/aboutTBUpdate.dtd | 0 src/chrome/locale/{ga => ga-IE}/aboutTor.dtd | 0 src/chrome/locale/{ga => ga-IE}/brand.dtd | 0 src/chrome/locale/{ga => ga-IE}/brand.properties | 0 .../locale/{ga => ga-IE}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{ga => ga-IE}/securityLevel.properties | 0 src/chrome/locale/{ga => ga-IE}/torbutton.dtd | 0 src/chrome/locale/{ga => ga-IE}/torbutton.properties | 0 src/chrome/locale/{nb => nb-NO}/aboutDialog.dtd | 0 src/chrome/locale/{nb => nb-NO}/aboutTBUpdate.dtd | 0 src/chrome/locale/{nb => nb-NO}/aboutTor.dtd | 0 src/chrome/locale/{nb => nb-NO}/brand.dtd | 0 src/chrome/locale/{nb => nb-NO}/brand.properties | 0 .../locale/{nb => nb-NO}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{nb => nb-NO}/securityLevel.properties | 0 src/chrome/locale/{nb => nb-NO}/torbutton.dtd | 0 src/chrome/locale/{nb => nb-NO}/torbutton.properties | 0 src/chrome/locale/{sv => sv-SE}/aboutDialog.dtd | 0 src/chrome/locale/{sv => sv-SE}/aboutTBUpdate.dtd | 0 src/chrome/locale/{sv => sv-SE}/aboutTor.dtd | 0 src/chrome/locale/{sv => sv-SE}/brand.dtd | 0 src/chrome/locale/{sv => sv-SE}/brand.properties | 0 .../locale/{sv => sv-SE}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{sv => sv-SE}/securityLevel.properties | 0 src/chrome/locale/{sv => sv-SE}/torbutton.dtd | 0 src/chrome/locale/{sv => sv-SE}/torbutton.properties | 0 trans_tools/import-translations.sh | 14 ++++++-------- 38 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 87467217..2edacef0 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -46,7 +46,7 @@ locale torbutton dz chrome/locale/dz/ locale torbutton el chrome/locale/el/ locale torbutton en chrome/locale/en-US/ locale torbutton eo chrome/locale/eo/ -locale torbutton es chrome/locale/es/ +locale torbutton es-ES chrome/locale/es-ES/ locale torbutton et chrome/locale/et/ locale torbutton eu chrome/locale/eu/ locale torbutton fa chrome/locale/fa/ @@ -56,7 +56,7 @@ locale torbutton fo chrome/locale/fo/ locale torbutton fr chrome/locale/fr/ locale torbutton fur chrome/locale/fur/ locale torbutton fy chrome/locale/fy/ -locale torbutton ga chrome/locale/ga/ +locale torbutton ga-IE chrome/locale/ga-IE/ locale torbutton gl chrome/locale/gl/ locale torbutton gu chrome/locale/gu/ locale torbutton gun chrome/locale/gun/ @@ -96,7 +96,7 @@ locale torbutton mt chrome/locale/mt/ locale torbutton my chrome/locale/my/ locale torbutton nah chrome/locale/nah/ locale torbutton nap chrome/locale/nap/ -locale torbutton nb chrome/locale/nb/ +locale torbutton nb-NO chrome/locale/nb-NO/ locale torbutton ne chrome/locale/ne/ locale torbutton nl chrome/locale/nl/ locale torbutton nn chrome/locale/nn/ @@ -121,7 +121,7 @@ locale torbutton sq chrome/locale/sq/ locale torbutton sr chrome/locale/sr/ locale torbutton st chrome/locale/st/ locale torbutton su chrome/locale/su/ -locale torbutton sv chrome/locale/sv/ +locale torbutton sv-SE chrome/locale/sv-SE/ locale torbutton sw chrome/locale/sw/ locale torbutton ta chrome/locale/ta/ locale torbutton te chrome/locale/te/ diff --git a/src/chrome/locale/es/aboutDialog.dtd b/src/chrome/locale/es-ES/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/es/aboutDialog.dtd rename to src/chrome/locale/es-ES/aboutDialog.dtd diff --git a/src/chrome/locale/es/aboutTBUpdate.dtd b/src/chrome/locale/es-ES/aboutTBUpdate.dtd similarity index 88% rename from src/chrome/locale/es/aboutTBUpdate.dtd rename to src/chrome/locale/es-ES/aboutTBUpdate.dtd index 70b46fae..259b9496 100644 --- a/src/chrome/locale/es/aboutTBUpdate.dtd +++ b/src/chrome/locale/es-ES/aboutTBUpdate.dtd @@ -5,4 +5,4 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Versión"> <!ENTITY aboutTBUpdate.releaseDate "Fecha de lanzamiento"> -<!ENTITY aboutTBUpdate.releaseNotes "Notas de versiones"> +<!ENTITY aboutTBUpdate.releaseNotes "Notas de la versión"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es-ES/aboutTor.dtd similarity index 100% rename from src/chrome/locale/es/aboutTor.dtd rename to src/chrome/locale/es-ES/aboutTor.dtd diff --git a/src/chrome/locale/es/brand.dtd b/src/chrome/locale/es-ES/brand.dtd similarity index 100% rename from src/chrome/locale/es/brand.dtd rename to src/chrome/locale/es-ES/brand.dtd diff --git a/src/chrome/locale/es/brand.properties b/src/chrome/locale/es-ES/brand.properties similarity index 100% rename from src/chrome/locale/es/brand.properties rename to src/chrome/locale/es-ES/brand.properties diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es-ES/browserOnboarding.properties similarity index 92% rename from src/chrome/locale/es/browserOnboarding.properties rename to src/chrome/locale/es-ES/browserOnboarding.properties index ce7973aa..fbcc74e4 100644 --- a/src/chrome/locale/es/browserOnboarding.properties +++ b/src/chrome/locale/es-ES/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Bienvenido/a onboarding.tour-tor-welcome.title=Estás listo/a. onboarding.tour-tor-welcome.description=Tor Browser ofrece un alto standar de privacidad y seguridad mientras se navega por la red. Está ahora protegido de rastreadores, vigilancia y censura. Esta rápida introducción te enseñará cómo. -onboarding.tour-tor-welcome.button=Comienza Ahora +onboarding.tour-tor-welcome.next-button=Ir a la privacidad onboarding.tour-tor-privacy=Privacidad onboarding.tour-tor-privacy.title=Rastreadores y espías molestos @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Visualización del circuito onboarding.tour-tor-circuit-display.title=Ver tu recorrido onboarding.tour-tor-circuit-display.description=Por cada dominio que visitas, tus datos de tráfico son transportados y cifrados en un circuito a través de tres repetidores de Tor alrededor del mundo. Ningún sitio web sabe desde dónde te conectas. Puedes pedir un nuevo circuito haciendo clic en 'Nuevo Circuito para este Sitio' en la Visualización del Circuito. onboarding.tour-tor-circuit-display.button=Ver mi recorrido +onboarding.tour-tor-circuit-display.next-button=Ir a la Seguridad onboarding.tour-tor-security=Seguridad onboarding.tour-tor-security.title=Elige tu experiencia. onboarding.tour-tor-security.description=También te proporcionamos configuraciones adicionales para aumentar la seguridad de tu navegador. Nuestra Configuración de Seguridad te permite bloquear elementos que podrían usarse para atacar tu computadora. Haz clic a continuación para ver lo que hacen las diferentes opciones. onboarding.tour-tor-security-level.button=Mira tu nivel de seguridad +onboarding.tour-tor-security-level.next-button=Ir a los Consejos de Expertos onboarding.tour-tor-expect-differences=Consejos de expertos onboarding.tour-tor-expect-differences.title=Espera algunas diferencias. onboarding.tour-tor-expect-differences.description=Con todas las características de seguridad y privacidad proporcionadas por Tor, tu experiencia mientras navegas por Internet puede ser un poco diferente. Las cosas pueden ser un poco más lentas, y dependiendo de tu nivel de seguridad, algunos elementos pueden no funcionar o no cargarse. También se te puede pedir que demuestres que eres un ser humano y no un robot. onboarding.tour-tor-expect-differences.button=Preguntas frecuentes (FAQ) +onboarding.tour-tor-expect-differences.next-button=Ir a los Servicios de Cebolla onboarding.tour-tor-onion-services=Servicios cebolla onboarding.tour-tor-onion-services.title=Protégete bien. onboarding.tour-tor-onion-services.description=Los servicios cebolla son sitios que terminan con .onion y proveen protecciones extra a editores y visitantes, incluyendo salvaguardas adicionales contra la censura. Los mismos permiten a cualquiera proveer contenido y servicios anónimamente. Haz clic abajo para visitar el sitio cebolla de DuckDuckGo. onboarding.tour-tor-onion-services.button=Visita un sitio cebolla +onboarding.tour-tor-onion-services.next-button=Hecho # Circuit Display onboarding. onboarding.tor-circuit-display.next=Siguiente diff --git a/src/chrome/locale/es/securityLevel.properties b/src/chrome/locale/es-ES/securityLevel.properties similarity index 100% rename from src/chrome/locale/es/securityLevel.properties rename to src/chrome/locale/es-ES/securityLevel.properties diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es-ES/torbutton.dtd similarity index 100% rename from src/chrome/locale/es/torbutton.dtd rename to src/chrome/locale/es-ES/torbutton.dtd diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es-ES/torbutton.properties similarity index 100% rename from src/chrome/locale/es/torbutton.properties rename to src/chrome/locale/es-ES/torbutton.properties diff --git a/src/chrome/locale/ga/aboutDialog.dtd b/src/chrome/locale/ga-IE/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/ga/aboutDialog.dtd rename to src/chrome/locale/ga-IE/aboutDialog.dtd diff --git a/src/chrome/locale/ga/aboutTBUpdate.dtd b/src/chrome/locale/ga-IE/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/ga/aboutTBUpdate.dtd rename to src/chrome/locale/ga-IE/aboutTBUpdate.dtd diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga-IE/aboutTor.dtd similarity index 100% rename from src/chrome/locale/ga/aboutTor.dtd rename to src/chrome/locale/ga-IE/aboutTor.dtd diff --git a/src/chrome/locale/ga/brand.dtd b/src/chrome/locale/ga-IE/brand.dtd similarity index 100% rename from src/chrome/locale/ga/brand.dtd rename to src/chrome/locale/ga-IE/brand.dtd diff --git a/src/chrome/locale/ga/brand.properties b/src/chrome/locale/ga-IE/brand.properties similarity index 100% rename from src/chrome/locale/ga/brand.properties rename to src/chrome/locale/ga-IE/brand.properties diff --git a/src/chrome/locale/ga/browserOnboarding.properties b/src/chrome/locale/ga-IE/browserOnboarding.properties similarity index 93% rename from src/chrome/locale/ga/browserOnboarding.properties rename to src/chrome/locale/ga-IE/browserOnboarding.properties index 8fe8d0cb..4f7a5030 100644 --- a/src/chrome/locale/ga/browserOnboarding.properties +++ b/src/chrome/locale/ga-IE/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Fáilte onboarding.tour-tor-welcome.title=Tá tú réidh. onboarding.tour-tor-welcome.description=Soláthraíonn Brabhsálaí Tor príobháideachas agus slándáil den chéad scoth ar an nGréasán. Cosnaíonn sé thú ar lorgaireacht, ar fhaire leictreonach, agus ar chinsireacht. Míneoidh an ceacht beag seo an chaoi a n-oibríonn sé. -onboarding.tour-tor-welcome.button=Tosaigh Anois +onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Príobháideachas onboarding.tour-tor-privacy.title=Cuir bac ar na lorgairí agus ar na gliúcaigh. @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Taispeántas an Chiorcaid onboarding.tour-tor-circuit-display.title=Do chosán a dhéanamh. onboarding.tour-tor-circuit-display.description=Ar gach fearann a dtugann tú cuairt air, cuirtear do chuid tráchta ar aghaidh trí chiorcad déanta as trí cinn d'athsheachadáin timpeall an domhain. Is féidir leat ciorcad nua a iarraidh trí ‘Ciorcadh Nua don Suíomh seo’ a chliceáil i dTaispeántas an Chiorcaid. onboarding.tour-tor-circuit-display.button=Mo Chosán +onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Slándáil onboarding.tour-tor-security.title=D'eispéireas féin. onboarding.tour-tor-security.description=Soláthraímid socruithe breise duit lenar féidir leat leibhéal slándála níos airde a bhaint amach trí, mar shampla, cosc a chur ar eilimintí áirithe a d'fhéadfaí a úsáid chun ionsaí a dhéanamh ar do ríomhaire. Cliceáil thíos chun tuilleadh eolais a fháil faoi na roghanna éagsúla. onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Leideanna onboarding.tour-tor-expect-differences.title=Bí ag súil le difríochtaí. onboarding.tour-tor-expect-differences.description=D'fhéadfadh d'eispéireas ar an Idirlíon a bheith pas beag difriúil mar gheall ar na gnéithe príobháideachais agus slándála i mbrabhsálaí Tor. B'fhéidir go mbeadh sé beagán níos moille, agus tá seans ann nach bhfeidhmeoidh nó nach lódálfaidh eilimintí áirithe, ag brath ar an leibhéal slándála. Uaireanta, iarrfar ort cruthúnas a thabhairt nach róbat thú. onboarding.tour-tor-expect-differences.button=Ceisteanna Coitianta +onboarding.tour-tor-expect-differences.next-button=Go to Onion Services onboarding.tour-tor-onion-services=Seirbhísí Onion onboarding.tour-tor-onion-services.title=Cosaint bhreise. onboarding.tour-tor-onion-services.description=Is éard atá i seirbhís onion ná suíomh speisialta ón fhearann barrleibhéil .onion a sholáthraíonn cosaintí breise d'fhoilsitheoirí agus do chuairteoirí, cosaintí ar an gcinsireacht san áireamh. Is féidir le haon duine seirbhísí onion a úsáid chun ábhar a fhoilsiú agus seirbhísí a sholáthar gan a ainm a nochtadh. Cliceáil thíos le cuairt a thabhairt ar an suíomh onion do DuckDuckGo. onboarding.tour-tor-onion-services.button=Oscail Oinniún +onboarding.tour-tor-onion-services.next-button=Déanta # Circuit Display onboarding. onboarding.tor-circuit-display.next=Ar Aghaidh diff --git a/src/chrome/locale/ga/securityLevel.properties b/src/chrome/locale/ga-IE/securityLevel.properties similarity index 100% rename from src/chrome/locale/ga/securityLevel.properties rename to src/chrome/locale/ga-IE/securityLevel.properties diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga-IE/torbutton.dtd similarity index 100% rename from src/chrome/locale/ga/torbutton.dtd rename to src/chrome/locale/ga-IE/torbutton.dtd diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga-IE/torbutton.properties similarity index 100% rename from src/chrome/locale/ga/torbutton.properties rename to src/chrome/locale/ga-IE/torbutton.properties diff --git a/src/chrome/locale/nb/aboutDialog.dtd b/src/chrome/locale/nb-NO/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/nb/aboutDialog.dtd rename to src/chrome/locale/nb-NO/aboutDialog.dtd diff --git a/src/chrome/locale/nb/aboutTBUpdate.dtd b/src/chrome/locale/nb-NO/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/nb/aboutTBUpdate.dtd rename to src/chrome/locale/nb-NO/aboutTBUpdate.dtd diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb-NO/aboutTor.dtd similarity index 100% rename from src/chrome/locale/nb/aboutTor.dtd rename to src/chrome/locale/nb-NO/aboutTor.dtd diff --git a/src/chrome/locale/nb/brand.dtd b/src/chrome/locale/nb-NO/brand.dtd similarity index 100% rename from src/chrome/locale/nb/brand.dtd rename to src/chrome/locale/nb-NO/brand.dtd diff --git a/src/chrome/locale/nb/brand.properties b/src/chrome/locale/nb-NO/brand.properties similarity index 100% rename from src/chrome/locale/nb/brand.properties rename to src/chrome/locale/nb-NO/brand.properties diff --git a/src/chrome/locale/nb/browserOnboarding.properties b/src/chrome/locale/nb-NO/browserOnboarding.properties similarity index 92% rename from src/chrome/locale/nb/browserOnboarding.properties rename to src/chrome/locale/nb-NO/browserOnboarding.properties index 41fa07c1..2c0193fc 100644 --- a/src/chrome/locale/nb/browserOnboarding.properties +++ b/src/chrome/locale/nb-NO/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Velkommen onboarding.tour-tor-welcome.title=Du er klar. onboarding.tour-tor-welcome.description=Tor Nettleser tilbyr den høyeste standarden på personvern og sikkerhet mens du surfer på nettet. Du er nå beskyttet mot sporing, overvåkning og sensur. Denne raske onboarding vil vise deg hvordan. -onboarding.tour-tor-welcome.button=Start nå +onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Personvern onboarding.tour-tor-privacy.title=Snub trackers and snoopers. @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Kretsvisning onboarding.tour-tor-circuit-display.title=Se din vei. onboarding.tour-tor-circuit-display.description=For hvert domene du besøker, blir trafikken din omdirigert og kryptert i en krets over tre Tor-reléer rundt om i verden. Ingen nettside vet hvor du kobler fra. Du kan be om en ny krets ved å klikke "Ny krets for dette nettstedet" på vår kretsvisning. onboarding.tour-tor-circuit-display.button=Se Min Vei +onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Sikkerhet onboarding.tour-tor-security.title=Velg din opplevelse. onboarding.tour-tor-security.description=Vi gir deg også tilleggsinnstillinger for å støte på nettleserens sikkerhet. Våre sikkerhetsinnstillinger lar deg blokkere elementer som kan brukes til å angripe datamaskinen din. Klikk nedenfor for å se hva de forskjellige alternativene gjør. onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Opplevelsestips onboarding.tour-tor-expect-differences.title=Forvent noen forskjeller. onboarding.tour-tor-expect-differences.description=Med alle de sikkerhets og personvernfunksjonene som Tor leverer, kan din erfaring mens du surfer på Internett, være litt annerledes. Det kan være litt tregere, og avhengig av sikkerhetsnivået, kan noen elementer ikke fungere eller lastes. Du kan også bli bedt om å bevise at du er et menneske og ikke en robot. onboarding.tour-tor-expect-differences.button=se FAQs +onboarding.tour-tor-expect-differences.next-button=Go to Onion Services onboarding.tour-tor-onion-services=Løk-tjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. onboarding.tour-tor-onion-services.description=Onion tjenester er nettsteder som slutter med en .onion som gir ekstra beskyttelse til utgivere og besøkende, inkludert ekstra sikkerhetskontroll mot sensur. Onion tjenester tillater alle å gi innhold og tjenester anonymt. Klikk nedenfor for å besøke DuckDuckGo-onionstedet. onboarding.tour-tor-onion-services.button=Besøk en Onion +onboarding.tour-tor-onion-services.next-button=Ferdig # Circuit Display onboarding. onboarding.tor-circuit-display.next=Neste diff --git a/src/chrome/locale/nb/securityLevel.properties b/src/chrome/locale/nb-NO/securityLevel.properties similarity index 100% rename from src/chrome/locale/nb/securityLevel.properties rename to src/chrome/locale/nb-NO/securityLevel.properties diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb-NO/torbutton.dtd similarity index 100% rename from src/chrome/locale/nb/torbutton.dtd rename to src/chrome/locale/nb-NO/torbutton.dtd diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb-NO/torbutton.properties similarity index 100% rename from src/chrome/locale/nb/torbutton.properties rename to src/chrome/locale/nb-NO/torbutton.properties diff --git a/src/chrome/locale/sv/aboutDialog.dtd b/src/chrome/locale/sv-SE/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/sv/aboutDialog.dtd rename to src/chrome/locale/sv-SE/aboutDialog.dtd diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv-SE/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/sv/aboutTBUpdate.dtd rename to src/chrome/locale/sv-SE/aboutTBUpdate.dtd diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv-SE/aboutTor.dtd similarity index 100% rename from src/chrome/locale/sv/aboutTor.dtd rename to src/chrome/locale/sv-SE/aboutTor.dtd diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv-SE/brand.dtd similarity index 100% rename from src/chrome/locale/sv/brand.dtd rename to src/chrome/locale/sv-SE/brand.dtd diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv-SE/brand.properties similarity index 100% rename from src/chrome/locale/sv/brand.properties rename to src/chrome/locale/sv-SE/brand.properties diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv-SE/browserOnboarding.properties similarity index 92% rename from src/chrome/locale/sv/browserOnboarding.properties rename to src/chrome/locale/sv-SE/browserOnboarding.properties index 29406698..d603eaf6 100644 --- a/src/chrome/locale/sv/browserOnboarding.properties +++ b/src/chrome/locale/sv-SE/browserOnboarding.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2018, The Tor Project, Inc. +# Copyright (c) 2019, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Välkommen onboarding.tour-tor-welcome.title=Du är redo. onboarding.tour-tor-welcome.description=Tor Browser erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. -onboarding.tour-tor-welcome.button=Börja nu +onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Sekretess onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare. @@ -21,21 +21,25 @@ onboarding.tour-tor-circuit-display=Kretsvisning onboarding.tour-tor-circuit-display.title=Se din väg. onboarding.tour-tor-circuit-display.description=För varje domän du besöker förmedlas din trafik och krypteras i en krets över tre tor-reläer runt om i världen. Ingen webbplats vet var du ansluter från. Du kan begära en ny krets genom att klicka på "ny krets för denna webbplats" på vår kretsvisning. onboarding.tour-tor-circuit-display.button=Se Min väg +onboarding.tour-tor-circuit-display.next-button=Go to Security onboarding.tour-tor-security=Säkerhet onboarding.tour-tor-security.title=Välj din upplevelse. onboarding.tour-tor-security.description=Vi ger dig också ytterligare inställningar för att stöta upp din webbläsares säkerhet. Våra säkerhetsinställningar kan du blockera element som kan användas för att attackera din dator. Klicka nedan för att se vad de olika alternativen gör. onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Erfarenhets tips onboarding.tour-tor-expect-differences.title=Förvänta dig vissa skillnader. onboarding.tour-tor-expect-differences.description=Med alla säkerhets- och sekretessfunktioner som Tor tillhandahåller kan din upplevelse när du surfar på internet vara lite annorlunda. Saker kan vara lite långsammare, och beroende på din säkerhetsnivå, vissa element kanske inte fungerar eller ladda. Du kan också bli ombedd att bevisa att du är en människa och inte en robot. onboarding.tour-tor-expect-differences.button=Se Vanliga frågor +onboarding.tour-tor-expect-differences.next-button=Go to Onion Services onboarding.tour-tor-onion-services=Onion tjänster onboarding.tour-tor-onion-services.title=Var extra skyddad. onboarding.tour-tor-onion-services.description=Onion-tjänster är webbplatser som slutar med en .onion som ger extra skydd till utgivare och besökare, inklusive extra garantier mot censur. Onion-tjänster tillåter alla att tillhandahålla innehåll och tjänster anonymt. Klicka nedan för att besöka DuckDuckGo-onion webbplatsen. onboarding.tour-tor-onion-services.button=Besök en Onion +onboarding.tour-tor-onion-services.next-button=Färdig # Circuit Display onboarding. onboarding.tor-circuit-display.next=Nästa diff --git a/src/chrome/locale/sv/securityLevel.properties b/src/chrome/locale/sv-SE/securityLevel.properties similarity index 100% rename from src/chrome/locale/sv/securityLevel.properties rename to src/chrome/locale/sv-SE/securityLevel.properties diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv-SE/torbutton.dtd similarity index 100% rename from src/chrome/locale/sv/torbutton.dtd rename to src/chrome/locale/sv-SE/torbutton.dtd diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv-SE/torbutton.properties similarity index 100% rename from src/chrome/locale/sv/torbutton.properties rename to src/chrome/locale/sv-SE/torbutton.properties diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 5fbe4e7d..f14c353a 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,13 +2,12 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es-ES fa fr ga-IE he hu id is it ja ka ko nb-NO nl pl pt-BR ru sv-SE tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. -# This is not used for official builds, but should remain -# so Basque XPIs can be build independently. We can do -# this for other languages too, if anyone requests this -# and translations are available. +# This is not used for official builds, but should remain so Basque XPIs can be +# built independently. We can do that for other languages too, if anyone +# requests it and translations are available. # XXX: Adding bn-BD as well as we don't ship that locale ourselves due to bug # 26498. Others might want to fix, build, and use it, though. BUNDLE_LOCALES="$BUNDLE_LOCALES eu bn-BD" @@ -76,10 +75,9 @@ for KEYVAL in "${FILEMAP[@]}"; do git merge -q origin/"$BRANCH" for i in $BUNDLE_LOCALES; do - UL="`echo $i|tr - _`" mkdir -p ../$LOCALE_DIR/$i/ # Some file names are lowercase in Transifex. - if [ -f $UL/"$DEST_FILE" ]; then + if [ -f $i/"$DEST_FILE" ]; then SRCFILE="$DEST_FILE" else SRCFILE="`echo $DEST_FILE | tr '[:upper:]' '[:lower:]'`" @@ -87,6 +85,6 @@ for KEYVAL in "${FILEMAP[@]}"; do # Use sed to work around a Transifex "double entity" issue. sed -e 's/\&brandShortName;/\&brandShortName;/g' \ -e 's/\&vendorShortName;/\&vendorShortName;/g' \ - $UL/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" + $i/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" done done

1 0

[torbutton/master] Merge branch 'bug_29943'
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit 76d056634148add263720504aa4c6ff0c480165a Merge: b10f69f1 ad0f608c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 8 16:12:46 2019 +0000 Merge branch 'bug_29943' src/chrome.manifest | 8 ++++---- src/chrome/locale/{es => es-ES}/aboutDialog.dtd | 0 src/chrome/locale/{es => es-ES}/aboutTBUpdate.dtd | 2 +- src/chrome/locale/{es => es-ES}/aboutTor.dtd | 0 src/chrome/locale/{es => es-ES}/brand.dtd | 0 src/chrome/locale/{es => es-ES}/brand.properties | 0 .../locale/{es => es-ES}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{es => es-ES}/securityLevel.properties | 0 src/chrome/locale/{es => es-ES}/torbutton.dtd | 0 src/chrome/locale/{es => es-ES}/torbutton.properties | 0 src/chrome/locale/{ga => ga-IE}/aboutDialog.dtd | 0 src/chrome/locale/{ga => ga-IE}/aboutTBUpdate.dtd | 0 src/chrome/locale/{ga => ga-IE}/aboutTor.dtd | 0 src/chrome/locale/{ga => ga-IE}/brand.dtd | 0 src/chrome/locale/{ga => ga-IE}/brand.properties | 0 .../locale/{ga => ga-IE}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{ga => ga-IE}/securityLevel.properties | 0 src/chrome/locale/{ga => ga-IE}/torbutton.dtd | 0 src/chrome/locale/{ga => ga-IE}/torbutton.properties | 0 src/chrome/locale/{nb => nb-NO}/aboutDialog.dtd | 0 src/chrome/locale/{nb => nb-NO}/aboutTBUpdate.dtd | 0 src/chrome/locale/{nb => nb-NO}/aboutTor.dtd | 0 src/chrome/locale/{nb => nb-NO}/brand.dtd | 0 src/chrome/locale/{nb => nb-NO}/brand.properties | 0 .../locale/{nb => nb-NO}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{nb => nb-NO}/securityLevel.properties | 0 src/chrome/locale/{nb => nb-NO}/torbutton.dtd | 0 src/chrome/locale/{nb => nb-NO}/torbutton.properties | 0 src/chrome/locale/{sv => sv-SE}/aboutDialog.dtd | 0 src/chrome/locale/{sv => sv-SE}/aboutTBUpdate.dtd | 0 src/chrome/locale/{sv => sv-SE}/aboutTor.dtd | 0 src/chrome/locale/{sv => sv-SE}/brand.dtd | 0 src/chrome/locale/{sv => sv-SE}/brand.properties | 0 .../locale/{sv => sv-SE}/browserOnboarding.properties | 8 ++++++-- src/chrome/locale/{sv => sv-SE}/securityLevel.properties | 0 src/chrome/locale/{sv => sv-SE}/torbutton.dtd | 0 src/chrome/locale/{sv => sv-SE}/torbutton.properties | 0 trans_tools/import-translations.sh | 14 ++++++-------- 38 files changed, 35 insertions(+), 21 deletions(-) diff --cc src/chrome.manifest index 53587fba,2edacef0..f6a267d7 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@@ -46,8 -46,7 +46,8 @@@ locale torbutton dz chrome/locale/dz locale torbutton el chrome/locale/el/ locale torbutton en chrome/locale/en-US/ locale torbutton eo chrome/locale/eo/ - locale torbutton es chrome/locale/es/ +locale torbutton es-AR chrome/locale/es-AR/ + locale torbutton es-ES chrome/locale/es-ES/ locale torbutton et chrome/locale/et/ locale torbutton eu chrome/locale/eu/ locale torbutton fa chrome/locale/fa/ diff --cc trans_tools/import-translations.sh index b8967287,f14c353a..c5724011 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@@ -2,15 -2,14 +2,14 @@@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync - BUNDLE_LOCALES="ar ca cs da de el es es-AR fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" -BUNDLE_LOCALES="ar ca cs da de el es-ES fa fr ga-IE he hu id is it ja ka ko nb-NO nl pl pt-BR ru sv-SE tr vi zh-CN zh-TW" ++BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko nb-NO nl pl pt-BR ru sv-SE tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. - # This is not used for official builds, but should remain - # so Basque XPIs can be build independently. We can do - # this for other languages too, if anyone requests this - # and translations are available. + # This is not used for official builds, but should remain so Basque XPIs can be + # built independently. We can do that for other languages too, if anyone + # requests it and translations are available. # XXX: Adding bn-BD as well as we don't ship that locale ourselves due to bug -# 26498. Others might want to fix, build, and use it, though. +# 26498 and #29257. Others might want to fix, build, and use it, though. BUNDLE_LOCALES="$BUNDLE_LOCALES eu bn-BD" LOCALE_DIR=../src/chrome/locale

1 0

[torbutton/master] Merge branch 'bug_29903'
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit b10f69f171b853bc3d4eb8c7153b73762faf4fda Merge: 3ff13208 021fc5c5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 8 15:49:24 2019 +0000 Merge branch 'bug_29903' src/modules/noscript-control.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[torbutton/master] Bug 29903: No WebGL click-to-play on the standard security level
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit 021fc5c5c5069bbcfd2d14dcc235fe29221fd597 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 26 12:15:32 2019 +0000 Bug 29903: No WebGL click-to-play on the standard security level --- src/modules/noscript-control.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 31ee98c2..4513dce8 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -17,7 +17,7 @@ let log = (level, msg) => logger.log(level, msg); // ## NoScript settings // Minimum and maximum capability states as controlled by NoScript. -const max_caps = ["fetch", "font", "frame", "media", "object", "other", "script"]; +const max_caps = ["fetch", "font", "frame", "media", "object", "other", "script", "webgl"]; const min_caps = ["frame", "other"]; // Untrusted capabilities for [Standard, Safer, Safest] safety levels.

1 0

[tor-browser-build/master] Merge branch 'bug_26498_v2'
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit c10e19ff904efd0bdb68ea40a83ac6cab49eb0dc Merge: f266df2 ab635bf Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 8 15:24:04 2019 +0000 Merge branch 'bug_26498_v2' rbm.conf | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Bug 26498: Add locale: es-AR
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit ab635bf6b1f77b00c24f03541150a2cf33cbdf3b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Mar 21 14:46:21 2019 +0000 Bug 26498: Add locale: es-AR --- rbm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rbm.conf b/rbm.conf index 8e3f54b..9381785 100644 --- a/rbm.conf +++ b/rbm.conf @@ -66,6 +66,7 @@ var: - da - de - el + - es-AR - es-ES - fa - fr

1 0

[tor-launcher/master] Bug 26498: Add locale es-AR
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit 970fa67ae56d959f94343010c2981d19b91fd189 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 18 23:29:17 2018 -0700 Bug 26498: Add locale es-AR --- src/chrome/content/network-settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index ef7571e..1c3498a 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -309,6 +309,7 @@ function populateLocaleList(aLangPackAddons) "de" : "Deutsch", "el" : "\u03B5\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", "es-ES" : "Espa\u00f1ol", + "es-AR" : "Espa\u00f1ol de Argentina", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", "ga" : "Gaeilge (Irish)",

1 0

[torbutton/master] Bug 26498: Add locale: es-AR
by gk＠torproject.org 08 Apr '19

08 Apr '19

commit 2ef5a96194e5cb24aa756913322bec86055087bc Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Mar 19 11:10:25 2019 +0000 Bug 26498: Add locale: es-AR --- src/chrome.manifest | 1 + trans_tools/import-translations.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 87467217..53587fba 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -47,6 +47,7 @@ locale torbutton el chrome/locale/el/ locale torbutton en chrome/locale/en-US/ locale torbutton eo chrome/locale/eo/ locale torbutton es chrome/locale/es/ +locale torbutton es-AR chrome/locale/es-AR/ locale torbutton et chrome/locale/et/ locale torbutton eu chrome/locale/eu/ locale torbutton fa chrome/locale/fa/ diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 5fbe4e7d..b8967287 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es es-AR fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain @@ -10,7 +10,7 @@ BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl p # this for other languages too, if anyone requests this # and translations are available. # XXX: Adding bn-BD as well as we don't ship that locale ourselves due to bug -# 26498. Others might want to fix, build, and use it, though. +# 26498 and #29257. Others might want to fix, build, and use it, though. BUNDLE_LOCALES="$BUNDLE_LOCALES eu bn-BD" LOCALE_DIR=../src/chrome/locale

1 0