- tor-commits - lists.torproject.org

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Nov '11

17 Nov '11

commit 2f7a6d5718dc78c50053c9d83fe1afe09d57f494 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 17 17:45:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index f885653..7f08e69 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 23:16+0000\n" +"PO-Revision-Date: 2011-11-17 17:44+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -34,8 +34,8 @@ msgid "" "find the answer to your question in this document, email " "help(a)rt.torproject.org." msgstr "" -"本用户手册包含关于如何下载和使用 Tor，以及当 Tor 无法连接到网络时该怎么办的信息。如果你没能在本手册内找到你需要的答案，请发送电子邮件至 " -"help(a)rt.torproject.org 。" +"本用户手册的内容有：如何下载 Tor、如何使用 Tor，以及当 Tor 无法连接到网络时该怎么办。如果你没能在本手册内找到你需要的答案，请发送电子邮件至" +" help(a)rt.torproject.org 。" #. type: Plain text #: en/tsum.text:11 @@ -43,7 +43,7 @@ msgid "" "Please note that we are providing support on a voluntary basis, and we get a" " lot of emails every single day. There is no need to worry if we don't get " "back to you straight away." -msgstr "请注意，我们是以志愿为基础提供支持，我们每天都收到大量电子邮件。如果我们没有即时回复，请不要担心。" +msgstr "请注意，我们是以自愿为基础提供支持，我们每天都收到大量的电子邮件。如果我们没有即时回复，请不要担心。" #. type: Plain text #: en/tsum.text:13 @@ -63,7 +63,7 @@ msgid "" "three random servers (also known as *relays*) in the Tor network, before the" " traffic is sent out onto the public Internet." msgstr "" -"Tor 是一个由虚拟通道组成的网络，能改善你的互联网隐私与安全。在你的网络通讯被发送至公共互联网之前，Tor 会先把它们经由 Tor " +"Tor 是一个由虚拟通道组成的网络，能改善你的互联网隐私与安全。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor " "网络中的三台随机服务器（也称为*“中继”*）传送。" #. type: Plain text @@ -88,8 +88,8 @@ msgid "" "traffic inside the Tor network, but it cannot encrypt your traffic between " "the Tor network and its final destination." msgstr "" -"Tor 会把你的通讯来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的通讯加密，但不能加密 Tor " -"网络与最终目的地之间的通讯。" +"Tor 会把你的流量来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的流量加密，但不能加密 Tor " +"网络与最终目的地之间的流量。" #. type: Plain text #: en/tsum.text:36 @@ -122,7 +122,7 @@ msgid "" msgstr "" "我们向大多数用户推荐 [Tor " "浏览器软件包](https://www.torproject.org/projects/torbrowser.html)。此软件包内含一个预先配置好的…" -" Tor 安全地浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。" +" Tor 安全的浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。" #. type: Plain text #: en/tsum.text:48 @@ -141,7 +141,7 @@ msgid "" "To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." msgstr "" "### 如何通过电子邮件获取 Tor\n" -"要获取用于 Windows 的英文版 Tor 浏览器软件包，请发送电子邮件至 gettor(a)torproject.org ，在正文区域内写上 **windows**。你可以把标题留空。" +"要获取用于 Windows 的 Tor 浏览器软件包英文版，请发送电子邮件至 gettor(a)torproject.org ，在正文区域内写上 **windows**。你可以把标题留空。" #. type: Plain text #: en/tsum.text:57 @@ -171,7 +171,7 @@ msgid "" "will give you a list of website mirrors to use.\n" msgstr "" "**注意**：Linux 和 Mac OS X 的 Tor 浏览器软件包相当大，你无法通过 Gmail、Hotmail 或者雅虎邮箱获取这些软件包。\n" -"如果你无法获取你想要的软件包，请发送邮件至 help(a)rt.torproject.org ，我们会给你一个网站镜像列表。\n" +"如果你无法获取你想要的软件包，请发送邮件至 help(a)rt.torproject.org ，我们会给提供你一份网站镜像列表。\n" #. type: Plain text #: en/tsum.text:73 @@ -244,7 +244,7 @@ msgid "" "we intended you to get." msgstr "" "你将获取到的，还有一个与软件包的文件名相同、扩展名为 **.asc** 的文件。这个 .asc 文件是一个 GPG " -"签名，它能允许你校验你下载到的文件是否与你想要下载的完全一致。" +"签名，它能让你校验所下载到的文件是否与你想要下载的完全一致。" #. type: Plain text #: en/tsum.text:105 @@ -252,7 +252,7 @@ msgstr "" msgid "" "Before you can verify the signature, you will have to download and\n" "install GnuPG: \n" -msgstr "在校验签名之前，你将需要下载和安装 GnuPG：\n" +msgstr "在校验签名之前，你将需要下载并安装 GnuPG：\n" #. type: Plain text #: en/tsum.text:109 @@ -271,7 +271,7 @@ msgstr "" msgid "" "Please note that you may need to edit the paths and the commands used below " "to get it to work on your system." -msgstr "请注意，你将需要编辑以下使用到的路径和命令，让它们能在你的系统中运行。" +msgstr "请注意，你可能需要修改下面所用到的路径和命令，让它们能在你的系统上生效。" #. type: Plain text #: en/tsum.text:115 @@ -364,7 +364,7 @@ msgid "" "file matches the version number in the filename." msgstr "" "当你已完成校验并看到 *\"Good signature\"* 的输出结果，请把软件包解压缩。然后你应该会看到一个类似 **tor-" -"browser_en-US** 这样的文件夹。这个文件夹里有另一个名为 **Docs** 的文件夹，内含一个 **changelog** 文件。请确保 " +"browser_en-US** 这样的文件夹。此文件夹里有另一个名为 **Docs** 的文件夹，内含一个 **changelog** 文件。请确保 " "changelog 里第一行的版本号与文件名中的版本号相符。" #. type: Plain text @@ -385,9 +385,9 @@ msgid "" "[https://check.torproject.org/](https://check.torproject.org/). You can now " "browse the Internet through Tor." msgstr "" -"当你运行 Tor 浏览器软件包，你会首先看到 Vidalia 启动并把你接入到 Tor " -"网络。之后你会看到一个浏览器显示出[https://check.torproject.org/](https://check.torproject.o…" -" Tor。现在你可以开始通过 Tor 来浏览互联网了。" +"当你运行 Tor 浏览器软件包，你会首先看到 Vidalia 启动并把你接入到 Tor 网络。之后你会看到一个浏览器打开了 " +"[https://check.torproject.org/](https://check.torproject.org/)，确认你正在使用 " +"Tor。现在你可以开始通过 Tor 来浏览互联网了。" #. type: Plain text #: en/tsum.text:163 @@ -454,8 +454,8 @@ msgid "" "(ISP) is blocking Tor. Very often this can be worked around with **Tor " "bridges**, hidden relays that aren't as easy to block." msgstr "" -"如果 Tor 仍然不能工作，那么可能是你的互联网服务提供商（ISP）正在阻挡 Tor。这通常可以使用 **Tor " -"网桥**，不易被阻挡的隐蔽中继服务器，来绕开阻挡。" +"如果 Tor 仍然不能工作，那么可能是你的互联网服务提供商（ISP）正在阻挡 Tor。这通常可以使用 **Tor 网桥** —— " +"不易被阻挡的隐蔽中继服务器，来绕开阻挡。" #. type: Plain text #: en/tsum.text:195 @@ -500,7 +500,7 @@ msgid "" "If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet." msgstr "" "### 如何使用代理服务器\n" -"如果使用网桥无法凑效，请尝试配置 Tor 去使用任何 HTTPS 或 SOCKS 代理以取得与 Tor 网络的连接。这意味着即使 Tor 已被你的本地网络所阻挡，你也可以安全地透过代理服务器连接到 Tor 网络，去访问一个未经审查的互联网。" +"如果使用网桥无法凑效，请尝试配置 Tor 去使用任何 HTTPS 或 SOCKS 代理以取得与 Tor 网络的连接。也就是说即使 Tor 已被你的本地网络所阻挡，你也可以安全地透过代理服务器连接到 Tor 网络，去访问一个未经审查的互联网。" #. type: Plain text #: en/tsum.text:223 @@ -730,6 +730,6 @@ msgid "" "Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!" msgstr "" "### 为什么 Tor 这么慢\n" -"Tor 有时候会比你正常的互联网连接慢一些。毕竟，你的通讯是透过许多不同国家，跨洋过海的传送。" +"Tor 有时候会比你正常的互联网连接慢一些。毕竟，你的流量穿越着许多不同国家，跨洋过海的传送。"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 17 Nov '11

