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

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 27 Mar '15

27 Mar '15

commit e4dad9f8c1c40c6493a5c9b66baf24638bfc6d9e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 27 17:15:07 2015 +0000 Update translations for bridgedb_completed --- lv/LC_MESSAGES/bridgedb.po | 55 +++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po index 0f70c18..5abdc30 100644 --- a/lv/LC_MESSAGES/bridgedb.po +++ b/lv/LC_MESSAGES/bridgedb.po @@ -1,18 +1,18 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: # Ojārs Balcers <ojars.balcers(a)gmail.com>, 2012 -# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013-2014 +# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013-2015 # ThePirateDuck <thepirateduck.w(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: ThePirateDuck <thepirateduck.w(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-27 17:12+0000\n" +"Last-Translator: Ojārs Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +32,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Atvainojiet! Notikusi ar Jūsu pieprasījumu saistīta kļūme." @@ -75,7 +75,7 @@ msgstr "Hei, %s!" msgid "Hello, friend!" msgstr "Sveiks, draug!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "Publiskās atslēgas" @@ -256,35 +256,58 @@ msgstr "Pieprasīt Pluggable Transport pēc TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Saņemt BridgeDB publiskās GnuPG atslēgas kopiju." -#: lib/bridgedb/templates/base.html:92 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Ziņot par kļūdu" -#: lib/bridgedb/templates/base.html:94 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Pirmkods" -#: lib/bridgedb/templates/base.html:97 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Izmaiņu žurnāls" -#: lib/bridgedb/templates/base.html:99 +#: lib/bridgedb/templates/base.html:98 msgid "Contact" msgstr "Sazināties" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Atlasīt visu" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Parādīt QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode Jūsu tiltu rindām" + #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Ak, man' dieniņ!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Sķiet, ka, saņemot Jūsu QRCode, notika kļūda." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Jūsu tiltu rindas ir QRCode. Skenējiet to ar QRCode lasītāju, lai iekopētu Jūsu tiltu rindas mobilajā tālrunī un citās iekārtās." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Šobrīd nav pieejamu tiltu..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -345,7 +368,7 @@ msgstr "nekas" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sJ%sā!" @@ -353,7 +376,7 @@ msgstr "%sJ%sā!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sS%saņemt tiltus"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Mar '15

27 Mar '15

commit a6d261cb331331ab155f5d241ef34475723c3c09 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 27 17:15:03 2015 +0000 Update translations for bridgedb --- lv/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po index 41ea751..5abdc30 100644 --- a/lv/LC_MESSAGES/bridgedb.po +++ b/lv/LC_MESSAGES/bridgedb.po @@ -4,15 +4,15 @@ # # Translators: # Ojārs Balcers <ojars.balcers(a)gmail.com>, 2012 -# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013-2014 +# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013-2015 # ThePirateDuck <thepirateduck.w(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-14 08:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-27 17:12+0000\n" +"Last-Translator: Ojārs Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -278,11 +278,11 @@ msgstr "Atlasīt visu" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "" +msgstr "Parādīt QRCode" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "QRCode Jūsu tiltu rindām" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -295,13 +295,13 @@ msgstr "Ak, man' dieniņ!" #: lib/bridgedb/templates/bridges.html:116 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Sķiet, ka, saņemot Jūsu QRCode, notika kļūda." #: lib/bridgedb/templates/bridges.html:121 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "Jūsu tiltu rindas ir QRCode. Skenējiet to ar QRCode lasītāju, lai iekopētu Jūsu tiltu rindas mobilajā tālrunī un citās iekārtās." #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..."

1 0

[ooni-probe/master] Add the list of test helper addresses to the report
by art＠torproject.org 27 Mar '15

27 Mar '15

