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

[tor/master] Add doc/WritingTests.txt to distribution
by nickm＠torproject.org 03 Sep '15

03 Sep '15

commit 1d514b8a91c7cea03b636156977d40b34802f8d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 3 10:30:54 2015 -0400 Add doc/WritingTests.txt to distribution --- doc/include.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/include.am b/doc/include.am index ff2de84..41d3d2a 100644 --- a/doc/include.am +++ b/doc/include.am @@ -37,7 +37,9 @@ endif EXTRA_DIST+= doc/HACKING doc/asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ doc/state-contents.txt \ - doc/torrc_format.txt doc/TUNING + doc/torrc_format.txt \ + doc/TUNING \ + doc/WritingTests.txt docdir = @docdir@

1 0

[tor-browser-bundle/master] Bug 10140: Support platform specific langpacks
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 5b34c06405a5524a5bc2b8ba42fd0587086dd52c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Sep 1 10:54:30 2015 +0000 Bug 10140: Support platform specific langpacks This patch allows to fetch Linux/Windows/OSX-specific language packs. Furthermore, it enables Japanese. --- gitian/descriptors/linux/gitian-bundle.yml | 3 ++- gitian/descriptors/mac/gitian-bundle.yml | 3 ++- gitian/descriptors/windows/gitian-bundle.yml | 3 ++- gitian/fetch-inputs.sh | 20 ++++++++++++++++++++ gitian/versions | 4 ++++ gitian/versions.alpha | 3 +++ gitian/versions.beta | 3 +++ gitian/versions.nightly | 3 +++ 8 files changed, 39 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f1d0554..afb632e 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -182,7 +182,8 @@ script: | # unzip linux-langpacks.zip cd linux-langpacks - for LANG in $BUNDLE_LOCALES + LINUX_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_LINUX" + for LANG in $LINUX_LOCALES do xpi=$LANG.xpi cp -a ../tor-browser ../tor-browser_$LANG diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a956fa7..dabe619 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -208,7 +208,8 @@ script: | # unzip mac-langpacks.zip cd mac-langpacks - for LANG in $BUNDLE_LOCALES + MAC_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_MAC" + for LANG in $MAC_LOCALES do xpi=$LANG.xpi DEST=$TORBROWSER_APP diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index c674e1b..649ff53 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -173,7 +173,8 @@ script: | # unzip ../win32-langpacks.zip cd win32-langpacks - for LANG in $BUNDLE_LOCALES + WIN32_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_WIN32" + for LANG in $WIN32_LOCALES do xpi=$LANG.xpi cp $xpi ../"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index a97ff62..42efa33 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -177,6 +177,7 @@ do fi done +# Fetch the common langpacks first, then the platform specific ones if any. mkdir -p langpacks-$FIREFOX_LANG_VER/linux-langpacks mkdir -p langpacks-$FIREFOX_LANG_VER/win32-langpacks mkdir -p langpacks-$FIREFOX_LANG_VER/mac-langpacks @@ -196,6 +197,25 @@ do cd .. done +for i in $BUNDLE_LOCALES_LINUX +do + cd linux-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done +for i in $BUNDLE_LOCALES_WIN32 +do + cd win32-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done +for i in $BUNDLE_LOCALES_MAC +do + cd mac-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done + "$WRAPPER_DIR/build-helpers/dzip.sh" ../win32-langpacks.zip win32-langpacks "$WRAPPER_DIR/build-helpers/dzip.sh" ../linux-langpacks.zip linux-langpacks "$WRAPPER_DIR/build-helpers/dzip.sh" ../mac-langpacks.zip mac-langpacks diff --git a/gitian/versions b/gitian/versions index 3df967e..b833342 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,5 +1,9 @@ TORBROWSER_VERSION_TYPE=release BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" + BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5005445..f37b98a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,8 @@ TORBROWSER_VERSION_TYPE=alpha BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.beta b/gitian/versions.beta index 343d4b5..c2143a0 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,5 +1,8 @@ TORBROWSER_VERSION_TYPE=beta BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index afb82c5..f0551f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -3,6 +3,9 @@ TORBROWSER_VERSION=tbb-nightly TORBROWSER_BUILDDIR=tbb-nightly TORBROWSER_SYMLINK_VERSION=0 BUNDLE_LOCALES="ar ru zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=0

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit badf55cb0fdda5c3c893f01f996a29a4e105d3d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index d238d3a..a371403 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -421,7 +421,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit f3a1676797a35a63ff2e40f89e6aab169b8661b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a371403..a875774 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -329,6 +329,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0

[tor-browser-bundle/master] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 199808ddbe8e9f640bc8cef57e6f09f2f3070d95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 4f6286d..bb285fd 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -423,7 +423,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/master] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 7097c9651a556a314a8265226e2e2c111934a7b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bb285fd..b1b3331 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -331,6 +331,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 03 Sep '15

03 Sep '15

