June 2013 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Ensure we're using the right gitian-builder commit via tagging.
by mikeperry＠torproject.org 26 Jun '13

26 Jun '13

commit 8905f2e7636cdf906882b82c76e2e9f0564d7339 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 26 14:59:04 2013 -0700 Ensure we're using the right gitian-builder commit via tagging. --- gitian/check-prerequisites.sh | 2 +- gitian/fetch-inputs.sh | 6 ++++++ gitian/verify-tags.sh | 11 ++++++++--- gitian/versions | 2 ++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index d716944..201b489 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -27,7 +27,7 @@ then echo echo "Please run:" echo " cd ../../ " - echo " torsocks git clone -b tor-browser-builder https://git.torproject.org/user/mikeperry/gitian-builder.git" + echo " torsocks git clone -b tor-browser-builder-1 https://git.torproject.org/builders/gitian-builder.git" echo " cd -" exit 1 fi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index a11d2cb..e5121ba 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -130,6 +130,12 @@ ln -sf $NOSCRIPT_PACKAGE noscript(a)noscript.net.xpi ln -sf $PDFJS_PACKAGE uriloader(a)pdf.js.xpi ln -sf $OPENSSL_PACKAGE openssl.tar.gz +# Fetch latest gitian-builder itself +cd .. +git fetch origin +git fetch --tags origin +cd inputs + if [ -d tbb-windows-installer/.git ]; then cd tbb-windows-installer diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 9c9a243..38dfec6 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -3,8 +3,8 @@ . ./versions -if [ -n $1 ]; then - INPUTS_DIR=../../gitian-builder/inputs +if [ -z "$1" ]; then + INPUTS_DIR=$PWD/../../gitian-builder/inputs else INPUTS_DIR=$1 fi @@ -40,11 +40,16 @@ cd tor git tag -v $TOR_TAG || exit 1 cd .. - cd https-everywhere git tag -v $HTTPSE_TAG || exit 1 cd .. +# Finally, verify gitian-builder itself +cd .. +git tag -v $GITIAN_TAG || exit 1 +git checkout $GITIAN_TAG || exit 1 +cd $INPUTS_DIR + exit 0 diff --git a/gitian/versions b/gitian/versions index b21d95a..0b616f0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -12,6 +12,8 @@ NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable +GITIAN_TAG=tor-browser-builder-3.0-1 + OPENSSL_VER=1.0.1e FIREFOX_LANG_VER=17.0.7esr

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 26 Jun '13

26 Jun '13

commit 37104e5cc408205f1de8814945ac707b83288fc4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 21:45:49 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/netview.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zh_CN/netview.po b/zh_CN/netview.po index c3dde52..3684e9f 100644 --- a/zh_CN/netview.po +++ b/zh_CN/netview.po @@ -1,13 +1,14 @@ # # Translators: # simabull tsai, 2013 +# simabull tsai, 2013 # Kevin Chen <szescxz(a)126.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-06-26 21:15+0000\n" +"PO-Revision-Date: 2013-06-26 21:40+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -46,7 +47,7 @@ msgid "" "through a series of relays on the network. Your application's traffic is " "then sent as a stream through that circuit. For efficiency, multiple " "streams may share the same circuit." -msgstr "当您要在 Tor 上进行匿名通讯时(比如，连接至一个网站)，Tor 将创建一个通道，或一个回路，通过一系列中继在网络上进行加密连接。应用程序的网络流量将以数据流的方式通过回路传送。考虑到效率，多个数据流可能共享一个回路。" +msgstr "在 Tor 上进行匿名通讯时（比如，连接至一个网站），Tor 将创建一个通道或一个回路，通过一系列中继在网络上进行加密连接。应用程序的网络流量将以数据流的方式通过回路传送。为了提高效率，多个数据流可能共享一个回路。" #. type: Content of: <html><body> #: en/netview.html:35

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 26 Jun '13

26 Jun '13

