November 2011 - tor-commits - lists.torproject.org

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

17 Nov '11

commit 83cb069a4c68085c8877f53d65337f3e93e0e7e1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 17 20:15:02 2011 +0000 Update translations for bridgedb --- cs/bridgedb.po | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cs/bridgedb.po b/cs/bridgedb.po index 2cef7f2..5b639b5 100644 --- a/cs/bridgedb.po +++ b/cs/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # Elisa <valhalla(a)gishpuppy.com>, 2011. +# <gsanky+transifex(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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2011-03-22 16:45+0000\n" -"Last-Translator: Elisa <valhalla(a)gishpuppy.com>\n" +"PO-Revision-Date: 2011-11-17 20:05+0000\n" +"Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +30,10 @@ msgid "" "even if your ISP is filtering connections to all the known Tor relays,\n" "they probably won't be able to block all the bridges." msgstr "" -"Přemosťující spojení (nebo zkráceně \"mosty\") jsou Tor síťové uzly, které nejsou zaznamenány\n" -"v hlavním adresáři Tor uzlů. Protože neexistuje veřejný seznam těchto uzlů,\n" -"proto ani váš internet poskytovatel, který by filtroval známé Tor uzly,\n" -"nebude pravděpodobně schopen blokovat všechny Tor mosty." +"Přemosťující spojení (nebo zkráceně \"mosty\") jsou Tor relaye, které nejsou" +" zaznamenány v hlavním adresáři Tor relayí. Protože neexistuje veřejný " +"seznam těchto uzlů, ani váš poskytovatel internetu, pokud blokuje připojení " +"ke všem známým Tor relayím, pravděpodobně nedokáže zablokovat všechny mosty." #: lib/bridgedb/I18n.py:28 msgid "" @@ -40,17 +41,17 @@ msgid "" "\"My ISP blocks connections to the Tor network\". Then add each bridge\n" "address one at a time." msgstr "" -"Aby jste použít výš zmiňované, jděte do síťového nastavení Vidalia a klikněte na\n" -"\"Můj ISP blokuje připojení do Tor sítě\". Pak přidejte adresu každého\n" -"mostu, po jednom..." +"Pro použití zmíněných řádek jděte do síťového nastavení Vidalie a klikněte " +"na \"My ISP blocks connections to the Tor network\" (Můj ISP blokuje " +"připojení k síti Tor). Poté přidejte mosty adresu po adrese." #: lib/bridgedb/I18n.py:32 msgid "" "Configuring more than one bridge address will make your Tor connection\n" "more stable, in case some of the bridges become unreachable." msgstr "" -"Nastavením více než jednoho mostu udělá vaše Tor připojení\n" -"více stabilní, v případě, že by se staly některé mosty nedostupné." +"Nastavení více než jednoho mostu udělá vaše Tor připojení stabilnější v " +"případě, že by se staly některé mosty nedostupné." #: lib/bridgedb/I18n.py:35 msgid "" @@ -60,15 +61,14 @@ msgid "" "lots of bridge addresses, you must send this request from an email address at\n" "one of the following domains:" msgstr "" -"Jiný způsob najít veřejné adresy mostů je, poslat mail na\n" -"bridges(a)torproject.org s řádkem \"get bridges\" v těle zprávy\n" -"mailu. Ačkoli můžeme ztížit útočníku, aby se\n" -"dověděl mnoho adres mostů, musíte poslat tuto žádost z některých email. adres z\n" -"těchto domén:" +"Další způsob jak získat veřejné adresy mostů je posláním emailu na " +"bridges(a)torproject.org pouze s textem \"get bridges\" v těle emailu. Abychom" +" ztížili útočníkovi získat velký počet adres mostů, musí emailová adresa " +"vaší žádosti pocházet z jedné z těchto domén:" #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]" -msgstr "[Tohle je automatická odpověď; prosím, neodpovídejte na ni]" +msgstr "[Toto je automatická zpráva; prosím, neodpovídejte na ni]" #: lib/bridgedb/I18n.py:43 msgid "" @@ -77,10 +77,10 @@ msgid "" "will change every few days, so check back periodically if you need more\n" "bridge addresses." msgstr "" -"Další způsob, jak najít adresy veřejných mostů, je jít na\n" -"https://bridges.torproject.org/. Odpovědi, které naleznete na stránce\n" -"se pravidelně mění, takže stránku pravidelně kontrolujte, pokud potřebujete víc\n" -"adres mostů." +"Další způsob, jak najít adresy veřejných mostů, je jít na " +"https://bridges.torproject.org/. Odpovědi, které naleznete na stránce se " +"pravidelně mění, takže stránku pravidelně kontrolujte, pokud potřebujete víc" +" adres mostů." #: lib/bridgedb/I18n.py:48 msgid "(no bridges currently available)" @@ -88,6 +88,6 @@ msgstr "(nejsou momentálně dostupné žádné mosty)" #: lib/bridgedb/I18n.py:50 msgid "(e-mail requests not currently supported)" -msgstr "(e-mail žádosti nejsou momentálně podporovány)" +msgstr "(e-mailové žádosti nejsou momentálně podporovány)"