commit 4d7f39f0f33160fb158e170f24b8bd18b65cc81a Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 25 11:46:46 2015 +0100 Add the list of test helper addresses to the report --- ooni/deck.py | 1 + ooni/nettest.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ooni/deck.py b/ooni/deck.py index d01378c..18354da 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -224,6 +224,7 @@ class Deck(InputFile): for th in net_test_loader.requiredTestHelpers: if not th['test_class'].localOptions[th['option']]: th['test_class'].localOptions[th['option']] = test_helpers[th['name']].encode('utf-8') + net_test_loader.testHelpers[th['option']] = th['test_class'].localOptions[th['option']] if not net_test_loader.collector: net_test_loader.collector = collector.encode('utf-8') diff --git a/ooni/nettest.py b/ooni/nettest.py index 618066f..c33750f 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -215,7 +215,8 @@ class NetTestLoader(object): 'software_version': software_version, 'options': options, 'input_hashes': input_file_hashes, - 'report_id': self.reportID + 'report_id': self.reportID, + 'test_helpers': self.testHelpers } return test_details @@ -323,6 +324,7 @@ class NetTestLoader(object): self.testName = test_class_name_to_name(test_class.name) self.testCases = test_cases self.testClasses = set([]) + self.testHelpers = {} if config.reports.unique_id is True: self.reportID = randomStr(64)

1 0

[ooni-probe/master] pep8 fixes
by art＠torproject.org 27 Mar '15

27 Mar '15

commit 0225d899fe6d652e2a21d180cc6cfd727a5fb1c0 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 25 11:47:00 2015 +0100 pep8 fixes --- ooni/deck.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 18354da..83a9a70 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -37,7 +37,8 @@ class InputFile(object): try: self.verify() except AssertionError: - log.err("The input %s failed validation. Going to consider it not cached." % self.id) + log.err("The input %s failed validation." + "Going to consider it not cached." % self.id) return False return True return False @@ -45,13 +46,13 @@ class InputFile(object): def save(self): with open(self.cached_descriptor, 'w+') as f: json.dump({ - 'name': self.name, - 'id': self.id, - 'version': self.version, - 'author': self.author, - 'date': self.date, - 'description': self.description - }, f) + 'name': self.name, + 'id': self.id, + 'version': self.version, + 'author': self.author, + 'date': self.date, + 'description': self.description + }, f) def load(self, descriptor): self.name = descriptor['name'] @@ -107,7 +108,8 @@ class Deck(InputFile): self.decksDirectory = os.path.abspath(decks_directory) self.deckHash = deck_hash - if deckFile: self.loadDeck(deckFile) + if deckFile: + self.loadDeck(deckFile) @property def cached_file(self):

1 0

[ooni-probe/master] Add support for report_id inside of reports
by art＠torproject.org 27 Mar '15

27 Mar '15

