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

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 13 Jun '19

13 Jun '19

commit 2b1579d7abfbae82ea571e6fd86dd1954c9b97d4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 13 02:21:42 2019 +0000 Update translations for support-portal --- contents+zh-CN.po | 282 ++++++++++++++++++++++++++---------------------------- 1 file changed, 137 insertions(+), 145 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 016d091ea..0fd534aa1 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3,10 +3,10 @@ # MD Rights <psychi2009(a)gmail.com>, 2018 # ヨイツの賢狼ホロ, 2019 # erinm, 2019 -# Yikai Yang <ff98sha(a)gmail.com>, 2019 # ciaran <ciaranchen(a)qq.com>, 2019 # Dianyu Liu <liudianyu5(a)gmail.com>, 2019 # Emma Peel, 2019 +# Yikai Yang <ff98sha(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-24 08:29+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Yikai Yang <ff98sha(a)gmail.com>, 2019\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" @@ -32,7 +32,7 @@ msgstr "常见问题" #: https//support.torproject.org/tbb/ (content/tbb/contents+en.lrtopic.title) msgid "Tor Browser" -msgstr "Tor Browser" +msgstr "Tor 浏览器" #: https//support.torproject.org/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) @@ -85,14 +85,14 @@ msgstr "其它" #: (content/tbb/tbb-3/contents+en.lrquestion.title) msgid "" "When I use Tor Browser, will anyone be able to tell which websites I visit?" -msgstr "当我使用 Tor Browser 时，其他人是否能知道我曾经访问过哪些网站？" +msgstr "当我使用 Tor 浏览器时，其他人是否能知道我曾经访问过哪些网站？" #: https//support.torproject.org/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.description) #: https//support.torproject.org/tbb/tbb-3/ #: (content/tbb/tbb-3/contents+en.lrquestion.description) msgid "Tor Browser prevents people from knowing the websites you visit." -msgstr "Tor Browser防止人们获知您访问过的网站。" +msgstr "Tor 浏览器防止人们获知您访问过的网站。" #: https//support.torproject.org/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.description) @@ -113,7 +113,7 @@ msgstr "有些机构，例如您的互联网服务提供商，也许会知道您 msgid "" "Our website is blocked by a censor. Can Tor Browser help users access our " "website?" -msgstr "我的网站被审查机构屏蔽了，Tor Browser 能帮助用户访问我的网站吗？" +msgstr "我的网站被审查机构屏蔽了，Tor 浏览器能帮助用户访问我的网站吗？" #: https//support.torproject.org/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -124,7 +124,7 @@ msgstr "我的网站被审查机构屏蔽了，Tor Browser 能帮助用户访问 msgid "" "Tor Browser can certainly help people access your website in places where it" " is blocked." -msgstr "Tor Browser 可以帮助人们访问所在地区被封锁的网站。" +msgstr "Tor 浏览器可以帮助人们访问所在地区被封锁的网站。" #: https//support.torproject.org/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -137,8 +137,7 @@ msgid "" "Browser](https://www.torproject.org/download) and then using it to navigate " "to the blocked site will allow access." msgstr "" -"大多数时候，只需下载 [Tor " -"Browser](https://www.torproject.org/download)，您就可以使用它去访问被屏蔽的网站。" +"大多数时候，只需下载 [Tor 浏览器](https://www.torproject.org/download)，您就可以使用它去访问被屏蔽的网站。" #: https//support.torproject.org/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -165,7 +164,7 @@ msgid "" "manual.torproject.org/) section on [censorship](https://tb-" "manual.torproject.org/circumvention/)" msgstr "" -"参阅 [Tor Browser 用户手册](https://tb-manual.torproject.org/) 关于 [审查](https://tb-" +"参阅 [Tor 浏览器用户手册](https://tb-manual.torproject.org/) 关于 [审查](https://tb-" "manual.torproject.org/zh-CN/circumvention/) 的章节获得更多信息。" #: https//support.torproject.org/faq/faq-3/ @@ -175,7 +174,7 @@ msgstr "" msgid "" "Should I install a new add-on or extension in Tor Browser, like AdBlock Plus" " or uBlock Origin?" -msgstr "我应该在 Tor Browser 中安装新的扩展程序吗，例如 AdBlock Plus 或者 uBlock Origin ?" +msgstr "我应该在 Tor 浏览器中安装新的扩展程序吗，例如 AdBlock Plus 或者 uBlock Origin ?" #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -184,7 +183,7 @@ msgstr "我应该在 Tor Browser 中安装新的扩展程序吗，例如 AdBloc msgid "" "It's strongly discouraged to install new add-ons in Tor Browser, because " "they can compromise your privacy and security." -msgstr "强烈建议不要在 Tor Browser 上安装新的附加组件，因为这可能会损害你的隐私和安全。" +msgstr "强烈建议不要在 Tor 浏览器上安装新的附加组件，因为这可能会损害你的隐私和安全。" #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -196,7 +195,7 @@ msgid "" "and <mark><a href=\"https://noscript.net/\">NoScript</a></mark> — and adding" " anything else could deanonymize you." msgstr "" -"Tor Browser 已经默认安装了两个插件 —— <mark><a href=\"https://www.eff.org/https-" +"Tor 浏览器已经默认安装了两个插件 —— <mark><a href=\"https://www.eff.org/https-" "everywhere\">HTTPS Everywhere</a></mark> 和 <mark><a " "href=\"https://noscript.net/\">NoScript</a></mark> —— 再安装别的插件将会让你降低（或失去）匿名性。" @@ -205,7 +204,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.title) msgid "Which platforms is Tor Browser available for?" -msgstr "Tor Browser 支持哪些平台？" +msgstr "Tor 浏览器支持哪些平台？" #: https//support.torproject.org/faq/faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.description) @@ -283,7 +282,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.title) msgid "How can I verify Tor Browser's signature?" -msgstr "我该如何验证 Tor Browser 的签名？" +msgstr "我该如何验证 Tor 浏览器的签名？" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -396,7 +395,7 @@ msgstr "为了验证签名你需要输入一些命令到windows命令行，cmd.e #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "The Tor Browser team signs Tor Browser releases." -msgstr "Tor Browser团队为Tor Browser发行版签名。" +msgstr "Tor 浏览器团队为Tor 浏览器发行版签名。" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -442,7 +441,7 @@ msgid "" "uid [ unknown] Tor Browser Developers (signing key) " "<torbrowser&at;torproject.org>" msgstr "" -"uid [ unknown] Tor Browser Developers (signing key) " +"uid [ unknown] Tor 浏览器Developers (signing key) " "<torbrowser&at;torproject.org>" #: https//support.torproject.org/tbb/how-to-verify-signature/ @@ -453,7 +452,7 @@ msgstr "sub rsa4096/0xEB774491D9FF06E2 2018-05-26 [S] [expires: 2020-09-12]" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "Key fingerprint = 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2" -msgstr "Key fingerprint = 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2" +msgstr "密钥的指纹为 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -505,7 +504,7 @@ msgid "" "gpg: Good signature from \"Tor Browser Developers (signing key) " "<torbrowser(a)torproject.org>\" [unknown]" msgstr "" -"gpg: Good signature from \"Tor Browser Developers (signing key) " +"gpg: Good signature from \"Tor 浏览器Developers (signing key) " "<torbrowser(a)torproject.org>\" [unknown]" #: https//support.torproject.org/tbb/how-to-verify-signature/ @@ -656,7 +655,7 @@ msgid "" "gpg: Good signature from \"Tor Browser Developers (signing key) " "<torbrowser&at;torproject.org>\" [unknown]" msgstr "" -"gpg: Good signature from \"Tor Browser Developers (signing key) " +"gpg: Good signature from \"Tor 浏览器Developers (signing key) " "<torbrowser&at;torproject.org>\" [unknown]" #: https//support.torproject.org/tbb/how-to-verify-signature/ @@ -675,14 +674,14 @@ msgstr "查看 https://www.gnupg.org/documentation/ 以了解更多关于GnuPG msgid "" "What are the most common issues with the latest stable version of Tor " "Browser?" -msgstr "常见于最新稳定版本的 Tor Browser 的问题是什么？" +msgstr "常见于最新稳定版本的 Tor 浏览器的问题是什么？" #: https//support.torproject.org/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) msgid "" "Whenever we release a new stable version of Tor Browser, we write a blog " "post that details its new features and known issues." -msgstr "当新的 Tor Browser 稳定版本发布时，我们将会写一篇包括新的特性与已知问题的博文。" +msgstr "当新的 Tor 浏览器稳定版本发布时，我们将会写一篇包括新的特性与已知问题的博文。" #: https//support.torproject.org/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -707,7 +706,7 @@ msgstr "" msgid "" "My antivirus or malware protection is blocking me from accessing Tor " "Browser." -msgstr "一些反病毒程序和恶意程序防护软件禁止我使用 Tor Browser。" +msgstr "一些反病毒程序和恶意程序防护软件禁止我使用 Tor 浏览器。" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -756,7 +755,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* TorBrowser" -msgstr "* Tor Browser" +msgstr "* Tor 浏览器" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -771,7 +770,7 @@ msgstr "* obfs4proxy （如果你使用网桥）" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "Finally, restart Tor Browser." -msgstr "最后，重新启动 Tor Browser。" +msgstr "最后，重新启动 Tor 浏览器。" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -789,7 +788,7 @@ msgstr "请注意 Kaspersky 一类的防病毒软件可能会在防火墙等级 #: (content/tbb/tbb-11/contents+en.lrquestion.title) msgid "" "I downloaded and installed Tor Browser for Windows, but now I can't find it." -msgstr "我在 Windows 上下载并安装了 Tor Browser 但是没办法找到它。" +msgstr "我在 Windows 上下载并安装了 Tor 浏览器但是没办法找到它。" #: https//support.torproject.org/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -823,18 +822,18 @@ msgstr "如果你在文件夹中找不到，请再次下载并注意询问你下 msgid "" "Choose a directory location that you'll remember easily, and once the " "download finishes you should see a Tor Browser folder there." -msgstr "选择一个你能简单记住的目录，下载完成后你能在选择的目录中看到 Tor Browser 文件夹。" +msgstr "选择一个你能简单记住的目录，下载完成后你能在选择的目录中看到 Tor 浏览器文件夹。" #: https//support.torproject.org/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.title) msgid "Can I use Flash in Tor Browser?" -msgstr "我可以在 Tor Browser上使用 Flash 吗？" +msgstr "我可以在 Tor 浏览器上使用 Flash 吗？" #: https//support.torproject.org/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description) msgid "" "Flash is disabled in Tor Browser, and we recommend you do not enable it." -msgstr "Tor Browser 中停用了 Flash，我们也不建议你启用它。" +msgstr "Tor 浏览器中停用了 Flash，我们也不建议你启用它。" #: https//support.torproject.org/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description) @@ -854,12 +853,12 @@ msgstr "幸运的是，大多数网站、设备，还有其它浏览器都正在 #: https//support.torproject.org/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.title) msgid "Does using Tor Browser protect other applications on my computer?" -msgstr "使用 Tor Browser 能够保护我电脑上的其他应用吗？" +msgstr "使用 Tor 浏览器能够保护我电脑上的其他应用吗？" #: https//support.torproject.org/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) msgid "Only Tor Browser's traffic will be routed over the Tor network." -msgstr "只有 Tor Browser 的流量会通过 Tor 网络传输。" +msgstr "只有 Tor 浏览器的流量会通过 Tor 网络传输。" #: https//support.torproject.org/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) @@ -888,7 +887,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-15/ #: (content/tbb/tbb-15/contents+en.lrquestion.title) msgid "Can I download Tor Browser for Chrome OS?" -msgstr "我能为Chrome OS下载Tor Browser吗?" +msgstr "我能为Chrome OS下载Tor 浏览器吗?" #: https//support.torproject.org/tbb/tbb-15/ #: (content/tbb/tbb-15/contents+en.lrquestion.description) @@ -933,14 +932,14 @@ msgstr "请注意，VPN 和 Tor 在隐私属性上是有区别的，但是 VPN #: https//support.torproject.org/tbb/tbb-17/ #: (content/tbb/tbb-17/contents+en.lrquestion.title) msgid "Is it safe to run Tor Browser and another browser at the same time?" -msgstr "同时运行 Tor Browser 和其他的浏览器安全吗?" +msgstr "同时运行 Tor 浏览器和其他的浏览器安全吗?" #: https//support.torproject.org/tbb/tbb-17/ #: (content/tbb/tbb-17/contents+en.lrquestion.description) msgid "" "If you run Tor Browser and another browser at the same time, it won't affect" " Tor's performance or privacy properties." -msgstr "如果您同时使用 Tor Browser 和其他浏览器，这不会影响 Tor 的安全性和私密性。" +msgstr "如果您同时使用 Tor 浏览器和其他浏览器，这不会影响 Tor 的安全性和私密性。" #: https//support.torproject.org/tbb/tbb-17/ #: (content/tbb/tbb-17/contents+en.lrquestion.description) @@ -948,7 +947,7 @@ msgid "" "However, be aware that your other browser is not keeping your activity " "private, and you may forget and accidentally use that non-private browser to" " do something that you intended to do in Tor Browser." -msgstr "但请注意，其他浏览器不能让您的活动保持私密，您可能会错误地使用非私密浏览器来执行您在 Tor Browser 中的操作。" +msgstr "但请注意，其他浏览器不能让您的活动保持私密，您可能会错误地使用非私密浏览器来执行您在 Tor 浏览器中的操作。" #: https//support.torproject.org/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.title) @@ -960,7 +959,7 @@ msgstr "有对 *BSD 的支持吗?" msgid "" "Sorry, but there is currently no official support for running Tor Browser on" " *BSD." -msgstr "抱歉，我们没有官方支持 *BSD 系统上的 Tor Browser 。" +msgstr "抱歉，我们没有官方支持 *BSD 系统上的 Tor 浏览器。" #: https//support.torproject.org/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.description) @@ -995,8 +994,7 @@ msgid "" "choosing \"configure\" (then following the prompts) in the Tor Launcher " "window that pops up when you open Tor Browser for the first time." msgstr "" -"有一些网桥是 Tor Browser 内置的，在第一次启动 Tor Browser 时你可以通过点击 Tor Launcher " -"中的“设置”（并遵循提示）来使用这些网桥。" +"有一些网桥是 Tor 浏览器内置的，在第一次启动 Tor 浏览器时你可以通过点击 Tor Launcher 中的“设置”（并遵循提示）来使用这些网桥。" #: https//support.torproject.org/tbb/tbb-19/ #: (content/tbb/tbb-19/contents+en.lrquestion.description) @@ -1015,8 +1013,7 @@ msgid "" "For more information about bridges, see the [Tor Browser manual](https://tb-" "manual.torproject.org/bridges)" msgstr "" -"关于网桥的更多信息请参阅 [Tor Browser 用户手册](https://tb-manual.torproject.org/zh-" -"CN/bridges)。" +"关于网桥的更多信息请参阅 [Tor 浏览器用户手册](https://tb-manual.torproject.org/zh-CN/bridges)。" #: https//support.torproject.org/tbb/tbb-2/ #: (content/tbb/tbb-2/contents+en.lrquestion.title) @@ -1068,7 +1065,7 @@ msgstr "" msgid "" "Tor Browser won't connect, but it doesn’t seem to be an issue with " "censorship." -msgstr "Tor Browser 没有连接上互联网，但这似乎并不是网络审查造成的问题。" +msgstr "Tor 浏览器没有连接上互联网，但这似乎并不是网络审查造成的问题。" #: https//support.torproject.org/tbb/tbb-20/ #: (content/tbb/tbb-20/contents+en.lrquestion.description) @@ -1077,7 +1074,7 @@ msgstr "Tor Browser 没有连接上互联网，但这似乎并不是网络审查 msgid "" "One of the most common issues that causes connection errors in Tor Browser " "is an incorrect system clock." -msgstr "造成 Tor Browser 连接失败的最常见的问题之一是系统时间设置错误。" +msgstr "造成 Tor 浏览器连接失败的最常见的问题之一是系统时间设置错误。" #: https//support.torproject.org/tbb/tbb-20/ #: (content/tbb/tbb-20/contents+en.lrquestion.description) @@ -1094,20 +1091,20 @@ msgid "" "If this doesn't fix the problem, see the Troubleshooting page on the [Tor " "Browser manual](https://tb-manual.torproject.org/en-US/troubleshooting)." msgstr "" -"如果这个问题还没有被解决，请查看位于 [Tor Browser 用户手册](https://tb-manual.torproject.org/zh-" +"如果这个问题还没有被解决，请查看位于 [Tor 浏览器用户手册](https://tb-manual.torproject.org/zh-" "CN/troubleshooting) 的故障排查界面。" #: https//support.torproject.org/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.title) msgid "How do I view Tor Browser message log?" -msgstr "我该怎么查询 Tor Browser 的消息日志？" +msgstr "我该怎么查询 Tor 浏览器的消息日志？" #: https//support.torproject.org/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.description) msgid "" "Click the button labelled \"Copy Tor Log To Clipboard\" that appears in the " "dialog window when Tor Browser is first connecting to the network." -msgstr "当 Tor Browser 第一次连接到网络时，点击窗口下方的“复制 Tor 日志到剪贴板”按钮。" +msgstr "当 Tor 浏览器第一次连接到网络时，点击窗口下方的“复制 Tor 日志到剪贴板”按钮。" #: https//support.torproject.org/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.description) @@ -1116,8 +1113,7 @@ msgid "" " onion at the top-left of the screen), then \"Open Network Settings\", then " "\"Copy Tor Log To Clipboard\"." msgstr "" -"如果 Tor Browser 已开启，点击 TorButton （屏幕左上角的绿色洋葱图标），然后点击“打开网络设置” - “复制 Tor " -"日志到剪贴板”。" +"如果 Tor 浏览器已开启，点击 TorButton （屏幕左上角的绿色洋葱图标），然后点击“打开网络设置” - “复制 Tor 日志到剪贴板”。" #: https//support.torproject.org/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.description) @@ -1130,12 +1126,12 @@ msgstr "当你复制了日志以后，你就可以粘贴到文字编辑器或邮 #: (content/tbb/tbb-22/contents+en.lrquestion.title) msgid "" "How can I make Tor run faster? Is Tor Browser slower than other browsers?" -msgstr "如何能使 Tor 运行得更快? Tor Browser 比其他的浏览器更慢吗?" +msgstr "如何能使 Tor 运行得更快? Tor 浏览器比其他的浏览器更慢吗?" #: https//support.torproject.org/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description) msgid "Using Tor Browser can sometimes be slower than other browsers." -msgstr "使用 Tor Browser 有时会比其他浏览器慢。" +msgstr "使用 Tor 浏览器有时会比其他浏览器慢。" #: https//support.torproject.org/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description) @@ -1164,7 +1160,7 @@ msgstr "也就是说， Tor 比以前快的多了，你未必会注意到和其 msgid "" "What search engine comes with Tor Browser and how does it protect my " "privacy?" -msgstr "Tor Browser 使用什么搜索引擎，它是如何保护我的隐私的?" +msgstr "Tor 浏览器使用什么搜索引擎，它是如何保护我的隐私的?" #: https//support.torproject.org/tbb/tbb-23/ #: (content/tbb/tbb-23/contents+en.lrquestion.description) @@ -1173,7 +1169,7 @@ msgid "" "default search engine in Tor Browser." msgstr "" "<mark><a href=\"https://duckduckgo.com/\">DuckDuckGo</a></mark> 是 Tor " -"Browser 的默认搜索引擎。" +"浏览器的默认搜索引擎。" #: https//support.torproject.org/tbb/tbb-23/ #: (content/tbb/tbb-23/contents+en.lrquestion.description) @@ -1210,8 +1206,8 @@ msgid "" "If you believe this is a Tor Browser issue, please report it on our <mark><a" " href=\"https://trac.torproject.org/\">bug tracker</a></mark>." msgstr "" -"如果你确信这是 Tor Browser 的问题，请你报告给<mark><a " -"href=\"https://trac.torproject.org/\">我们的 Bug 跟踪平台</a></mark>。" +"如果你确信这是 Tor 浏览器的问题，请你报告给<mark><a href=\"https://trac.torproject.org/\">我们的 " +"Bug 跟踪平台</a></mark>。" #: https//support.torproject.org/tbb/tbb-25/ #: (content/tbb/tbb-25/contents+en.lrquestion.title) @@ -1243,19 +1239,19 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.title) msgid "How do I update Tor Browser?" -msgstr "我如何更新 Tor Browser?" +msgstr "我如何更新 Tor 浏览器?" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "You can update Tor Browser as soon as a new version is released." -msgstr "你可以更新 Tor Browser 至最新版本。" +msgstr "你可以更新 Tor 浏览器至最新版本。" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "" "Tor Browser will prompt you to update the software once a new version has " "been released." -msgstr "每当 Tor Browser有更新版被发布时，都会有提示自动出现。" +msgstr "每当 Tor 浏览器有更新版被发布时，都会有提示自动出现。" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1271,14 +1267,14 @@ msgid "" "Browser Update\">" msgstr "" "<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " -"Browser Update\">" +"浏览器Update\">" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "" "You may see a written indication when Tor Browser opens telling you that an " "update is available." -msgstr "当 Tor Browser 需要更新时，你可以在打开 Tor Browser 时看见一个更新提示。" +msgstr "当 Tor 浏览器需要更新时，你可以在打开 Tor 浏览器时看见一个更新提示。" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1288,7 +1284,7 @@ msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"新版本提醒\ #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "Tor browser will install the updates." -msgstr "Tor Browser 会安装更新。" +msgstr "Tor 浏览器会安装更新。" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1298,17 +1294,17 @@ msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release aler #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.title) msgid "How do I uninstall Tor Browser?" -msgstr "我如何卸载 Tor Browser?" +msgstr "我如何卸载 Tor 浏览器?" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) msgid "Removing Tor Browser from your system is simple:" -msgstr "在您的系统上删除 Tor Browser 非常简单：" +msgstr "在您的系统上删除 Tor 浏览器非常简单：" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) msgid "* Locate your Tor Browser folder or application." -msgstr "* 打开你 Tor Browser 的文件夹。" +msgstr "* 打开你 Tor 浏览器的文件夹。" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -1325,12 +1321,12 @@ msgid "" "\"tor-browser_en-US\" if you are running the English Tor Browser." msgstr "" "在 Windows 系统中默认是在桌面；在 macOS 中则是应用程序文件夹；而在 GNU/Linux 系统中则没有默认路径，例如，如果你的 Tor " -"Browser 是英文版的话，那目录的名称会是“tor-browser_en-US”。" +"浏览器是英文版的话，那目录的名称会是“tor-browser_en-US”。" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) msgid "* Delete the Tor Browser folder or application." -msgstr "* 删除 Tor Browser 文件夹或者应用程序。" +msgstr "* 删除 Tor 浏览器文件夹或者应用程序。" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -1349,14 +1345,14 @@ msgstr "* 你并不需要使用操作系统中的卸载工具。" msgid "" "Is there a way to change the IP address that Tor Browser assigns me for a " "particular site?" -msgstr "我可以改变 Tor Browser 为我在某个网站分配的 IP 地址吗？" +msgstr "我可以改变 Tor 浏览器为我在某个网站分配的 IP 地址吗？" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "" "Tor Browser has two ways to change your relay circuit — \"New Identity\" and" " \"New Tor Circuit for this Site\"." -msgstr "Tor Browser 有两种方法改变你的中继线路 —— “新身份”和“为该站点使用新 Tor 线路”。" +msgstr "Tor 浏览器有两种方法改变你的中继线路 —— “新身份”和“为该站点使用新 Tor 线路”。" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1391,16 +1387,14 @@ msgstr "" msgid "" "Tor Browser will warn you that all activity and downloads will be stopped, " "so take this into account before clicking \"New Identity\"." -msgstr "Tor Browser 会提示你所有的活动和下载会被终止，在你点击“新身份”时考虑这一点。" +msgstr "Tor 浏览器会提示你所有的活动和下载会被终止，在你点击“新身份”时考虑这一点。" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "" "<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " "Browser Menu\">" -msgstr "" -"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " -"Browser Menu\">" +msgstr "<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor 浏览器Menu\">" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1449,14 +1443,14 @@ msgstr "" msgid "" "A website (bank, email provider, etc..) locks me out whenever I use Tor, " "what can I do?" -msgstr "一个网站（银行，电子邮件等）封锁了我（即使我没再使用 Tor Browser），我该怎么办？" +msgstr "一个网站（银行，电子邮件等）封锁了我（即使我没再使用 Tor 浏览器），我该怎么办？" #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) msgid "" "Tor Browser often makes your connection appear as though it is coming from " "an entirely different part of the world." -msgstr "Tor Browser 会让你的网络活动看起来像是来自于世界各个不同地区的网络连接。" +msgstr "Tor 浏览器会让你的网络活动看起来像是来自于世界各个不同地区的网络连接。" #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1489,21 +1483,21 @@ msgstr "联系你的服务提供商询问它们有没有支持双因素验证。 #: https//support.torproject.org/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.title) msgid "Can I set Tor Browser as my default browser?" -msgstr "我可以设置 Tor Browser 为默认浏览器吗？" +msgstr "我可以设置 Tor 浏览器为默认浏览器吗？" #: https//support.torproject.org/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.description) msgid "" "There is currently no supported method for setting Tor Browser as your " "default browser." -msgstr "目前没有设置 Tor Browser 为默认浏览器的方法。" +msgstr "目前没有设置 Tor 浏览器为默认浏览器的方法。" #: https//support.torproject.org/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.description) msgid "" "The Tor Browser works hard to isolate itself from the rest of your system, " "and the steps for making it the default browser are unreliable." -msgstr "Tor Browser 做了大量工作使它和你的操作系统的其他部分相互隔离，以及设置为默认浏览器的过程并不可靠。" +msgstr "Tor 浏览器做了大量工作使它和你的操作系统的其他部分相互隔离，以及设置为默认浏览器的过程并不可靠。" #: https//support.torproject.org/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.description) @@ -1511,17 +1505,17 @@ msgid "" "This means sometimes a website would load in the Tor Browser, and sometimes " "it would load in another browser, this type of behavior can be dangerous and" " anonymity-breaking." -msgstr "这意味着有些网站会在 Tor Browser 中打开，有些会在其他浏览器中打开，这种行为很危险而且会破坏匿名性。" +msgstr "这意味着有些网站会在 Tor 浏览器中打开，有些会在其他浏览器中打开，这种行为很危险而且会破坏匿名性。" #: https//support.torproject.org/tbb/tbb-33/ #: (content/tbb/tbb-33/contents+en.lrquestion.title) msgid "Does running Tor Browser make me a relay?" -msgstr "运行 Tor Browser 让我成为一个中继吗？" +msgstr "运行 Tor 浏览器让我成为一个中继吗？" #: https//support.torproject.org/tbb/tbb-33/ #: (content/tbb/tbb-33/contents+en.lrquestion.description) msgid "Running Tor Browser does not make you act as a relay in the network." -msgstr "运行 Tor Browser 不会使你成为网络中的一个中继节点。" +msgstr "运行 Tor 浏览器不会使你成为网络中的一个中继节点。" #: https//support.torproject.org/tbb/tbb-33/ #: (content/tbb/tbb-33/contents+en.lrquestion.description) @@ -1543,14 +1537,14 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.title) msgid "Why does Tor Browser ship with JavaScript enabled?" -msgstr "为什么 Tor Browser 默认启用 JavaScript ?" +msgstr "为什么 Tor 浏览器默认启用 JavaScript ?" #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.description) msgid "" "We configure NoScript to allow JavaScript by default in Tor Browser because " "many websites will not work with JavaScript disabled." -msgstr "因为禁用 JavaScript 会让很多网站无法工作， Tor Browser 内置的 NoScript 默认允许 JavaScript。" +msgstr "因为禁用 JavaScript 会让很多网站无法工作， Tor 浏览器内置的 NoScript 默认允许 JavaScript。" #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.description) @@ -1566,8 +1560,7 @@ msgid "" "making it usable for the majority of people, so for now, that means leaving " "JavaScript enabled by default." msgstr "" -"原则上来说，我们不仅想让 Tor Browser 尽可能安全，还想让大多数人都可以使用。所以按照目前状态， Tor Browser 会继续默认启用 " -"JavaScript。" +"原则上来说，我们不仅想让 Tor 浏览器尽可能安全，还想让大多数人都可以使用。所以按照目前状态， Tor 浏览器会继续默认启用 JavaScript。" #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.description) @@ -1607,19 +1600,19 @@ msgstr "最有效的方法往往是联系网站管理员，告诉他们验证码 #: https//support.torproject.org/tbb/tbb-36/ #: (content/tbb/tbb-36/contents+en.lrquestion.title) msgid "Can I run multiple instances of Tor Browser?" -msgstr "我能同时运行多个 Tor Browser 吗？" +msgstr "我能同时运行多个 Tor 浏览器吗？" #: https//support.torproject.org/tbb/tbb-36/ #: (content/tbb/tbb-36/contents+en.lrquestion.description) msgid "" "We do not recommend running multiple instances of Tor Browser, and doing so " "may not work as anticipated on many platforms." -msgstr "我们不建议运行多个 Tor Browser 实例，在很多平台中这样做可能会导致运行不正常。" +msgstr "我们不建议运行多个 Tor 浏览器实例，在很多平台中这样做可能会导致运行不正常。" #: https//support.torproject.org/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.title) msgid "I need Tor Browser in a language that's not English." -msgstr "我需要 Tor Browser 提供英语之外的语言。" +msgstr "我需要 Tor 浏览器提供英语之外的语言。" #: https//support.torproject.org/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -1630,8 +1623,8 @@ msgid "" "working to add more. Want to help us translate? [See here](https://tb-" "manual.torproject.org/becoming-tor-translator/)" msgstr "" -"我们希望每个人都能用它们的语言享受Tor Browser。Tor " -"Browser现在已经[可以支持25种不同的语言](https://www.torproject.org/download/languages/)，而…" +"我们希望每个人都能用它们的语言享受Tor 浏览器。Tor " +"浏览器现在已经[可以支持25种不同的语言](https://www.torproject.org/download/languages/)，而且我们正…" "://tb-manual.torproject.org/becoming-tor-translator/)" #: https//support.torproject.org/tbb/tbb-37/ @@ -1641,18 +1634,18 @@ msgid "" "installing and testing [Tor Browser Alpha " "releases](https://www.torproject.org/download/alpha/)." msgstr "" -"你也可以帮助我们测试我们会发布的下一个语言，通过安装和测试 [Tor Browser Alpha " +"你也可以帮助我们测试我们会发布的下一个语言，通过安装和测试 [Tor 浏览器Alpha " "发行版](https://www.torproject.org/download/alpha/)." #: https//support.torproject.org/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.title) msgid "Will my network admin be able to tell I'm using Tor Browser?" -msgstr "网络管理员能发现我正在使用 Tor Browser 吗？" +msgstr "网络管理员能发现我正在使用 Tor 浏览器吗？" #: https//support.torproject.org/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) msgid "When using Tor Browser, no one can see the websites that you visit." -msgstr "使用 Tor Browser 时，没人能看见你在浏览的网站。" +msgstr "使用 Tor 浏览器时，没人能看见你在浏览的网站。" #: https//support.torproject.org/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.description) @@ -1667,7 +1660,7 @@ msgstr "不过你的网络提供商或网络管理员也许可以发现你在使 msgid "" "I’m having trouble using features on Facebook, Twitter, or some other " "website when I’m using Tor Browser." -msgstr "我用 Tor Browser 访问 Facebook、Twitter 之类的网站时遇到了问题。" +msgstr "我用 Tor 浏览器访问 Facebook、Twitter 之类的网站时遇到了问题。" #: https//support.torproject.org/tbb/tbb-39/ #: (content/tbb/tbb-39/contents+en.lrquestion.description) @@ -1691,21 +1684,21 @@ msgstr "把安全等级设置为“标准”。" #: https//support.torproject.org/tbb/tbb-4/ #: (content/tbb/tbb-4/contents+en.lrquestion.title) msgid "Why is Tor Browser built from Firefox and not some other browser?" -msgstr "为什么 Tor Browser 是基于 Firefox 而不是其他的浏览器呢？" +msgstr "为什么 Tor 浏览器是基于 Firefox 而不是其他的浏览器呢？" #: https//support.torproject.org/tbb/tbb-4/ #: (content/tbb/tbb-4/contents+en.lrquestion.description) msgid "" "Tor Browser is a modified version of Firefox specifically designed for use " "with Tor." -msgstr "Tor Browser 是为和 Tor 一起使用而定制的 Firefox 。" +msgstr "Tor 浏览器是为和 Tor 一起使用而定制的 Firefox 。" #: https//support.torproject.org/tbb/tbb-4/ #: (content/tbb/tbb-4/contents+en.lrquestion.description) msgid "" "A lot of work has been put into making the Tor Browser, including the use of" " extra patches to enhance privacy and security." -msgstr "Tor Browser 做了很多工作，例如加入强化隐私和安全的补丁。" +msgstr "Tor 浏览器做了很多工作，例如加入强化隐私和安全的补丁。" #: https//support.torproject.org/tbb/tbb-4/ #: (content/tbb/tbb-4/contents+en.lrquestion.description) @@ -1713,7 +1706,7 @@ msgid "" "While it is technically possible to use Tor with other browsers, you may " "open yourself up to potential attacks or information leakage, so we strongly" " discourage it." -msgstr "虽然你可以同时使用 Tor Browser 和其他的浏览器，但是同时使用其他浏览器会暴露你的身份信息。我们强烈建议您不要使用其他浏览器。" +msgstr "虽然你可以同时使用 Tor 浏览器和其他的浏览器，但是同时使用其他浏览器会暴露你的身份信息。我们强烈建议您不要使用其他浏览器。" #: https//support.torproject.org/tbb/tbb-4/ #: (content/tbb/tbb-4/contents+en.lrquestion.description) @@ -1724,17 +1717,17 @@ msgid "" msgstr "" "<mark><a " "href=\"https://www.torproject.org/projects/torbrowser/design/\">了解关于 Tor " -"Browser 的设计的更多信息</a></mark>。" +"浏览器的设计的更多信息</a></mark>。" #: https//support.torproject.org/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.title) msgid "Does Tor Browser use a different circuit for each website?" -msgstr "Tor Browser 是否为每个网站使用不同的线路？" +msgstr "Tor 浏览器是否为每个网站使用不同的线路？" #: https//support.torproject.org/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.description) msgid "In Tor Browser, every new domain gets its own circuit." -msgstr "Tor Browser 中，每一个新的羽毛会分配到一条独立的链路。" +msgstr "Tor 浏览器中，每一个新的羽毛会分配到一条独立的链路。" #: https//support.torproject.org/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.description) @@ -1745,7 +1738,7 @@ msgid "" "design." msgstr "" "<mark><a href=\"https://www.torproject.org/projects/torbrowser/design" -"/#identifier-linkability\">Tor Browser 的设计和实现 </a></mark>文档进一步解释了设计背后的思考。" +"/#identifier-linkability\">Tor 浏览器的设计和实现 </a></mark>文档进一步解释了设计背后的思考。" #: https//support.torproject.org/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.title) @@ -1757,14 +1750,14 @@ msgstr "为什么我的搜索引擎换成了 DuckDuckGo?" msgid "" "With the release of Tor Browser 6.0.6, we switched to DuckDuckGo as the " "primary search engine." -msgstr "Tor Browser 6.0.6 后使用 DuckDuckGo 作为内置搜索引擎。" +msgstr "Tor 浏览器6.0.6 后使用 DuckDuckGo 作为内置搜索引擎。" #: https//support.torproject.org/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.description) msgid "" "For a while now, Disconnect has had no access to Google search results which" " we used in Tor Browser." -msgstr "我们以前在 Tor Browser 使用的 Disconnect 已经不能再从 Google 获得搜索结果。" +msgstr "我们以前在 Tor 浏览器使用的 Disconnect 已经不能再从 Google 获得搜索结果。" #: https//support.torproject.org/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.description) @@ -1778,7 +1771,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.title) msgid "Why does my Tor Browser say something about Firefox not working?" -msgstr "为什么 Tor Browser 会提示“Firefox 没有响应“？" +msgstr "为什么 Tor 浏览器会提示“Firefox 没有响应“？" #: https//support.torproject.org/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.description) @@ -1787,7 +1780,7 @@ msgid "" "US/firefox/organizations/\">Firefox ESR</a></mark>, so errors regarding " "Firefox may occur." msgstr "" -"Tor Browser 基于 <mark><a href=\"https://www.mozilla.org/en-" +"Tor 浏览器基于 <mark><a href=\"https://www.mozilla.org/en-" "US/firefox/organizations/\">Firefox ESR</a></mark> 开发，所以也许会遇到 Firefox 的错误。" #: https//support.torproject.org/tbb/tbb-42/ @@ -1796,7 +1789,7 @@ msgid "" "Please be sure no other instance of Tor Browser is already running, and that" " you have extracted Tor Browser in a location that your user has the correct" " permissions for." -msgstr "请确认你只有一个 Tor Browser 在运行并且你的 Tor Browser 安装在一个有正确权限的文件夹里。" +msgstr "请确认你只有一个 Tor 浏览器在运行并且你的 Tor 浏览器安装在一个有正确权限的文件夹里。" #: https//support.torproject.org/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.description) @@ -1807,27 +1800,27 @@ msgid "" "common for anti-virus / anti-malware software to cause this type of issue." msgstr "" "请参阅<mark><a href=\"http://support.torproject.org/#tbb-10\">我的防病毒软件 / " -"反恶意软件工具阻止我使用 Tor Browser</a></mark>，这是这种问题产生的主要原因。" +"反恶意软件工具阻止我使用 Tor 浏览器</a></mark>，这是这种问题产生的主要原因。" #: https//support.torproject.org/tbb/tbb-5/ #: (content/tbb/tbb-5/contents+en.lrquestion.title) msgid "" "Can I still use another browser, like Chrome or Firefox, when I am using Tor" " Browser?" -msgstr "我能在使用 Tor Browser 时使用其它的浏览器吗（例如 Chrome 或 Firefox）？" +msgstr "我能在使用 Tor 浏览器时使用其它的浏览器吗（例如 Chrome 或 Firefox）？" #: https//support.torproject.org/tbb/tbb-5/ #: (content/tbb/tbb-5/contents+en.lrquestion.description) msgid "" "You can certainly use another browser while you are also using Tor Browser." -msgstr "你当然可以在使用 Tor Browser 时使用其它的浏览器。" +msgstr "你当然可以在使用 Tor 浏览器时使用其它的浏览器。" #: https//support.torproject.org/tbb/tbb-5/ #: (content/tbb/tbb-5/contents+en.lrquestion.description) msgid "" "However, you should know that the privacy properties of Tor Browser will not" " be present in the other browser." -msgstr "不过你应该清楚其他浏览器不能提供和 Tor Browser 一样的隐私保护。" +msgstr "不过你应该清楚其他浏览器不能提供和 Tor 浏览器一样的隐私保护。" #: https//support.torproject.org/tbb/tbb-5/ #: (content/tbb/tbb-5/contents+en.lrquestion.description) @@ -1835,19 +1828,19 @@ msgid "" "Be careful when switching back and forth between Tor and a less safe " "browser, because you may accidentally use the other browser for something " "you intended to do using Tor." -msgstr "不过在切换浏览器时要多加小心，你也许会不小心在普通浏览器里执行要在 Tor Browser 中执行的操作。" +msgstr "不过在切换浏览器时要多加小心，你也许会不小心在普通浏览器里执行要在 Tor 浏览器中执行的操作。" #: https//support.torproject.org/tbb/tbb-6/ #: (content/tbb/tbb-6/contents+en.lrquestion.title) msgid "Can I make Tor Browser my default browser?" -msgstr "我能将 Tor Browser 作为我的默认浏览器吗？" +msgstr "我能将 Tor 浏览器作为我的默认浏览器吗？" #: https//support.torproject.org/tbb/tbb-6/ #: (content/tbb/tbb-6/contents+en.lrquestion.description) msgid "" "Unfortunately, there is no supported way to make Tor Browser your default " "browser." -msgstr "目前没有设置 Tor Browser 为默认浏览器的方法。" +msgstr "目前没有设置 Tor 浏览器为默认浏览器的方法。" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.title) @@ -1888,7 +1881,7 @@ msgstr "这么做也许能解决你的问题：" msgid "" "\"Hi! I tried to access your site xyz.com while using Tor Browser and " "discovered that you don't allow Tor users to access your site." -msgstr "“嗨！我正在使用 Tor Browser 访问 xyz.com ，不过似乎你们并没有允许 Tor 用户访问。" +msgstr "“嗨！我正在使用 Tor 浏览器访问 xyz.com ，不过似乎你们并没有允许 Tor 用户访问。" #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -1953,14 +1946,14 @@ msgstr "我能用其他的浏览器使用 Tor 服务吗？" msgid "" "We strongly recommend against using Tor in any browser other than Tor " "Browser." -msgstr "我们强烈不推荐把 Tor 和 Tor Browser 以外的浏览器搭配使用。" +msgstr "我们强烈不推荐把 Tor 和 Tor 浏览器以外的浏览器搭配使用。" #: https//support.torproject.org/tbb/tbb-9/ #: (content/tbb/tbb-9/contents+en.lrquestion.description) msgid "" "Using Tor in another browser can leave you vulnerable without the privacy " "protections of Tor Browser." -msgstr "在其它浏览器中使用 Tor 可能会使你置于没有 Tor Browser 提供的隐私保护的风险中。" +msgstr "在其它浏览器中使用 Tor 可能会使你置于没有 Tor 浏览器提供的隐私保护的风险中。" #: https//support.torproject.org/tormessenger/tormessenger-1/ #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.title) @@ -2055,7 +2048,7 @@ msgid "" "which prevents Onion Browser from having the same privacy protections as Tor" " Browser." msgstr "" -"但是，苹果要求所有在 iOS 运行的浏览器使用 Webkit ，这会使 Onion Browser 不能提供和 Tor Browser 相同的隐私保护。" +"但是，苹果要求所有在 iOS 运行的浏览器使用 Webkit ，这会使 Onion Browser 不能提供和 Tor 浏览器相同的隐私保护。" #: https//support.torproject.org/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description) @@ -2089,9 +2082,9 @@ msgid "" "alpha releases](https://blog.torproject.org/new-alpha-release-tor-browser-" "android)." msgstr "" -"我们近期正在进行Android上的 Tor Browser " -"相关的工作，你可以[测试我们的alpha发行版](https://blog.torproject.org/new-alpha-release-tor-" -"browser-android)." +"我们近期正在进行Android上的 Tor " +"浏览器相关的工作，你可以[测试我们的alpha发行版](https://blog.torproject.org/new-alpha-release-" +"tor-browser-android)." #: https//support.torproject.org/tormobile/tormobile-5/ #: (content/tormobile/tormobile-5/contents+en.lrquestion.description) @@ -2108,7 +2101,7 @@ msgstr "" #: https//support.torproject.org/censorship/censorship-3/ #: (content/censorship/censorship-3/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" -msgstr "torproject.org 被屏蔽了，怎么下载 Tor Browser？" +msgstr "torproject.org 被屏蔽了，怎么下载 Tor 浏览器？" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) @@ -2129,8 +2122,8 @@ msgid "" "the latest version of Tor Browser, hosted at a variety of locations that are" " less likely to be censored, such as Dropbox, Google Drive, and GitHub." msgstr "" -"GetTor 是一项通过不同方式自动回复最新版 Tor Browser 下载链接的服务。这些链接由不同处所托管，例如 Dropbox 、Google " -"Drive 和 GitHub." +"GetTor 是一项通过不同方式自动回复最新版 Tor 浏览器下载链接的服务。这些链接由不同处所托管，例如 Dropbox 、Google Drive" +" 和 GitHub." #: https//support.torproject.org/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.title) @@ -2157,8 +2150,8 @@ msgid "" " download](/tbb/how-to-verify-signature/)), the fingerprint of the key used " "to make the signature, and the package’s checksum." msgstr "" -"GetTor 将会给你自动回复一封电子邮件给，信中会带有 Tor Browser 的下载链接、数字签名（用于[验证下载](/tbb/how-to-" -"verify-signature/)）、签名的指纹和文件的散列值。" +"GetTor 将会给你自动回复一封电子邮件给，信中会带有 Tor 浏览器的下载链接、数字签名（用于[验证下载](/tbb/how-to-verify-" +"signature/)）、签名的指纹和文件的散列值。" #: https//support.torproject.org/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description) @@ -2180,7 +2173,7 @@ msgid "" "href=\"https://twitter.com/get_tor\">@get_tor</a></mark> with one of the " "following codes in it (you don't need to follow the account):" msgstr "" -"要获得 Tor Browser 的下载链接，你可以向 <mark><a href=\"https://twitter.com/get_tor\"> " +"要获得 Tor 浏览器的下载链接，你可以向 <mark><a href=\"https://twitter.com/get_tor\"> " "@get_tor </a></mark>发送带有下列信息的私信（你不需要关注这个账号）：" #: https//support.torproject.org/gettor/gettor-3/ @@ -2214,7 +2207,7 @@ msgstr "通过 XMPP（Jitsi，CoyM）使用 GetTor。" msgid "" "To get links for downloading Tor Browser, send a message to " "gettor(a)torproject.org with one of the following codes in it:" -msgstr "要获得 Tor Browser 的下载链接，你可以向 gettor(a)torproject.org 发送带有下面信息的电子邮件：" +msgstr "要获得 Tor 浏览器的下载链接，你可以向 gettor(a)torproject.org 发送带有下面信息的电子邮件：" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.title) @@ -2572,8 +2565,8 @@ msgid "" "correctly: even a small mistake will stop Tor Browser from being able to " "reach the site." msgstr "" -"如果无法访问您想访问的洋葱服务，请检查是否正确输入了洋葱地址的16个字符（或者新版地址的56个字符）。只要有一点点错误， Tor Browser " -"就无法连接到网站。" +"如果无法访问您想访问的洋葱服务，请检查是否正确输入了洋葱地址的16个字符（或者新版地址的56个字符）。只要有一点点错误， Tor " +"浏览器就无法连接到网站。" #: https//support.torproject.org/connecting/connecting-3/ #: (content/connecting/connecting-3/contents+en.lrquestion.description) @@ -2689,7 +2682,7 @@ msgstr "当我使用 Tor 时，窃听者能够获取我分享给网站的信息 #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "Tor prevents eavesdroppers from learning sites that you visit." -msgstr "Tor Browser 防止窃听者获知您访问过的网站。" +msgstr "Tor 浏览器防止窃听者获知您访问过的网站。" #: https//support.torproject.org/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) @@ -2756,7 +2749,7 @@ msgid "" "encryption.</h4>" msgstr "" "<h4 class=\"card-title\">这个可视化实例展示了窃听者在不同的情况（网站是否支持 HTTPS ，是否在使用 Tor " -"Browser）时会看到哪些信息。</h4>" +"浏览器）时会看到哪些信息。</h4>" #: https//support.torproject.org/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.title) @@ -3341,7 +3334,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) msgid "You can access these websites by using Tor Browser." -msgstr "您可以用 Tor Browser 访问这些网站。" +msgstr "您可以用 Tor 浏览器访问这些网站。" #: https//support.torproject.org/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) @@ -3392,7 +3385,7 @@ msgid "" "When accessing a website that uses an onion service, Tor Browser will show " "at the URL bar an icon of a little green onion displaying the state of your " "connection: secure and using an onion service." -msgstr "当你浏览洋葱服务网站时，Tor Browser 会在地址栏左侧以一个绿色的洋葱图标表示（使用洋葱服务的安全连接）。 " +msgstr "当你浏览洋葱服务网站时，Tor 浏览器会在地址栏左侧以一个绿色的洋葱图标表示（使用洋葱服务的安全连接）。 " #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -3448,7 +3441,7 @@ msgid "" "Tor Browser comes with two add-ons installed: [NoScript](#noscript) and " "[HTTPS Everywhere](#https-everywhere)." msgstr "" -"Tor Browser上安装了两个组件: [NoScript](#noscript)和[HTTPS Everywhere](#https-" +"Tor 浏览器上安装了两个组件: [NoScript](#noscript)和[HTTPS Everywhere](#https-" "everywhere)." #: https//support.torproject.org/misc/glossary/ @@ -3927,8 +3920,8 @@ msgid "" "in the Tor Browser." msgstr "" "Flash Player 是一个[浏览器插件](#add-on-extension-or-" -"plugin)，用于为互联网[应用程序](#app)观看音频和视频内容。因为它并不安全，您不应该在 [Tor Browser](#tor-" -"browser) 中启用 Flash。很多使用 Flash 的服务也提供 HTML5 替代方案，应该可以在 Tor Browser 中使用。" +"plugin)，用于为互联网[应用程序](#app)观看音频和视频内容。因为它并不安全，您不应该在 [Tor 浏览器](#tor-browser) " +"中启用 Flash。很多使用 Flash 的服务也提供 HTML5 替代方案，应该可以在 Tor 浏览器中使用。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4074,7 +4067,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "HTTPS Everywhere is installed in [Tor Browser](#tor-browser)." -msgstr "HTTPS Everywhere 已经内置于 [Tor Browser](#tor-browser) 中。" +msgstr "HTTPS Everywhere 已经内置于 [Tor 浏览器](#tor-browser) 中。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4290,7 +4283,7 @@ msgid "" "the window, which allows you to control the [JavaScript](#javascript)that " "runs on individual web pages, or to block it entirely." msgstr "" -"[Tor Browser](#tor-browser) 包含一个叫 NoScript 的[扩展](#add-on-extension-or-" +"[Tor 浏览器](#tor-browser) 包含一个叫 NoScript 的[扩展](#add-on-extension-or-" "plugin)，可通过窗口左上角的 “S” 图标访问。允许你控制运行于单个网页中的 [JavaScript](#javascript)，或者完全阻止运行" " JavaScript。" @@ -4881,7 +4874,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor Browser" -msgstr "### Tor Browser" +msgstr "### Tor 浏览器" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4921,7 +4914,7 @@ msgstr "" msgid "" "By default, Tor Browser does not keep any [browsing history](#browsing-" "history)." -msgstr "Tor Browser 默认不保留任何[浏览记录](#browsing-history)。" +msgstr "Tor 浏览器默认不保留任何[浏览记录](#browsing-history)。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4940,7 +4933,7 @@ msgstr "### Tor 启动器" msgid "" "When you run [Tor Browser](#tor-browser) for the first time, you see the Tor" " Launcher window." -msgstr "当您第一次运行 [Tor Browser](#tor-browser) 时, 您会看到 Tor 启动器的界面。" +msgstr "当您第一次运行 [Tor 浏览器](#tor-browser) 时, 您会看到 Tor 启动器的界面。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5092,8 +5085,7 @@ msgid "" "Tor2web is a project to let users access [onion services](#onion-services) " "without using the [Tor Browser](#tor-browser)." msgstr "" -"Tor2web 是一个让用户不使用 [Tor Browser](#tor-browser) 访问 [洋葱服务](#onion-services) " -"的项目。" +"Tor2web 是一个让用户不使用 [Tor 浏览器](#tor-browser) 访问 [洋葱服务](#onion-services) 的项目。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5475,7 +5467,7 @@ msgstr "" msgid "" "The files on my computer have been locked, and someone is demanding I " "download Tor Browser to pay a ransom for my files!" -msgstr "我电脑上的一些文件被锁住了，有人要求我下载 Tor Browser 来支付赎金赎回文件！" +msgstr "我电脑上的一些文件被锁住了，有人要求我下载 Tor 浏览器来支付赎金赎回文件！" #: https//support.torproject.org/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) @@ -5488,14 +5480,14 @@ msgid "" "The Tor Project did not create this malware. The malware authors are asking " "you to download Tor Browser presumably to contact them anonymously with the " "ransom they're demanding from you." -msgstr "Tor Project 并不是这个恶意软件的作者。不过恶意软件的作者希望你使用 Tor Browser 来匿名的联系他们来交付赎金。" +msgstr "Tor Project 并不是这个恶意软件的作者。不过恶意软件的作者希望你使用 Tor 浏览器来匿名的联系他们来交付赎金。" #: https//support.torproject.org/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) msgid "" "If this is your first introduction to Tor Browser, we understand that you " "might think we're bad people who enable even worse people." -msgstr "如果这是你第一次听说 Tor Browser，我们知道你可能会认为我们是坏人。" +msgstr "如果这是你第一次听说 Tor 浏览器，我们知道你可能会认为我们是坏人。" #: https//support.torproject.org/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) @@ -5587,7 +5579,7 @@ msgstr "Vidalia 已经不再维护和支持。" msgid "" "A large portion of the features Vidalia offered have now been integrated " "into Tor Browser itself." -msgstr "Vidalia 提供的许多功能已经整合进了 Tor Browser 中。" +msgstr "Vidalia 提供的许多功能已经整合进了 Tor 浏览器中。" #: templates/footer.html:5 msgid "Our mission:"

