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

[bridgedb/master] Remove tabs
by aagbsn＠torproject.org 22 Jun '13

22 Jun '13

commit 7706539c12abf23cf919007c27e1c1b2e01af64d Author: aagbsn <aagbsn(a)extc.org> Date: Sat Jun 22 19:23:36 2013 +0200 Remove tabs --- lib/bridgedb/Main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 9f09b7f..90b2998 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -192,11 +192,11 @@ def load(cfg, splitter, clear=False): # XXX: what do we do with all these or_addresses? # The bridge stability metrics are only concerned with a single ip:port # So for now, we will only consider the bridges primary IP:port - if bridge.getID() in timestamps.keys(): - ts = timestamps[bridge.getID()][:] - ts.sort() - for timestamp in ts: - bridgedb.Stability.addOrUpdateBridgeHistory(bridge, timestamp) + if bridge.getID() in timestamps.keys(): + ts = timestamps[bridge.getID()][:] + ts.sort() + for timestamp in ts: + bridgedb.Stability.addOrUpdateBridgeHistory(bridge, timestamp) f.close() # read pluggable transports from extra-info document # XXX: should read from networkstatus after bridge-authority

1 0

[bridgedb/master] Update URLs to point at PTTBB
by aagbsn＠torproject.org 22 Jun '13

22 Jun '13

commit f1fca186fde4281f19bb791fc9b09ef560f5e9b9 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Jun 22 19:45:18 2013 +0200 Update URLs to point at PTTBB --- lib/bridgedb/templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index e7f9c5e..2839e1a 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -6,8 +6,8 @@ <div class="span1"> <p class="lead"><span class="step-title"> ${_("Step 1")} </span></p></div> <div class="span5 step-text"> - ${_("Get %s Tor Browser Bundle %s") % \ -("""<a href="https://www.torproject.org/download/download-easy.html">""", "</a>")}</div> + ${_("Get the %s Pluggable Transports Tor Browser Bundle %s") % \ +("""<a href="https://www.torproject.org/projects/obfsproxy.html.en#download">""", "</a>")}</div> </div> <div class="step row"> <div class="span1">

1 0

[bridgedb/master] Use correct loglevel and skip inactive bridges.
by aagbsn＠torproject.org 22 Jun '13

22 Jun '13

commit 6f12c3aad44ef51fbf38baa1470b143037891718 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Jun 22 19:18:20 2013 +0200 Use correct loglevel and skip inactive bridges. --- lib/bridgedb/Main.py | 9 +++++---- lib/bridgedb/Stability.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index c9c7fbd..9f09b7f 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -192,10 +192,11 @@ def load(cfg, splitter, clear=False): # XXX: what do we do with all these or_addresses? # The bridge stability metrics are only concerned with a single ip:port # So for now, we will only consider the bridges primary IP:port - ts = timestamps[bridge.getID()][:] - ts.sort() - for timestamp in ts: - bridgedb.Stability.addOrUpdateBridgeHistory(bridge, timestamp) + if bridge.getID() in timestamps.keys(): + ts = timestamps[bridge.getID()][:] + ts.sort() + for timestamp in ts: + bridgedb.Stability.addOrUpdateBridgeHistory(bridge, timestamp) f.close() # read pluggable transports from extra-info document # XXX: should read from networkstatus after bridge-authority diff --git a/lib/bridgedb/Stability.py b/lib/bridgedb/Stability.py index a86f853..5cd7e8e 100644 --- a/lib/bridgedb/Stability.py +++ b/lib/bridgedb/Stability.py @@ -184,7 +184,7 @@ def addOrUpdateBridgeHistory(bridge, timestamp): bhe = db.getBridgeHistory(bridge.fingerprint) if not bridge.running: - log.notice("%s is not running" % bridge.fingerprint) + logging.info("%s is not running" % bridge.fingerprint) return bhe # Parse the descriptor and see if the address or port changed

1 0

[bridgedb/master] Remove unused line
by aagbsn＠torproject.org 22 Jun '13

22 Jun '13

commit 3fff9518d51fbed1e8c6f8fef4177e7cd9b75767 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Jun 22 18:24:25 2013 +0200 Remove unused line --- lib/bridgedb/HTTPServer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 7e62085..380439a 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -277,7 +277,6 @@ def addWebServer(cfg, dist, sched): return site def setLocaleFromRequestHeader(request): - default_lang = lang = "en" langs = request.getHeader('accept-language').split(',') logging.debug("Accept-Language: %s" % langs) localedir=os.path.join(os.path.dirname(__file__), 'i18n/')

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 22 Jun '13

22 Jun '13

commit 127cbf8b1b9763568dd889064ca38b786ae8f8a6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 22 10:46:47 2013 +0000 Update translations for mat-gui_completed --- pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR.po b/pt_BR.po index f546432..d306a03 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-06-21 21:13+0000\n" +"PO-Revision-Date: 2013-06-22 10:17+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 22 Jun '13

22 Jun '13

commit c16b44f01a07b053ffefdff5a89dcbd91b2ba258 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 22 10:46:44 2013 +0000 Update translations for mat-gui --- pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR.po b/pt_BR.po index f546432..d306a03 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-06-21 21:13+0000\n" +"PO-Revision-Date: 2013-06-22 10:17+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 22 Jun '13

22 Jun '13

commit f6aca488f89c09c27814362a214ca2fbe3ab46d9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 22 10:46:34 2013 +0000 Update translations for tails-persistence-setup_completed --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index b2cba1a..ee64346 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-21 20:48+0000\n" +"PO-Revision-Date: 2013-06-22 10:17+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 22 Jun '13

22 Jun '13

commit cd62603f584901ce7c62b8f92ef8e6cf3674e78c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 22 10:46:31 2013 +0000 Update translations for tails-persistence-setup --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index b2cba1a..ee64346 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-21 20:48+0000\n" +"PO-Revision-Date: 2013-06-22 10:17+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 22 Jun '13

22 Jun '13

commit 64042d1054daaaaf535061742f68bb5f32f37c23 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 22 10:45:31 2013 +0000 Update translations for vidalia_completed --- ca/qt_ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/qt_ca.po b/ca/qt_ca.po index e1dd078..ad2e471 100644 --- a/ca/qt_ca.po +++ b/ca/qt_ca.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-06-22 09:33+0000\n" +"PO-Revision-Date: 2013-06-22 10:16+0000\n" "Last-Translator: pau.selles <pau.selles(a)josoc.cat>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 22 Jun '13

22 Jun '13

commit 34cec2c4d5429f0c664cd5f39027671c932959d0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 22 10:45:25 2013 +0000 Update translations for vidalia --- ca/qt_ca.po | 2 +- ca/vidalia_ca.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ca/qt_ca.po b/ca/qt_ca.po index e1dd078..ad2e471 100644 --- a/ca/qt_ca.po +++ b/ca/qt_ca.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-06-22 09:33+0000\n" +"PO-Revision-Date: 2013-06-22 10:16+0000\n" "Last-Translator: pau.selles <pau.selles(a)josoc.cat>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index a5037c2..e1025f6 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-22 10:16+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0