May 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Update copyright/licence file header for lib/bridgedb/HTTPServer.py.
by isis＠torproject.org 06 May '14

06 May '14

commit d2ff6dd8efabc255dbad60253a4a052cd714ec32 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 5 19:26:26 2014 +0000 Update copyright/licence file header for lib/bridgedb/HTTPServer.py. --- lib/bridgedb/HTTPServer.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index cf8a83a..cbff653 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -1,6 +1,11 @@ -# BridgeDB by Nick Mathewson. -# Copyright (c) 2007-2013, The Tor Project, Inc. -# See LICENSE for licensing information +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_HTTPServer -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: please see included AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2013-2014, Isis Lovecruft +# :license: see LICENSE for licensing information """ This module implements the web (http, https) interfaces to the bridge database.

1 0

[bridgedb/develop] Don't translate strings which go into the bucket files.
by isis＠torproject.org 06 May '14

06 May '14

commit 7c63162e12a60acfe3420741e0797f6e05e052af Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 2 16:57:56 2014 +0000 Don't translate strings which go into the bucket files. --- lib/bridgedb/Bucket.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 416c1ea..2914bf5 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -232,11 +232,11 @@ class BucketManager: f = open(filename, 'w') for bh in bridgeHistories: days = bh.tosa / long(60*60*24) - line = "%s:%s\t(%d %s)" % \ - (bh.ip, bh.port, days, _("""days at this address""")) + line = "%s:%s\t(%d days at this address)" % \ + (bh.ip, bh.port, days) if str(bh.fingerprint) in blocklist.keys(): - line = line + "\t%s: (%s)" % (_("""(Might be blocked)"""), - ",".join(blocklist[bh.fingerprint]),) + line = line + "\t(Might be blocked): (%s)" % \ + ",".join(blocklist[bh.fingerprint]) f.write(line + '\n') f.close() except IOError:

1 0

[bridgedb/develop] PEP8 whitespace fix for one line in bridgedb.HTTPServer.
by isis＠torproject.org 06 May '14

06 May '14

commit 25be173fd45804fd7ff324074efc4520c04f4681 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 5 19:26:52 2014 +0000 PEP8 whitespace fix for one line in bridgedb.HTTPServer. --- lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index cbff653..5f41f6f 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -50,7 +50,7 @@ from bridgedb.parse import headers from bridgedb.safelog import logSafely -TEMPLATE_DIR = os.path.join(os.path.dirname(__file__),'templates') +TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates') GEOIP_DBFILE = '/usr/share/GeoIP/GeoIP.dat' rtl_langs = ('ar', 'he', 'fa', 'gu_IN', 'ku')

1 0

[tor-browser-bundle/master] Make 3.6.x officially the 'stable' series.
by mikeperry＠torproject.org 06 May '14

06 May '14

commit 1259ad85be7f7299b94da14f53f850d544b6cd12 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 6 05:23:47 2014 -0700 Make 3.6.x officially the 'stable' series. --- gitian/versions | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index a410fff..c3faa7b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,5 +1,6 @@ -TORBROWSER_VERSION=3.5.5-pre -BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +TORBROWSER_VERSION=3.6.1 +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 @@ -7,17 +8,17 @@ FIREFOX_VERSION=24.5.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.4.4 -TORBUTTON_TAG=1.6.7.0 +TORLAUNCHER_TAG=0.2.5.4 +TORBUTTON_TAG=1.6.9.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.8 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.13 +FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 @@ -37,11 +38,13 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +HTTPSE_VER=3.5.1 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.20-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi +HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -67,7 +70,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -88,6 +92,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC…

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 06 May '14

06 May '14

commit 8f36d1810a56b1c2bb970ed72ba78b48d2bc2346 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 11:45:11 2014 +0000 Update translations for torcheck_completed --- ja/torcheck.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ja/torcheck.po b/ja/torcheck.po index 2f3b98a..108c085 100644 --- a/ja/torcheck.po +++ b/ja/torcheck.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-30 14:10+0000\n" +"PO-Revision-Date: 2014-05-06 11:41+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -96,3 +96,6 @@ msgstr "JavaScript が有効です。" msgid "JavaScript is disabled." msgstr "JavaScript が無効です。" + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "ただし、 Tor ブラウザーバンドルではないようです。"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 May '14

06 May '14

commit 5e4f4b67c4e6346bd6f695b01d7e7ae63c1882f1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 11:45:09 2014 +0000 Update translations for torcheck --- ja/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/torcheck.po b/ja/torcheck.po index ee3f018..108c085 100644 --- a/ja/torcheck.po +++ b/ja/torcheck.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 11:41+0000\n" +"Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,4 +98,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript が無効です。" msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "ただし、 Tor ブラウザーバンドルではないようです。"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 06 May '14

