[tor-commits] [torbutton/master] Bug 29943: Use locales in AB-CD scheme to match Mozilla

gk at torproject.org gk at torproject.org
Mon Apr 8 16:15:09 UTC 2019


commit ad0f608cba44dc8be382b380b844cfd66dedecba
Author: Georg Koppen <gk at 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





More information about the tor-commits mailing list