commit 2f8cac6ccd57358c31245375e085d99ca58aa5d8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 21:45:37 2013 +0000 Update translations for vidalia_help --- zh_CN/netview.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zh_CN/netview.po b/zh_CN/netview.po index 3cd7776..3684e9f 100644 --- a/zh_CN/netview.po +++ b/zh_CN/netview.po @@ -1,13 +1,14 @@ # # Translators: # simabull tsai, 2013 +# simabull tsai, 2013 # Kevin Chen <szescxz(a)126.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-06-26 18:41+0000\n" +"PO-Revision-Date: 2013-06-26 21:40+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -46,7 +47,7 @@ msgid "" "through a series of relays on the network. Your application's traffic is " "then sent as a stream through that circuit. For efficiency, multiple " "streams may share the same circuit." -msgstr "当您要在 Tor 上进行匿名通讯时(比如，连接至一个网站)，Tor 将创建一个通道，或一个回路，通过一系列中继在网络上进行加密连接。应用程序的网络流量将以数据流的方式通过回路传送。考虑到效率，多个数据流可能共享一个回路。" +msgstr "在 Tor 上进行匿名通讯时（比如，连接至一个网站），Tor 将创建一个通道或一个回路，通过一系列中继在网络上进行加密连接。应用程序的网络流量将以数据流的方式通过回路传送。为了提高效率，多个数据流可能共享一个回路。" #. type: Content of: <html><body> #: en/netview.html:35

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 26 Jun '13

26 Jun '13

commit f4aa302dc7b2c4d6190147e789593bd3cfcac316 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 21:15:42 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/netview.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/netview.po b/zh_CN/netview.po index 3cd7776..c3dde52 100644 --- a/zh_CN/netview.po +++ b/zh_CN/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-06-26 18:41+0000\n" +"PO-Revision-Date: 2013-06-26 21:15+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

r26231: {website} Update jobs page to link in the automation engineer position (website/trunk/about/en)
by Mike Perry 26 Jun '13

26 Jun '13

Author: mikeperry Date: 2013-06-26 19:04:24 +0000 (Wed, 26 Jun 2013) New Revision: 26231 Modified: website/trunk/about/en/jobs.wml Log: Update jobs page to link in the automation engineer position. Modified: website/trunk/about/en/jobs.wml =================================================================== --- website/trunk/about/en/jobs.wml 2013-06-23 09:48:36 UTC (rev 26230) +++ website/trunk/about/en/jobs.wml 2013-06-26 19:04:24 UTC (rev 26231) @@ -16,6 +16,7 @@ <ul> +<li><a href="<page about/jobs-lead-automation>">Lead Automation Engineer</a></li> <li><a href="<page about/jobs-pluggabletransport>">Pluggable transport developer</a></li> </ul>

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 26 Jun '13

26 Jun '13

commit 805051022ae3507fc1bb81c3f557f2532f6ce105 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 18:45:46 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/netview.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/netview.po b/zh_CN/netview.po index 4334ced..3cd7776 100644 --- a/zh_CN/netview.po +++ b/zh_CN/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-06-26 18:15+0000\n" +"PO-Revision-Date: 2013-06-26 18:41+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 26 Jun '13

26 Jun '13

commit 9e276aebcfcf7455a4f2c3bc4da871b35f230c12 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 18:45:34 2013 +0000 Update translations for vidalia_help --- zh_CN/netview.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/netview.po b/zh_CN/netview.po index 4334ced..3cd7776 100644 --- a/zh_CN/netview.po +++ b/zh_CN/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-06-26 18:15+0000\n" +"PO-Revision-Date: 2013-06-26 18:41+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 26 Jun '13

26 Jun '13

commit 6e42c5775a0dd0480783abe60eceb0d2563bda2c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 18:15:46 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/netview.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/netview.po b/zh_CN/netview.po index 497d70b..4334ced 100644 --- a/zh_CN/netview.po +++ b/zh_CN/netview.po @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-29 22:51+0000\n" +"PO-Revision-Date: 2013-06-26 18:15+0000\n" "Last-Translator: simabull tsai\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 26 Jun '13

26 Jun '13

commit c006a68cdcbefa70b058b65f0f506c1b2fcab846 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 26 18:15:35 2013 +0000 Update translations for vidalia_help --- zh_CN/netview.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/netview.po b/zh_CN/netview.po index 497d70b..4334ced 100644 --- a/zh_CN/netview.po +++ b/zh_CN/netview.po @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-29 22:51+0000\n" +"PO-Revision-Date: 2013-06-26 18:15+0000\n" "Last-Translator: simabull tsai\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[tor-browser-bundle/master] Bump package version, too..
by mikeperry＠torproject.org 26 Jun '13

26 Jun '13

commit bd5465a42aa82a35c17fd05d9e535ac0c64e6463 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 26 11:10:36 2013 -0700 Bump package version, too.. Ugh. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 227f0bb..b21d95a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.0-alpha-1 +TORBROWSER_VERSION=3.0-alpha-2 BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1

1 0