1 0

[stem/master] Tests fail to run with python 3.8
by atagar＠torproject.org 12 Jun '19

12 Jun '19

commit af52d8b16f6623e3bdf0b470697b91a69b497dc2 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 12 13:18:20 2019 -0700 Tests fail to run with python 3.8 Python's platform module removed its linux_distribution() method... https://trac.torproject.org/projects/tor/ticket/30847 https://docs.python.org/3/library/platform.html#platform.linux_distribution https://stackoverflow.com/questions/49554443/platform-linux-distribution-de… This method was only used for display purposes to indicate the OS where the tests were ran. No big whoop if we simply omit the information. --- test/task.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/task.py b/test/task.py index be518ca7..1c14e64e 100644 --- a/test/task.py +++ b/test/task.py @@ -120,7 +120,10 @@ def _check_platform_version(): extra = platform.release() elif platform.system() == 'Darwin': extra = platform.release() - elif platform.system() == 'Linux': + elif platform.system() == 'Linux' and hasattr(platform, 'linux_distribution'): + # TODO: platform.linux_distribution() was removed in python 3.8 + # https://trac.torproject.org/projects/tor/ticket/30847 + extra = ' '.join(platform.linux_distribution()[:2]) else: extra = None

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 12 Jun '19

12 Jun '19

