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

[stem/master] Drop unnecessary regex split
by atagar＠torproject.org 08 Jul '15

08 Jul '15

commit 0e2ff466cb5d7be249ac53f774536cfc4dcd2010 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 8 08:25:37 2015 -0700 Drop unnecessary regex split Just cleaning up some unnecessary code that we can drop with the removal of duplicate checks in #16525. --- stem/util/test_tools.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index e36f5fa..9081dcd 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -199,18 +199,12 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa is_block_comment = False for index, line in enumerate(lines): - whitespace, content = re.match('^(\s*)(.*)$', line).groups() - - # TODO: This does not check that block indentations are two spaces - # because differentiating source from string blocks ("""foo""") is more - # of a pita than I want to deal with right now. - - if '"""' in content: + if '"""' in line: is_block_comment = not is_block_comment - if check_newlines and '\r' in content: + if check_newlines and '\r' in line: issues.setdefault(path, []).append(Issue(index + 1, 'contains a windows newline', line)) - elif check_exception_keyword and content.lstrip().startswith('except') and content.endswith(', exc:'): + elif check_exception_keyword and line.strip().startswith('except') and line.strip().endswith(', exc:'): # Python 2.6 - 2.7 supports two forms for exceptions... # # except ValueError, exc: @@ -234,7 +228,7 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa # instance "I'm hungry"). Also checking for '\' at the end since # that can indicate a multi-line string. - issues.setdefault(path, []).append(Issue(index + 1, "use single rather than double quotes", line)) + issues.setdefault(path, []).append(Issue(index + 1, 'use single rather than double quotes', line)) return issues

1 0

[stem/master] Improvements on the PEP8 checks
by atagar＠torproject.org 08 Jul '15

08 Jul '15

commit a61446b1fe81cd9b40f962d9c3bbddc688754573 Merge: 28cbc64 0e2ff46 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 8 08:27:06 2015 -0700 Improvements on the PEP8 checks Citing code in style issues, and dropping some manual checks that are no longer necessary with new versions of PEP8... https://trac.torproject.org/projects/tor/ticket/16525 run_tests.py | 4 ++-- stem/util/test_tools.py | 29 ++++++++--------------------- 2 files changed, 10 insertions(+), 23 deletions(-)

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 08 Jul '15

08 Jul '15

commit a6f40ff012b4d759001c2ec4c337596bc61e8613 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 8 14:16:12 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- da/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/da/aboutdialog.dtd b/da/aboutdialog.dtd new file mode 100644 index 0000000..215d73f --- /dev/null +++ b/da/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "The Tor Browser; er udviklet af"> + +<!ENTITY project.tpoLink "the &leverandørForkortelse"> +<!ENTITY project.end "En non-profit arbejder for at beskytte dit privatliv og din frihed online."> + +<!ENTITY help.start "Vil du hjælpe?"> + +<!ENTITY help.donateLink "Doner"> +<!ENTITY help.or "eller"> + +<!ENTITY help.getInvolvedLink "bliv involveret"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Spørgsmål?"> + +<!ENTITY bottomLinks.grow "Hjælp Tor Network med at vokse!"> + +<!ENTITY bottomLinks.license "Licens Information"> +<!ENTITY tor.TrademarkStatement "'Tor' og 'Onion Logo' er registreret varemærke tilhørende 'The Tor Project, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 08 Jul '15

08 Jul '15

commit 8c837d92e75b6be52d5ba2000037d23426a8a510 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 8 14:16:07 2015 +0000 Update translations for torbutton-aboutdialogdtd --- da/aboutdialog.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/da/aboutdialog.dtd b/da/aboutdialog.dtd index 5099ad7..215d73f 100644 --- a/da/aboutdialog.dtd +++ b/da/aboutdialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "The Tor Browser; er udviklet af">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "the &leverandørForkortelse"> +<!ENTITY project.end "En non-profit arbejder for at beskytte dit privatliv og din frihed online."> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "Vil du hjælpe?">  -<!ENTITY help.donateLink "Donate"> -<!ENTITY help.or " or "> +<!ENTITY help.donateLink "Doner"> +<!ENTITY help.or "eller">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolvedLink "bliv involveret"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "Spørgsmål?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Hjælp Tor Network med at vokse!">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "Licens Information"> +<!ENTITY tor.TrademarkStatement "'Tor' og 'Onion Logo' er registreret varemærke tilhørende 'The Tor Project, Inc.">

1 0

[meek/master] Better wording.
by dcf＠torproject.org 07 Jul '15

07 Jul '15