17 Nov '11

commit 70d1d8660a30c27a4460c517030878bb9d025d43 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 17 17:15:26 2011 +0000 Update translations for vidalia_help --- it/netview.po | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/it/netview.po b/it/netview.po index 6bc0769..92ceaa8 100644 --- a/it/netview.po +++ b/it/netview.po @@ -1,12 +1,13 @@ # # Translators: +# <a.n0on3(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-17 16:49+0000\n" +"Last-Translator: n0on3 <a.n0on3(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/netview.html:16 msgid "Network Viewer" -msgstr "" +msgstr "Visualizzatore della Rete" #. type: Content of: <html><body> #: en/netview.html:20 @@ -25,16 +26,18 @@ msgid "" "The network viewer lets you see relays in the Tor network and where your " "traffic is going." msgstr "" +"Il Visualizzatore della Rete permette di visualizzare i relay nella rete Tor" +" ai quali il vostro traffico è destinato." #. type: Content of: <html><body> #: en/netview.html:25 msgid "<a name=\"overview\"/>" -msgstr "" +msgstr "<a name=\"overview\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:26 msgid "Overview" -msgstr "" +msgstr "Introduzione" #. type: Content of: <html><body> #: en/netview.html:28 @@ -45,6 +48,9 @@ msgid "" "then sent as a stream through that circuit. For efficiency, multiple " "streams may share the same circuit." msgstr "" +"Quando si vuole comunicare in modo anonimo attraverso la rete Tor (ad " +"esempio, connettersi ad un sito web), Tor crea una serie di tunnel, o " +"circuiti ..." #. type: Content of: <html><body> #: en/netview.html:35

