October 2019 - tor-commits - lists.torproject.org

[bridgedb/develop] Update to pylint version 2.4.2.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 2d3ef0a8ce5a01ff641aed43efd90d49405a42fd Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 15:56:19 2019 -0700 Update to pylint version 2.4.2. The bug that was once the reason to stick with version 1.1.0 has seen been resolved: <https://github.com/PyCQA/pylint/issues/203> --- .test.requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index 2b6da2f..298d61a 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -8,7 +8,5 @@ coverage==4.5.4 mechanize==0.4.3 pep8==1.7.1 -# pylint must be pinned until pylint bug #203 is fixed. See -# https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages… -pylint==1.1.0 +pylint==2.4.2 sure==1.4.11

1 0

[bridgedb/develop] Require exactly pillow version 6.1.0.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit f78db9b955bdca354dd8db6a1f552d869c1f6cbc Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 16:38:26 2019 -0700 Require exactly pillow version 6.1.0. This makes the pillow requirement consistent with all other requirements, which are pinned to a specific version. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 05d5444..d5a3c9f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ PyCryptodome==3.9.0 Twisted==19.7.0 gnupg==2.3.1 ipaddr==2.2.0 -pillow>=6.1.0 +pillow==6.1.0 pyOpenSSL==19.0.0 pygeoip==0.3.2 qrcode==6.1

1 0

[bridgedb/develop] Use canonical package names.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 14dfd92ec825b1689da4b5c3438463249a37b9a0 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Oct 1 10:10:58 2019 -0700 Use canonical package names. Let's capitalise packages correctly. --- .travis.requirements.txt | 4 ++-- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 4d451da..3e768d2 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -16,14 +16,14 @@ Babel==2.7.0 BeautifulSoup==3.2.1 Mako==1.1.0 -PyCryptodome==3.9.0 +pycryptodome==3.9.0 Twisted==19.7.0 coverage==4.5.4 coveralls==1.8.2 gnupg==2.3.1 ipaddr==2.2.0 mechanize==0.4.3 -pillow==6.1.0 +Pillow==6.1.0 pygeoip==0.3.2 qrcode==6.1 service_identity==18.1.0 diff --git a/requirements.txt b/requirements.txt index d5a3c9f..6944d1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ Babel==2.7.0 BeautifulSoup==3.2.1 Mako==1.1.0 -PyCryptodome==3.9.0 +pycryptodome==3.9.0 Twisted==19.7.0 gnupg==2.3.1 ipaddr==2.2.0 -pillow==6.1.0 +Pillow==6.1.0 pyOpenSSL==19.0.0 pygeoip==0.3.2 qrcode==6.1

1 0

[bridgedb/develop] Merge branch 'fix/29484' into develop
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 53bcb77571c7a1f6c60bef44fefb1ef39cd65c7f Merge: 44d6ed3 edf27d1 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 15:34:57 2019 -0700 Merge branch 'fix/29484' into develop .test.requirements.txt | 12 +++++------- .travis.requirements.txt | 31 ++++++++++++++++--------------- .travis.yml | 28 ++-------------------------- CHANGELOG | 6 ++++++ Makefile | 2 +- bridgedb/distributors/email/server.py | 3 ++- bridgedb/distributors/https/server.py | 2 +- bridgedb/test/test_crypto.py | 2 +- bridgedb/test/test_email_dkim.py | 2 +- bridgedb/test/test_email_server.py | 2 +- bridgedb/test/test_persistent.py | 8 ++++---- bridgedb/translations.py | 2 +- doc/HACKING.md | 17 +++++++++++++++++ requirements.txt | 26 +++++++++++++------------- scripts/install-dependencies | 5 ++--- 15 files changed, 73 insertions(+), 75 deletions(-)

1 0