commit 53cbc68fdba87fba6350e20865c01a0cb02eebfa Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 3 10:16:27 2015 +0000 Update translations for tor-messenger-otrproperties --- hr_HR/otr.properties | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/hr_HR/otr.properties b/hr_HR/otr.properties index 07a14ec..9190510 100644 --- a/hr_HR/otr.properties +++ b/hr_HR/otr.properties @@ -1,28 +1,28 @@ -msgevent.encryption_required_part1=You attempted to send an unencrypted message to %S. As a policy, unencrypted messages are not allowed. -msgevent.encryption_required_part2=Attempting to start a private conversation. Your message will be retransmitted when the private conversation starts. -msgevent.encryption_error=An error occurred when encrypting your message. The message was not sent. -msgevent.connection_ended=%S has already closed their private connection to you. Your message was not sent. Either end your private conversation, or restart it. -msgevent.setup_error=An error occured while setting up a private conversation with %S. -msgevent.msg_reflected=You are receiving your own OTR messages. You are either trying to talk to yourself, or someone is reflecting your messages back at you. -msgevent.msg_resent=The last message to %S was resent. -msgevent.rcvdmsg_not_private=The encrypted message received from %S is unreadable, as you are not currently communicating privately. -msgevent.rcvdmsg_unreadable=We received an unreadable encrypted message from %S. -msgevent.rcvdmsg_malformed=We received a malformed data message from %S. -msgevent.log_heartbeat_rcvd=Heartbeat received from %S. -msgevent.log_heartbeat_sent=Heartbeat sent to %S. -msgevent.rcvdmsg_general_err=An OTR error occured. -msgevent.rcvdmsg_unecrypted=We received an unencrypted message from %S. -msgevent.rcvdmsg_unrecognized=We received an unrecognized OTR message from %S. -msgevent.rcvdmsg_for_other_instance=%S has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message. -context.gone_secure_private=Private conversation with %S started. -context.gone_secure_unverified=Private conversation with %S started. However, their identity has not been verified. -context.still_secure=Successfully refreshed the private conversation with %S. -error.enc=Error occurred encrypting message. -error.not_priv=You sent encrypted data to %S, who wasn't expecting it. -error.unreadable=You transmitted an unreadable encrypted message. -error.malformed=You transmitted a malformed data message. -resent=[resent] -tlv.disconnected=%S has ended their private conversation with you; you should do the same. +msgevent.encryption_required_part1=Pokušali ste poslati neenkriptiranu poruku %S. Neenkriptirane poruke nisu dozvoljene. +msgevent.encryption_required_part2=Pokušavam započeti privatni razgovor. Vaša poruka će biti ponovno poslana kad privatni razgovor započne. +msgevent.encryption_error=Došlo je do pogreške prilikom enkripcije Vaše poruke. Poruka nije poslana. +msgevent.connection_ended=%S je već zatvorio svoju privatnu vezu prema Vama. Vaša poruka nije poslana. Ili završite svoj privatni razgovor ili ga ponovno pokrenite. +msgevent.setup_error=Došlo je do pogreške prilikom uspostave privatnog razgovora s %S. +msgevent.msg_reflected=Primate vlastite OTR poruke. Ili želite pričati sami sa sobom, ili netko reflektira Vaše poruke natrag Vama. +msgevent.msg_resent=Posljednja poruka za %S je poslana ponovno. +msgevent.rcvdmsg_not_private=Enkriptirana poruka primljena od %S je nečitljiva, jer trenutno ne komunicirate privatno. +msgevent.rcvdmsg_unreadable=Primili smo nečitljivu enkriptiranu poruku od %S. +msgevent.rcvdmsg_malformed=Primili smo poruku o malformiranim podatcima od %S. +msgevent.log_heartbeat_rcvd=Otkucaj srca primljen od %S. +msgevent.log_heartbeat_sent=Otkucaj srca poslan prema %S. +msgevent.rcvdmsg_general_err=Došlo je do OTR pogreške. +msgevent.rcvdmsg_unecrypted=Primili smo neenkriptiranu poruku od %S. +msgevent.rcvdmsg_unrecognized=Primili smo neprepoznatu OTR poruku od %S. +msgevent.rcvdmsg_for_other_instance=%S je poslao poruku namjenjenu za različitu sesiju. Ako ste prijavljeni više puta, možda je neka druga sesija primila tu poruku. +context.gone_secure_private=Privatni razgovor s %S pokrenut. +context.gone_secure_unverified=Privatni razgovor s %S pokrenut. Kako bilo, identitet kontakta nije verificiran. +context.still_secure=Uspješno osvježen privatni razgovor s %S. +error.enc=Došlo je do pogreške prilikom enkripcije poruke. +error.not_priv=Poslali ste enkriptirane podatke prema %S, koji to nije očekivao. +error.unreadable=Poslali ste nečitljivu enkriptiranu poruku. +error.malformed=Poslali ste poruku malformiranih podataka. +resent=[ponovno poslano] +tlv.disconnected=%S je završio privatni razgovor s Vama; i Vi bi trebali učiniti isto. query.msg=%S has requested an Off-the Record private conversation. However, you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for more information. trust.unused=Unused trust.not_private=Not Private

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 03 Sep '15