commit 5820bd45c0611cbd1c908df9ba4f2dfdc7e31f69 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 25 11:38:05 2015 +0100 Add support for report_id inside of reports --- data/ooniprobe.conf.sample | 2 ++ ooni/nettest.py | 49 +++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 6c8f7f3..9f6d0f4 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -17,6 +17,8 @@ privacy: # Should we collect a full packet capture on the client? includepcap: false reports: + # Should we place a unique ID inside of every report + unique_id: true # This is a prefix for each packet capture file (.pcap) per test: pcap: null collector: null diff --git a/ooni/nettest.py b/ooni/nettest.py index 71cb94f..618066f 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -10,7 +10,7 @@ from twisted.python import usage, reflect from ooni import otime from ooni.tasks import Measurement -from ooni.utils import log, sanitize_options +from ooni.utils import log, sanitize_options, randomStr from ooni.utils.net import hasRawSocketPermission from ooni.settings import config @@ -203,18 +203,20 @@ class NetTestLoader(object): input_file_hashes.append(input_file['hash']) options = sanitize_options(self.options) - test_details = {'start_time': otime.epochToUTC(time.time()), - 'probe_asn': config.probe_ip.geodata['asn'], - 'probe_cc': config.probe_ip.geodata['countrycode'], - 'probe_ip': config.probe_ip.geodata['ip'], - 'probe_city': config.probe_ip.geodata['city'], - 'test_name': self.testName, - 'test_version': self.testVersion, - 'software_name': 'ooniprobe', - 'software_version': software_version, - 'options': options, - 'input_hashes': input_file_hashes - } + test_details = { + 'start_time': otime.epochToUTC(time.time()), + 'probe_asn': config.probe_ip.geodata['asn'], + 'probe_cc': config.probe_ip.geodata['countrycode'], + 'probe_ip': config.probe_ip.geodata['ip'], + 'probe_city': config.probe_ip.geodata['city'], + 'test_name': self.testName, + 'test_version': self.testVersion, + 'software_name': 'ooniprobe', + 'software_version': software_version, + 'options': options, + 'input_hashes': input_file_hashes, + 'report_id': self.reportID + } return test_details def _parseNetTestOptions(self, klass): @@ -321,6 +323,10 @@ class NetTestLoader(object): self.testName = test_class_name_to_name(test_class.name) self.testCases = test_cases self.testClasses = set([]) + + if config.reports.unique_id is True: + self.reportID = randomStr(64) + for test_class, test_method in self.testCases: self.testClasses.add(test_class) @@ -341,7 +347,7 @@ class NetTestLoader(object): test_instance = klass() if test_instance.requiresRoot and not hasRawSocketPermission(): - raise errors.InsufficientPrivileges + raise e.InsufficientPrivileges if test_instance.requiresTor: self.requiresTor = True test_instance.requirements() @@ -446,13 +452,14 @@ class NetTest(object): return ' '.join(tc.name for tc, _ in self.testCases) def doneNetTest(self, result): - if not self.summary: - return - print "Summary for %s" % self.testDetails['test_name'] - print "------------" + "-"*len(self.testDetails['test_name']) - for test_class in self.testClasses: - test_instance = test_class() - test_instance.displaySummary(self.summary) + if self.summary: + print "Summary for %s" % self.testDetails['test_name'] + print "------------" + "-"*len(self.testDetails['test_name']) + for test_class in self.testClasses: + test_instance = test_class() + test_instance.displaySummary(self.summary) + if self.testDetails["report_id"]: + print "Report ID: %s" % self.testDetails["report_id"] def doneReport(self, report_results): """

1 0

[ooni-probe/master] Merge pull request #383 from TheTorProject/fix/oonideckgen
by art＠torproject.org 27 Mar '15

27 Mar '15

commit dc7f7d7dadbf971ac984723ca6ff312886dfb9fb Merge: 2c069e1 578e645 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Mar 27 16:22:46 2015 +0100 Merge pull request #383 from TheTorProject/fix/oonideckgen Handle also unhandled exceptions inside of ooni(deckgen|report|resources... bin/oonideckgen | 4 +++- bin/oonireport | 4 +++- bin/ooniresources | 18 ++++++++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-)

1 0

[ooni-probe/master] Handle also unhandled exceptions inside of ooni(deckgen|report|resources)
by art＠torproject.org 27 Mar '15

27 Mar '15

commit 578e645233ed12ae26fb2b6b2f1af309ae5398df Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 27 11:30:33 2015 +0100 Handle also unhandled exceptions inside of ooni(deckgen|report|resources) * Exit with the correct exit status --- bin/oonideckgen | 4 +++- bin/oonireport | 4 +++- bin/ooniresources | 18 ++++++++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/bin/oonideckgen b/bin/oonideckgen index a761349..f4dd392 100755 --- a/bin/oonideckgen +++ b/bin/oonideckgen @@ -1,4 +1,5 @@ #!/usr/bin/env python +import sys import exceptions from twisted.internet import defer, reactor @@ -10,7 +11,8 @@ exitCode = 128 def failed(failure): global exitCode - r = failure.trap(exceptions.SystemExit) + r = failure.trap(exceptions.SystemExit, + Exception) if r != exceptions.SystemExit: log.err("Failed to run oonideckgen") log.exception(failure) diff --git a/bin/oonireport b/bin/oonireport index ee9a214..38fd5a7 100755 --- a/bin/oonireport +++ b/bin/oonireport @@ -1,4 +1,5 @@ #!/usr/bin/env python +import sys from twisted.internet import defer, reactor from ooni.utils import log @@ -9,7 +10,8 @@ exitCode = 128 def failed(failure): global exitCode - r = failure.trap(exceptions.SystemExit) + r = failure.trap(exceptions.SystemExit, + Exception) if r != exceptions.SystemExit: log.err("Failed to run oonideckgen") log.exception(failure) diff --git a/bin/ooniresources b/bin/ooniresources index 1960a1d..6913bb4 100755 --- a/bin/ooniresources +++ b/bin/ooniresources @@ -1,15 +1,28 @@ #!/usr/bin/env python +import sys from twisted.internet import defer, reactor from ooni.utils import log from ooni.resources import cli +exitCode = 128 def failed(failure): - log.err("Failed to run ooniresources") - log.exception(failure) + global exitCode + + r = failure.trap(exceptions.SystemExit, + Exception) + if r != exceptions.SystemExit: + log.err("Failed to run ooniresources") + log.exception(failure) + exitCode = 127 + else: + exitCode = failure.value.code reactor.stop() def done(result): + global exitCode + + exitCode = 0 reactor.stop() def start(): @@ -19,3 +32,4 @@ def start(): reactor.callWhenRunning(start) reactor.run() +sys.exit(exitCode)

