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

[translation/torbutton-torbuttondtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed
by translation＠torproject.org 14 Sep '20

14 Sep '20

commit 285ebda675c49e01ce86e2cecc9e9204ccdb7ac8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 16:17:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ga-IE/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga-IE/torbutton.dtd b/ga-IE/torbutton.dtd index 4c875960d7..8cb1458bc6 100644 --- a/ga-IE/torbutton.dtd +++ b/ga-IE/torbutton.dtd @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Ciorcad Nua don Suíomh seo">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip ""> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel ""> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Oscail leid fhíordheimhnithe don tseirbhís onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Meabhraigh an eochair seo">

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 14 Sep '20

14 Sep '20

commit bb7c006e52ba24d280c550916d812d5e21547cc1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 16:17:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ga-IE/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ga-IE/torbutton.dtd b/ga-IE/torbutton.dtd index dbca0894d4..8cb1458bc6 100644 --- a/ga-IE/torbutton.dtd +++ b/ga-IE/torbutton.dtd @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Ciorcad Nua don Suíomh seo">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Oscail leid fhíordheimhnithe don tseirbhís onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Meabhraigh an eochair seo">

1 0

[translation/torbutton-branddtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_completed
by translation＠torproject.org 14 Sep '20

14 Sep '20

commit c8c0e09930e4f2e2a858bef7b29b087aa6b9b856 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 16:17:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_… --- ga-IE/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga-IE/brand.dtd b/ga-IE/brand.dtd index fe727572d1..0c8c771a01 100644 --- a/ga-IE/brand.dtd +++ b/ga-IE/brand.dtd @@ -10,7 +10,7 @@  -<!ENTITY brandProductName ""> +<!ENTITY brandProductName "Brabhsálaí Tor">  <!ENTITY plugins.installed.find "Cliceáil chun forlíontáin an chórais a lódáil">

1 0

[translation/torbutton-brandproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandproperties_completed
by translation＠torproject.org 14 Sep '20

14 Sep '20

commit ff70e395a6455e6f51ccd8e5d55c479e81407b1d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 16:17:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandprop… --- ga-IE/brand.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga-IE/brand.properties b/ga-IE/brand.properties index 962eb774b2..3449484cb2 100644 --- a/ga-IE/brand.properties +++ b/ga-IE/brand.properties @@ -8,7 +8,7 @@ brandFullName=Brabhsálaí Tor # LOCALIZATION NOTE(brandProductName): # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -# brandProductName=Tor Browser +brandProductName=Brabhsálaí Tor vendorShortName=Tionscadal Tor homePageSingleStartMain=Firefox Start, leathanach baile sciobtha, le cuardach ionsuite

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 14 Sep '20

14 Sep '20

commit 922721d75e7f699dce7d3eefa0382e8952a98f41 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 16:15:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- da/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 1207fe770c..b043db203d 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -77,5 +77,5 @@ <!ENTITY https-everywhere.chrome.status_cancel_button "Annuller"> <!ENTITY https-everywhere.standalone.proxy_server_info_prefix "Proxyserver kører på"> -<!ENTITY https-everywhere.standalone.transparent_true ""> -<!ENTITY https-everywhere.standalone.transparent_false ""> +<!ENTITY https-everywhere.standalone.transparent_true "Du skal opsætte dine firewall-regler for at viderestille pakker til den angivne vært eller port."> +<!ENTITY https-everywhere.standalone.transparent_false "Du skal konfigurere dine programmer til at bruge en HTTP-proxy på den angivne vært eller port.">

1 0

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

14 Sep '20

commit 048c0a0e259a61f07bad93e49a87ef90f88d8c41 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 16:15:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- zh_CN/LC_MESSAGES/bridgedb.po | 269 +++++++++++++++++++++--------------------- 1 file changed, 136 insertions(+), 133 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 9a9310c512..c381fcdb4f 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -3,17 +3,19 @@ # This file is distributed under the same license as the bridgedb project. # # Translators: +# shenzhui007 <12231252(a)bjtu.edu.cn>, 2020 # khi, 2013 # khi, 2013 # khi, 2013 # Christopher M <i(a)cicku.me>, 2012 -# Cloud P <heige.pcloud(a)outlook.com>, 2019 +# Cloud P <heige.pcloud(a)outlook.com>, 2019-2020 # ff98sha, 2019-2020 # hanl <iamh4n(a)gmail.com>, 2011 # Meng San, 2014,2016 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 # Meng San, 2016 # Mingye Wang <arthur200126(a)gmail.com>, 2016 +# Scott Rhodes <starring169(a)gmail.com>, 2020 # khi, 2014-2015 # YFdyh000 <yfdyh000(a)gmail.com>, 2014-2015 # ff98sha, 2019 @@ -21,14 +23,14 @@ 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-05 14:57+0000\n" -"Last-Translator: ff98sha\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-09-14 16:09+0000\n" +"Last-Translator: shenzhui007 <12231252(a)bjtu.edu.cn>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -51,18 +53,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 "抱歉，你的邮件请求出现问题。" @@ -70,15 +70,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 "更改日志" @@ -94,31 +94,26 @@ msgstr "显示二维码" msgid "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/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:125 -msgid "Uh oh, spaghettios!" -msgstr "哎呀！" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "获取二维码时出错。" -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "二维码包含网桥信息。利用二维码扫描程序，可将相应的网桥信息复制到手机或其他设备。" -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "BridgeDB 遇到了一个错误。" + +#: bridgedb/distributors/https/templates/bridges.html:116 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:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -194,64 +189,32 @@ msgstr "是(%sY%s)！" msgid "%sG%set Bridges" msgstr "获取网桥(%sG%s)" -#: bridgedb/strings.py:43 -msgid "[This is an automated message; please do not reply.]" -msgstr "[这是一封自动生成的邮件，请勿回复。]" +#: 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 "您已超出了发送频率的限制，请慢慢来！两封邮件之间需要最少 %s 小时的间隔。在间隔期间发出的所有邮件将被忽略。" -#: 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 "欢迎来到 BridgeDB！" - -#. 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 "你好，%s！" - -#: 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." -msgstr "本邮件是对 %s 的自动回复，日期 %s %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" @@ -262,7 +225,7 @@ msgid "" msgstr "BridgeDB 提供多种%s可拔插传输%s网桥，用于混淆 Tor 网络的连接，从而让网络监控者难以判断你在使用 Tor。\n" #. 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" @@ -274,7 +237,7 @@ msgstr "另外提供一些IPv6格式的网桥，不过某些可插拔传输类 #. 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" @@ -283,21 +246,21 @@ msgid "" "\n" msgstr "此外，BridgeDB 提供很多 %s 非可插拔传输 %s 的普通网桥。\n虽然听起来不够酷，但是这些普通网桥依然可以在很多情况下帮助绕过审查。\n" -#: 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 "%s网桥%s即 Tor 中继节点，用于帮助用户绕过审查或封锁。" -#: 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" @@ -306,106 +269,146 @@ msgid "" "providers: %s or %s." msgstr "另一种获取网桥的方式是向 %s 发送邮件。\n将邮件主题留空，并在邮件正文写“get transport obfs4”。\n请注意：你必须使用下列邮件服务商\n提供的邮箱发送邮件：%s 或 %s。" -#: 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 "如果您的 Tor 浏览器无法连接，请查看%s和%s。" -#: 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:107 +msgid "Bridge distribution mechanisms" +msgstr "网桥分发机制" + +#. 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:115 +#, python-format +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: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: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 "用户可以通过发送一封邮件至%sbridges(a)torproject.xn--org%s,get-gc0eo819b57b03nejuo7yb9yt9v3n7m transport obfs4”，以通过“邮件”方式申请网桥。" + +#: bridgedb/strings.py:129 +msgid "Reserved" +msgstr "已预留" + #: bridgedb/strings.py:130 +#, python-format +msgid "" +"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 "BridgeDB 维护少量未被自动发布的网桥。\n相反，我们保留这些网桥以进行手动分发，\n将它们分发给非政府组织和其他需要网桥的组织和个人。\n通过“保留”机制分发的网桥可能很久不会被用户使用\n请注意，“保留的”发行版机制\n在%s网桥池分配%s文件中被称为“未分配”。" + +#: bridgedb/strings.py:137 +msgid "None" +msgstr "无" + +#: bridgedb/strings.py:138 +msgid "" +"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 "" + +#: bridgedb/strings.py:148 msgid "Please select options for bridge type:" msgstr "请选择类型类型。" -#: bridgedb/strings.py:131 +#: bridgedb/strings.py:149 msgid "Do you need IPv6 addresses?" msgstr "是否需要IPv6地址？" -#: bridgedb/strings.py:132 +#: bridgedb/strings.py:150 #, python-format msgid "Do you need a %s?" msgstr "是否需要 %s？" -#: bridgedb/strings.py:136 +#: bridgedb/strings.py:154 msgid "Your browser is not displaying images properly." msgstr "浏览器无法正确显示图片。" -#: bridgedb/strings.py:137 +#: bridgedb/strings.py:155 msgid "Enter the characters from the image above..." msgstr "请输入上图中的字符（不区分大小写）..." -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:159 msgid "How to start using your bridges" msgstr "如何使用网桥" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:143 +#: bridgedb/strings.py:161 #, 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 "如需在 Tor 浏览器中添加网桥，请先根据 %s Tor 浏览器下载页面 %s 的说明下载和启动 Tor 浏览器。" - -#. 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:" -msgstr "当“Tor 网络设置” 对话框出现时，点击“配置” ，然后根据向导操作，直到看到下面的问题：" +" 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 "首先，您需要%s下载 Tor Browser%s。我们的 Tor Browser 用户手册解答了如何为 Tor Browser 添加您的网桥。如果您正在使用 Windows，Linux 或者 OS X，%s点击这里%s以详细了解。如果您正在使用安卓系统，%s点击这里%s。" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:152 +#: bridgedb/strings.py:166 msgid "" -"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" -"to the Tor network?" -msgstr "网络提供商（ISP）或其他人是否对 Tor 网络连接进行审查或封锁？" +"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 "打开你的浏览器偏好以添加这些网桥到你的Tor 浏览器中，点击“Tor”，然后将它们填入“提供一个网桥”一栏中。" -#. 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." -msgstr "选择“是”，然后点击“下一步”。如下添加新的网桥，请将网桥地址行通过复制粘贴的方式输入到文本输入框。最后，点击“连接”就可以连接至 Tor 网络。如有问题需要帮助，请点击“Tor 网络设置”向导窗口中的“帮助”按钮。" - -#: bridgedb/strings.py:164 -msgid "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:168 -msgid "Request vanilla bridges." -msgstr "请求普通网桥。" - -#: bridgedb/strings.py:169 -msgid "Request IPv6 bridges." -msgstr "请求IPv6网络。" - -#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:171 -msgid "Request a Pluggable Transport by TYPE." -msgstr "按照类型请求不同的可插拔传输网桥。" +#: bridgedb/strings.py:173 +msgid "(Request unobfuscated Tor bridges.)" +msgstr "（申请非混淆 Tor 网桥。）" -#. 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." -msgstr "获取 BridgeDB 的 GnuPG 公共密匙。" +msgid "(Request IPv6 bridges.)" +msgstr "（申请IPv6网桥。）" + +#: bridgedb/strings.py:175 +msgid "(Request obfs4 obfuscated bridges.)" +msgstr "（申请obfs4混淆网桥。）"

1 0

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

14 Sep '20

commit 22eb173c2929dfdf60cb61e62d218e9c80c5e989 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 16:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 51364003e6..d5e5ba541c 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -24,7 +24,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-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-09-14 15:42+0000\n" +"PO-Revision-Date: 2020-09-14 16:09+0000\n" "Last-Translator: shenzhui007 <12231252(a)bjtu.edu.cn>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -321,7 +321,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 "“Moat”分发机制是Tor浏览器的一部分，允许用户\n在Tor浏览器的设置里面请求网桥。为了获得网桥，去\nTor浏览器的%sTor设置%s，点击“请求新网桥”，解决后续验证码，那么Tor浏览器就会自动为您添加一个新的网桥。" #: bridgedb/strings.py:125 #, python-format @@ -357,7 +357,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 "分发机制是“None”的网桥，并不由BridgeDB分发。\n这种网桥，由网桥运作者负责分发给\n用户。注意，在中继搜索里，一个新建立的网桥的分发\n机制会在一天左右的时间内显示为“None”。请耐心等候一段时间，\n它将会转变为网桥的实际分发机制。\n" #: bridgedb/strings.py:148 msgid "Please select options for bridge type:"

1 0

[chutney/master] TorNet: Use %s rather than %r for Paths
by nickm＠torproject.org 14 Sep '20

14 Sep '20

commit 7b203b0b235cb0bfcda284c3406c881aa7a53acd Author: c <c(a)chroniko.jp> Date: Sat Aug 22 11:24:55 2020 +0000 TorNet: Use %s rather than %r for Paths For #40012 --- lib/chutney/TorNet.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index e3aca65..fa6f6aa 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2137,7 +2137,7 @@ class TorEnviron(chutney.Templating.Environ): hostname = hostname.strip() my['hs-hostname'] = hostname except IOError as e: - print("Error: hs %r error %d: %r opening hostname file '%r'" % + print("Error: hs %r error %d: %r opening hostname file '%s'" % (my['nick'], e.errno, e.strerror, hs_hostname_file)) return my['hs-hostname'] @@ -2224,7 +2224,7 @@ class Network(object): # subtract 1 second to avoid collisions and get the correct ordering newdir = get_new_absolute_nodes_path(time.time() - 1) - print("NOTE: renaming %r to %r" % (nodesdir, newdir)) + print("NOTE: renaming '%s' to '%s'" % (nodesdir, newdir)) nodesdir.rename(newdir) def create_new_nodes_dir(self): @@ -2251,7 +2251,7 @@ class Network(object): 'is not a link') # create the new, uniquely named directory, and link it to nodes - print("NOTE: creating %r, linking to %r" % (newnodesdir, nodeslink)) + print("NOTE: creating '%s', linking to '%s'" % (newnodesdir, nodeslink)) # this gets created with mode 0700, that's probably ok mkdir_p(newnodesdir) try:

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 14 Sep '20

14 Sep '20

commit a55626400964f2fd55779c701598e7c0d38c61c9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 15:45:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- da/https-everywhere.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index c8b3b30e51..1207fe770c 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -75,3 +75,7 @@ <!ENTITY https-everywhere.chrome.regex "Matcher regulære udtryk"> <!ENTITY https-everywhere.chrome.redirect_to "Viderestil til"> <!ENTITY https-everywhere.chrome.status_cancel_button "Annuller"> + +<!ENTITY https-everywhere.standalone.proxy_server_info_prefix "Proxyserver kører på"> +<!ENTITY https-everywhere.standalone.transparent_true ""> +<!ENTITY https-everywhere.standalone.transparent_false "">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 14 Sep '20

14 Sep '20

commit 04399ef084615d5578a3aabc9225c828469b89f6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 14 15:45:29 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- da/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index f84c9b49f7..b043db203d 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -77,5 +77,5 @@ <!ENTITY https-everywhere.chrome.status_cancel_button "Annuller"> <!ENTITY https-everywhere.standalone.proxy_server_info_prefix "Proxyserver kører på"> -<!ENTITY https-everywhere.standalone.transparent_true "You must set up your firewall rules to forward packets to the specified host and port."> -<!ENTITY https-everywhere.standalone.transparent_false "You must configure your applications to use an HTTP proxy on the specified host and port."> +<!ENTITY https-everywhere.standalone.transparent_true "Du skal opsætte dine firewall-regler for at viderestille pakker til den angivne vært eller port."> +<!ENTITY https-everywhere.standalone.transparent_false "Du skal konfigurere dine programmer til at bruge en HTTP-proxy på den angivne vært eller port.">

1 0