1 0

[torbel/master] 4503 - catch ErrorReply
by sebastian＠torproject.org 17 Nov '11

17 Nov '11

commit 653ce38bfb7ac03722db9e58b3121e9fff356698 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Nov 17 08:52:20 2011 -0800 4503 - catch ErrorReply TorCtl may raise an ErrorReply when we try to close a stream that is not ours. TorBEL will now catch the exception and log the error message --- controller.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/controller.py b/controller.py index fe6dbf7..b94c79e 100644 --- a/controller.py +++ b/controller.py @@ -853,6 +853,12 @@ class Controller(TorCtl.EventHandler): except TorCtl.TorCtlClosed: # Bail if we closed. return + except TorCtl.ErrorReply, e: + # We can receive "552 Unknown stream" if Tor pukes on the stream + # before we actually receive the event and use it. + log.error("(%s, %d): Error attaching stream!", + router.nickname, event.target_port) + return if narrow: self.narrow(stream.router, event.target_port)

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Nov '11

17 Nov '11

commit 702d97b6ceac7c39dadacd1f1d93a5ad0cc7293d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 17 16:15:05 2011 +0000 Update translations for tsum --- cs/tsum.po | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/cs/tsum.po b/cs/tsum.po index c5915e2..60fa5ae 100644 --- a/cs/tsum.po +++ b/cs/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-17 15:44+0000\n" +"PO-Revision-Date: 2011-11-17 16:12+0000\n" "Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -43,8 +43,8 @@ msgid "" " lot of emails every single day. There is no need to worry if we don't get " "back to you straight away." msgstr "" -"Vemte prosím v potaz, že naše podpora je čistě dobrovolná a dostáváme " -"každodenně velké množství emailů. Není potřeba se strachovat, pokud vám " +"Vezměte prosím v potaz, že naše podpora je čistě dobrovolná a dostáváme " +"každodenně velké množství emailů. Není potřeba se strachovat pokud vám " "neodpovíme obratem." #. type: Plain text @@ -105,9 +105,9 @@ msgid "" "to a website with a username and password, make sure that you are using " "HTTPS (e.g. **https**://torproject.org/, not **http**://torproject.org/)." msgstr "" -"Pokud přenášíte citlivé informace, například při přihlašování se na stránku " -"s uživatelským jménem a heslem, ujistěte se, že používáte HTTPS (například " -"**https**://torproject.org/, ne **http**://torproject.org/)." +"Pokud přenášíte citlivé informace, například při přihlašování se na nějakou " +"stránku uživatelským jménem a heslem, ujistěte se, že používáte HTTPS " +"(například **https**://torproject.org/, ne **http**://torproject.org/)." #. type: Plain text #: en/tsum.text:38 @@ -196,7 +196,7 @@ msgid "" "It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." msgstr "" "#### Jak dostat Tor jako několik malých balíčků\n" -"Je možné si vyžádat Tor Browser Bundle pro Windows jako několik malých balíčků místo jednoho velkého. To může být užitečné pokud nemáte dostupný bandwidth, nebo pokud vám váš emailový provider nedovoluje přijímat velké přílohy." +"Lze si vyžádat Tor Browser Bundle pro Windows jako několik malých balíčků místo jednoho velkého. To může být užitečné pokud nemáte dostupný bandwidth nebo pokud vám váš emailový provider nedovoluje přijímat velké přílohy." #. type: Plain text #: en/tsum.text:76 @@ -224,8 +224,7 @@ msgid "" "assemble the small sized packages." msgstr "" "Je důležité napsat klíčové slovo *split* na zvláštní řádek. Vizte sekci *Co " -"dělat s rozděleným balíčkem* pro informace o rozbalení a sestavení malých " -"částí balíčku." +"dělat s rozděleným balíčkem* pro informace o rozbalení a sestavení balíčku." #. type: Plain text #: en/tsum.text:89 @@ -450,7 +449,7 @@ msgid "" "connect because:" msgstr "" "Pokud vaše normální Internetové připojení funguje, ale Tor se stále nemůže " -"připojit k síti, zkuste následující: otevřte ovládací panel Vidalii, " +"připojit k síti, zkuste následující: otevřte ovládací panel Vidalie, " "klikněte na *Message Log* a vyberte sekci *Advanced*. Tor se nemusel " "připojit proto, že:" @@ -562,7 +561,7 @@ msgstr "" #. type: Bullet: '1. ' #: en/tsum.text:235 msgid "Open the Vidalia control panel, click on *Settings*." -msgstr "Otevřte kontrolní panel Vidalii a klikněte na *Settings* (nastavení)." +msgstr "Otevřte kontrolní panel Vidalie a klikněte na *Settings* (nastavení)." #. type: Bullet: '2. ' #: en/tsum.text:235 @@ -728,7 +727,7 @@ msgid "" "[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " "Project website." msgstr "" -"Pro více informací navštivte [často kladené " +"Pro více informací vizte [často kladené " "dotazy](https://torproject.org/docs/faq.html#VidaliaPassword) na stránce Tor" " Projektu."

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Nov '11