commit a0fed3e160bc4ee25769106fec69614fe14e02ad Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 12 16:49:42 2019 +0000 Update translations for torbutton-browseronboardingproperties --- nb-NO/browserOnboarding.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nb-NO/browserOnboarding.properties b/nb-NO/browserOnboarding.properties index d1acc0eb5..d8901f994 100644 --- a/nb-NO/browserOnboarding.properties +++ b/nb-NO/browserOnboarding.properties @@ -5,7 +5,7 @@ onboarding.tour-tor-welcome=Velkommen onboarding.tour-tor-welcome.title=Du er klar. onboarding.tour-tor-welcome.description=Tor Nettleser tilbyr den høyeste standarden på personvern og sikkerhet mens du surfer på nettet. Du er nå beskyttet mot sporing, overvåkning og sensur. Denne raske onboarding vil vise deg hvordan. -onboarding.tour-tor-welcome.next-button=Go to Privacy +onboarding.tour-tor-welcome.next-button=Gå til Personvern onboarding.tour-tor-privacy=Personvern onboarding.tour-tor-privacy.title=Snub trackers and snoopers. @@ -21,20 +21,20 @@ onboarding.tour-tor-circuit-display=Kretsvisning onboarding.tour-tor-circuit-display.title=Se din vei. onboarding.tour-tor-circuit-display.description=For hvert domene du besøker, blir trafikken din omdirigert og kryptert i en krets over tre Tor-reléer rundt om i verden. Ingen nettside vet hvor du kobler fra. Du kan be om en ny krets ved å klikke "Ny krets for dette nettstedet" på vår kretsvisning. onboarding.tour-tor-circuit-display.button=Se Min Vei -onboarding.tour-tor-circuit-display.next-button=Go to Security +onboarding.tour-tor-circuit-display.next-button=Gå til Sikkerhet onboarding.tour-tor-security=Sikkerhet onboarding.tour-tor-security.title=Velg din opplevelse. onboarding.tour-tor-security.description=Vi gir deg også tilleggsinnstillinger for å støte på nettleserens sikkerhet. Våre sikkerhetsinnstillinger lar deg blokkere elementer som kan brukes til å angripe datamaskinen din. Klikk nedenfor for å se hva de forskjellige alternativene gjør. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security.description-suffix=Merk: Som standard er NoScript og HTTPS Everywhere ikke inkludert i verktøylinjen, men du kan tilpasse verktøylinjen din for å legge dem til. +onboarding.tour-tor-security-level.button=Se Sikkerhetsnivået Ditt onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Opplevelsestips onboarding.tour-tor-expect-differences.title=Forvent noen forskjeller. onboarding.tour-tor-expect-differences.description=Med alle de sikkerhets og personvernfunksjonene som Tor leverer, kan din erfaring mens du surfer på Internett, være litt annerledes. Det kan være litt tregere, og avhengig av sikkerhetsnivået, kan noen elementer ikke fungere eller lastes. Du kan også bli bedt om å bevise at du er et menneske og ikke en robot. onboarding.tour-tor-expect-differences.button=se FAQs -onboarding.tour-tor-expect-differences.next-button=Go to Onion Services +onboarding.tour-tor-expect-differences.next-button=Gå til Onion Tjenester onboarding.tour-tor-onion-services=Løk-tjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. @@ -46,10 +46,10 @@ onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S onboarding.tour-tor-update.prefix-new=Ny onboarding.tour-tor-update.prefix-updated=Oppdatert -onboarding.tour-tor-toolbar=Toolbar -onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout +onboarding.tour-tor-toolbar=Verktøylinje +onboarding.tour-tor-toolbar-update-8.5.title=Verktøylinjeoppsett onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. -onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security +onboarding.tour-tor-toolbar-update-8.5.next-button=Gå til Sikkerhet onboarding.tour-tor-security-update-8.5.title=Security level experience onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings.