1 0

r25226: {website} American censorship day is over, for now. (website/trunk/en)
by Andrew Lewman 17 Nov '11

17 Nov '11

Author: phobos Date: 2011-11-17 19:48:06 +0000 (Thu, 17 Nov 2011) New Revision: 25226 Modified: website/trunk/en/index.wml Log: American censorship day is over, for now. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-11-16 19:06:49 UTC (rev 25225) +++ website/trunk/en/index.wml 2011-11-17 19:48:06 UTC (rev 25226) @@ -148,8 +148,6 @@ </div>  -<a style="width:200px;height:100px;vertical-align:middle;text-align:center;background-color:#000;position:absolute;z-index:5555;top:10px;left:150px;background-image:url(/images/stop-censorship-small.png);background-position:center center;background-repeat:no-repeat;" href="http://americancensorship.org"></a> - <div id="sidecol"> <div id="torusers"> <h2>Who Uses Tor?</h2>

1 0

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

17 Nov '11

commit 1cafca7243a28d1a0c4bef5ed17ba542b9f07930 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 17 19:45:17 2011 +0000 Update translations for vidalia --- cs/qt_cs.po | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cs/qt_cs.po b/cs/qt_cs.po index e63f633..95b730a 100644 --- a/cs/qt_cs.po +++ b/cs/qt_cs.po @@ -1,13 +1,14 @@ # # Translators: +# <gsanky+transifex(a)gmail.com>, 2011. # runasand <runa.sandvik(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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2010-12-05 19:59+0000\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2011-11-17 19:43+0000\n" +"Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,12 +25,12 @@ msgstr "Aktivovat" #: qmessagebox.h:319 msgctxt "QApplication" msgid "Executable '%1' requires Qt %2, found Qt %3." -msgstr "Spuštěný '%1' vyžaduje aby %2, byl nazalezen" +msgstr "Spustitelný soubor '%1' vyžaduje Qt %2, nalezeno Qt %3" #: qmessagebox.h:321 msgctxt "QApplication" msgid "Incompatible Qt Library Error" -msgstr "Chyba nekompatibility knihovny Qt" +msgstr "Chyba - Nekompatibilní knihovna Qt" #: qapplication.cpp:2095 msgctxt "QApplication" @@ -39,7 +40,7 @@ msgstr "QT_LAYOUT_DIRECTION" #: qaccessibleobject.cpp:350 msgctxt "QApplication" msgid "Activates the program's main window" -msgstr "Aktivovat program do hlavního okna" +msgstr "Aktivovat hlavní okno programu" #: qmessagebox.cpp:2104 msgctxt "QDialogButtonBox" @@ -89,7 +90,7 @@ msgstr "Neukládat" #: qdialogbuttonbox.cpp:554 msgctxt "QDialogButtonBox" msgid "Discard" -msgstr "Odložit" +msgstr "Zahodit" #: qdialogbuttonbox.cpp:557 msgctxt "QDialogButtonBox" @@ -109,7 +110,7 @@ msgstr "&Ne" #: qdialogbuttonbox.cpp:566 msgctxt "QDialogButtonBox" msgid "N&o to All" -msgstr "Ne & pro všechny" +msgstr "Ne &pro všechny" #: qdialogbuttonbox.cpp:569 msgctxt "QDialogButtonBox" @@ -174,7 +175,7 @@ msgstr "Datum změny" #: qfiledialog_win.cpp:126 msgctxt "QFileDialog" msgid "All Files (*)" -msgstr "Všechny Soubory (*)" +msgstr "Všechny soubory (*)" #: qfiledialog.cpp:881 msgctxt "QFileDialog" @@ -214,12 +215,12 @@ msgid "" msgstr "" "%1\n" "Soubor nebyl nalezen.\n" -"Prosím ověřte správný název souboru." +"Prosím ověřte, zda byl název souboru zadán správně." #: qdirmodel.cpp:833 msgctxt "QFileDialog" msgid "My Computer" -msgstr "Můj počítač" +msgstr "Tento počítač" #: qfiledialog.cpp:462 msgctxt "QFileDialog" @@ -234,7 +235,7 @@ msgstr "&Smazat" #: qfiledialog.cpp:464 msgctxt "QFileDialog" msgid "Show &hidden files" -msgstr "Zobrazit & skrýt složky" +msgstr "Zobrazit &skryté soubory" #: ui_qfiledialog.h:264 msgctxt "QFileDialog" @@ -249,12 +250,12 @@ msgstr "Hlavní adresář" #: ui_qfiledialog.h:284 msgctxt "QFileDialog" msgid "List View" -msgstr "Zobrazit seznam" +msgstr "Jako seznam" #: ui_qfiledialog.h:289 msgctxt "QFileDialog" msgid "Detail View" -msgstr "Zobrazit detail" +msgstr "Jako detaily" #: ui_qfiledialog.h:292 msgctxt "QFileDialog"