17 Nov '11

commit ed7a7fe14cb8398e8698bab2e2a1616c78633ea9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 17 15:45:12 2011 +0000 Update translations for tsum --- cs/tsum.po | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/cs/tsum.po b/cs/tsum.po index fa90ab5..c5915e2 100644 --- a/cs/tsum.po +++ b/cs/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-13 19:19+0000\n" +"PO-Revision-Date: 2011-11-17 15:44+0000\n" "Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -66,8 +66,8 @@ msgid "" " traffic is sent out onto the public Internet." msgstr "" "Tor je síť virtuálních tunelů která vám umožňuje zvýšit soukromí a " -"zabezpečení na Internetu. Tor funguje na principu posílání veškeré " -"komunikace skrz tři náhodné servery (nebo *relayi*) v síti Tor než je " +"zabezpečení na Internetu. Tor funguje na principu posílání veškeré vaší " +"komunikace skrz tři náhodné servery (nebo *relaye*) v síti Tor než je " "poslána do veřejného internetu." #. type: Plain text @@ -94,9 +94,9 @@ msgid "" "traffic inside the Tor network, but it cannot encrypt your traffic between " "the Tor network and its final destination." msgstr "" -"Tor anonymizuje původ veškeré vaší komunikace, a zašifruje vše mezi vámi a " -"sítí Tor. Tor také šifruje komunikaci uvnitř sítě Tor, ale nemůže zašifrovat" -" komunikaci mezi sítí Tor a jejím cílem." +"Tor anonymizuje původ veškeré vaší komunikace a šifruje vše mezi vámi a sítí" +" Tor. Tor také šifruje komunikaci uvnitř sítě Tor, ale nemůže zašifrovat " +"komunikaci mezi sítí Tor a jejím cílem." #. type: Plain text #: en/tsum.text:36 @@ -357,8 +357,7 @@ msgstr "" msgid "" "To verify the signature of the package you downloaded, run the following " "command:" -msgstr "" -"K ověření že podpisu bálíčku co jste stáhli, proveďte následující příkaz:" +msgstr "K ověření podpisu bálíčku co jste stáhli proveďte následující příkaz:" #. type: Plain text #: en/tsum.text:134 @@ -393,11 +392,11 @@ msgid "" "want to make sure that the version number on the top line of the changelog " "file matches the version number in the filename." msgstr "" -"Po ověření že podpis je v pořádku, můžete archiv extrahovat. Měli byste poté" -" vidět adresář na způsob **tor-browser_en-US**. Uvnitř tohoto adresáře je " +"Po ověření že podpis je v pořádku můžete archiv extrahovat. Měli byste poté " +"vidět adresář na způsob **tor-browser_en-US**. Uvnitř tohoto adresáře je " "další adresář se jménem **Docs**, který obsahuje soubor **changelog**. " -"Chcete se ujistit, že verze na prvním řádku tohoto souboru je stejná jako " -"verze ve jméně." +"Ujistěte se, že verze na prvním řádku tohoto souboru je stejná jako verze ve" +" jméně." #. type: Plain text #: en/tsum.text:153 @@ -417,10 +416,10 @@ msgid "" "[https://check.torproject.org/](https://check.torproject.org/). You can now " "browse the Internet through Tor." msgstr "" -"Po spuštění Tor Browser Bundle uvidíte program Vidalia startovat a připojit " -"se k síti Tor. Po té uvidéte prohlížeč potvrzující že nyní používáte Tor. K " -"tomuto ověření se využívá " -"[https://check.torproject.org/](https://check.torproject.org/). Můžete nyní " +"Po spuštění Tor Browser Bundle uvidíte nejprve startovat program Vidalia a " +"připojit se k síti Tor. Po té uvidéte prohlížeč potvrzující že nyní " +"používáte Tor. K tomuto ověření se využívá " +"[https://check.torproject.org/](https://check.torproject.org/). Nyní můžete " "brouzdat Internet skrz Tor." #. type: Plain text @@ -464,7 +463,7 @@ msgid "" "system clock with an Internet time server. \n" msgstr "" "**Vaše systémové hodiny jdou mimo**: Ujistěte se, že datum a čas ve vašem " -"systému josu správné a restartujte Tor. Možná bude potřeba synchronizovat " +"systému jsou správné a restartujte Tor. Možná bude potřeba synchronizovat " "vaše systémové hodiny s Internetovým časovým serverem.\n" #. type: Plain text @@ -557,7 +556,7 @@ msgid "" "The steps below assume you have a functional Tor/Vidalia configuration, and " "you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." msgstr "" -"Následující kroky předpokládají, že máte funkční Tor/Vidalia konfiguraci, a " +"Následující kroky předpokládají, že máte funkční Tor/Vidalia konfiguraci a " "že jste našli seznam HTTPS, SOCKS4, či SOCKS5 proxin." #. type: Bullet: '1. '