1 0

[community/master] rollback lektor file that shouldn't have been committed
by pili＠torproject.org 12 Jun '19

12 Jun '19

commit f0a6a864168149cdcb3314881e095344c8ae927f Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 12 18:38:42 2019 +0200 rollback lektor file that shouldn't have been committed --- .../i18n/__pycache__/lektor_i18n.cpython-37.pyc | Bin 15397 -> 15379 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc index 488bd31..52322b7 100644 Binary files a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc and b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc differ

1 0

[community/master] Training section
by pili＠torproject.org 12 Jun '19

12 Jun '19

commit 6b6a515a2146371e7ccf79ea72a39a38e062def8 Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 12 17:56:11 2019 +0200 Training section --- content/training/best-practices/contents.lr | 58 +++++++++++++++++++++ content/training/resources/contents.lr | 19 +++++++ content/training/resources/tor-network-2019.odp | Bin 0 -> 244102 bytes content/training/resources/tor-network-2019.odp.lr | 13 +++++ content/training/resources/tor-network-2019.pdf | Bin 0 -> 524047 bytes content/training/resources/tor-network-2019.pdf.lr | 13 +++++ .../resources/tor-slides-full-deck-2019.odp | Bin 0 -> 3569187 bytes .../resources/tor-slides-full-deck-2019.odp.lr | 13 +++++ .../resources/tor-slides-full-deck-2019.pdf | Bin 0 -> 2344713 bytes .../resources/tor-slides-full-deck-2019.pdf.lr | 13 +++++ models/resource.ini | 32 ++++++++++++ models/resources.ini | 34 ++++++++++++ .../i18n/__pycache__/lektor_i18n.cpython-37.pyc | Bin 15379 -> 15397 bytes templates/macros/resources.html | 8 +++ templates/resource.html | 1 + templates/resources.html | 29 +++++++++++ templates/training.html | 17 ++++-- 17 files changed, 247 insertions(+), 3 deletions(-) diff --git a/content/training/best-practices/contents.lr b/content/training/best-practices/contents.lr new file mode 100644 index 0000000..741685b --- /dev/null +++ b/content/training/best-practices/contents.lr @@ -0,0 +1,58 @@ +section: training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Training Best Practices +--- +subtitle: Good preparation is essential to an effective and safe training, so we've curated some resources to help you make the most of your training event. +--- +cta: Best Practices for Trainers +--- +key: 1 +--- +html: two-columns-page.html +--- +body: + +Running security trainings is a fun and rewarding way to help your community conduct human rights work safely. Good preparation is essential to an effective and safe training, so we've curated some resources to help you make the most of your training event. + +## Before the training + +_Am I the right person to give this training?_ + +Security trainings can help people communicate and use the internet safely, but there are additional considerations to be made before training some at-risk groups. That's why we recommend this resource from EFF's Security Education Companion, ["Am I the right person to give this training?"](https://sec.eff.org/articles/right-person-to-train). This resource can help you be sure that you're doing the best by the community of people you wish to train. + +Other questions to ask yourself before deciding to do a training: + +- How will you assess the needs of your group? What needs can you meet? +- How will you assess the skill level of your group? What skill levels can you teach to? + +Once you've answered those questions, you're ready to plan your training! + +1. Find a location that is accessible, affordable, has an internet connection and other materials like a white board, projector, and screen. Make sure that the location is safe for your attendees to visit. +2. Promote your event in your community's spaces, taking safety into consideration. Under many circumstances, social media is great for promotion, but for higher risk groups, you may want to use a smaller word-of-mouth network or require community members to share information individually to other trusted people. +3. Create localized handouts for some of the more difficult concepts that you'll be teaching. +4. Make sure you have plenty of stickers to hand out to participants! +5. Create a link list of all the resources you'll be talking about. This includes downloads and PDFs of handouts. You'll share this link list on a whiteboard or project it at the training. +6. Determine how you'll do hands-on assistance at your training. Will you be able to handle this alone? Or will you require partners? If you need more help, make sure the partners you're bringing in are aware of the safety needs of the community, and communicate with your contacts in the community to make sure they're okay with you bringing in additional trainers. +7. Make sure your presentation is up-to-date (both information and screenshots) and save your presentation in two file formats -- for example, odp and pdf -- and on at least one additional device -- for example, on your computer and on a USB stick. +8. Decide how you will facilitate a safer space. We recommend using the Tor Code of Conduct. You can also start the training by asking participants to come up with their own community agreements for the space. + +## At the training + +1. Create an agenda and share it on a projection or on a whiteboard so that your participants can be prepared for the day. +2. Communicate about how much time the training will take, and when breaks will happen. Make sure you take breaks! +3. Communicate about when you'll take questions, either during the training, at the end, or both. +4. Communicate about how you'll offer hands-on help (if at all). +5. Communicate about how participants can contact you securely after the training. +6. Show the participants the resources at community.torproject.org and support.torproject.org. +7. Show the participants other resources like sec.eff.org. + +## After the training + +1. Think about how you will evaluate your success at the training. You may want to create a follow up survey, or at least contact participants and ask them to share their feedback with you. + diff --git a/content/training/resources/contents.lr b/content/training/resources/contents.lr new file mode 100644 index 0000000..58a6907 --- /dev/null +++ b/content/training/resources/contents.lr @@ -0,0 +1,19 @@ +section: training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Training Resources +--- +subtitle: Do you teach your community about using Tor? These resources are for you. +--- +key: 2 +--- +html: resources.html +--- +body: + +Do you teach your community about using Tor? These training resources are for you. \ No newline at end of file diff --git a/content/training/resources/tor-network-2019.odp b/content/training/resources/tor-network-2019.odp new file mode 100644 index 0000000..2d24160 Binary files /dev/null and b/content/training/resources/tor-network-2019.odp differ diff --git a/content/training/resources/tor-network-2019.odp.lr b/content/training/resources/tor-network-2019.odp.lr new file mode 100644 index 0000000..d1abc51 --- /dev/null +++ b/content/training/resources/tor-network-2019.odp.lr @@ -0,0 +1,13 @@ +_model: resource +--- +title: Tor Network +--- +description: ODP file +--- +type: odp +--- +date: 2019 +--- +file: tor-network-2019.odp +--- +key: 1 \ No newline at end of file diff --git a/content/training/resources/tor-network-2019.pdf b/content/training/resources/tor-network-2019.pdf new file mode 100644 index 0000000..a5187ea Binary files /dev/null and b/content/training/resources/tor-network-2019.pdf differ diff --git a/content/training/resources/tor-network-2019.pdf.lr b/content/training/resources/tor-network-2019.pdf.lr new file mode 100644 index 0000000..5a84664 --- /dev/null +++ b/content/training/resources/tor-network-2019.pdf.lr @@ -0,0 +1,13 @@ +_model: resource +--- +title: Tor Network +--- +description: PDF file +--- +type: pdf +--- +date: 2019 +--- +file: tor-network-2019.pdf +--- +key: 0 \ No newline at end of file diff --git a/content/training/resources/tor-slides-full-deck-2019.odp b/content/training/resources/tor-slides-full-deck-2019.odp new file mode 100644 index 0000000..66d3d70 Binary files /dev/null and b/content/training/resources/tor-slides-full-deck-2019.odp differ diff --git a/content/training/resources/tor-slides-full-deck-2019.odp.lr b/content/training/resources/tor-slides-full-deck-2019.odp.lr new file mode 100644 index 0000000..97ef6dc --- /dev/null +++ b/content/training/resources/tor-slides-full-deck-2019.odp.lr @@ -0,0 +1,13 @@ +_model: resource +--- +title: Tor Network +--- +description: ODP file +--- +type: odp +--- +date: 2019 +--- +file: tor-slides-full-deck-2019.odp +--- +key: 3 \ No newline at end of file diff --git a/content/training/resources/tor-slides-full-deck-2019.pdf b/content/training/resources/tor-slides-full-deck-2019.pdf new file mode 100644 index 0000000..6933dcf Binary files /dev/null and b/content/training/resources/tor-slides-full-deck-2019.pdf differ diff --git a/content/training/resources/tor-slides-full-deck-2019.pdf.lr b/content/training/resources/tor-slides-full-deck-2019.pdf.lr new file mode 100644 index 0000000..86b9049 --- /dev/null +++ b/content/training/resources/tor-slides-full-deck-2019.pdf.lr @@ -0,0 +1,13 @@ +_model: resource +--- +title: Tor Network +--- +description: PDF file +--- +type: pdf +--- +date: 2019 +--- +file: tor-slides-full-deck-2019.pdf +--- +key: 3 \ No newline at end of file diff --git a/models/resource.ini b/models/resource.ini new file mode 100644 index 0000000..2198873 --- /dev/null +++ b/models/resource.ini @@ -0,0 +1,32 @@ +[model] +name = Resource +label = {{ this.title }} + +[fields.name] +label = Name +type = string +translate = True + +[fields.link] +label = Link +type = string + +[fields.description] +label = Description +type = string + +[fields.type] +label = Type +type = string + +[fields.date] +label = date +type = string + +[fields.file] +label = File +type = string + +[fields.key] +label = Key +type = string \ No newline at end of file diff --git a/models/resources.ini b/models/resources.ini new file mode 100644 index 0000000..1df9906 --- /dev/null +++ b/models/resources.ini @@ -0,0 +1,34 @@ +[model] +name = Resources +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string +translate = True + +[fields.section_id] +label = Section_id +type = string +translate = False + +[fields.body] +label = Body +type = markdown + +[fields.color] +label = Color +type = string + +[fields.html] +label = Html +type = string + +[children] +model = resource +order_by = key \ No newline at end of file diff --git a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc index 52322b7..488bd31 100644 Binary files a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc and b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc differ diff --git a/templates/macros/resources.html b/templates/macros/resources.html new file mode 100644 index 0000000..e632faf --- /dev/null +++ b/templates/macros/resources.html @@ -0,0 +1,8 @@ +{% macro render_resource(item) %} +<tr> + <td><a href="{{ item|url }}">{{ item.file }}</a></td> + <td>{{ item.description }}</td> + <td>{{ item.type}}</td> + <td>{{ item.date }}</td> +</tr> +{% endmacro %} diff --git a/templates/resource.html b/templates/resource.html new file mode 100644 index 0000000..0b1bdf2 --- /dev/null +++ b/templates/resource.html @@ -0,0 +1 @@ +{{ this.name }} \ No newline at end of file diff --git a/templates/resources.html b/templates/resources.html new file mode 100644 index 0000000..d40c313 --- /dev/null +++ b/templates/resources.html @@ -0,0 +1,29 @@ +<div class="row pt-5"> + {% include 'sidenav.html' %} + <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> + {{ this.body }} + <div class="container py-3"> + <div class="row"> + <table class="table"> + <thead> + <tr> + <th scope="col">Title</th> + <th scope="col">Description</th> + <th scope="col">Formats</th> + <th scope="col">Last Updated</th> + </tr> + </thead> + <tbody> + {% from "macros/resources.html" import render_resource %} + {% for item in this.attachments %} + {{ render_resource(item) }} + {% endfor %} + </tbody> + </table> + </div> + </div> + </div> +</div> + + + diff --git a/templates/training.html b/templates/training.html index a7fcbb6..65c7187 100644 --- a/templates/training.html +++ b/templates/training.html @@ -7,10 +7,21 @@ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> - <div class="row py-5"> - <h2 class="text-primary text-center mx-auto"><u>{{ _('Resources') }}</u> - </h2> + {% for child in this.children|sort(attribute='key') %} + {% if child.key != '0' %} + <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> + <div class="card h-100 border-0"> + <div class="card-body"> + <h2 class="text-primary display-2"><i class="fas fa-{{ child.image }}"></i></h2> + <h4 class="card-title text-primary">{{ child.title }}</h4> + <p class="card-text">{{ child.subtitle }}</p> + <a href="{{ child.path|url }}">{{ child.cta }} <i class="fas fa-arrow-right"></i></a> + </div> + </div> + </div> + {% endif %} + {% endfor %} </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Join the Community') }}</h2>