03 Sep '15

commit d86d1388c52e564f01d37b4eb31f2ae4e0cb741e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 3 09:46:38 2015 +0000 Update translations for tor-messenger-ircproperties --- hr_HR/irc.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR/irc.properties b/hr_HR/irc.properties index 1523ea6..5aaa70b 100644 --- a/hr_HR/irc.properties +++ b/hr_HR/irc.properties @@ -103,9 +103,9 @@ message.nick.you=You are now known as %S. # Could not change the nickname. %S is the user's nick. message.nick.fail=Nije moguće koristiti željeni nadimak. Vaš nadimak ostaje %S. # The parameter is the message.parted.reason, if a part message is given. -message.parted.you=You have left the room (Part%1$S). +message.parted.you=Napustili ste sobu (Part%1$S). # %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given. -message.parted=%1$S has left the room (Part%2$S). +message.parted=%1$S je napustio sobu (Part%2$S). # %S is the part message supplied by the user. message.parted.reason=: %S # %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.

1 0

[translation/tor-messenger-authproperties_completed] Update translations for tor-messenger-authproperties_completed
by translation＠torproject.org 03 Sep '15

03 Sep '15

commit 502d5dc86392703867bac6105e51b474b2f63460 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 3 09:46:23 2015 +0000 Update translations for tor-messenger-authproperties_completed --- hr_HR/auth.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hr_HR/auth.properties b/hr_HR/auth.properties new file mode 100644 index 0000000..3c57b7c --- /dev/null +++ b/hr_HR/auth.properties @@ -0,0 +1,12 @@ +auth.title=Verificiraj identitet %S. +auth.yourFingerprint=Otisak prsta za Vas, %S:\n%S +auth.theirFingerprint=Navodni otisak prsta za %S:\n%S +auth.help=Verificiranje identiteta kontakta osigurava da je osoba s kojom razgovarate uistinu onaj za kog se predstavlja. +auth.helpTitle=Pomoć pri verifikaciji +auth.question=Ovo je pitanje koje pita Vaš kontakt:\n\n%S\n\nUnesite tajni odgovor ovdje (osjetljivo na velika i mala slova): +auth.secret=Unesite tajnu ovdje: +auth.error=Došlo je do pogreške prilikom verificiranja identiteta Vašeg kontakta. +auth.success=Verificiranje identiteta Vašeg kontakta uspješno dovršeno. +auth.successThem=Vaš kontakt je uspješno verificirao Vaš identitet. Možda bi htjeli verificirati njihov identitet postavljanjem svog pitanja. +auth.fail=Nije uspjelo verificiranje identiteta Vašeg kontakta. +auth.done=Gotovo

1 0

[translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties
by translation＠torproject.org 03 Sep '15

03 Sep '15

commit 1ad069bbf813cea6f61db609acef8e0fce457d81 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 3 09:46:19 2015 +0000 Update translations for tor-messenger-authproperties --- hr_HR/auth.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hr_HR/auth.properties b/hr_HR/auth.properties index c3b4403..3c57b7c 100644 --- a/hr_HR/auth.properties +++ b/hr_HR/auth.properties @@ -1,12 +1,12 @@ auth.title=Verificiraj identitet %S. auth.yourFingerprint=Otisak prsta za Vas, %S:\n%S auth.theirFingerprint=Navodni otisak prsta za %S:\n%S -auth.help=Verifying a contact's identity helps ensure that the person you are talking to is who they claim to be. -auth.helpTitle=Verification help -auth.question=This is the question asked by your contact:\n\n%S\n\nEnter secret answer here (case sensitive): +auth.help=Verificiranje identiteta kontakta osigurava da je osoba s kojom razgovarate uistinu onaj za kog se predstavlja. +auth.helpTitle=Pomoć pri verifikaciji +auth.question=Ovo je pitanje koje pita Vaš kontakt:\n\n%S\n\nUnesite tajni odgovor ovdje (osjetljivo na velika i mala slova): auth.secret=Unesite tajnu ovdje: -auth.error=An error occurred while verifying your contact's identity. -auth.success=Verifying your contact's identity completed successfully. -auth.successThem=Your contact has successfully verified your identity. You may want to verify their identity as well by asking your own question. -auth.fail=Failed to verify your contact's identity. +auth.error=Došlo je do pogreške prilikom verificiranja identiteta Vašeg kontakta. +auth.success=Verificiranje identiteta Vašeg kontakta uspješno dovršeno. +auth.successThem=Vaš kontakt je uspješno verificirao Vaš identitet. Možda bi htjeli verificirati njihov identitet postavljanjem svog pitanja. +auth.fail=Nije uspjelo verificiranje identiteta Vašeg kontakta. auth.done=Gotovo

1 0