July 2015 - tor-commits - lists.torproject.org

[torbutton/master] Bug 16268: non-en-US Tor Browser has Firefox branding in about box.
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit d7ff1cc7c2b785a2e44e2a568ae0d66a890f225b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jul 27 13:40:29 2015 -0400 Bug 16268: non-en-US Tor Browser has Firefox branding in about box. Import aboutDialog.dtd and aboutTor.properties from Transifex. Improved import-translations.sh to check that all .dtd and .properties files are imported. Work around a Transifex issue that caused some entities to be encoded twice. --- trans_tools/import-translations.sh | 88 ++++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 28 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index c29ed4c..28816ff 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync @@ -11,6 +11,48 @@ BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru tr vi zh-CN" # and translations are available. BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv" +LOCALE_DIR=../src/chrome/locale + +# FILEMAP is an array of "localeFile:translationBranch" strings. +FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" + "aboutTor.dtd:abouttor-homepage" + "aboutTor.properties:torbutton-abouttorproperties" + "brand.dtd:torbutton-branddtd" + "brand.properties:torbutton-brandproperties" + "browser.properties:torbutton-browserproperties" + "torbutton.dtd:torbutton-torbuttondtd" + "torbutton.properties:torbutton-torbuttonproperties" + ) + +# Verify that the FILEMAP contains an entry for each Torbutton file. +FILES_ARE_MISSING=0 +for DEST_PATH in $LOCALE_DIR/en/*.dtd $LOCALE_DIR/en/*.properties; +do + IS_FILE_IN_MAP=0 + DEST_FILE=${DEST_PATH##*/} + for KEYVAL in "${FILEMAP[@]}"; + do + FILE="${KEYVAL%%:*}" + if [ $FILE = $DEST_FILE ]; + then + IS_FILE_IN_MAP=1 + break; + fi + done + + if [ $IS_FILE_IN_MAP -eq 0 ]; + then + echo "Please add $DEST_FILE to FILEMAP." 1>&2 + FILES_ARE_MISSING=1 + fi +done + +if [ $FILES_ARE_MISSING -ne 0 ]; +then + exit 1 +fi + +# Clone or update our translation repo. if [ -d translation ]; then cd translation @@ -20,32 +62,22 @@ else git clone https://git.torproject.org/translation.git fi +# Update each translated file for each locale. +echo "Locales: $BUNDLE_LOCALES" cd translation -for i in $BUNDLE_LOCALES -do - UL="`echo $i|tr - _`" - mkdir -p ../../src/chrome/locale/$i/ - git checkout abouttor-homepage - git merge origin/abouttor-homepage - cp $UL/aboutTor.dtd ../../src/chrome/locale/$i/ - - git checkout torbutton-torbuttondtd - git merge origin/torbutton-torbuttondtd - cp $UL/torbutton.dtd ../../src/chrome/locale/$i/ - - git checkout torbutton-branddtd - git merge origin/torbutton-branddtd - cp $UL/brand.dtd ../../src/chrome/locale/$i/ - - git checkout torbutton-torbuttonproperties - git merge origin/torbutton-torbuttonproperties - cp $UL/torbutton.properties ../../src/chrome/locale/$i/ - - git checkout torbutton-browserproperties - git merge origin/torbutton-browserproperties - cp $UL/browser.properties ../../src/chrome/locale/$i/ - - git checkout torbutton-brandproperties - git merge origin/torbutton-brandproperties - cp $UL/brand.properties ../../src/chrome/locale/$i/ +for KEYVAL in "${FILEMAP[@]}"; do + FILE="${KEYVAL%%:*}" + BRANCH="${KEYVAL##*:}" + echo "Updating ${FILE}..." + git checkout -q "$BRANCH" + git merge -q origin/"$BRANCH" + for i in $BUNDLE_LOCALES; + do + UL="`echo $i|tr - _`" + mkdir -p ../$LOCALE_DIR/$i/ +# Use sed to work around a Transifex "double entity" issue. + sed -e 's/\&brandShortName;/\&brandShortName;/g' \ + -e 's/\&vendorShortName;/\&vendorShortName;/g' \ + $UL/"$FILE" > ../$LOCALE_DIR/$i/"$FILE" + done done

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit 3637bb43d7acc70f025f5a8da2db7efe4ada8294 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:47 2015 +0000 Update translations for tor-messenger-privproperties_completed --- es_AR/priv.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/es_AR/priv.properties b/es_AR/priv.properties new file mode 100644 index 0000000..db39744 --- /dev/null +++ b/es_AR/priv.properties @@ -0,0 +1 @@ +priv.account=Generando clave privada para %S (%S) ...

1 0

[tor-commits] [translation/tor-messenger-loggerproperties_completed] Update translations for tor-messenger-loggerproperties_completed
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit 63e3e79fda48126406c69566e40756fa3cb2198d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:41 2015 +0000 Update translations for tor-messenger-loggerproperties_completed --- es_AR/logger.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/es_AR/logger.properties b/es_AR/logger.properties new file mode 100644 index 0000000..e95122c --- /dev/null +++ b/es_AR/logger.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE (badLogfile): +# %S is the filename of the log file. +badLogfile=Archivo de registro corrupto o vacío: %S