1 0

[gettor/master] Erronous log message on MakeStat.py
by kaner＠torproject.org 17 Nov '11

17 Nov '11

commit 14963e778db81c347c27bb5081f03e044b3b86a0 Author: Christian Fromme <kaner(a)strace.org> Date: Thu Nov 17 20:12:06 2011 +0100 Erronous log message on MakeStat.py --- MakeStat.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MakeStat.py b/MakeStat.py index 9bc8c70..f5ddf70 100644 --- a/MakeStat.py +++ b/MakeStat.py @@ -76,7 +76,6 @@ def main(): fileList = sorted(fileList) for f in fileList: dateInfo, stats = makestats(f, config.PACKAGES) - print "File: ", f printStatsStdout(dateInfo, stats) if __name__ == "__main__":

1 0

[torbel/master] 4500 - check TorCtl.get_router return value
by sebastian＠torproject.org 17 Nov '11

17 Nov '11

commit a0a63388e36c5384e4730e48555474fdf4566d72 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Nov 17 07:55:37 2011 -0800 4500 - check TorCtl.get_router return value TorCtl.get_router can return None if no descriptor is found; added a test before using. --- controller.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/controller.py b/controller.py index fe6dbf7..7bef189 100644 --- a/controller.py +++ b/controller.py @@ -647,10 +647,11 @@ class Controller(TorCtl.EventHandler): try: ns = self.conn.get_network_status("id/" + rid)[0] router = self.conn.get_router(ns) - self.add_to_cache(router) - # Notify scheduler that a new router is available for testing. - if self.scheduler: - self.scheduler.new_descriptor(router) + if router: + self.add_to_cache(router) + # Notify scheduler that a new router is available for testing. + if self.scheduler: + self.scheduler.new_descriptor(router) except TorCtl.ErrorReply, e: log.error("NEWDESC: Controller error: %s", str(e))

1 0

[torbel/master] Merge remote-tracking branch 'aagbsn/4500-check-return-value'
by sebastian＠torproject.org 17 Nov '11

17 Nov '11

commit ec8879dbc5d110a6d655ea3d461de432ccc28331 Merge: 653ce38 a0a6338 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Nov 17 19:07:17 2011 +0100 Merge remote-tracking branch 'aagbsn/4500-check-return-value' controller.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)

1 0

[torbel/master] Log when we can't get a descriptor in new_desc_event()
by sebastian＠torproject.org 17 Nov '11

17 Nov '11

commit 80ffc89f88a43f009bda0b07139b388f9598d3b7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Nov 17 19:12:12 2011 +0100 Log when we can't get a descriptor in new_desc_event() --- controller.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/controller.py b/controller.py index 826fe6e..42c440f 100644 --- a/controller.py +++ b/controller.py @@ -652,6 +652,9 @@ class Controller(TorCtl.EventHandler): # Notify scheduler that a new router is available for testing. if self.scheduler: self.scheduler.new_descriptor(router) + else: + log.warn("Couldn't get descriptor for router with id %s", + rid) except TorCtl.ErrorReply, e: log.error("NEWDESC: Controller error: %s", str(e))

1 0

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

17 Nov '11

commit 29fa7a91a54e462676562e27883ea55128cfaf76 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 17 18:15:06 2011 +0000 Update translations for tsum --- zh/tsum.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 7f08e69..85cbfc7 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-17 17:44+0000\n" +"PO-Revision-Date: 2011-11-17 17:54+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -617,8 +617,8 @@ msgid "" "### What to do with split packages\n" "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” 结尾的文件以开始拆包。" +"### 如何处理拆分过的软件包\n" +"当你索要了拆分过的软件包，你有可能按错乱的次序收到各个部分。在试图把它们解压缩之前，你需要确保你已收到了每一个部分。把所有部分保存到电脑的一个文件夹中，先把它们各自解压缩，再双击以 “..split.part01.exe” 结尾的文件进行解压缩。" #. type: Plain text #: en/tsum.text:277

1 0

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

17 Nov '11

commit c7d62c6a3a934b654eaacdb5260cd5176d3fb5d7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 17 17:45:23 2011 +0000 Update translations for vidalia_help --- it/netview.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/it/netview.po b/it/netview.po index 92ceaa8..269897c 100644 --- a/it/netview.po +++ b/it/netview.po @@ -6,7 +6,7 @@ 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: 2011-11-17 16:49+0000\n" +"PO-Revision-Date: 2011-11-17 17:25+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" @@ -50,7 +50,7 @@ msgid "" 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 " -"<i>circuiti</i> ..." +"<i>circuiti</i> [to-be-continued]" #. type: Content of: <html><body> #: en/netview.html:35

1 0

[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