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

[tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4
by dgoulet＠torproject.org 01 Mar '21

01 Mar '21

commit eb1759633af4eda00926a8987831f8fb7c811c17 Merge: ad4f87ed3f 296a557bfc Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Mar 1 08:33:41 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 01 Mar '21

01 Mar '21

commit fa06aaf7d787709589f48d8e10789c67782b1657 Merge: 36212ad953 49ce31b2b6 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Mar 1 08:33:47 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5

1 0

[tor/master] git-list-tor-branches: remove 0.4.3
by nickm＠torproject.org 01 Mar '21

01 Mar '21

commit 6b7a1454098e165d6e006ddc06c3284215600287 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 1 08:28:53 2021 -0500 git-list-tor-branches: remove 0.4.3 --- scripts/git/git-list-tor-branches.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh index 61ec9809e9..2bcd4722b4 100755 --- a/scripts/git/git-list-tor-branches.sh +++ b/scripts/git/git-list-tor-branches.sh @@ -139,9 +139,6 @@ finish() { branch maint-0.3.5 branch release-0.3.5 -branch maint-0.4.3 -branch release-0.4.3 - branch maint-0.4.4 branch release-0.4.4

1 0

[tor/master] Correct documentation for lib_meminfo.md
by nickm＠torproject.org 01 Mar '21

01 Mar '21

commit 1b36e50fdd529a15214a673d3247eb26337de43a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 1 08:12:46 2021 -0500 Correct documentation for lib_meminfo.md --- src/lib/meminfo/lib_meminfo.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/meminfo/lib_meminfo.md b/src/lib/meminfo/lib_meminfo.md index 87f509d648..e248faab90 100644 --- a/src/lib/meminfo/lib_meminfo.md +++ b/src/lib/meminfo/lib_meminfo.md @@ -1,5 +1,2 @@ @dir /lib/meminfo -@brief lib/meminfo: Inspecting malloc() usage. - -Only available when malloc() provides mallinfo() or something similar. - +@brief lib/meminfo: Inspecting system memory availability.

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 01 Mar '21

01 Mar '21

commit 84bb9d90e292939fbe6ed7d7de2bab1ea5b4d992 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 1 10:17:20 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- pt_PT.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pt_PT.po b/pt_PT.po index 27001e1939..1f62e23123 100644 --- a/pt_PT.po +++ b/pt_PT.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>, 2021 # Hugo Costa <hugoncosta(a)gmail.com>, 2020 # Hugo Costa <hugoncosta(a)gmail.com>, 2019-2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2019 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-03-01 10:03+0000\n" +"Last-Translator: A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 01 Mar '21

01 Mar '21

commit ce10ed0020a437cd35d79260b8b0dcb98886ef91 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 1 10:15:59 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- pt_PT.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pt_PT.po b/pt_PT.po index f7a515c7f3..702d1fc5d9 100644 --- a/pt_PT.po +++ b/pt_PT.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>, 2021 # Hugo Costa <hugoncosta(a)gmail.com>, 2020 # Hugo Costa <hugoncosta(a)gmail.com>, 2019-2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2019 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-03-01 10:03+0000\n" +"Last-Translator: A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -159,7 +160,7 @@ msgstr "não tem disponível memória suficiente neste sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "No explanation available for reason '{reason}'." -msgstr "" +msgstr "Não existe explicação disponível para a razão '{reason}'." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:359 msgid "The system is up-to-date" @@ -243,7 +244,7 @@ msgstr "A transferir a atualização" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:554 #, perl-brace-format msgid "Downloading the upgrade to {name} {version}..." -msgstr "" +msgstr "A descarregar a atualização a {name} {version}..." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:614 msgid "" @@ -341,11 +342,11 @@ msgstr "Não foi possível desligar a rede" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:750 msgid "Error while cancelling the upgrade download" -msgstr "" +msgstr "Erro ao cancelar o descarregar da atualização" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:751 msgid "Failed to cancel the upgrade download" -msgstr "" +msgstr "Falha no cancelar de descarga da atualização" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:757 msgid "Upgrading the system" @@ -547,7 +548,7 @@ msgstr "Não é possível copiar %(infile)s para %(outfile)s: %(message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:497 msgid "Removing existing Tails system" -msgstr "" +msgstr "A remover sistema Tails existente" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:507 #, python-format

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 01 Mar '21

01 Mar '21

commit 88a5831b11155a018483c9d95e0a6efb5897b820 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 1 04:17:35 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index d4c1c9bec2..e2e6e19d7e 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -19,6 +19,7 @@ # 忻然李 <2544304894(a)qq.com>, 2020 # Runzhe Liang <18051080098(a)163.com>, 2020 # Scott Rhodes <starring169(a)gmail.com>, 2020 +# Feng Zi <admin(a)fengzi.ga>, 2021 # msgid "" msgstr "" @@ -26,7 +27,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-21 16:01+EST\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Scott Rhodes <starring169(a)gmail.com>, 2020\n" +"Last-Translator: Feng Zi <admin(a)fengzi.ga>, 2021\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,7 +149,7 @@ msgstr "Tor 的rpm软件包管理器" #: https//support.torproject.org/abuse/ #: (content/abuse/contents+en.lrtopic.title) msgid "Abuse FAQ" -msgstr "" +msgstr "有关滥用的常见问题" #: https//support.torproject.org/metrics/ #: (content/metrics/contents+en.lrtopic.title) @@ -201,7 +202,7 @@ msgstr "一些拼写注解" #: https//support.torproject.org/glossary/antivirus/ #: (content/glossary/antivirus/contents+en.lrword.translation) msgid "A few translation notes" -msgstr "" +msgstr "一些翻译说明" #: https//support.torproject.org/glossary/add-on-extension-or-plugin/ #: (content/glossary/add-on-extension-or-plugin/contents+en.lrword.definition) @@ -379,7 +380,7 @@ msgstr "[Tor 浏览器](../tor-browser)会在您关闭[会话](../session)后删 #: https//support.torproject.org/glossary/captcha/ #: (content/glossary/captcha/contents+en.lrword.term) msgid "Captcha" -msgstr "" +msgstr "验证码" #: https//support.torproject.org/glossary/captcha/ #: (content/glossary/captcha/contents+en.lrword.definition)

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 01 Mar '21

01 Mar '21

commit 02adc4cbaa070e99419c6eb679764089065bcb23 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 1 03:45:45 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- zh_CN/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/messages.json b/zh_CN/messages.json index 5e5ef2bb1a..f65adc72cd 100644 --- a/zh_CN/messages.json +++ b/zh_CN/messages.json @@ -84,6 +84,6 @@ "message": "常见问题" }, "support": { - "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." + "message": "查看 Tor <a href=\"https://support.torproject.org/zh-CN/\">支持页面</a>中的 <a href=\"https://support.torproject.org/zh-CN/censorship/\">审查</a> 主题。" } }

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 01 Mar '21

01 Mar '21

commit 90be09cd2fe8bd907a72e0851add8135d82ecc3a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 1 03:15:46 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- zh_CN/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/messages.json b/zh_CN/messages.json index 7272e38388..5e5ef2bb1a 100644 --- a/zh_CN/messages.json +++ b/zh_CN/messages.json @@ -66,7 +66,7 @@ "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the <strong>List of all projects</strong> and create a new issue." }, "bugTracker": { - "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "在 Tor 项目的 GitLab 上<a href=\"https://gitlab.onionize.space/\">申请一个账号</a>，然后在 Snowflake 项目中<a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">提交一个新的问题</a>。" }, "descriptive": { "message": "请尽量客观地描述您的情况，如果可能，请同时报告您的日志文件，这将帮助我们重现漏洞。"

1 0