April 2020 - tor-commits - lists.torproject.org

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit ff62df4da63fdbad8b780bc79441d6e3141c3d5c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 13:45:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- pt_BR/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 1cc20a6b0a..e92aba9844 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -29,8 +29,8 @@ 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: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-04-29 13:39+0000\n" +"Last-Translator: drebs <drebs(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[lego/master] This fix padding issues in the websites footer
by hiro＠torproject.org 29 Apr '20

29 Apr '20

commit de8aa0d721f67d39a6618abebce5dae80c2dc160 Merge: 93bd0e2 2ddbc01 Author: hiro <hiro(a)torproject.org> Date: Wed Apr 29 15:25:32 2020 +0200 This fix padding issues in the websites footer https://gitlab.torproject.org/torproject/web/lego/-/issues/10 Merge remote-tracking branch 'nicoleiocana/padding/margin-issue-in-footer' templates/footer.html | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)

1 0

[lego/master] Fix padding/margin issue in footer
by hiro＠torproject.org 29 Apr '20

29 Apr '20

commit 2ddbc01be88a18c4f56043c90250b18d81f210c2 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sat Apr 11 17:20:47 2020 +0000 Fix padding/margin issue in footer --- templates/footer.html | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 0bc2814..01fd857 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -68,6 +68,8 @@ </div> </div> </div> + + <div class="row"> <div class="col-12 d-flex justify-content-center"> <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> <p class="text-primary-light text-uppercase">{{ _('Subscribe to our Newsletter') }}</p> @@ -87,7 +89,9 @@ </div> </div> </div> - + </div> + + <div class="row"> <div class="col-12 d-flex justify-content-center"> <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> {% from "macros/footer.html" import render_faq %} @@ -108,12 +112,13 @@ </div> </div> </div> - <script src="{{ '/static/js/jquery-3.2.1.min.js'|asseturl }}" ></script> - <script src="{{ '/static/js/popper.min.js'|asseturl }}" ></script> - <script src="{{ '/static/js/bootstrap.bundle.min.js'|asseturl }}" ></script> - <script src="{{ '/static/js/scrollspy.min.js'|asseturl }}" ></script> - <script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> - <script src="{{ '/static/js/download.js'|asseturl }}" ></script> - <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> + </div> + <script src="{{ '/static/js/jquery-3.2.1.min.js'|asseturl }}" ></script> + <script src="{{ '/static/js/popper.min.js'|asseturl }}" ></script> + <script src="{{ '/static/js/bootstrap.bundle.min.js'|asseturl }}" ></script> + <script src="{{ '/static/js/scrollspy.min.js'|asseturl }}" ></script> + <script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> + <script src="{{ '/static/js/download.js'|asseturl }}" ></script> + <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> </div> </div>

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit 75477d674319e2ea86321f8b66120235a3f96be0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 13:15:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- da/LC_MESSAGES/bridgedb.po | 230 +++++++++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 112 deletions(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index 1f5f116b65..c3c3809fc3 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -15,8 +15,8 @@ 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: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-07 07:22+0000\n" +"POT-Creation-Date: 2020-04-09 14:45-0700\n" +"PO-Revision-Date: 2020-04-29 13:10+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -45,18 +45,16 @@ msgstr "" #. variable. #. We use our metrics singleton to keep track of BridgeDB metrics such as #. "number of failed HTTPS bridge requests." +#. Convert all key/value pairs from bytes to str. #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" -#. "obfs2" -#. "obfs3" -#. "scramblesuit" -#. "fteproxy" +#. "obfs4" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:138 +#: bridgedb/distributors/https/server.py:154 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -64,15 +62,15 @@ msgstr "" msgid "Language" msgstr "" -#: bridgedb/distributors/https/templates/base.html:92 +#: bridgedb/distributors/https/templates/base.html:94 msgid "Report a Bug" msgstr "" -#: bridgedb/distributors/https/templates/base.html:95 +#: bridgedb/distributors/https/templates/base.html:97 msgid "Source Code" msgstr "" -#: bridgedb/distributors/https/templates/base.html:98 +#: bridgedb/distributors/https/templates/base.html:100 msgid "Changelog" msgstr "" @@ -93,7 +91,7 @@ msgstr "" #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) #: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:119 msgid "Uh oh, spaghettios!" msgstr "" @@ -107,12 +105,12 @@ msgid "" " your bridge lines onto mobile and other devices." msgstr "" -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:125 msgid "There currently aren't any bridges available..." msgstr "" -#: bridgedb/distributors/https/templates/bridges.html:133 -#: bridgedb/distributors/https/templates/bridges.html:137 +#: bridgedb/distributors/https/templates/bridges.html:127 +#: bridgedb/distributors/https/templates/bridges.html:131 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -188,64 +186,32 @@ msgstr "" msgid "%sG%set Bridges" msgstr "" -#: bridgedb/strings.py:43 -msgid "[This is an automated message; please do not reply.]" +#: bridgedb/strings.py:33 +msgid "[This is an automated email.]" msgstr "" -#: bridgedb/strings.py:45 +#: bridgedb/strings.py:35 msgid "Here are your bridges:" msgstr "" -#: bridgedb/strings.py:47 +#: bridgedb/strings.py:37 #, 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 "" -#: bridgedb/strings.py:50 -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 "" - -#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: bridgedb/strings.py:55 -msgid "Currently supported transport TYPEs:" -msgstr "" - -#: bridgedb/strings.py:56 -#, python-format -msgid "Hey, %s!" -msgstr "" - -#: bridgedb/strings.py:57 -msgid "Hello, friend!" -msgstr "" - -#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 -msgid "Public Keys" -msgstr "" - -#. TRANSLATORS: This string will end up saying something like: -#. "This email was generated with rainbows, unicorns, and sparkles -#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: bridgedb/strings.py:62 -#, python-format +#: bridgedb/strings.py:40 msgid "" -"This email was generated with rainbows, unicorns, and sparkles\n" -"for %s on %s at %s." +"If these bridges are not what you need, reply to this email with one of\n" +"the following commands in the message body:" msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: bridgedb/strings.py:72 +#: bridgedb/strings.py:50 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -256,7 +222,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: bridgedb/strings.py:79 +#: bridgedb/strings.py:57 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -268,7 +234,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: bridgedb/strings.py:88 +#: bridgedb/strings.py:66 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -277,21 +243,21 @@ msgid "" "\n" msgstr "" -#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 +#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356 msgid "What are bridges?" msgstr "" -#: bridgedb/strings.py:102 +#: bridgedb/strings.py:79 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: bridgedb/strings.py:107 +#: bridgedb/strings.py:84 msgid "I need an alternative way of getting bridges!" msgstr "" #. TRANSLATORS: Please DO NOT translate "get transport obfs4". -#: bridgedb/strings.py:109 +#: bridgedb/strings.py:86 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Leave the email subject\n" @@ -300,106 +266,146 @@ msgid "" "providers: %s or %s." msgstr "" -#: bridgedb/strings.py:117 +#: bridgedb/strings.py:94 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and #. "Support Portal", respectively. -#: bridgedb/strings.py:121 +#: bridgedb/strings.py:98 #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "" -#: bridgedb/strings.py:125 +#: bridgedb/strings.py:102 msgid "Here are your bridge lines:" msgstr "" -#: bridgedb/strings.py:126 +#: bridgedb/strings.py:103 msgid "Get Bridges!" msgstr "" -#: bridgedb/strings.py:130 -msgid "Please select options for bridge type:" +#: bridgedb/strings.py:107 +msgid "Bridge distribution mechanisms" msgstr "" -#: bridgedb/strings.py:131 -msgid "Do you need IPv6 addresses?" +#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". +#: bridgedb/strings.py:109 +#, python-format +msgid "" +"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n" +"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n" +"the pseudo-mechanism \"None\". The following list briefly explains how these\n" +"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" +"mechanisms is." msgstr "" -#: bridgedb/strings.py:132 +#: bridgedb/strings.py:115 #, python-format -msgid "Do you need a %s?" +msgid "" +"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" +"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" +"solve the subsequent CAPTCHA." msgstr "" -#: bridgedb/strings.py:136 -msgid "Your browser is not displaying images properly." +#: bridgedb/strings.py:119 +#, python-format +msgid "" +"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n" +"request bridges from inside their Tor Browser settings. To get bridges, go to\n" +"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" +"subsequent CAPTCHA, and Tor Browser will automatically add your new\n" +"bridges." msgstr "" -#: bridgedb/strings.py:137 -msgid "Enter the characters from the image above..." +#: bridgedb/strings.py:125 +#, python-format +msgid "" +"Users can request bridges from the \"Email\" distribution mechanism by sending an\n" +"email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n" +"email body." msgstr "" -#: bridgedb/strings.py:141 -msgid "How to start using your bridges" +#: bridgedb/strings.py:129 +msgid "Reserved" msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:143 +#: bridgedb/strings.py:130 #, 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." +"BridgeDB maintains a small number of bridges that are not distributed\n" +"automatically. Instead, we reserve these bridges for manual distribution and\n" +"hand them out to NGOs and other organizations and individuals that need\n" +"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" +"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" +"called \"Unallocated\" in %sbridge pool assignment%s files." msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:148 -msgid "" -"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" -"the wizard until it asks:" +#: bridgedb/strings.py:137 +msgid "None" msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:152 +#: bridgedb/strings.py:138 msgid "" -"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" -"to the Tor network?" +"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n" +"It is the bridge operator's responsibility to distribute their bridges to\n" +"users. Note that on Relay Search, a freshly set up bridge's distribution\n" +"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" +"it will then change to the bridge's actual distribution mechanism.\n" msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:156 -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" -"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." +#: bridgedb/strings.py:148 +msgid "Please select options for bridge type:" +msgstr "" + +#: bridgedb/strings.py:149 +msgid "Do you need IPv6 addresses?" msgstr "" -#: bridgedb/strings.py:164 -msgid "Displays this message." +#: bridgedb/strings.py:150 +#, python-format +msgid "Do you need a %s?" 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:168 -msgid "Request vanilla bridges." +#: bridgedb/strings.py:154 +msgid "Your browser is not displaying images properly." msgstr "" -#: bridgedb/strings.py:169 -msgid "Request IPv6 bridges." +#: bridgedb/strings.py:155 +msgid "Enter the characters from the image above..." msgstr "" -#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:171 -msgid "Request a Pluggable Transport by TYPE." +#: bridgedb/strings.py:159 +msgid "How to start using your bridges" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: bridgedb/strings.py:161 +#, python-format +msgid "" +" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n" +" Manual explains how you can add your bridges to Tor Browser. If you are\n" +" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" +" are using Android, %sclick here%s." +msgstr "" + +#: bridgedb/strings.py:166 +msgid "" +"Add these bridges to your Tor Browser by opening your browser\n" +"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" +"bridge\" field." +msgstr "" + +#: bridgedb/strings.py:173 +msgid "(Request unobfuscated Tor bridges.)" msgstr "" -#. TRANSLATORS: Please DO NOT translate "BridgeDB". -#. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:174 -msgid "Get a copy of BridgeDB's public GnuPG key." +msgid "(Request IPv6 bridges.)" +msgstr "" + +#: bridgedb/strings.py:175 +msgid "(Request obfs4 obfuscated bridges.)" msgstr ""

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit bcc1befada491ee6eea2e985d0c6ba3d35d613a8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 13:15:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- da/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index 653515b78f..bbcf5cfdfa 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -16,7 +16,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: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-29 12:43+0000\n" +"PO-Revision-Date: 2020-04-29 13:10+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -341,7 +341,7 @@ msgid "" "bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" "see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" "called \"Unallocated\" in %sbridge pool assignment%s files." -msgstr "" +msgstr "BridgeDB vedligeholder et mindre antal broer som ikke distribueres automatisk.\nVi reserverer i stedet broerne til manuel distribution og uddeler dem til\nikke-statslige organisationer og andre organisationer og enkeltpersoner som\nbehøver broer. Broer som distribueres over mekanismen \"Reserveret\" ser måske\nikke brugere i lang tid. Bemærk at distributionsmekanismen \"Reverseret\" kaldes\n\"Unallocated\" i %sbridge pool assignment%s-filer." #: bridgedb/strings.py:137 msgid "None" @@ -354,7 +354,7 @@ msgid "" "users. Note that on Relay Search, a freshly set up bridge's distribution\n" "mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" "it will then change to the bridge's actual distribution mechanism.\n" -msgstr "" +msgstr "Broer som anvender distributionsmekanismen \"Ingen\" distribueres ikke af BridgeDB.\nDet er brooperatørens ansvar er at distribuere deres broer til brugerne.\nBemærk ved Relæsøgning vil en frisk opsætning af broers distributionsmekanisme\nsige \"Ingen\" i op til cirka en dag. Vær lidt tålmodig og\nden vil blive ændret til broens faktiske distributionsmekanisme.\n" #: bridgedb/strings.py:148 msgid "Please select options for bridge type:"

1 0

[tor-browser-build/master] Add GeKo to nightly build emails
by boklm＠torproject.org 29 Apr '20

29 Apr '20

commit 4d855e74585ac099e4c5526c83c04302093305d2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 29 15:02:28 2020 +0200 Add GeKo to nightly build emails --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 8e4bc05..6addb1d 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,5 +2,5 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org', 'sysrqb(a)torproject.org', ]," nightly_build_sign_build: 1

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit aff20dbfb1a6d75603b580b37d0927d1ccabbc4b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 12:51:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-PT.po | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index adcf9945f0..dbfc889629 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -1,9 +1,10 @@ +# # Translators: # Emma Peel, 2019 -# Hugo9191 <hugoncosta(a)gmail.com>, 2020 # erinm, 2020 # Rui <xymarior(a)yandex.com>, 2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2020 +# Hugo9191 <hugoncosta(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -11,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Manuela Silva <manuelarodsilva(a)gmail.com>, 2020\n" +"Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>, 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,7 +82,7 @@ msgstr "Transferência" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Running Tor Browser for the First Time" -msgstr "" +msgstr "Executar o Tor Browser pela primeira vez" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -101,7 +102,7 @@ msgstr "Pontes" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Managing Identities" -msgstr "" +msgstr "Gerir Identidades" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -150,7 +151,7 @@ msgstr "Problemas conhecidos" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.title) msgid "Mobile Tor" -msgstr "" +msgstr "Mobile Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -160,7 +161,7 @@ msgstr "Traduzir o Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Making Tor Browser Portable" -msgstr "" +msgstr "Tornar o Tor Browser portátil" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -605,6 +606,9 @@ msgid "" "at a certain point, see the [Troubleshooting](../troubleshooting) page for " "help solving the problem." msgstr "" +"Se estiver numa ligação relativamente rápida, mas esta barra parecer estar " +"bloqueada num ponto determinado, consulte a página de [Resolução de " +"Problemas](../troubleshooting) para ajudar a resolver o problema." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body)

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit 673aa5d845cc8f788fa1f5beaf1d928c89024681 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 12:45:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- da/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index c507718a10..653515b78f 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -16,7 +16,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: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-28 15:39+0000\n" +"PO-Revision-Date: 2020-04-29 12:43+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -300,7 +300,7 @@ msgid "" "the pseudo-mechanism \"None\". The following list briefly explains how these\n" "mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" "mechanisms is." -msgstr "" +msgstr "BridgeDB implementerer fire mekanismer til at distribuere broer: \"HTTPS\", \"Moat\",\n\"E-mail\" og \"Reserveret\". Broer som ikke distribueres over BridgeDB bruger\npseudomekanismen \"Ingen\". Følgende liste forklarer kort hvordan mekanismerne\nvirker og vores %sBridgeDB metrics%s visualiserer hvor populær hver\nmekanisme er." #: bridgedb/strings.py:115 #, python-format @@ -308,7 +308,7 @@ msgid "" "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" "bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" "solve the subsequent CAPTCHA." -msgstr "" +msgstr "Distributionsmekanismen \"HTTPS\" uddeler broer over webstedet. Få broer ved at\ngå til %sbridges.torproject.org%s og vælge dine foretrukne valgmuligheder\nog løs den efterfølgende CAPTCHA." #: bridgedb/strings.py:119 #, python-format @@ -318,7 +318,7 @@ msgid "" "your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" "subsequent CAPTCHA, and Tor Browser will automatically add your new\n" "bridges." -msgstr "" +msgstr "Distributionsmekanismen \"Moat\" er en del af Tor Browser som giver brugerne\nmulighed for at anmode om broer i deres Tor Browser-indstillinger. Få broer ved\nat gå til din Tor Browsers %sTor-indstillinger%s og klik på \"Anmod om en ny bro\", løs\nden efterfølgende CAPTCHA og Tor Browser tilføjer automatisk dine nye\nbroer." #: bridgedb/strings.py:125 #, python-format @@ -389,7 +389,7 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr " Først skal du %sdownloade Tor Browser%s. Vores Tor Browser-brugermanual\n forklarer hvordan du kan tilføje dine broer til Tor Browser. Hvis du\n bruger Windows, Linux eller OS X, så klik på %sklik her%s for at lærer mere.\n Hvis du bruger Android, så %sklik her%s." #: bridgedb/strings.py:166 msgid ""

1 0

[tor/master] core/mainloop: remove noisy logging
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit 84fe1c891bc77a2363a119f3c7dc834127bcacc7 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 12 19:55:12 2020 +0000 core/mainloop: remove noisy logging --- src/core/mainloop/connection.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 3c8527dd5..218873ae6 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -3687,9 +3687,6 @@ connection_buf_read_from_socket(connection_t *conn, ssize_t *max_to_read, /* Do not allow inbuf to grow past INT_MAX - 1. */ const ssize_t maximum = INT_MAX - 1 - buf_datalen(conn->inbuf); if (at_most > maximum) { - log_debug(LD_NET, "%d: inbuf_datalen=%"TOR_PRIuSZ", adding %" - TOR_PRIdSZ" might overflow.", - (int)conn->s, buf_datalen(conn->inbuf), at_most); at_most = maximum; }

1 0

[tor/master] core/mainloop: Limit growth of conn->inbuf
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit fd3e0c154236c59c2972b549500675980bb02507 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Mar 3 07:01:05 2020 +0000 core/mainloop: Limit growth of conn->inbuf If the buf_t's length could potentially become greater than INT_MAX - 1, it sets off an IF_BUG_ONCE in buf_read_from_tls(). All of the rest of the buffers.c code has similar BUG/asserts for this invariant. --- changes/bug33131 | 3 +++ src/core/mainloop/connection.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/changes/bug33131 b/changes/bug33131 new file mode 100644 index 000000000..bc5ef7bc2 --- /dev/null +++ b/changes/bug33131 @@ -0,0 +1,3 @@ + o Minor bugfixes (mainloop): + - Better guard against growing a buffer past its maximum 2GB in size. + Fixes bug 33131; bugfix on 0.3.0.4-rc. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 3595bba85..3c8527dd5 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -3684,6 +3684,15 @@ connection_buf_read_from_socket(connection_t *conn, ssize_t *max_to_read, at_most = connection_bucket_read_limit(conn, approx_time()); } + /* Do not allow inbuf to grow past INT_MAX - 1. */ + const ssize_t maximum = INT_MAX - 1 - buf_datalen(conn->inbuf); + if (at_most > maximum) { + log_debug(LD_NET, "%d: inbuf_datalen=%"TOR_PRIuSZ", adding %" + TOR_PRIdSZ" might overflow.", + (int)conn->s, buf_datalen(conn->inbuf), at_most); + at_most = maximum; + } + slack_in_buf = buf_slack(conn->inbuf); again: if ((size_t)at_most > slack_in_buf && slack_in_buf >= 1024) {

1 0