commit 30db0cba962d4620c8787bc455d8f5e8eb2b8d8c Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 7 09:04:33 2015 -0700 Better wording. --- meek-client/helper.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meek-client/helper.go b/meek-client/helper.go index 37c4615..6b89f5a 100644 --- a/meek-client/helper.go +++ b/meek-client/helper.go @@ -14,8 +14,8 @@ import ( "time" ) -// The code in this file has to do communicating with the meek-http-helper -// browser extension. +// The code in this file has to do with communication between meek-client and +// the meek-http-helper browser extension. type JSONRequest struct { Method string `json:"method,omitempty"`

1 0

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

07 Jul '15

commit 8649566129fcc7c10956d0cf3b35cd955738e670 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 7 13:46:58 2015 +0000 Update translations for tor-messenger-authproperties_completed --- en_GB/auth.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/en_GB/auth.properties b/en_GB/auth.properties new file mode 100644 index 0000000..f76c719 --- /dev/null +++ b/en_GB/auth.properties @@ -0,0 +1,12 @@ +auth.title=Verify %S's identity +auth.yourFingerprint=Fingerprint for you, %S:\n%S +auth.theirFingerprint=Purported fingerprint for %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.secret=Enter secret here: +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.done=Done

1 0

[translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed
by translation＠torproject.org 07 Jul '15

07 Jul '15

commit f81be58c74cd9348f04bd51390a3b14142ce9c94 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 7 13:46:53 2015 +0000 Update translations for tor-messenger-authdtd_completed --- en_GB/auth.dtd | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/en_GB/auth.dtd b/en_GB/auth.dtd new file mode 100644 index 0000000..1b66fec --- /dev/null +++ b/en_GB/auth.dtd @@ -0,0 +1,21 @@ +<!ENTITY authDialog.title "Verify contact's identity"> +<!ENTITY authDialog.authenticate "Verify"> +<!ENTITY authDialog.cancel "Cancel"> +<!ENTITY authDialog.help "Help"> +<!ENTITY authDialog.yes "Yes"> +<!ENTITY authDialog.no "No"> +<!ENTITY authDialog.verified "I have verified that this is in fact the correct fingerprint."> +<!ENTITY authDialog.yourFingerprint "Your fingerprint"> +<!ENTITY authDialog.theirFingerprint "Their purported fingerprint"> +<!ENTITY authDialog.manualVerification "Manual fingerprint verification"> +<!ENTITY authDialog.questionAndAnswer "Question and answer"> +<!ENTITY authDialog.sharedSecret "Shared secret"> +<!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialogue below that you have verified the fingerprint."> +<!ENTITY authDialog.choose "Choose"> +<!ENTITY authDialog.how "How would you like to verify your contact's identity?"> +<!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter."> +<!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> +<!ENTITY authDialog.question "Enter question here:"> +<!ENTITY authDialog.answer "Enter secret answer here (case sensitive):"> +<!ENTITY authDialog.secret "Enter secret here:"> +<!ENTITY authDialog.waiting "Waiting for contact ..."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 07 Jul '15

07 Jul '15

commit 7c7dafaee8b1a4067d82a149c5e78994e9fc1bd6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 7 13:46:48 2015 +0000 Update translations for tor-messenger-authdtd --- en_GB/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB/auth.dtd b/en_GB/auth.dtd index 8df5727..1b66fec 100644 --- a/en_GB/auth.dtd +++ b/en_GB/auth.dtd @@ -10,7 +10,7 @@ <!ENTITY authDialog.manualVerification "Manual fingerprint verification"> <!ENTITY authDialog.questionAndAnswer "Question and answer"> <!ENTITY authDialog.sharedSecret "Shared secret"> -<!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> +<!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialogue below that you have verified the fingerprint."> <!ENTITY authDialog.choose "Choose"> <!ENTITY authDialog.how "How would you like to verify your contact's identity?"> <!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter.">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 07 Jul '15

07 Jul '15

commit 8d54bb4cff2ae636b300a6ba9057add76f141371 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 7 13:46:11 2015 +0000 Update translations for tails-misc_completed --- en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB.po b/en_GB.po index 6ab9f48..d01a1a2 100644 --- a/en_GB.po +++ b/en_GB.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-06-28 19:40+0200\n" -"PO-Revision-Date: 2015-07-07 12:51+0000\n" +"PO-Revision-Date: 2015-07-07 13:19+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Jul '15

07 Jul '15

commit 1778b560648eb7b58faf57bef33c599ba3198a62 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 7 13:46:07 2015 +0000 Update translations for tails-misc --- en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB.po b/en_GB.po index 6ab9f48..d01a1a2 100644 --- a/en_GB.po +++ b/en_GB.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-06-28 19:40+0200\n" -"PO-Revision-Date: 2015-07-07 12:51+0000\n" +"PO-Revision-Date: 2015-07-07 13:19+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0