1 0

[ooni-probe/master] Merge pull request #381 from TheTorProject/feature/unique_identifier
by art＠torproject.org 27 Mar '15

27 Mar '15

commit 9522b90e43e219dd80849201979dccc684742a29 Merge: dc7f7d7 0225d89 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Mar 27 16:23:28 2015 +0100 Merge pull request #381 from TheTorProject/feature/unique_identifier Feature/unique identifier + Test helper addresses data/ooniprobe.conf.sample | 2 ++ ooni/deck.py | 21 ++++++++++-------- ooni/nettest.py | 51 ++++++++++++++++++++++++++------------------ 3 files changed, 44 insertions(+), 30 deletions(-)

1 0

[torbutton/master] Fix 1.9.1.0 changelog
by gk＠torproject.org 27 Mar '15

27 Mar '15

commit 3fd6a708722a56c6ba283ba55417c99c768dbf03 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 27 15:04:45 2015 +0000 Fix 1.9.1.0 changelog --- src/CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e9b5c6b..e140ff5 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -16,7 +16,8 @@ * Bug 14937: Show meek and flashproxy bridges in tor circuit display * Bugs 13891+15207: Fix exceptions/errors in circuit display with bridges * Bug 13019: Change locale hiding pref to boolean - * Bug 7255: Warn users about maximizing windows (off by default) + * Bug 7255: Warn users about maximizing windows + * Bug 14631: Improve profile access error msgs (strings). 1.9.0.0 * Bug 13882: Fix display of bridges after bridge settings have been changed

1 0

[tor-browser-bundle/master] Fix the 4.5a5 changelog
by gk＠torproject.org 27 Mar '15

27 Mar '15

commit 089db12fdc4ebd18e3fa2d5e970f4c5f8843990e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 27 14:57:42 2015 +0000 Fix the 4.5a5 changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f27632f..0292d82 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -27,6 +27,7 @@ Tor Browser 4.5a5 -- Mar 31 2015 * Bugs 13891+15207: Fix exceptions/errors in circuit display with bridges * Bug 13019: Change locale hiding pref to boolean * Bug 7255: Warn users about maximizing windows + * Bug 14631: Improve profile access error msgs (strings). * Pluggable Transport Dependency Updates: * Bug 15448: Use golang 1.4.2 for meek and obs4proxy * Bug 15265: Switch go.net repo to golang.org/x/net @@ -43,6 +44,7 @@ Tor Browser 4.5a5 -- Mar 31 2015 * Bug 13375: Create a hybrid GUI/desktop/shell launcher wrapper * Bug 12468: Only print/write log messages if launched with --debug * Windows + * Bug 3861: Begin signing Tor Browser for Windows the Windows way * Bug 15201: Disable 'runas Administrator' codepaths in updater * Bug 14688: Create shortcuts to desktop and start menu by default (optional)

1 0