1 0

[translation/tor-messenger-loggerproperties] Update translations for tor-messenger-loggerproperties
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit 911dc307f405cf350ed20e54e73a3cb8b9c63209 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:38 2015 +0000 Update translations for tor-messenger-loggerproperties --- es_AR/logger.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/logger.properties b/es_AR/logger.properties index 2228c50..e95122c 100644 --- a/es_AR/logger.properties +++ b/es_AR/logger.properties @@ -4,4 +4,4 @@ # LOCALIZATION NOTE (badLogfile): # %S is the filename of the log file. -badLogfile=Empty or corrupt log file: %S +badLogfile=Archivo de registro corrupto o vacío: %S

1 0

[tor-commits] [translation/tor-messenger-imtooltipproperties_completed] Update translations for tor-messenger-imtooltipproperties_completed
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit 22f3bb802a724c5e0fef30aa6ff784cd7d0b0b3c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:29 2015 +0000 Update translations for tor-messenger-imtooltipproperties_completed --- es_AR/imtooltip.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/es_AR/imtooltip.properties b/es_AR/imtooltip.properties new file mode 100644 index 0000000..4de4024 --- /dev/null +++ b/es_AR/imtooltip.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +buddy.username=Nombre de usuario +buddy.account=Cuenta +contact.tags=Etiquetas

1 0

[translation/tor-messenger-imtooltipproperties] Update translations for tor-messenger-imtooltipproperties
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit 8fc3c71b8f4410f2db469696cc57dd0fb4069a3d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:26 2015 +0000 Update translations for tor-messenger-imtooltipproperties --- es_AR/imtooltip.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_AR/imtooltip.properties b/es_AR/imtooltip.properties index 0dd51fe..4de4024 100644 --- a/es_AR/imtooltip.properties +++ b/es_AR/imtooltip.properties @@ -2,6 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -buddy.username=Username -buddy.account=Account -contact.tags=Tags +buddy.username=Nombre de usuario +buddy.account=Cuenta +contact.tags=Etiquetas

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit 0f4afdac1c7d48f8c29294875e423a0de34e9350 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:19 2015 +0000 Update translations for tor-messenger-fingerdtd --- es_AR/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/finger.dtd b/es_AR/finger.dtd index 7e611a4..63fba51 100644 --- a/es_AR/finger.dtd +++ b/es_AR/finger.dtd @@ -3,7 +3,7 @@ <!ENTITY finger.status "Status"> <!ENTITY finger.verified "Verified"> <!ENTITY finger.fingerprint "Fingerprint"> -<!ENTITY finger.account "Account"> +<!ENTITY finger.account "Cuenta"> <!ENTITY finger.protocol "Protocol"> <!ENTITY finger.verify "Verify"> <!ENTITY finger.remove "Remove">

1 0

[tor-commits] [translation/tor-messenger-facebookproperties_completed] Update translations for tor-messenger-facebookproperties_completed
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit 11e2b7398f4d98c0f701aa6689d0e08370af59ec Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:15 2015 +0000 Update translations for tor-messenger-facebookproperties_completed --- es_AR/facebook.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/es_AR/facebook.properties b/es_AR/facebook.properties new file mode 100644 index 0000000..f2e72f2 --- /dev/null +++ b/es_AR/facebook.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +connection.error.useUsernameNotEmailAddress=Por favor, utilice su nombre de usuario de Facebook, no una dirección de correo electrónico + +facebook.chat.name=Chat de Facebook

1 0

[translation/tor-messenger-facebookproperties] Update translations for tor-messenger-facebookproperties
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit 51c1a465fc423cc1882a7d32091dddd63b22c4bd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:11 2015 +0000 Update translations for tor-messenger-facebookproperties --- es_AR/facebook.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es_AR/facebook.properties b/es_AR/facebook.properties index aaf7cdc..f2e72f2 100644 --- a/es_AR/facebook.properties +++ b/es_AR/facebook.properties @@ -2,6 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -connection.error.useUsernameNotEmailAddress=Please use your Facebook username, not an email address +connection.error.useUsernameNotEmailAddress=Por favor, utilice su nombre de usuario de Facebook, no una dirección de correo electrónico -facebook.chat.name=Facebook Chat +facebook.chat.name=Chat de Facebook

1 0

[tor-commits] [translation/tor-messenger-contactsproperties_completed] Update translations for tor-messenger-contactsproperties_completed
by translation＠torproject.org 28 Jul '15

28 Jul '15

commit a421bcbf52c5847dfdf08ff6d2ce3ef95b515d5a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 28 02:17:03 2015 +0000 Update translations for tor-messenger-contactsproperties_completed --- es_AR/contacts.properties | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/es_AR/contacts.properties b/es_AR/contacts.properties new file mode 100644 index 0000000..e13ed0d --- /dev/null +++ b/es_AR/contacts.properties @@ -0,0 +1,8 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE (defaultGroup): +# This is the name of the group that will automatically be created when adding a +# buddy without specifying a group. +defaultGroup=Contactos

1 0