1 0

[community/master] Update link to contact
by pili＠torproject.org 12 Jun '19

12 Jun '19

commit 949f242d5e5a6dc24dbab152784a2b90e556f6ec Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 12 11:54:52 2019 +0200 Update link to contact --- content/training/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/training/contents.lr b/content/training/contents.lr index 1cb0f37..da8dfc2 100644 --- a/content/training/contents.lr +++ b/content/training/contents.lr @@ -20,4 +20,4 @@ body: ##We want to teach the world about Tor. Will you help? -Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. +Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please [contact our community team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam… for more help.

1 0

[styleguide/master] no hardcoded uppercase #30027
by emmapeel＠torproject.org 12 Jun '19

12 Jun '19

commit 07137a11a87317f829b08a84ac75d88b36bf3755 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jun 12 16:01:42 2019 +0200 no hardcoded uppercase #30027 --- assets/scss/_tor.scss | 4 ++-- assets/scss/_type.scss | 2 +- assets/scss/utilities/_text.scss | 4 ++-- assets/static/bootstrap.css | 12 ++++++------ templates/components.html | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/scss/_tor.scss b/assets/scss/_tor.scss index 4ea5311..ea45e2f 100755 --- a/assets/scss/_tor.scss +++ b/assets/scss/_tor.scss @@ -179,7 +179,7 @@ small, .small{ } h6 { - text-transform: uppercase; + text-transform: none !important; font-weight: bold; color: $purple; } @@ -299,7 +299,7 @@ mark, .mark { // Badges // .badge{ - text-transform: uppercase; + text-transform: none !important; } // diff --git a/assets/scss/_type.scss b/assets/scss/_type.scss index b1b8f61..4d3c698 100755 --- a/assets/scss/_type.scss +++ b/assets/scss/_type.scss @@ -105,7 +105,7 @@ mark, // Builds on `abbr` .initialism { font-size: 90%; - text-transform: uppercase; + text-transform: none !important; } // Blockquotes diff --git a/assets/scss/utilities/_text.scss b/assets/scss/utilities/_text.scss index f4b6e65..a65d1b1 100755 --- a/assets/scss/utilities/_text.scss +++ b/assets/scss/utilities/_text.scss @@ -25,8 +25,8 @@ // Transformation .text-lowercase { text-transform: lowercase !important; } -.text-uppercase { text-transform: uppercase !important; } -.text-capitalize { text-transform: capitalize !important; } +.text-uppercase { text-transform: none !important; } +.text-capitalize { text-transform: none !important; } // Weight and italics diff --git a/assets/static/bootstrap.css b/assets/static/bootstrap.css index 21874b7..95e67d2 100644 --- a/assets/static/bootstrap.css +++ b/assets/static/bootstrap.css @@ -440,7 +440,7 @@ mark, .initialism { font-size: 90%; - text-transform: uppercase; } + text-transform: none; } .blockquote { margin-bottom: 1rem; @@ -6269,10 +6269,10 @@ a.bg-dark:focus, a.bg-dark:hover { text-transform: lowercase !important; } .text-uppercase { - text-transform: uppercase !important; } + text-transform: none !important; } .text-capitalize { - text-transform: capitalize !important; } + text-transform: none !important; } .font-weight-light { font-weight: 300 !important; } @@ -6401,12 +6401,12 @@ a.text-dark:focus, a.text-dark:hover { font-family: Source Sans Pro Bold; } h5 { - text-transform: uppercase; + text-transform: none; font-weight: bold; color: #7D4698; } h6 { - text-transform: uppercase; + text-transform: none; font-weight: bold; color: #7D4698; } @@ -6593,7 +6593,7 @@ mark, .mark { padding: 20px !important; } .badge { - text-transform: uppercase; } + text-transform: none; } .breadcrumb { background-color: #fff; } diff --git a/templates/components.html b/templates/components.html index cb5b6cc..1726f3a 100644 --- a/templates/components.html +++ b/templates/components.html @@ -54,13 +54,13 @@ </div> <div class="row p-5 bg-light"> <div class="col-12"> - <h2>Example heading <span class="badge badge-primary">New</span></h2> + <h2>Example heading <span class="badge badge-primary">NEW</span></h2> </div> <div class="col-12"> - <h4 class="pt-4">Example heading <span class="badge badge-secondary">New</span></h4> + <h4 class="pt-4">Example heading <span class="badge badge-secondary">NEW</span></h4> </div> <div class="col-12"> - <h6 class="pt-4">Example heading <span class="badge-pill badge-primary">New</span></h6> + <h6 class="pt-4">Example heading <span class="badge-pill badge-primary">NEW</span></h6> </div> </div>

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 12 Jun '19