[bridgedb/develop] Add instructions on how to update dependencies.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 73053db105605f74af02f9475ef30377b74be89d Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Oct 2 09:48:14 2019 -0700 Add instructions on how to update dependencies. --- doc/HACKING.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/HACKING.md b/doc/HACKING.md index a8ec640..5993696 100644 --- a/doc/HACKING.md +++ b/doc/HACKING.md @@ -34,6 +34,22 @@ we make are: ## Making a release +### Updating dependencies + +We maintain three requirements.txt files: + +* requirements.txt (for BridgeDB) +* .travis.requirements.txt (for Travis CI) +* .test.requirements.txt (for unit tests) + +Each of these files contains pinned dependencies, which are guaranteed to work +for a given release. Before releasing a new version of BridgeDB, we should +update our dependencies. The tool [pur][pur] (available through pip) helps us +with this. It checks a given requirements.txt file and updates each dependency +to its latest version: + + pur -r REQUIREMENTS_FILE + ### Bumping the version number Bumping the version number at release time (which, for BridgeDB really means @@ -67,3 +83,4 @@ References ---------- [trac]: https://trac.torproject.org/projects/tor/query?status=!closed&component=Cir… [workflow]: https://nvie.com/posts/a-successful-git-branching-model/ +[pur]: https://pypi.org/project/pur/

1 0

[bridgedb/develop] Add CHANGELOG entry.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit edf27d16c44401c2187505f8448915a0353fe334 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 15:55:45 2019 -0700 Add CHANGELOG entry. --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c2fca89..48e18eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,12 @@ Changes in version A.B.C - YYYY-MM-DD also makes our implementation consistent with our (slightly updated) specification. + * FIXES https://bugs.torproject.org/29484 + Update BridgeDB's requirements to the latest respective versions. Among + others, this patch set updates Twisted to 19.7.0, pyOpenSSL to 19.0.0, + and replaces (the abandoned) PyCrypto with PyCryptodome, which fixes + security vulnerabilities. + Changes in version 0.8.2 - 2019-09-20 Updated translations for the following languages:

1 0

[bridgedb/develop] Update French translation.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 41e38fca404d70e9c0f8f1ed7895524dc7504ac4 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 30 16:20:06 2019 -0700 Update French translation. --- bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po index 32c57a7..12d091d 100644 --- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Translators: # AO <ao(a)localizationlab.org>, 2018-2019 # apaddlingduck, 2014 # Boubou <cece31840(a)gmail.com>, 2015 @@ -30,7 +31,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2019-05-17 16:23+0000\n" +"PO-Revision-Date: 2019-09-23 19:14+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -121,7 +122,7 @@ msgstr "Étape %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Télécharger %s le Navigateur Tor %s" +msgstr "Téléchargez %s le Navigateur Tor %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -131,7 +132,7 @@ msgstr "Étape %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Obtenir des %s ponts %s" +msgstr "Obtenez des %s ponts %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -141,7 +142,7 @@ msgstr "Étape %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Maintenant, %s ajouter les ponts au navigateur Le Navigateur Tor %s" +msgstr "Maintenant, %s ajoutez les ponts au Navigateur Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[bridgedb/develop] Merge branch 'task/31903' into develop
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit 44d6ed319f8c6f8c43ea0db2eb8c0e64c3d73b50 Merge: 0751ad7 a93a636 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 15:16:37 2019 -0700 Merge branch 'task/31903' into develop bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +- bridgedb/i18n/templates/bridgedb.pot | 312 ++++++++++++++++--------------- 3 files changed, 167 insertions(+), 156 deletions(-)

1 0

[bridgedb/develop] Use last-available translation to fix unit test.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit d9d886f15aad518713a08650002e32abe9cdf73e Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Oct 1 12:04:19 2019 -0700 Use last-available translation to fix unit test. When we last updated our translations, in commit 968a5db, the Dutch translation for "What are bridges?" disappared, which broke a unit test. This commit re-adds this particular translation -- it does seem correct, after all. --- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po index 1348231..62ada3b 100644 --- a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po @@ -268,7 +268,7 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "Wat zijn bridges?" #: bridgedb/strings.py:102 #, python-format

1 0

[bridgedb/develop] Request new translations.
by phw＠torproject.org 03 Oct '19

03 Oct '19