1 0

[metrics-web/master] Add another bwauth consensus parameter.
by karsten＠torproject.org 17 Nov '11

17 Nov '11

commit 7d174341a08de66ffe85cf9efec5ae269e826ed7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 17 12:18:33 2011 +0100 Add another bwauth consensus parameter. --- src/org/torproject/chc/Checker.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/chc/Checker.java b/src/org/torproject/chc/Checker.java index 1774a55..5614c04 100644 --- a/src/org/torproject/chc/Checker.java +++ b/src/org/torproject/chc/Checker.java @@ -180,8 +180,8 @@ public class Checker { + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts," + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq," + "cbtmintimeout,cbtinitialtimeout,bwauthpid,bwauthbestratio," - + "bwauthcircs,bwauthkp,bwauthtd,bwauthti,bwauthtidecay"). - split(","))); + + "bwauthcircs,bwauthkp,bwauthtd,bwauthti,bwauthtidecay," + + "bwauthdescbw").split(","))); SortedSet<String> conflicts = new TreeSet<String>(); for (Status vote : this.downloadedVotes) { Map<String, String> voteConsensusParams =

1 0

[tor/master] trivial code cleanup in generate_v2_networkstatus_opinion()
by arma＠torproject.org 17 Nov '11

17 Nov '11

commit 95163ec072d4af00ad0c043fce3e8bccf5f5908b Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Nov 16 18:59:20 2011 -0500 trivial code cleanup in generate_v2_networkstatus_opinion() --- src/or/dirserv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 58ceeda..e4cbcaa 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2888,7 +2888,7 @@ generate_v2_networkstatus_opinion(void) goto done; } - contact = get_options()->ContactInfo; + contact = options->ContactInfo; if (!contact) contact = "(none)"; @@ -2971,7 +2971,7 @@ generate_v2_networkstatus_opinion(void) }); if (tor_snprintf(outp, endp-outp, "directory-signature %s\n", - get_options()->Nickname)<0) { + options->Nickname)<0) { log_warn(LD_BUG, "Unable to write signature line."); goto done; }

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Nov '11

17 Nov '11

commit 017332c25d25855cb4c2a36fef2416638ff0a773 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 23:45:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index b54b20a..f885653 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 23:14+0000\n" +"PO-Revision-Date: 2011-11-16 23:16+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -721,7 +721,7 @@ msgid "" "For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks." msgstr "" "### 我想使用其它浏览器\n" -"基于安全理由，我们推荐你仅适用 Tor 浏览器软件包来浏览互联网。Tor 在技术上是和其它浏览器一起使用的，但这样做你就迎向了潜在的攻击。" +"基于安全理由，我们推荐你仅使用 Tor 浏览器软件包来浏览互联网。Tor 在技术上是可以和其它浏览器一起使用的，但这样做你就迎向了潜在的攻击。" #. type: Plain text #: en/tsum.text:325

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Nov '11

17 Nov '11