12 Jun '19

commit 0c66f9a497fab14d47a6b5d5b137b6d0e1ba6f54 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 12 10:18:08 2019 +0000 Update translations for tbmanual-contentspot --- contents+ca.po | 12 ++++++++++++ contents+cs.po | 51 ++++++++++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 773a9ccec..6b13ead9a 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -259,6 +259,9 @@ msgid "" "The safest and simplest way to download Tor Browser is from the official Tor" " Project website at https://www.torproject.org/download." msgstr "" +"La manera segura i simple de descarregar el navegador Tor és mitjançant la " +"pàgina oficial del projecte Tor en el web " +"https://www.torproject.org/download." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -366,6 +369,9 @@ msgid "" " Message to @get_tor with the words \"osx en\" in it (you don't need to " "follow the account)." msgstr "" +"Per obtenir els enllaços per la descàrrega del navegador Tor en anglès per " +"macOS, enviï una piulada a @get_tor amb el següent text: \"osx en\" (no " +"precisa se seguidor del compte)." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -1917,6 +1923,8 @@ msgid "" "Visit https://www.torproject.org/download/ and download a copy of the latest" " Tor Browser release, then install it as before." msgstr "" +"Visitar https://www.torproject.org/download/ i descarregar una còpia de " +"l'última versió del navegador Tor, posteriorment instal·lar." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.title) @@ -2297,6 +2305,10 @@ msgid "" "default location, however the folder will be named \"tor-browser_en-US\" if " "you are running the English Tor Browser." msgstr "" +"1. Ubica la carpeta del navegador Tor. La localització per defecte a Windows" +" és en el escriptori; en macOS és en la carpeta d'aplicacions. A Linux, no " +"hi ha una localització prefixada, de manera que la carpeta serà anomenada " +"\"tor-browser_en-US\" si s'utilitza la versió anglesa." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) diff --git a/contents+cs.po b/contents+cs.po index 17849b563..44ed32a59 100644 --- a/contents+cs.po +++ b/contents+cs.po @@ -4,6 +4,7 @@ # Michal Várady <miko.vaji(a)gmail.com>, 2019 # erinm, 2019 # Michal Stanke <mstanke(a)mozilla.cz>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -11,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-06-03 14:04+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Michal Stanke <mstanke(a)mozilla.cz>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -138,7 +139,7 @@ msgstr "Známé problémy" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.title) msgid "ABOUT TOR BROWSER" -msgstr "" +msgstr "O PROHLÍŽEČI TOR" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.description) @@ -191,7 +192,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "##### HOW TOR WORKS" -msgstr "" +msgstr "##### JAK TOR FUNGUJE" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -225,7 +226,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.title) msgid "DOWNLOADING" -msgstr "" +msgstr "STAHOVÁNÍ" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.description) @@ -277,7 +278,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "##### GETTOR" -msgstr "" +msgstr "##### GETTOR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -290,7 +291,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "###### TO USE GETTOR VIA EMAIL:" -msgstr "" +msgstr "##### POUŽITÍ GETTOR POMOCÍ E-MAILU:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -322,7 +323,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "###### TO USE GETTOR VIA TWITTER:" -msgstr "" +msgstr "##### POUŽITÍ GETTOR PŘES TWITTER:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -335,7 +336,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "###### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):" -msgstr "" +msgstr "##### POUŽITÍ GETTOR POMOCÍ JABBER/XMPP (JITSI, COYIM, ETC):" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -349,7 +350,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) msgid "RUNNING TOR BROWSER FOR THE FIRST TIME" -msgstr "" +msgstr "PRVNÍ SPUŠTĚNÍ TORU" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.description) @@ -370,7 +371,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "##### CONNECT" -msgstr "" +msgstr "##### PŘIPOJIT" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -393,7 +394,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "##### CONFIGURE" -msgstr "" +msgstr "##### KONFIGUROVAT" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -451,7 +452,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) msgid "BRIDGES" -msgstr "" +msgstr "MOSTY" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.description) @@ -482,7 +483,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "##### GETTING BRIDGE ADDRESSES" -msgstr "" +msgstr "##### ZÍSKÁNÍ ADRESY PŘEMOSTĚNÍ" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -508,7 +509,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "##### ENTERING BRIDGE ADDRESSES" -msgstr "" +msgstr "##### ZADÁNÍ ADRES PŘEMOSTĚNÍ" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -704,7 +705,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "##### USING PLUGGABLE TRANSPORTS" -msgstr "" +msgstr "##### POUŽÍVÁNÍ DODATEČNÝCH SPOJENÍ" #: https//tb-manual.torproject.org/transports/ #: (content/transports/contents+en.lrtopic.body) @@ -749,7 +750,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) msgid "CIRCUMVENTION" -msgstr "" +msgstr "OBCHÁZENÍ" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.description) @@ -809,7 +810,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "##### WHICH TRANSPORT SHOULD I USE?" -msgstr "" +msgstr "##### KTERÝ TRANSPORT BYCH MĚL POUŽÍT?" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -839,7 +840,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.title) msgid "MANAGING IDENTITIES" -msgstr "" +msgstr "SPRÁVA IDENTIT" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.description) @@ -927,7 +928,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "##### LOGGING IN OVER TOR" -msgstr "" +msgstr "##### PŘIHLÁŠENÍ PŘES TOR" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1141,7 +1142,7 @@ msgstr "" #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.title) msgid "SECURE CONNECTIONS" -msgstr "" +msgstr "ZABEZPEČENÁ PŘIPOJENÍ" #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.description) @@ -1436,7 +1437,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.title) msgid "SECURITY SETTINGS" -msgstr "" +msgstr "NASTAVENÍ ZABEZPEČENÍ" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1552,7 +1553,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.title) msgid "UPDATING" -msgstr "" +msgstr "AKTUALIZACE" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.description) @@ -1753,7 +1754,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.title) msgid "TROUBLESHOOTING" -msgstr "" +msgstr "ODSTRAŇOVÁNÍ PROBLÉMŮ" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.description) @@ -1845,7 +1846,7 @@ msgstr "" #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.title) msgid "KNOWN ISSUES" -msgstr "" +msgstr "ZNÁMÉ PROBLÉMY" #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.body) @@ -1930,7 +1931,7 @@ msgstr "" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.title) msgid "UNINSTALLING" -msgstr "" +msgstr "ODINSTALACE" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.description)