06 May '14

commit 0991dac19b65bfc48c5a4f1c48568dfbc6073cf8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 10:15:53 2014 +0000 Update translations for tails-iuk --- eu.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eu.po b/eu.po index b8a2c68..aacade5 100644 --- a/eu.po +++ b/eu.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# jonbraun <ahandoze(a)gmail.com>, 2014 # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 08:17+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-04-16 17:54+0200\n" +"PO-Revision-Date: 2014-05-06 09:50+0000\n" +"Last-Translator: jonbraun <ahandoze(a)gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -135,7 +136,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available" -msgstr "" +msgstr "Bertsio berria eskuragarri" #: ../lib/Tails/IUK/Frontend.pm:468 msgid "Downloading upgrade"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 May '14

06 May '14

commit f7ff4b0c576b9d3fbc3f5b4fd90e2cbe64a7b39d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 10:15:40 2014 +0000 Update translations for tails-misc --- eu.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/eu.po b/eu.po index 13584b0..30587b8 100644 --- a/eu.po +++ b/eu.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# jonbraun <ahandoze(a)gmail.com>, 2014 # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-27 19:29+0200\n" -"PO-Revision-Date: 2014-04-30 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 09:50+0000\n" +"Last-Translator: jonbraun <ahandoze(a)gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" -msgstr "" +msgstr "Tor prest dago" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." @@ -199,7 +200,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/iceweasel:12 msgid "Tor is not ready" -msgstr "" +msgstr "Tor ez dago prest" #: config/chroot_local-includes/usr/local/bin/iceweasel:13 msgid "Tor is not ready. Start Tor Browser anyway?" @@ -247,7 +248,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-about:27 msgid "About Tails" -msgstr "" +msgstr "Tails-i buruz" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 @@ -476,7 +477,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 msgid "i2p" -msgstr "" +msgstr "i2p" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 msgid "Anonymous overlay network"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 06 May '14

06 May '14

commit 05ba5fb6cbdbd52296b32ddb4ebd6abb74f5f153 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 10:15:22 2014 +0000 Update translations for liveusb-creator --- eu/eu.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eu/eu.po b/eu/eu.po index 990c369..99dff8b 100644 --- a/eu/eu.po +++ b/eu/eu.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# jonbraun <ahandoze(a)gmail.com>, 2014 # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2012-2013 # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2013 # totorika93 <totorika93(a)gmail.com>, 2012 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:33+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-04-27 13:07+0200\n" +"PO-Revision-Date: 2014-05-06 10:02+0000\n" +"Last-Translator: jonbraun <ahandoze(a)gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -204,7 +205,7 @@ msgstr "" #: ../liveusb/dialog.py:174 msgid "Install Tails" -msgstr "" +msgstr "Tails instalatu" #: ../liveusb/gui.py:630 msgid "Installation complete!" @@ -341,7 +342,7 @@ msgstr "" msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "" +msgstr "Aukeratutako fitxategia irakurtezina da. Mesedez zuzendu bere baimenak edo beste fitxategi bat aukeratu. " #: ../liveusb/creator.py:337 #, python-format

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 06 May '14

06 May '14

commit a586ceb98dd68c5bbea09e4851fca76f343a0e50 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 09:45:14 2014 +0000 Update translations for torcheck_completed --- he/torcheck.po | 2 +- pt/torcheck.po | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/he/torcheck.po b/he/torcheck.po index cd79115..5dbc922 100644 --- a/he/torcheck.po +++ b/he/torcheck.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 09:13+0000\n" +"PO-Revision-Date: 2014-05-06 09:20+0000\n" "Last-Translator: GenghisKhan <genghiskhan(a)gmx.ca>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" diff --git a/pt/torcheck.po b/pt/torcheck.po index 89a3506..8f11d26 100644 --- a/pt/torcheck.po +++ b/pt/torcheck.po @@ -2,17 +2,18 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# André Monteiro <andre.monteir(a)gmail.com>, 2014 # flavioamieiro <flavioamieiro(a)gmail.com>, 2012 # SonhosDigitais <sonhosdigitais(a)gmx.com>, 2013 -# Nizia Dantas <niziadantasyouversion(a)gmail.com>, 2014 +# Nizia Dantas <nizia.dantas(a)gmail.com>, 2014 # dragulian <rocha.t80(a)gmail.com>, 2014 # Zeca Gatilho <paulo.mosh(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-04-29 14:55+0000\n" -"Last-Translator: dragulian <rocha.t80(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 09:30+0000\n" +"Last-Translator: André Monteiro <andre.monteir(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,3 +97,6 @@ msgstr "JavaScript activado." msgid "JavaScript is disabled." msgstr "JavaScript desactivado." + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "No entanto, não parece ser o conjunto de navegador Tor"

1 0