commit ddf7998c513d4fe9e640c949989c169fa683a965 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 23:15:05 2011 +0000 Update translations for tsum --- zh/tsum.po | 66 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 25 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 5ab9143..b54b20a 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 22:44+0000\n" +"PO-Revision-Date: 2011-11-16 23:14+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgid "" "Please note that we are providing support on a voluntary basis, and we get a" " lot of emails every single day. There is no need to worry if we don't get " "back to you straight away." -msgstr "请注意，我们是以志愿为基础提供支持，我们每天都受到大量电子邮件。如果我们没有即时回复，请不要担心。" +msgstr "请注意，我们是以志愿为基础提供支持，我们每天都收到大量电子邮件。如果我们没有即时回复，请不要担心。" #. type: Plain text #: en/tsum.text:13 @@ -78,6 +78,7 @@ msgid "" "The green monitors represent relays in the Tor network, while the three keys" " represent the layers of encryption between the user and each relay." msgstr "" +"上图描绘了一个用户通过 Tor 浏览不同的网站。绿色的显示器代表着 Tor 网络里的中继服务器，三把钥匙则代表该用户与每个中继之间的加密层。" #. type: Plain text #: en/tsum.text:31 @@ -169,7 +170,7 @@ msgid "" "want, send an email to help(a)rt.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**注意**：Linux 和 Mac OS X 的 Tor 浏览器软件包相当大，你将无法通过 Gmail、Hotmail 或者雅虎有奖获取这些软件包。\n" +"**注意**：Linux 和 Mac OS X 的 Tor 浏览器软件包相当大，你无法通过 Gmail、Hotmail 或者雅虎邮箱获取这些软件包。\n" "如果你无法获取你想要的软件包，请发送邮件至 help(a)rt.torproject.org ，我们会给你一个网站镜像列表。\n" #. type: Plain text @@ -178,7 +179,7 @@ msgid "" "#### How to get Tor as several small sized packages\n" "It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." msgstr "" -"#### 如何以几个小尺寸文件包的形式获取 Tor\n" +"#### 如何以若干个小尺寸文件包的形式获取 Tor\n" "你也可以要求以若干个小尺寸文件包，而非一个大文件包的形式索要 Windows 版本的 Tor 浏览器软件包。当你没有很大带宽可用，或者你的电邮提供商不允许你接收大附件的时候，这会很有帮助。" #. type: Plain text @@ -186,7 +187,7 @@ msgstr "" msgid "" "Send an email to gettor(a)torproject.org with the following words in the body " "of the email:" -msgstr "以以下的单词为正文内容发送一封电子邮件到 gettor(a)torproject.org ：" +msgstr "把以下的单词作为正文内容发送一封电子邮件至 gettor(a)torproject.org ：" #. type: Plain text #: en/tsum.text:79 @@ -204,7 +205,7 @@ msgid "" "It is important that you include the keyword *split* on its own line. See " "*What to do with split packages* for information on how to unpack and re-" "assemble the small sized packages." -msgstr "请紧记要把关键词 *split* 独立出一行。请参看 *如何处理拆分了的软件包* 以了解关于如何解压缩与重组小尺寸文件包的信息。" +msgstr "请紧记要把关键词 *split* 独立出一行。请参阅 *如何处理拆分了的软件包* 以了解关于如何解压缩与重组小尺寸文件包的信息。" #. type: Plain text #: en/tsum.text:89 @@ -223,7 +224,7 @@ msgid "" "iOS](http://sid77.slackware.it/iphone/)." msgstr "" "我们也有适用于 [Nokia Maemo/N900](https://www.torproject.org/docs/N900.html.en) 和 " -"[Apple iOS](http://sid77.slackware.it/iphone/) 的试验软件包。" +"[Apple iOS](http://sid77.slackware.it/iphone/) 的试验性软件包。" #. type: Plain text #: en/tsum.text:97 @@ -349,7 +350,7 @@ msgid "" " and the output from GnuPG in an email to help(a)rt.torproject.org." msgstr "" "输出的结果应为 *\"Good signature\"*。若是 Bad signature " -"则意味着该文件被篡改过。如果你看见一个坏的签名，请把你在哪里下载到该软件包、你验证签名的过程、以及 GunPG 的输出结果一并以电邮发送到 " +"则意味着该文件被篡改过。如果你看见一个坏的签名，请把你在哪里下载到该软件包、你验证签名的过程、以及 GunPG 的输出结果一并以电子邮件发送到 " "help(a)rt.torproject.org." #. type: Plain text @@ -394,7 +395,7 @@ msgstr "" msgid "" "*Please note that it is important that you use the browser that comes\n" "with the bundle, and not your own browser.*\n" -msgstr "*请注意，你必须使用软件包里的浏览器，而不是你自己的浏览器。这至关重要。*\n" +msgstr "*请注意，你必须使用软件包里的浏览器，而不是你自己的浏览器。这点至关重要。*\n" #. type: Plain text #: en/tsum.text:169 @@ -403,7 +404,7 @@ msgid "" "Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see *How to use an open proxy* below." msgstr "" "### 当 Tor 无法连接时怎么办\n" -"有些用户会遇到 Vidalia 在尝试连接到 Tor 网络时卡住不动的情况。遇到这种情况，请确保你已连接到互联网。如果你需要通过代理服务器连接，请参看下面的 *“如何使用代理服务器”*。" +"有些用户会遇到 Vidalia 在尝试连接到 Tor 网络时卡住不动的情况。遇到这种情况，请确保你已连接到互联网。如果你需要通过代理服务器连接，请参阅下面的 *“如何使用代理服务器”*。" #. type: Plain text #: en/tsum.text:174 @@ -413,7 +414,7 @@ msgid "" "*Message Log* and select the *Advanced* tab. It may be that Tor won't " "connect because:" msgstr "" -"如果你的普通互联网连接运作正常，而 Tor 却无法连接到网络，请尝试以下步骤；打开 Vidalia 的设置面板，点击 *消息日志* 并选择 *高级* " +"如果你的普通互联网连接运作正常，而 Tor 却无法连接到网络，请尝试以下步骤：打开 Vidalia 的控制面板，点击 *消息日志* 并选择 *高级* " "标签页。Tor 无法连接到网络也许是因为：" #. type: Plain text @@ -423,7 +424,7 @@ msgid "" "**Your system clock is off**: Make sure that the date and time on your\n" "system is correct, and restart Tor. You may need to synchronize your\n" "system clock with an Internet time server. \n" -msgstr "**你的系统时钟不准确**：请确保你的系统中的日期与时间正确，然后重启 Tor。你也许需要把系统时钟与某台网络时间服务器进行同步。\n" +msgstr "**你的系统时钟不准确**：请确保你系统中的日期和时间正确，然后重启 Tor。你也许需要把系统时钟与某台网络时间服务器进行同步。\n" #. type: Plain text #: en/tsum.text:183 @@ -471,7 +472,7 @@ msgid "" "To use a bridge, you will first have to locate one; you can either browse to [bridges.torproject.org](https://bridges.torproject.org/), or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write **get bridges** in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address." msgstr "" "### 如何寻找一个网桥\n" -"要使用网桥，你首先需要找一个。你可以浏览 [bridges.torproject.org](https://bridges.torproject.org/) ，或者发送电子邮件到 bridge(a)torproject.org 。如果你发送电子邮件，请确保在电子邮件的正文区域内写上 **get bridges**。否则你将得不到回复。请注意你只能使用 gmail.com 或 yahoo.com 邮箱来发送此邮件。" +"要使用网桥，你首先需要找一个。你可以浏览 [bridges.torproject.org](https://bridges.torproject.org/) ，或者发送电子邮件到 bridge(a)torproject.org 。如果发送电子邮件，请你确保在电子邮件的正文区域内写上 **get bridges**。否则你将得不到回复。请注意你只能使用 gmail.com 或 yahoo.com 邮箱来发送此邮件。" #. type: Plain text #: en/tsum.text:208 @@ -532,10 +533,10 @@ msgid "" "7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" "proxy to access the rest of the Tor network.\n" msgstr "" -"3. 在 *Address* 一栏里填上代理服务器的地址，这可以是主机名或IP地址。\n" +"3. 在 *地址* 一栏里填上代理服务器的地址，这可以是主机名或IP地址。\n" "4. 填上代理服务器的端口。\n" -"5. 一般来说，你并不需要用户名和密码。如果需要，则也相应地填上。\n" -"6. 选择你在使用的代理服务器的 *Type*，可以是 HTTP/HTTPS，SOCKS4 或 SOCKS5。\n" +"5. 一般来说，你并不需要用户名和密码。如果需要，则也相应的填上。\n" +"6. 选择你在使用的代理服务器的 *类型*，可以是 HTTP/HTTPS，SOCKS4 或 SOCKS5。\n" "7. 点击 *确定* 按钮。Vidalia 和 Tor 现已成功配置为使用代理服务器连接到 Tor 网络。\n" #. type: Plain text @@ -545,7 +546,7 @@ msgid "" "This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." msgstr "" "## 常见问题\n" -"本章会回答一些最普遍的问题。如果你的问题没有在此处提及，请发送电子邮件至 help(a)rt.torproject.org 。" +"本节会回答一些最普遍的问题。如果你的问题没有在此处提及，请发送电子邮件至 help(a)rt.torproject.org 。" #. type: Plain text #: en/tsum.text:244 @@ -554,7 +555,7 @@ msgid "" "If you are using Windows and find that you cannot extract the archive, download and install [7-Zip](http://www.7-zip.org/)." msgstr "" "### 无法解压缩\n" -"如果你正使用 Windows 且无法把压缩包解压缩，请下载并安装 [7-Zip](http://www.7-zip.org/) 。" +"如果你正使用 Windows 且无法把压缩包解压缩，请下载并安装 [7-Zip](http://www.7-zip.org/)。" #. type: Plain text #: en/tsum.text:248 @@ -563,7 +564,7 @@ msgid "" "and use winzip to extract the archive. Before renaming the file, tell " "Windows to show file extensions:" msgstr "" -"如果你无法下载 7-Zip，尝试把 .z 文件重命名为 .zip 然后使用 WinZip 来解压。在改名之前，先让 Windows 显示文件扩展名：" +"如果你无法下载 7-Zip，尝试把 .z 文件重命名为 .zip 然后使用 WinZip 解压缩。在改名之前，先让 Windows 显示文件扩展名：" #. type: Plain text #: en/tsum.text:254 @@ -574,6 +575,11 @@ msgid "" "3. Click on the *View* tab\n" "4. Uncheck *Hide extensions for known file types* and click *OK*" msgstr "" +"#### Windows XP\n" +"1. 打开 *我的电脑*\n" +"2. 点击 *工具*，在菜单里选择 *文件夹选项*\n" +"3. 点击 *查看* 标签页\n" +"4. 取消勾选 *隐藏已知文件类型的扩展名* 并点击 *确定*" #. type: Plain text #: en/tsum.text:260 @@ -584,6 +590,11 @@ msgid "" "3. Click on the *View* tab\n" "4. Uncheck *Hide extensions for known file types* and click *OK*" msgstr "" +"#### Windows Vista\n" +"1. 打开 *我的电脑*\n" +"2. 点击 *组织*，在菜单里选择 *文件夹和搜索选项*\n" +"3. 点击 *查看* 标签页\n" +"4. 取消勾选 *隐藏已知文件类型的扩展名* 并点击 *确定*" #. type: Plain text #: en/tsum.text:266 @@ -594,6 +605,11 @@ msgid "" "3. Click on the *View* tab\n" " 4. Uncheck *Hide extensions for known file types* and click *OK*" msgstr "" +"#### Windows 7\n" +"1. 打开 *我的电脑*\n" +"2. 点击 *组织*，在菜单里选择 *文件夹和搜索选项*\n" +"3. 点击 *查看* 标签页\n" +"4. 取消勾选 *隐藏已知文件类型的扩展名* 并点击 *确定*" #. type: Plain text #: en/tsum.text:273 @@ -602,7 +618,7 @@ msgid "" "When you request a split package, the parts may arrive out of order. You need to make sure you have received all the parts before you attempt to unpack them. Save all the parts into one directory on your computer, unzip them, and double-click the file that ends in \"..split.part01.exe\" to start the unpacking process." msgstr "" "### 如何处理拆分了的软件包\n" -"当你索要了拆分的软件包，你有可能不按次序地收到各个部分。在尝试拆包之前，你需要确保你已收到了所有部分。把所有部分保存到电脑里的一个文件夹中，把它们解压缩，双击以 ..split.part01.exe 结尾的文件以开始拆包。" +"当你索要了拆分的软件包，你有可能按错乱的次序收到各个部分。在尝试拆包之前，你需要确保你已收到了每一个部分。把所有部分保存到电脑的一个文件夹中，把它们解压缩，双击以 “..split.part01.exe” 结尾的文件以开始拆包。" #. type: Plain text #: en/tsum.text:277 @@ -633,7 +649,7 @@ msgid "" msgstr "" "**Vidalia 和 Tor 已在运行**：\n" "举个例子，假如你已安装过 Vidalia 软件包而你现在正尝试运行 Tor 浏览器软件包，这种情况就有可能发生。\n" -"这样的话你将需要先关闭旧版的 Vidalia 和 Tor。\n" +"这样的话你将需要先关闭旧版的 Vidalia 和 Tor，再运行当前的版本。\n" #. type: Plain text #: en/tsum.text:294 @@ -647,9 +663,9 @@ msgid "" "and terminate the Tor process. Then use Vidalia to restart Tor.\n" msgstr "" "**Vidalia 崩溃了，但 Tor 仍在运行**：\n" -"如果提示输入控制密码的对话框里有一个“重置”按钮，\n" +"如果提示输入控制密码的对话框里有一个“复位设定”按钮，\n" "你可以点击该按钮，Vidalia 会以一个新的随机控制密码重启 Tor。\n" -"如果你没有看到“重置”按钮，或者 Vidalia 无法重启 Tor，\n" +"如果你没有看到“复位设定”按钮，或者 Vidalia 无法重启 Tor，\n" "请前往你的进程或任务管理器，终止 Tor 的进程。然后再用 Vidalia 来重启 Tor。\n" #. type: Plain text @@ -660,7 +676,7 @@ msgid "" "Project website." msgstr "" "要了解更多，请参阅 Tor Project 网站上的 " -"[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword)。" +"[常见问题](https://torproject.org/docs/faq.html#VidaliaPassword)。" #. type: Plain text #: en/tsum.text:303 @@ -695,7 +711,7 @@ msgid "" "Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" "/torbutton-faq.html#noflash) for more information." msgstr "" -"请参考 [Torbutton FAQ](https://www.torproject.org/torbutton/torbutton-" +"请参阅 [Torbutton 常见问题](https://www.torproject.org/torbutton/torbutton-" "faq.html#noflash) 以了解更多信息。" #. type: Plain text

1 0

[tor/master] fix trivial typo
by arma＠torproject.org 17 Nov '11

17 Nov '11

commit 3992c5487f23429c2782e7988aa0598407f6845a Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Nov 16 18:10:13 2011 -0500 fix trivial typo somebody should s/authoritative directory server/directory authority/g at some point --- src/or/router.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index c9f141b..b6b96a5 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1024,7 +1024,7 @@ authdir_mode_any_nonhidserv(const or_options_t *options) } /** Return true iff we are an authoritative directory server that is * authoritative about receiving and serving descriptors of type - * purpose its dirport. Use -1 for "any purpose". */ + * purpose on its dirport. Use -1 for "any purpose". */ int authdir_mode_handles_descs(const or_options_t *options, int purpose) {

1 0