1 0

[tor/master] Stop hard-coding env vars in the git scripts
by asn＠torproject.org 12 Jun '19

12 Jun '19

commit 396134188f21b3f8bdfe35171f14c6b70446ea3e Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:34:44 2019 +1000 Stop hard-coding env vars in the git scripts Set the env vars: * TOR_MASTER_NAME to override the tor master branch name, and * TOR_WKT_NAME to override the worktree path Fixes bug 30841; bugfix on 0.4.0.1-alpha. --- changes/bug30841 | 3 +++ scripts/git/git-merge-forward.sh | 4 ++-- scripts/git/git-pull-all.sh | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug30841 b/changes/bug30841 new file mode 100644 index 000000000..c6d1c5146 --- /dev/null +++ b/changes/bug30841 @@ -0,0 +1,3 @@ + o Minor bugfixes (git scripts): + - Stop hard-coding the tor master branch name and worktree path in the + git scripts. Fixes bug 30841; bugfix on 0.4.0.1-alpha. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index c9ec55ac6..ba2998328 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -17,9 +17,9 @@ GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"} # The tor master git repository directory from which all the worktree have # been created. -TOR_MASTER_NAME="tor" +TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"} # The worktrees location (directory). -TOR_WKT_NAME="tor-wkt" +TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} ######################### # End of configuration. # diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index e5ba96a05..8eb42c7c1 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -17,9 +17,9 @@ GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"} # The tor master git repository directory from which all the worktree have # been created. -TOR_MASTER_NAME="tor" +TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"} # The worktrees location (directory). -TOR_WKT_NAME="tor-wkt" +TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} ######################### # End of configuration. #