commit a93a636072865c60fa9d1e36dee2d4a5c09355d5 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 15:05:38 2019 -0700 Request new translations. We modified a string in strings.py and should request new translations for it. The following command updated bridgedb.pot automatically: python setup.py extract_messages --- bridgedb/i18n/templates/bridgedb.pot | 312 ++++++++++++++++++----------------- 1 file changed, 161 insertions(+), 151 deletions(-) diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index bc6080f..1607e92 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -1,24 +1,42 @@ -# Translations template for BridgeDB. -# Copyright (C) 2015 'The Tor Project, Inc.' -# This file is distributed under the same license as the BridgeDB project. -# -# Translators: -# runasand <inactive+runasand(a)transifex.com>, 2011 +# Translations template for bridgedb. +# Copyright (C) 2019 'The Tor Project, Inc.' +# This file is distributed under the same license as the bridgedb project. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-19 09:41+0000\n" -"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" -"Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n" +"Project-Id-Version: bridgedb 0.8.0+15.gd9d886f.dirty\n" +"Report-Msgid-Bugs-To: " +"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" +"=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" +"POT-Creation-Date: 2019-10-03 15:04-0700\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" -"Language: en\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - +"Generated-By: Babel 2.7.0\n" + +#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*- +#. This file is part of BridgeDB, a Tor bridge distribution system. +#. :authors: please see included AUTHORS file +#. :copyright: (c) 2007-2017, The Tor Project, Inc. +#. (c) 2013-2017, Isis Lovecruft +#. :license: see LICENSE for licensing information +#. : The path to the HTTPS distributor's web templates. (Should be the +#. : "templates" directory in the same directory as this file.) +#. Setting `filesystem_checks` to False is recommended for production servers, +#. due to potential speed increases. This means that the atimes of the Mako +#. template files aren't rechecked every time the template is requested +#. (otherwise, if they are checked, and the atime is newer, the template is +#. recompiled). `collection_size` sets the number of compiled templates which +#. are cached before the least recently used ones are removed. See: +#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup +#. : Localisations which BridgeDB supports which should be rendered right-to-left. +#. We use our metrics singleton to keep track of BridgeDB metrics such as +#. "number of failed HTTPS bridge requests." #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" @@ -30,177 +48,171 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/https/server.py:167 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." -msgstr "Sorry! Something went wrong with your request." +msgstr "" -#: bridgedb/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Report a Bug" +msgstr "" -#: bridgedb/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:82 msgid "Source Code" -msgstr "Source Code" +msgstr "" -#: bridgedb/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:85 msgid "Changelog" -msgstr "Changelog" - -#: bridgedb/https/templates/base.html:88 -msgid "Contact" -msgstr "Contact" +msgstr "" -#: bridgedb/https/templates/bridges.html:35 +#: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" -msgstr "Select All" +msgstr "" -#: bridgedb/https/templates/bridges.html:40 +#: bridgedb/distributors/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Show QRCode" +msgstr "" -#: bridgedb/https/templates/bridges.html:52 +#: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QRCode for your bridge lines" +msgstr "" #. 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!". :) -#: bridgedb/https/templates/bridges.html:67 -#: bridgedb/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:67 +#: bridgedb/distributors/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Uh oh, spaghettios!" +msgstr "" -#: bridgedb/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "It seems there was an error getting your QRCode." +msgstr "" -#: bridgedb/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:73 msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices." +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy " +"your bridge lines onto mobile and other devices." +msgstr "" -#: bridgedb/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "There currently aren't any bridges available..." +msgstr "" -#: bridgedb/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:132 #, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr " Perhaps you should try %s going back %s and choosing a different bridge type!" +msgid " Perhaps you should try %s going back %s and choosing a different bridge type!" +msgstr "" -#: bridgedb/https/templates/index.html:11 +#: bridgedb/distributors/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "Step %s1%s" +msgstr "" -#: bridgedb/https/templates/index.html:13 +#: bridgedb/distributors/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Download %s Tor Browser %s" +msgstr "" -#: bridgedb/https/templates/index.html:25 +#: bridgedb/distributors/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "Step %s2%s" +msgstr "" -#: bridgedb/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Get %s bridges %s" +msgstr "" -#: bridgedb/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "Step %s3%s" +msgstr "" -#: bridgedb/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Now %s add the bridges to Tor Browser %s" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#: bridgedb/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sJ%sust give me bridges!" +msgstr "" -#: bridgedb/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:51 msgid "Advanced Options" -msgstr "Advanced Options" +msgstr "" -#: bridgedb/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:86 msgid "No" -msgstr "No" +msgstr "" -#: bridgedb/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:87 msgid "none" -msgstr "none" +msgstr "" #. 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." -#: bridgedb/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "%sY%ses!" +msgstr "" #. 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"! -#: bridgedb/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sG%set Bridges" +msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[This is an automated message; please do not reply.]" +msgstr "" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Here are your bridges:" +msgstr "" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" -"emails is %s hours. All further emails during this time period will be ignored." -msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored." +"emails is %s hours. All further emails during this time period will be " +"ignored." +msgstr "" #: bridgedb/strings.py:50 -msgid "" -"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgid "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "Welcome to BridgeDB!" +msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Currently supported transport TYPEs:" +msgstr "" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "Hey, %s!" +msgstr "" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Hello, friend!" +msgstr "" -#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 msgid "Public Keys" -msgstr "Public Keys" +msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -210,7 +222,7 @@ msgstr "Public Keys" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -221,10 +233,11 @@ msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s o msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" "which can help obfuscate your connections to the Tor Network, making it more\n" -"difficult for anyone watching your internet traffic to determine that you are\n" +"difficult for anyone watching your internet traffic to determine that you are" +"\n" "using Tor.\n" "\n" -msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -232,7 +245,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -242,140 +255,137 @@ msgstr "Some bridges with IPv6 addresses are also available, though some Pluggab #: bridgedb/strings.py:88 #, python-format msgid "" -"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" -"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any" +"\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still" +"\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n" +msgstr "" -#: bridgedb/strings.py:101 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 msgid "What are bridges?" -msgstr "What are bridges?" +msgstr "" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "I need an alternative way of getting bridges!" +msgstr "" #: bridgedb/strings.py:108 #, python-format msgid "" -"Another way to get bridges is to send an email to %s. Please note that you must\n" +"Another way to get bridges is to send an email to %s. Please note that you " +"must\n" "send the email using an address from one of the following email providers:\n" -"%s, %s or %s." -msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s." +"%s or %s." +msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "My bridges don't work! I need help!" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format -msgid "If your Tor doesn't work, you should email %s." -msgstr "If your Tor doesn't work, you should email %s." +msgid "If your Tor cannot connect, please take a look at the %s and our %s." +msgstr "" -#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:121 -msgid "" -"Try including as much info about your case as you can, including the list of\n" -"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" -"and any messages which Tor gave out, etc." -msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc." - -#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Here are your bridge lines:" +msgstr "" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:122 msgid "Get Bridges!" -msgstr "Get Bridges!" +msgstr "" -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:126 msgid "Please select options for bridge type:" -msgstr "Please select options for bridge type:" +msgstr "" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:127 msgid "Do you need IPv6 addresses?" -msgstr "Do you need IPv6 addresses?" +msgstr "" -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:128 #, python-format msgid "Do you need a %s?" -msgstr "Do you need a %s?" +msgstr "" -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:132 msgid "Your browser is not displaying images properly." -msgstr "Your browser is not displaying images properly." +msgstr "" -#: bridgedb/strings.py:140 +#: bridgedb/strings.py:133 msgid "Enter the characters from the image above..." -msgstr "Enter the characters from the image above..." +msgstr "" -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:137 msgid "How to start using your bridges" -msgstr "How to start using your bridges" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:139 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "To enter bridges into Tor Browser, first go to the %s Tor Browser download\npage %s and then follow the instructions there for downloading and starting\nTor Browser." +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:151 +#: bridgedb/strings.py:144 msgid "" -"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " +"follow\n" "the wizard until it asks:" -msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:155 +#: bridgedb/strings.py:148 msgid "" -"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"Does your Internet Service Provider (ISP) block or otherwise censor " +"connections\n" "to the Tor network?" -msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:159 +#: bridgedb/strings.py:152 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" -"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and" +"\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance." +msgstr "" -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:160 msgid "Displays this message." -msgstr "Displays this message." +msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:164 msgid "Request vanilla bridges." -msgstr "Request vanilla bridges." +msgstr "" -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:165 msgid "Request IPv6 bridges." -msgstr "Request IPv6 bridges." +msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:167 msgid "Request a Pluggable Transport by TYPE." -msgstr "Request a Pluggable Transport by TYPE." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:177 +#: bridgedb/strings.py:170 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Get a copy of BridgeDB's public GnuPG key." +msgstr "" +

1 0