commit 76d056634148add263720504aa4c6ff0c480165a Merge: b10f69f1 ad0f608c Author: Georg Koppen gk@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