1 0

[tor/master] scripts/git: Stop hard-coding the bash path in the git scripts
by asn＠torproject.org 12 Jun '19

12 Jun '19

commit 973800b847844cfaacf48658d02fe3ada77cbcf6 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:29:10 2019 +1000 scripts/git: Stop hard-coding the bash path in the git scripts Some OSes don't have bash in /usr/bin, others have an ancient bash at this path. Fixes bug 30840; bugfix on 0.4.0.1-alpha. --- changes/bug30840 | 4 ++++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 2 +- scripts/git/pre-commit.git-hook | 2 +- scripts/git/pre-push.git-hook | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug30840 b/changes/bug30840 new file mode 100644 index 000000000..562b0fbd9 --- /dev/null +++ b/changes/bug30840 @@ -0,0 +1,4 @@ + o Minor bugfixes (git scripts): + - Stop hard-coding the bash path in the git scripts. Some OSes don't + have bash in /usr/bin, others have an ancient bash at this path. + Fixes bug 30840; bugfix on 0.4.0.1-alpha. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index 15af6f3db..c9ec55ac6 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################## # Configuration (change me!) # diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 6fe7e5981..e5ba96a05 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ################################## # User configuration (change me) # diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 0701b27b5..2030a600f 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # The remote upstream branch on which git.torproject.org/tor.git points to. UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index b285776c0..2a2983719 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # To install this script, copy it to .git/hooks/pre-commit in local copy of # tor git repo and make sure it has permission to execute. diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index c9e72a4d4..51b0c896c 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # git pre-push hook script to: # 1) prevent "fixup!" and "squash!" commit from ending up in master, release-*

1 0