[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r21265: {translation} added two files and updated a few others (in translation/trunk/projects/website/zh_CN: . docs torbrowser torbutton)
Author: runa
Date: 2009-12-18 17:21:11 -0500 (Fri, 18 Dec 2009)
New Revision: 21265
Added:
translation/trunk/projects/website/zh_CN/1-high.bridges.po
translation/trunk/projects/website/zh_CN/2-medium.donate.po
Modified:
translation/trunk/projects/website/zh_CN/1-high.download.po
translation/trunk/projects/website/zh_CN/1-high.easy-download.po
translation/trunk/projects/website/zh_CN/1-high.finding-tor.po
translation/trunk/projects/website/zh_CN/1-high.index.po
translation/trunk/projects/website/zh_CN/2-medium.overview.po
translation/trunk/projects/website/zh_CN/3-low.people.po
translation/trunk/projects/website/zh_CN/4-optional.open-positions.po
translation/trunk/projects/website/zh_CN/4-optional.translation-overview.po
translation/trunk/projects/website/zh_CN/4-optional.translation.po
translation/trunk/projects/website/zh_CN/docs/1-high.tor-doc-windows.po
translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po
translation/trunk/projects/website/zh_CN/torbrowser/1-high.index.po
translation/trunk/projects/website/zh_CN/torbutton/3-low.options.po
Log:
added two files and updated a few others
Added: translation/trunk/projects/website/zh_CN/1-high.bridges.po
===================================================================
--- translation/trunk/projects/website/zh_CN/1-high.bridges.po (rev 0)
+++ translation/trunk/projects/website/zh_CN/1-high.bridges.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -0,0 +1,298 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:9
+msgid "<a id=\"BridgeIntroduction\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/en/bridges.wml:10
+msgid "<a class=\"anchor\" href=\"#BridgeIntroduction\">Tor: Bridges</a>"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:11 /tmp/Qu50a0Mycg.xml:76
+#: /tmp/Qu50a0Mycg.xml:99 /tmp/Qu50a0Mycg.xml:122 /tmp/Qu50a0Mycg.xml:146
+msgid "<hr />"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:14
+msgid ""
+"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed "
+"in the main Tor directory. Since there is no complete public list of them, "
+"even if your ISP is filtering connections to all the known Tor relays, they "
+"probably won't be able to block all the bridges. If you suspect your access "
+"to the Tor network is being blocked, you may want to use the bridge feature "
+"of Tor."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:22
+msgid ""
+"The addition of bridges to Tor is a step forward in the blocking resistance "
+"race. It is perfectly possible that even if your ISP filters the Internet, "
+"you do not require a bridge to use Tor. Many filtering programs look for "
+"unencrypted Tor directory requests to recognize that you're using Tor, but "
+"Tor version 0.2.0.23-rc and later use encrypted directory queries by "
+"default. This change means that most filtering programs are now unable to "
+"recognize Tor connections. So you should try to use Tor without bridges "
+"first, since it might work."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:33
+msgid ""
+"Note that it's also possible that Tor is non-functional for other reasons. "
+"The latest version of <a href=\"<page torbrowser/index>\">The Tor Browser "
+"Bundle</a> on Windows tries to give you better hints about why Tor is having "
+"problems connecting. You should also read <a href=\"https://wiki.torproject.";
+"org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">the FAQ about problems with "
+"running Tor properly</a> when you have issues. If you feel that the issue "
+"is clearly blocking, or you'd simply like to try because you're unsure or "
+"feeling adventurous, please read on. Ensure that you're using the <a href="
+"\"<page download>#Dev\">latest 0.2.1.x or 0.2.2.x bundle for your platform</"
+"a>."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:46
+msgid ""
+"To use a bridge, you'll need to locate one. Furthermore, you'll need to "
+"configure Tor with whatever bridge address you intend to use. You'll do this "
+"with Vidalia, the Tor controller. If your Internet connection requires the "
+"use of a proxy, you'll probably need to configure Vidalia to do so first. If "
+"you don't think you need to configure a proxy for your Internet connection, "
+"you probably don't. Give it a try and if you have issues, ask us for help."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:55
+msgid ""
+"Freedom House has produced a video on how to get and use Tor bridges. You "
+"can view the video at <a href=\"http://tinyvid.tv/show/3uiwckrlqynqv";
+"\">TinyVid: Using Bridge Relays to Access Tor</a>. Know of a better video, "
+"or one translated into your language? Let us know!"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:67
+msgid ""
+"At the moment, you can get a bridge by visiting <a href=\"https://bridges.";
+"torproject.org/\">https://bridges.torproject.org/</a> with your web browser. "
+"If this page is filtered for you, and you don't have any other proxies or "
+"ways to reach it, there are <a href=\"#FindingMore\">other ways to find "
+"bridges</a> too."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:74
+msgid "<a id=\"Understanding\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/en/bridges.wml:75
+msgid "<a class=\"anchor\" href=\"#Understanding\">Understanding bridges</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:79
+msgid "As an example, you'll get a bridge entry that looks like the following:"
+msgstr ""
+
+#. type: Content of: <div><pre>
+#: /home/runa/tor/website/en/bridges.wml:82
+#, no-wrap
+msgid ""
+"<samp>\n"
+"bridge 141.201.27.48:443 4352e58420e68f5e40bf7c74faddccd9d1349413\n"
+"</samp>\n"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:88
+msgid ""
+"Understanding the components of a bridge line isn't strictly required but "
+"may prove useful. You can skip this section if you'd like.<br /> The first "
+"element is the IP address: <tt>'141.201.27.48'</tt><br /> The second element "
+"is the port: <tt>'443'</tt><br /> The third element, the fingerprint, is "
+"optional: <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br />"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:96
+msgid "<a id=\"UsingBridges\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/en/bridges.wml:97
+msgid ""
+"<a class=\"anchor\" href=\"#UsingBridges\">Using bridges with Tor and "
+"Vidalia</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:102
+msgid ""
+"To use the example bridge address above, go to Vidalia's Network settings "
+"page, and click \"My ISP blocks connections to the Tor network\". Add each "
+"bridge address one at a time in the Vidalia Network settings page, by "
+"pasting it into the \"Add a Bridge\" window and then clicking the \"+\" "
+"sign. Adding a bridge is pictured below:"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:109
+msgid ""
+"<br /><br /> <img src=\"$(IMGROOT)/vidalia-bridges.png\" alt=\"Vidalia's "
+"Network settings page\" /> <br /><br />"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:114
+msgid ""
+"You'll want to add as many bridge addresses as you know about, since "
+"additional bridges will increase reliability. One bridge should be enough to "
+"reach the Tor network, but if you only have one bridge and it goes down, you "
+"will be cut off from the Tor network."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:120
+msgid "<a id=\"FindingMore\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/en/bridges.wml:121
+msgid ""
+"<a class=\"anchor\" href=\"#FindingMore\">Finding more bridges for Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:125
+msgid ""
+"Another way to find public bridge addresses is to send mail to "
+"bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body "
+"of the mail. You'll need to send this request from a gmail account, though "
+"— otherwise we make it too easy for an attacker to make a lot of email "
+"addresses and learn about all the bridges. Almost instantly, you'll receive "
+"a reply that includes:"
+msgstr ""
+
+#. type: Content of: <div><pre>
+#: /home/runa/tor/website/en/bridges.wml:133
+#, no-wrap
+msgid ""
+"Here are your bridge relays:\n"
+"\n"
+" bridge 60.16.182.53:9001 c9111bd74a710c0d25dda6b35e181f1aa7911133\n"
+" bridge 87.237.118.139:444 c18dde4804e8fcb48464341ca1375eb130453a39\n"
+" bridge 60.63.97.221:443 ab5c849ed5896d53052e43966ee9aba2ff92fb82\n"
+"\n"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:141
+msgid ""
+"Once you've received the email with bridge information, you can continue the "
+"Vidalia configuration steps outlined <a href=\"#UsingBridges\">above</a>."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:144
+msgid "<a id=\"RunningABridge\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/en/bridges.wml:145
+msgid "<a class=\"anchor\" href=\"#RunningABridge\">Running a Tor Bridge</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:149
+msgid ""
+"If you want to help out and you can't run a <a href=\"<page docs/tor-doc-"
+"relay>\">normal Tor relay</a>, you should run a bridge relay. You can "
+"configure it either way:"
+msgstr ""
+
+#. type: Content of: <div><p><ul><li>
+#: /home/runa/tor/website/en/bridges.wml:153
+msgid ""
+"manually <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#torrc\">edit your torrc file</a> to be just these four lines:<br />"
+msgstr ""
+
+#. type: Content of: <div><p><ul><li><pre>
+#: /home/runa/tor/website/en/bridges.wml:156
+#, no-wrap
+msgid ""
+"<code>\n"
+"SocksPort 0\n"
+"ORPort 443\n"
+"BridgeRelay 1\n"
+"Exitpolicy reject *:*\n"
+"</code>"
+msgstr ""
+
+#. type: Content of: <div><p><ul><li>
+#: /home/runa/tor/website/en/bridges.wml:162
+msgid ""
+"<a href=\"<page docs/tor-doc-relay>\">or using Vidalia</a>:<br /> <img src="
+"\"$(IMGROOT)/vidalia-bridges-setup.png\" alt=\"Vidalia's Sharing settings "
+"page\" />"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:168
+msgid ""
+"If you get \"Could not bind to 0.0.0.0:443: Permission denied\" errors on "
+"startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#ServerForFirewalledClients\">some complex port forwarding</a>."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:175
+msgid ""
+"When configured as a bridge, your server will <b>not</b> appear in the "
+"public Tor network."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:180
+msgid ""
+"Your bridge relay will automatically publish its address to the bridge "
+"authority, which will give it out via https or email as above. You can also "
+"tell a user about your bridge directly: if you're using Vidalia, you can "
+"copy-and-paste the bridge address from the Settings window. If you're on "
+"Linux or BSD, you can construct the bridge address manually using the <a "
+"href=\"#Understanding\">format above</a> (you can find the fingerprint in "
+"your Tor log files or in <tt>/var/lib/tor/fingerprint</tt> depending on your "
+"platform)."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/bridges.wml:191
+msgid ""
+"If you would like to learn more about our bridge design from a technical "
+"standpoint, please read the <a href=\"<svnsandbox>doc/spec/bridges-spec.txt"
+"\">Tor bridges specification</a>. If you're interested in running an "
+"unpublished bridge or other non-standard uses, please do read the "
+"specification."
+msgstr ""
Modified: translation/trunk/projects/website/zh_CN/1-high.download.po
===================================================================
--- translation/trunk/projects/website/zh_CN/1-high.download.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/1-high.download.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: 2009-12-16 03:11-0700\n"
"Last-Translator: Mini Dragon <projecteurs@xxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -32,26 +32,28 @@
"Please take time to read the <a href=\"#Warning\">warning</a> to familiarize "
"yourself with the pitfalls and limits of Tor."
msgstr ""
-"警告：想让 Tor 真正地保护你吗？……那么，请不要在安装软件后就什么也不管了。你需要改变你的一些习惯，还要重新配置软件！Tor，就它本身来说，并<b>"
-"不能</b>全面保护你的匿名。请花一点时间阅读 <a href=\"#Warning\">警告</a> 使自己了解 Tor 存在的隐患和局限。"
+"警告：想让 Tor 真正地保护你吗？……那么，请不要在安装软件后就什么也不管了。你需"
+"要改变你的一些习惯，还要重新配置软件！Tor，就它本身来说，并<b>不能</b>全面保"
+"护你的匿名。请花一点时间阅读 <a href=\"#Warning\">警告</a> 使自己了解 Tor 存"
+"在的隐患和局限。"
#. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:25 /tmp/VkffT12MDb.xml:307
+#: /home/runa/tor/website/en/download.wml:25 /tmp/3GI3PiTtRq.xml:307
msgid "Operating System"
msgstr "操作系统"
#. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:26 /tmp/VkffT12MDb.xml:308
+#: /home/runa/tor/website/en/download.wml:26 /tmp/3GI3PiTtRq.xml:308
msgid "Download Stable"
msgstr "稳定版"
#. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:27 /tmp/VkffT12MDb.xml:309
+#: /home/runa/tor/website/en/download.wml:27 /tmp/3GI3PiTtRq.xml:309
msgid "Download Unstable"
msgstr "测试版"
#. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:28 /tmp/VkffT12MDb.xml:310
+#: /home/runa/tor/website/en/download.wml:28 /tmp/3GI3PiTtRq.xml:310
msgid "Installation and Configuration"
msgstr "安装及配置"
@@ -61,8 +63,8 @@
"<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows "
"7, Vista, XP, 2000, 2003 Server</em></small>"
msgstr ""
-"<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows 7, "
-"Vista, XP, 2000, 2003 Server</em></small>"
+"<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows "
+"7, Vista, XP, 2000, 2003 Server</em></small>"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:38
@@ -79,11 +81,11 @@
"<a href=\"<package-win32-bundle-alpha>\"><version-win32-bundle-alpha></a> "
"(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>)"
msgstr ""
-"<a href=\"<package-win32-bundle-alpha>\"><version-win32-bundle-alpha></a> (<a "
-"href=\"<package-win32-bundle-alpha-sig>\">sig</a>)"
+"<a href=\"<package-win32-bundle-alpha>\"><version-win32-bundle-alpha></a> "
+"(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>)"
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:46 /tmp/VkffT12MDb.xml:327
+#: /home/runa/tor/website/en/download.wml:46 /tmp/3GI3PiTtRq.xml:327
msgid "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
msgstr "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
@@ -93,8 +95,8 @@
"<img src=\"images/distros/windows.png\" /> Tor Browser Bundle for Windows "
"<br /> (Contains Tor, Vidalia, Torbutton, Polipo, and Firefox)"
msgstr ""
-"<img src=\"images/distros/windows.png\" /> Windows Tor 浏览器套件 <br />（包括 "
-"Tor、Vidalia、Torbutton、Polipo 和 Firefox）"
+"<img src=\"images/distros/windows.png\" /> Windows Tor 浏览器套件 <br />（包"
+"括 Tor、Vidalia、Torbutton、Polipo 和 Firefox）"
#. PO4ASHARPBEGIN Translators should link to the Browser Bundle for their language,PO4ASHARPEND
#. PO4ASHARPBEGIN e.g. _ru.exe Russian, _de.exe for Deutsch, etc.PO4ASHARPEND
@@ -106,8 +108,8 @@
"<version-torbrowserbundle>_en-US.exe.asc\">sig</a>)"
msgstr ""
"<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe"
-"\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-browser"
-"-<version-torbrowserbundle>_zh-CN.exe.asc\">sig</a>)"
+"\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-browser-"
+"<version-torbrowserbundle>_zh-CN.exe.asc\">sig</a>)"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:63
@@ -120,8 +122,8 @@
"<img src=\"images/distros/windows.png\" /> Tor IM Browser Bundle for Windows "
"<br />(Contains Tor, Vidalia, Torbutton, Polipo, Firefox, and Pidgin)"
msgstr ""
-"<img src=\"images/distros/windows.png\" /> Windows Tor IM 浏览器套件 <br />（包括 "
-"Tor、Vidalia、Torbutton、Polipo、Firefox 和 Pidgin）"
+"<img src=\"images/distros/windows.png\" /> Windows Tor IM 浏览器套件 <br />"
+"（包括 Tor、Vidalia、Torbutton、Polipo、Firefox 和 Pidgin）"
#. PO4ASHARPBEGIN Translators should link to the IM Browser Bundle for their language,PO4ASHARPEND
#. PO4ASHARPBEGIN e.g. _ru.exe Russian, _de.exe for Deutsch, etc.PO4ASHARPEND
@@ -132,9 +134,9 @@
"exe\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-im-browser-"
"<version-torimbrowserbundle>_en-US.exe.asc\">sig</a>)"
msgstr ""
-"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_zh-"
-"CN.exe\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-im-"
-"browser-<version-torimbrowserbundle>_zh-CN.exe.asc\">sig</a>)"
+"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN."
+"exe\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-im-browser-"
+"<version-torimbrowserbundle>_zh-CN.exe.asc\">sig</a>)"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:80
@@ -143,12 +145,13 @@
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:86
+#, fuzzy
msgid ""
-"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>-stable is a "
-"universal binary (OSX 10.4 & 10.5), -alpha is x86 only.</em></small>"
+"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>Intel Only</"
+"em></small>"
msgstr ""
-"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>-stable is a "
-"universal binary (OSX 10.4 & 10.5), -alpha is x86 only.</em></small>"
+"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>PowerPC Only "
+"(OSX 10.3, 10.4, 10.5)</em></small>"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:90
@@ -165,20 +168,21 @@
"<a href=\"<package-osx-bundle-alpha>\"><version-osx-bundle-alpha></a> (<a "
"href=\"<package-osx-bundle-alpha-sig>\">sig</a>)"
msgstr ""
-"<a href=\"<package-osx-bundle-alpha>\"><version-osx-bundle-alpha></a> (<a href"
-"=\"<package-osx-bundle-alpha-sig>\">sig</a>)"
+"<a href=\"<package-osx-bundle-alpha>\"><version-osx-bundle-alpha></a> (<a "
+"href=\"<package-osx-bundle-alpha-sig>\">sig</a>)"
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:97 /tmp/VkffT12MDb.xml:115
-#: /tmp/VkffT12MDb.xml:344 /tmp/VkffT12MDb.xml:361
+#: /home/runa/tor/website/en/download.wml:97 /tmp/3GI3PiTtRq.xml:115
+#: /tmp/3GI3PiTtRq.xml:344 /tmp/3GI3PiTtRq.xml:361
msgid "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
msgstr "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:103
+#, fuzzy
msgid ""
-"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>PowerPC Only "
-"(OSX 10.3, 10.4, 10.5)</em></small>"
+"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>PowerPC Only</"
+"em></small>"
msgstr ""
"<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>PowerPC Only "
"(OSX 10.3, 10.4, 10.5)</em></small>"
@@ -189,8 +193,8 @@
"<a href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></"
"a> (<a href=\"<package-oldosx-bundle-stable-sig>\">sig</a>)"
msgstr ""
-"<a href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></a> "
-"(<a href=\"<package-oldosx-bundle-stable-sig>\">sig</a>)"
+"<a href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></"
+"a> (<a href=\"<package-oldosx-bundle-stable-sig>\">sig</a>)"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:111
@@ -211,12 +215,12 @@
"<small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:125 /tmp/VkffT12MDb.xml:371
+#: /home/runa/tor/website/en/download.wml:125 /tmp/3GI3PiTtRq.xml:371
msgid "<a href=\"<page download-unix>\">Linux/Unix download page</a>"
msgstr "<a href=\"<page download-unix>\">Linux/Unix 下载页面</a>"
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:128 /tmp/VkffT12MDb.xml:374
+#: /home/runa/tor/website/en/download.wml:128 /tmp/3GI3PiTtRq.xml:374
msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
msgstr "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
@@ -237,7 +241,8 @@
msgid ""
"Stable packages are released when we believe the features and code will not "
"change for many months."
-msgstr "当我们确信程序的特性和代码在很多个月以内不会发生变化时，我们发布稳定版。"
+msgstr ""
+"当我们确信程序的特性和代码在很多个月以内不会发生变化时，我们发布稳定版。"
#. type: Content of: <div><div><p>
#: /home/runa/tor/website/en/download.wml:143
@@ -248,7 +253,8 @@
"and security bugs in these downloads. Please be prepared to <a href="
"\"https://bugs.torproject.org/\";>report bugs</a>."
msgstr ""
-"我们发布测试版的目的是让你帮我们测试新的特性并修正错误。即使它们比上面列出的稳定版的版本号要高，但这些下载它们存在严重的可靠性问题和安全问题的可能性高得"
+"我们发布测试版的目的是让你帮我们测试新的特性并修正错误。即使它们比上面列出的"
+"稳定版的版本号要高，但这些下载它们存在严重的可靠性问题和安全问题的可能性高得"
"多。请随时准备 <a href=\"https://bugs.torproject.org/\";>报告错误</a>。"
#. type: Content of: <div><div><p>
@@ -260,10 +266,10 @@
"href=\"http://www.privoxy.org/\";>Privoxy</a>, which are supporting "
"applications distributed under the GNU GPL."
msgstr ""
-"Tor 是 <a href=\"http://www.fsf.org/\";>自由软件</a> 根据 <a "
-"href=\"<svnsandbox>LICENSE\">3-clause BSD 许可证</a> 发布。Tor 套件还包括遵循 GNU GPL 发布的 "
-"<a href=\"<page vidalia/index>\">Vidalia</a> 和 <a "
-"href=\"http://www.privoxy.org/\";>Privoxy</a>。"
+"Tor 是 <a href=\"http://www.fsf.org/\";>自由软件</a> 根据 <a href="
+"\"<svnsandbox>LICENSE\">3-clause BSD 许可证</a> 发布。Tor 套件还包括遵循 GNU "
+"GPL 发布的 <a href=\"<page vidalia/index>\">Vidalia</a> 和 <a href=\"http://";
+"www.privoxy.org/\">Privoxy</a>。"
#. type: Content of: <div><div><p>
#: /home/runa/tor/website/en/download.wml:159
@@ -272,8 +278,8 @@
"want Tor to become faster and more usable please consider <a href=\"<page "
"donate>\">making a tax-deductible donation to The Tor Project</a>."
msgstr ""
-"安装 Tor 以及使用 Tor 网络不需要付费，但如果你希望 Tor 更快更好用，请考虑 <a href=\"<page donate>\">捐助 Tor "
-"项目（免税）</a>."
+"安装 Tor 以及使用 Tor 网络不需要付费，但如果你希望 Tor 更快更好用，请考虑 "
+"<a href=\"<page donate>\">捐助 Tor 项目（免税）</a>."
#. type: Content of: <div><div><p>
#: /home/runa/tor/website/en/download.wml:168
@@ -284,10 +290,10 @@
"\"http://rss.gmane.org/gmane.network.onion-routing.announce\";>watch the "
"list's RSS feed</a>."
msgstr ""
-"为了及时得到安全警告和新的稳定版本的通知，请订阅 <a href=\"http://archives.seul.org/or/announce/\";>or-"
-"announce 邮件列表</a> （你需要通过电子邮件确认）。您还可以 <a "
-"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\";>浏览邮件列表的 RSS "
-"订阅点</a>。"
+"为了及时得到安全警告和新的稳定版本的通知，请订阅 <a href=\"http://archives.";
+"seul.org/or/announce/\">or-announce 邮件列表</a> （你需要通过电子邮件确认）。"
+"您还可以 <a href=\"http://rss.gmane.org/gmane.network.onion-routing.announce";
+"\">浏览邮件列表的 RSS 订阅点</a>。"
#. type: Attribute 'title' of: <div><div><link>
#: /home/runa/tor/website/en/download.wml:175
@@ -302,10 +308,10 @@
"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
"<input type=\"submit\" value=\"subscribe to or-announce\"/>"
msgstr ""
-"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type=\"hidden\" "
-"name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name=\"host\" "
-"value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> <input type=\"submit\" "
-"value=\"订阅 to or-announce\"/>"
+"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
+"\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
+"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
+"<input type=\"submit\" value=\"订阅 to or-announce\"/>"
#. type: Content of: <div><div>
#: /home/runa/tor/website/en/download.wml:188
@@ -316,7 +322,8 @@
#: /home/runa/tor/website/en/download.wml:189
msgid ""
"<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
-msgstr "<a class=\"anchor\" href=\"#Warning\">警告：想让 Tor 真正的保护你吗？</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#Warning\">警告：想让 Tor 真正的保护你吗？</a>"
#. type: Content of: <div><div><p>
#: /home/runa/tor/website/en/download.wml:193
@@ -326,8 +333,9 @@
"all you need to maintain your anonymity. There are several major pitfalls "
"to watch out for:"
msgstr ""
-"……那么，请不要在安装之后就什么都不管了。你需要改变你的一些习惯，并重新配置你的软件！Tor，就它本身来说并 <B>不能</B> "
-"全部保持你的匿名。有一些常见的陷阱需要提防："
+"……那么，请不要在安装之后就什么都不管了。你需要改变你的一些习惯，并重新配置你"
+"的软件！Tor，就它本身来说并 <B>不能</B> 全部保持你的匿名。有一些常见的陷阱需"
+"要提防："
# 修改了 Firefox 下载地址的链接，以便用户更快的找到“简体中文”的下载链接
#. type: Content of: <div><div><ol><li>
@@ -339,10 +347,10 @@
"mozilla.com/en-US/firefox/all-older.html\">Firefox</a> with the <a href="
"\"https://addons.mozilla.org/firefox/2275/\";>Torbutton</a> extension."
msgstr ""
-"Tor 仅仅保护那些配置过将数据通过 Tor 传输的应用程序——它不会奇迹般的在你安装后就匿名所有通讯。我们建议您使用 <a "
-"href=\"http://www.mozilla.com/en-US/firefox/all-";
-"older.html#languages\">Firefox</a> 并安装 <a "
-"href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton</a> 扩展。"
+"Tor 仅仅保护那些配置过将数据通过 Tor 传输的应用程序——它不会奇迹般的在你安装后"
+"就匿名所有通讯。我们建议您使用 <a href=\"http://www.mozilla.com/en-US/";
+"firefox/all-older.html#languages\">Firefox</a> 并安装 <a href=\"https://";
+"addons.mozilla.org/firefox/2275/\">Torbutton</a> 扩展。"
#. type: Content of: <div><div><ol><li>
#: /home/runa/tor/website/en/download.wml:209
@@ -357,11 +365,13 @@
"or broadcast sensitive information. Some people prefer using two browsers "
"(one for Tor, one for unsafe browsing)."
msgstr ""
-"Torbutton 会阻止浏览器插件，如 Java、Flash、ActiveX、RealPlayer、Quicktime、Adobe's PDF 插件 "
-"和其他：他们可能导致泄露你的 IP 地址。一些网站的功能可能受影响。例如，这意味着 YouTube 被禁用。如果你确实需要 Youtube，你可以 <a "
-"href=\"<page torbutton/faq>#noflash\">重新配置 Torbutton</a> "
-"允许它；但是请注意，这可能导致潜在的攻击。此外，像 Google 工具条这样的扩展会查询有关你访问站点的信息：它们可能绕过 Tor "
-"并/或泄露敏感信息。有些人喜欢使用两个浏览器（一个使用 Tor，另一个使用不安全的浏览）。"
+"Torbutton 会阻止浏览器插件，如 Java、Flash、ActiveX、RealPlayer、Quicktime、"
+"Adobe's PDF 插件 和其他：他们可能导致泄露你的 IP 地址。一些网站的功能可能受影"
+"响。例如，这意味着 YouTube 被禁用。如果你确实需要 Youtube，你可以 <a href="
+"\"<page torbutton/faq>#noflash\">重新配置 Torbutton</a> 允许它；但是请注意，"
+"这可能导致潜在的攻击。此外，像 Google 工具条这样的扩展会查询有关你访问站点的"
+"信息：它们可能绕过 Tor 并/或泄露敏感信息。有些人喜欢使用两个浏览器（一个使用 "
+"Tor，另一个使用不安全的浏览）。"
#. type: Content of: <div><div><ol><li>
#: /home/runa/tor/website/en/download.wml:222
@@ -372,10 +382,10 @@
"mozilla.org/firefox/82/\">CookieCuller</a> can help protect any cookies you "
"do not want to lose."
msgstr ""
-"谨防 Cookies：如果你曾在未使用 Tor 的情况下浏览了某个站点，这个站点给你设置了一个 Cookie，那么，即使你又开始使用 Tor，那个 "
-"cookie 仍能用来确认你的身份。Torbutton 会安全的处理您的 Cookies。<a "
-"href=\"https://addons.mozilla.org/firefox/82/\";>CookieCuller</a> 能帮助您保留不想丢失的 "
-"Cookies。"
+"谨防 Cookies：如果你曾在未使用 Tor 的情况下浏览了某个站点，这个站点给你设置了"
+"一个 Cookie，那么，即使你又开始使用 Tor，那个 cookie 仍能用来确认你的身份。"
+"Torbutton 会安全的处理您的 Cookies。<a href=\"https://addons.mozilla.org/";
+"firefox/82/\">CookieCuller</a> 能帮助您保留不想丢失的 Cookies。"
#. type: Content of: <div><div><ol><li>
#: /home/runa/tor/website/en/download.wml:231
@@ -388,10 +398,11 @@
"information, you should use as much care as you would on the normal scary "
"Internet — use HTTPS or other end-to-end encryption and authentication."
msgstr ""
-"Tor 匿名通信的来源，并加密你和 Tor 网络以及 Tor 网络中的所有数据，但是 <a href=\"https://wiki.torproject.";
-"org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">它不能加密 Tor "
-"网络与通信目的地之间的数据</a>。如果你正在传输敏感信息，你应该像平时在令人担心的互联网上一样谨小慎微——使用 HTTPS "
-"或其他端到端的加密与认证手段。"
+"Tor 匿名通信的来源，并加密你和 Tor 网络以及 Tor 网络中的所有数据，但是 <a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#ExitEavesdroppers\">它不能加密 Tor 网络与通信目的地之间的数据</a>。如"
+"果你正在传输敏感信息，你应该像平时在令人担心的互联网上一样谨小慎微——使用 "
+"HTTPS 或其他端到端的加密与认证手段。"
#. type: Content of: <div><div><ol><li>
#: /home/runa/tor/website/en/download.wml:243
@@ -403,9 +414,10 @@
"applications you download through Tor, unless you've verified their "
"integrity."
msgstr ""
-"尽管 Tor 阻挡了在本地网络上想要发现或影响你的通信目的地的攻击者，它也使新的攻击成为可能：恶意的或配置错误的 Tor "
-"出口节点会将错误的页面发送给你，甚至，将伪装成受信区域的、嵌入的 Java 小程序发送给你。当打开通过 Tor "
-"下载的文件或应用程序时请格外小心，除非你已经验证了其完整性。"
+"尽管 Tor 阻挡了在本地网络上想要发现或影响你的通信目的地的攻击者，它也使新的攻"
+"击成为可能：恶意的或配置错误的 Tor 出口节点会将错误的页面发送给你，甚至，将伪"
+"装成受信区域的、嵌入的 Java 小程序发送给你。当打开通过 Tor 下载的文件或应用程"
+"序时请格外小心，除非你已经验证了其完整性。"
#. type: Content of: <div><div>
#: /home/runa/tor/website/en/download.wml:252
@@ -419,8 +431,9 @@
"list of pitfalls isn't complete, and we need your help <a href=\"<page "
"volunteer>#Documentation\">identifying and documenting all the issues</a>."
msgstr ""
-"仔细些、多学些。明白 Tor 能提供什么、不能提供什么。以上这个常见陷阱的列表并不完整，我们需要你帮忙<a href=\"<page "
-"volunteer>#Documentation\">确认并记录所有问题</a>。"
+"仔细些、多学些。明白 Tor 能提供什么、不能提供什么。以上这个常见陷阱的列表并不"
+"完整，我们需要你帮忙<a href=\"<page volunteer>#Documentation\">确认并记录所有"
+"问题</a>。"
#. type: Content of: <div><div><p>
#: /home/runa/tor/website/en/download.wml:264
@@ -429,8 +442,8 @@
"package signatures</a>, which allows you to make sure you've downloaded the "
"file we intended you to get."
msgstr ""
-"查看 <a href=\"<page verifying-signatures>\">关于如何验证软件包签名的 "
-"FAQ</a>，你可以据此确认你下载的是我们希望你得到的文件。"
+"查看 <a href=\"<page verifying-signatures>\">关于如何验证软件包签名的 FAQ</"
+"a>，你可以据此确认你下载的是我们希望你得到的文件。"
#. type: Content of: <div><div><p>
#: /home/runa/tor/website/en/download.wml:270
@@ -441,16 +454,19 @@
"\">Privoxy source</a> or <a href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia "
"source</a>."
msgstr ""
-"查看<a href=\"<page documentation>#Developers\">开发者文档</a>，其中介绍了如何从 SVN 获取 Tor "
-"开发中的最新版本的源代码。你也可以下载 <a href=\"dist/\">Privoxy 源文件</a> 或 <a href=\"dist/vidalia-"
-"bundles/?C=M;O=D\">Vidalia 源文件</a>。"
+"查看<a href=\"<page documentation>#Developers\">开发者文档</a>，其中介绍了如"
+"何从 SVN 获取 Tor 开发中的最新版本的源代码。你也可以下载 <a href=\"dist/"
+"\">Privoxy 源文件</a> 或 <a href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia 源"
+"文件</a>。"
#. type: Content of: <div><div><p>
#: /home/runa/tor/website/en/download.wml:281
msgid ""
"If you have trouble downloading Tor from this site, here is a <a href="
"\"<page mirrors>\">list of sites mirroring the Tor site</a>."
-msgstr "如果你无法从这个站点下载 Tor，这里是 <a href=\"<page mirrors>\">Tor 的镜像网站列表</a>。"
+msgstr ""
+"如果你无法从这个站点下载 Tor，这里是 <a href=\"<page mirrors>\">Tor 的镜像网"
+"站列表</a>。"
#. type: Content of: <div><div>
#: /home/runa/tor/website/en/download.wml:285
@@ -466,9 +482,9 @@
"stable and development versions, see the <a href=\"<svnsandbox>ChangeLog"
"\">ChangeLog</a>."
msgstr ""
-"若需要每一个 Tor 稳定版本的更改列表，请阅读 <a "
-"href=\"<svnsandbox>ReleaseNotes\">发布记录</a>。稳定版本和开发版本的所有变化，请阅读 <a "
-"href=\"<svnsandbox>ChangeLog\">更新日志</a>。"
+"若需要每一个 Tor 稳定版本的更改列表，请阅读 <a href="
+"\"<svnsandbox>ReleaseNotes\">发布记录</a>。稳定版本和开发版本的所有变化，请阅"
+"读 <a href=\"<svnsandbox>ChangeLog\">更新日志</a>。"
#. type: Content of: <div>
#: /home/runa/tor/website/en/download.wml:297
@@ -493,8 +509,8 @@
"<img src=\"images/ico-win.png\" /> Windows (Contains only Tor)<br /> "
"<small><em>Windows 7, Vista, XP, 2000, 2003 Server</em></small>"
msgstr ""
-"<img src=\"images/ico-win.png\" /> Windows（仅包含 Tor）<br /> <small><em>Windows "
-"7, Vista, XP, 2000, 2003 Server</em></small>"
+"<img src=\"images/ico-win.png\" /> Windows（仅包含 Tor）<br /> "
+"<small><em>Windows 7, Vista, XP, 2000, 2003 Server</em></small>"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:320
@@ -502,8 +518,8 @@
"<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href="
"\"<package-win32-stable-sig>\">sig</a>)"
msgstr ""
-"<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href"
-"=\"<package-win32-stable-sig>\">sig</a>)"
+"<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href="
+"\"<package-win32-stable-sig>\">sig</a>)"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:323
@@ -511,19 +527,19 @@
"<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href="
"\"<package-win32-alpha-sig>\">sig</a>)"
msgstr ""
-"<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href"
-"=\"<package-win32-alpha-sig>\">sig</a>)"
+"<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href="
+"\"<package-win32-alpha-sig>\">sig</a>)"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:333
+#, fuzzy
msgid ""
"<img src=\"images/ico-osx-uni.png\" /> Mac (Contains only Tor)<br /> "
-"<small><em>-stable is a universal binary (OSX 10.4 & 10.5), -alpha is "
-"x86 only.</em></small>"
+"<small><em>Intel Only</em></small>"
msgstr ""
-"<img src=\"images/ico-osx-uni.png\" /> Mac（仅包含 Tor）<br /> <small><em>-stable "
-"is a universal binary (OSX 10.4 & 10.5), -alpha is x86 "
-"only.</em></small>"
+"<img src=\"images/ico-osx-uni.png\" /> Mac（仅包含 Tor）<br /> <small><em>-"
+"stable is a universal binary (OSX 10.4 & 10.5), -alpha is x86 only.</"
+"em></small>"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:337
@@ -531,8 +547,8 @@
"<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href="
"\"<package-osx-stable-sig>\">sig</a>)"
msgstr ""
-"<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href=\"<package-"
-"osx-stable-sig>\">sig</a>)"
+"<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href="
+"\"<package-osx-stable-sig>\">sig</a>)"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:340
@@ -545,9 +561,10 @@
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:350
-msgid ""
-"Mac (Contains only Tor)<br /> <small><em>PowerPC Only (OSX 10.3)</em></small>"
-msgstr "Mac（仅包含 Tor）<br /> <small><em>PowerPC Only (OSX 10.3)</em></small>"
+#, fuzzy
+msgid "Mac (Contains only Tor)<br /> <small><em>PowerPC Only</em></small>"
+msgstr ""
+"Mac（仅包含 Tor）<br /> <small><em>PowerPC Only (OSX 10.3)</em></small>"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:354
@@ -555,8 +572,8 @@
"<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href="
"\"<package-oldosx-stable-sig>\">sig</a>)"
msgstr ""
-"<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href"
-"=\"<package-oldosx-stable-sig>\">sig</a>)"
+"<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href="
+"\"<package-oldosx-stable-sig>\">sig</a>)"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:357
@@ -564,8 +581,8 @@
"<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href="
"\"<package-oldosx-alpha-sig>\">sig</a>)"
msgstr ""
-"<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href"
-"=\"<package-oldosx-alpha-sig>\">sig</a>)"
+"<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href="
+"\"<package-oldosx-alpha-sig>\">sig</a>)"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:367
@@ -581,7 +598,8 @@
msgid ""
"Source tarballs<br /> <kbd>./configure && make && src/or/"
"tor</kbd>"
-msgstr "源代码<br /> <kbd>./configure && make && src/or/tor</kbd>"
+msgstr ""
+"源代码<br /> <kbd>./configure && make && src/or/tor</kbd>"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/download.wml:384
@@ -600,3 +618,10 @@
msgstr ""
"<a href=\"<package-source-alpha>\"><version-alpha></a> (<a href=\"<package-"
"source-alpha-sig>\">sig</a>)"
+
+#~ msgid ""
+#~ "<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>-stable is "
+#~ "a universal binary (OSX 10.4 & 10.5), -alpha is x86 only.</em></small>"
+#~ msgstr ""
+#~ "<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>-stable is "
+#~ "a universal binary (OSX 10.4 & 10.5), -alpha is x86 only.</em></small>"
Modified: translation/trunk/projects/website/zh_CN/1-high.easy-download.po
===================================================================
--- translation/trunk/projects/website/zh_CN/1-high.easy-download.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/1-high.easy-download.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:17+0100\n"
"PO-Revision-Date: 2009-12-16 03:12-0700\n"
"Last-Translator: Mini Dragon <projecteurs@xxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -26,7 +26,7 @@
msgstr "<hr />"
#. type: Content of: <div><table><tr><th>
-#: /home/runa/tor/website/en/easy-download.wml:13 /tmp/4Zq4Hxd7Ca.xml:15
+#: /home/runa/tor/website/en/easy-download.wml:13 /tmp/Coo4tom1Wy.xml:15
msgid "<img src=\"images/logo.windows-header.gif\"/>"
msgstr "<img src=\"images/logo.windows-header.gif\"/>"
@@ -42,9 +42,9 @@
"png\"/><img src=\"images/distros/package.png\"/><img src=\"images/distros/"
"src.png\"/>"
msgstr ""
-"<img src=\"images/distros/generic.png\"/><img "
-"src=\"images/distros/freebsd.png\"/><img "
-"src=\"images/distros/package.png\"/><img src=\"images/distros/src.png\"/>"
+"<img src=\"images/distros/generic.png\"/><img src=\"images/distros/freebsd."
+"png\"/><img src=\"images/distros/package.png\"/><img src=\"images/distros/"
+"src.png\"/>"
#. PO4ASHARPBEGIN Translators: please point to the version of TBB in your language,PO4ASHARPEND
#. PO4ASHARPBEGIN if there is one.PO4ASHARPEND
@@ -54,8 +54,8 @@
"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US."
"exe\">Tor Browser Bundle for Windows</a>"
msgstr ""
-"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_zh-"
-"CN.exe\">Windows Tor 浏览器套件</a>"
+"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN."
+"exe\">Windows Tor 浏览器套件</a>"
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/easy-download.wml:25
@@ -81,75 +81,82 @@
#. type: Content of: <div><table><tr><td>
#: /home/runa/tor/website/en/easy-download.wml:36
-msgid "Simple. Point. Click. Install."
-msgstr "一键安装!"
+msgid ""
+"Simple. Drag and Drop Install. i386-only. <a href=\"<page download>"
+"\">PowerPC? Go here.</a>"
+msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/easy-download.wml:37
+#: /home/runa/tor/website/en/easy-download.wml:38
msgid "Easy to Install."
msgstr "易于安装。"
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/easy-download.wml:39
+#: /home/runa/tor/website/en/easy-download.wml:40
msgid "<a href=\"<page download-unix>\">Linux/BSD/Unix/Source</a>"
msgstr "<a href=\"<page download-unix>\">Linux/BSD/Unix/源代码</a>"
#. type: Content of: <div><div>
-#: /home/runa/tor/website/en/easy-download.wml:46
+#: /home/runa/tor/website/en/easy-download.wml:47
msgid ""
"Tor does <strong>not</strong> magically encrypt all of your Internet "
"activities. Understand what Tor does and does not do for you. <a href="
"\"<page download>#Warning\">Read more about this topic</a>."
msgstr ""
-"Tor <strong>不会</strong> 奇迹般地加密你在 Internet 上的所有活动。请了解 Tor 能为你做什么，不能为你做什么。<a "
-"href=\"<page download>#Warning\">阅读更多</a>。"
+"Tor <strong>不会</strong> 奇迹般地加密你在 Internet 上的所有活动。请了解 Tor "
+"能为你做什么，不能为你做什么。<a href=\"<page download>#Warning\">阅读更多</"
+"a>。"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/easy-download.wml:53
+#: /home/runa/tor/website/en/easy-download.wml:54
msgid ""
"Need more download options? <a href=\"<page download>\">See advanced "
"choices</a>."
-msgstr "需要选择更多的下载？ <a href=\"<page download>\">请查看高级下载选择</a>。"
+msgstr ""
+"需要选择更多的下载？ <a href=\"<page download>\">请查看高级下载选择</a>。"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/easy-download.wml:58
+#: /home/runa/tor/website/en/easy-download.wml:59
msgid ""
"Verify the signatures for the downloads above (<a href=\"<page verifying-"
"signatures>\">How?</a>):"
-msgstr "验证下载的文件的签名（<a href=\"<page verifying-signatures>\">怎样验证？</a>）："
+msgstr ""
+"验证下载的文件的签名（<a href=\"<page verifying-signatures>\">怎样验证？</"
+"a>）："
#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/en/easy-download.wml:60
+#: /home/runa/tor/website/en/easy-download.wml:61
msgid ""
"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US."
"exe.asc\">Tor Browser Bundle for Windows signature</a>"
msgstr ""
-"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_zh-"
-"CN.exe.asc\">Windows Tor 浏览器套件签名</a>"
+"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN."
+"exe.asc\">Windows Tor 浏览器套件签名</a>"
#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/en/easy-download.wml:61
+#: /home/runa/tor/website/en/easy-download.wml:62
msgid ""
"<a href=\"<package-win32-bundle-stable-sig>\">Installation Bundle for "
"Windows signature</a>"
msgstr "<a href=\"<package-win32-bundle-stable-sig>\">Windows 安装套件签名</a>"
#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/en/easy-download.wml:62
+#: /home/runa/tor/website/en/easy-download.wml:63
msgid ""
"<a href=\"<package-osx-bundle-stable-sig>\">Installation Bundle for OS X "
"signature</a>"
msgstr "<a href=\"<package-osx-bundle-stable-sig>\">OS X 安装套件签名</a>"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/easy-download.wml:68
+#: /home/runa/tor/website/en/easy-download.wml:69
msgid ""
"Interested in <a href=\"<page overview>#overview\">learning more about Tor "
"in general</a>?"
-msgstr "有兴趣 <a href=\"<page overview>#overview\">关于 Tor 的一般信息</a>吗？"
+msgstr ""
+"有兴趣 <a href=\"<page overview>#overview\">关于 Tor 的一般信息</a>吗？"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/easy-download.wml:74
+#: /home/runa/tor/website/en/easy-download.wml:75
msgid ""
"To keep informed of security advisories and new stable releases, subscribe "
"to the <a href=\"http://archives.seul.org/or/announce/\";>or-announce mailing "
@@ -157,25 +164,28 @@
"\"http://rss.gmane.org/gmane.network.onion-routing.announce\";>watch the "
"list's RSS feed</a>."
msgstr ""
-"为了及时得到安全警告和新的稳定版本的通知，请订阅 <a href=\"http://archives.seul.org/or/announce/\";>or-"
-"announce 邮件列表</a>（你需要通过电子邮件确认）。您还可以 <a "
-"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\";>浏览邮件列表的 RSS "
-"订阅点</a>。"
+"为了及时得到安全警告和新的稳定版本的通知，请订阅 <a href=\"http://archives.";
+"seul.org/or/announce/\">or-announce 邮件列表</a>（你需要通过电子邮件确认）。"
+"您还可以 <a href=\"http://rss.gmane.org/gmane.network.onion-routing.announce";
+"\">浏览邮件列表的 RSS 订阅点</a>。"
#. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/easy-download.wml:82
+#: /home/runa/tor/website/en/easy-download.wml:83
msgid ""
"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
"\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
"<input type=\"submit\" value=\"subscribe to or-announce\"/>"
msgstr ""
-"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type=\"hidden\" "
-"name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name=\"host\" "
-"value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> <input type=\"submit\" "
-"value=\"subscribe to or-announce\"/>"
+"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
+"\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
+"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
+"<input type=\"submit\" value=\"subscribe to or-announce\"/>"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/easy-download.wml:90
+#: /home/runa/tor/website/en/easy-download.wml:91
msgid "All trademarks are the property of their respective owners."
msgstr "所有商标均为其各自所有者的财产。"
+
+#~ msgid "Simple. Point. Click. Install."
+#~ msgstr "一键安装!"
Modified: translation/trunk/projects/website/zh_CN/1-high.finding-tor.po
===================================================================
--- translation/trunk/projects/website/zh_CN/1-high.finding-tor.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/1-high.finding-tor.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:17+0100\n"
"PO-Revision-Date: 2009-11-26 15:54-0700\n"
"Last-Translator: yfdyh000 <yfdyh000@xxxxxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,8 +21,8 @@
msgstr "Tor：寻找 Tor"
#. type: Content of: <div>
-#: /home/runa/tor/website/en/finding-tor.wml:9 /tmp/QvjJwVvlJX.xml:24
-#: /tmp/QvjJwVvlJX.xml:39 /tmp/QvjJwVvlJX.xml:60 /tmp/QvjJwVvlJX.xml:81
+#: /home/runa/tor/website/en/finding-tor.wml:9 /tmp/fxaCWCFGJE.xml:24
+#: /tmp/fxaCWCFGJE.xml:39 /tmp/fxaCWCFGJE.xml:60 /tmp/fxaCWCFGJE.xml:81
msgid "<hr />"
msgstr "<hr />"
@@ -37,9 +37,10 @@
"improve these instructions, please <a href=\"<page contact>\">contact us</a> "
"and let us know."
msgstr ""
-"有时，如果我们的网站在您的地区被封锁，您无法直接访问 Tor 项目的官方网站。这时有一些方法可以查找并下载最新版本的 "
-"Tor。如果您正在从搜索引擎的缓存，或直接从我们的网站，或通过其他方法阅读此页，希望这些内容对您有所帮助。此外，如果您有更好的建议，请 <a "
-"href=\"<page contact>\">联系我们</a> 让我们知道。"
+"有时，如果我们的网站在您的地区被封锁，您无法直接访问 Tor 项目的官方网站。这时"
+"有一些方法可以查找并下载最新版本的 Tor。如果您正在从搜索引擎的缓存，或直接从"
+"我们的网站，或通过其他方法阅读此页，希望这些内容对您有所帮助。此外，如果您有"
+"更好的建议，请 <a href=\"<page contact>\">联系我们</a> 让我们知道。"
#. type: Content of: <div>
#: /home/runa/tor/website/en/finding-tor.wml:21
@@ -51,7 +52,9 @@
msgid ""
"<a class=\"anchor\" href=\"#WithTor\">Fetching Tor with Tor: Using your web "
"browser</a>"
-msgstr "<a class=\"anchor\" href=\"#WithTor\">使用您的网络浏览器，通过 Tor 取得 Tor</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#WithTor\">使用您的网络浏览器，通过 Tor 取得 Tor</"
+"a>"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/finding-tor.wml:27
@@ -64,10 +67,11 @@
"verifying-signatures>\">verify the signature</a> of any downloaded package "
"when possible."
msgstr ""
-"如果您已经运行了 Tor，你应该可以用您现有的 Tor 安全的下载一个最新版本的 Tor。你应该这样帮助你没有 Tor 的朋友获取 Tor。你可以从 "
-"Tor 官方网站的 <a href=\"<page download>\">下载页面</a> 或众多的 <a href=\"<page "
-"mirrors>\">镜像网站</a>下载 Tor。请注意尽可能的 <a href=\"<page verifying-"
-"signatures>\">验证已下载文件的数字签名</a>。"
+"如果您已经运行了 Tor，你应该可以用您现有的 Tor 安全的下载一个最新版本的 Tor。"
+"你应该这样帮助你没有 Tor 的朋友获取 Tor。你可以从 Tor 官方网站的 <a href="
+"\"<page download>\">下载页面</a> 或众多的 <a href=\"<page mirrors>\">镜像网站"
+"</a>下载 Tor。请注意尽可能的 <a href=\"<page verifying-signatures>\">验证已下"
+"载文件的数字签名</a>。"
#. type: Content of: <div>
#: /home/runa/tor/website/en/finding-tor.wml:36
@@ -89,8 +93,9 @@
"can find the list by searching for \"Tor mirrors\" on your favorite search "
"engine."
msgstr ""
-"Tor 镜像网站是一个精确拷贝官方网站的网站。我们目前已经有 <a href=\"<page mirrors>\">几十个镜像网站</a> ， "
-"你可以通过使用你喜欢的搜索引擎搜索 \"Tor mirrors\" 获得镜像网站的列表。"
+"Tor 镜像网站是一个精确拷贝官方网站的网站。我们目前已经有 <a href=\"<page "
+"mirrors>\">几十个镜像网站</a> ， 你可以通过使用你喜欢的搜索引擎搜索 \"Tor "
+"mirrors\" 获得镜像网站的列表。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/finding-tor.wml:50
@@ -101,8 +106,9 @@
"without a signature. It's probably safe, but a cautious user should check "
"signatures when possible."
msgstr ""
-"在使用镜像网站下载后 <a href=\"<page verifying-signatures>\">验证数字签名</a>是非常重要的。我们无法保证镜像网站"
-"的没有数字签名的软件包的安全性。它也可能是安全的，但谨慎的用户应尽可能的检查数字签名。"
+"在使用镜像网站下载后 <a href=\"<page verifying-signatures>\">验证数字签名</a>"
+"是非常重要的。我们无法保证镜像网站的没有数字签名的软件包的安全性。它也可能是"
+"安全的，但谨慎的用户应尽可能的检查数字签名。"
#. type: Content of: <div>
#: /home/runa/tor/website/en/finding-tor.wml:58
@@ -123,8 +129,8 @@
"the body of the email, and instructions will be sent as a reply."
msgstr ""
"可以通过发送电子邮件到一个专门的电子邮件地址得到它的副本：'<tt>gettor AT "
-"torproject.org</tt>'。现在，任何人都可以发送电子邮件得到 Tor。用户只需要在电子邮件的正文写上'help'向我们发送， "
-"我们就会回复您。"
+"torproject.org</tt>'。现在，任何人都可以发送电子邮件得到 Tor。用户只需要在电"
+"子邮件的正文写上'help'向我们发送， 我们就会回复您。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/finding-tor.wml:70
@@ -137,10 +143,11 @@
"doesn't use DKIM, we'll send a short explanation and then ignore the email "
"address for the next day or so."
msgstr ""
-"为了避免意外的发送垃圾邮件给您，我们只回复从支持 <a href=\"http://www.dkim.org/\";>DKIM</a> "
-"功能的邮件系统发出的邮件（这是一个电子邮件功能，让我们确认，在 \"From\"栏的是真实的电子邮件地址）。Gmail "
-"就是支持这个功能的一个电子邮件系统。如果我们收到了从不支持 DKIM "
-"的电子邮件系统发出的邮件，我们会向您发送简短的说明，然后在未来一天左右忽略这个电子邮件地址。"
+"为了避免意外的发送垃圾邮件给您，我们只回复从支持 <a href=\"http://www.dkim.";
+"org/\">DKIM</a> 功能的邮件系统发出的邮件（这是一个电子邮件功能，让我们确认，"
+"在 \"From\"栏的是真实的电子邮件地址）。Gmail 就是支持这个功能的一个电子邮件系"
+"统。如果我们收到了从不支持 DKIM 的电子邮件系统发出的邮件，我们会向您发送简短"
+"的说明，然后在未来一天左右忽略这个电子邮件地址。"
#. type: Content of: <div>
#: /home/runa/tor/website/en/finding-tor.wml:79
@@ -170,13 +177,16 @@
"talk to the <tt>'gettor'</tt> user. <br/> An example response returned by "
"<tt>gettor</tt> is presented below:<br/>"
msgstr ""
-"您可以通过 XDCC IRC 文件传输协议获取源码、BIN 文件以及其它与 Tor 相关的文件。这时，您最好使用 SSL 协议连接 IRC "
-"服务器。当前已知有<tt>gettor</tt>用户活动的 IRC 服务器有 Freenode、2600、Indymedia 和 "
-"OFTC。<br/><br/>如果您现在能够连上这些 IRC 网络的其中之一，请查找用户名'<tt>gettor</tt>'，该用户连接自'<tt>ch"
-"eck.torproject.org</tt>'。找到后，请向它发送私人会话，格式如下：<br/><br/>'<tt>/msg gettor xdcc "
-"list</tt>'<br/><br/><tt>gettor</tt>会返回一个可供下载的文件列表。如果它没有反应，可能某处出了问题。某些 IRC 网络"
-"要求只有注册用户才能向其它用户发送私人会话（这是为了防止垃圾信息），这时您需要先注册，然后才能与<tt>'gettor'</tt>用户联系。<br/><"
-"tt>gettor</tt>返回的信息如下所示：<br/>"
+"您可以通过 XDCC IRC 文件传输协议获取源码、BIN 文件以及其它与 Tor 相关的文件。"
+"这时，您最好使用 SSL 协议连接 IRC 服务器。当前已知有<tt>gettor</tt>用户活动"
+"的 IRC 服务器有 Freenode、2600、Indymedia 和 OFTC。<br/><br/>如果您现在能够连"
+"上这些 IRC 网络的其中之一，请查找用户名'<tt>gettor</tt>'，该用户连接"
+"自'<tt>check.torproject.org</tt>'。找到后，请向它发送私人会话，格式如下：<br/"
+"><br/>'<tt>/msg gettor xdcc list</tt>'<br/><br/><tt>gettor</tt>会返回一个可供"
+"下载的文件列表。如果它没有反应，可能某处出了问题。某些 IRC 网络要求只有注册用"
+"户才能向其它用户发送私人会话（这是为了防止垃圾信息），这时您需要先注册，然后"
+"才能与<tt>'gettor'</tt>用户联系。<br/><tt>gettor</tt>返回的信息如下所示：<br/"
+">"
#. type: Content of: <div><p><pre>
#: /home/runa/tor/website/en/finding-tor.wml:105
@@ -226,8 +236,9 @@
"use, you may have to manually accept the file, please consult the manual for "
"your software or <a href=\"<page contact>\">contact us for help</a>."
msgstr ""
-"发送这些命令，<tt>gettor</tt> 用户会作出回应。将通过 XDCC 文件传输发送这些文件。您使用的 IRC "
-"客户端可能需要手动接收文件，请参考您的软件帮助信息或 <a href=\"<page contact>\">联系我们</a> 帮助您。"
+"发送这些命令，<tt>gettor</tt> 用户会作出回应。将通过 XDCC 文件传输发送这些文"
+"件。您使用的 IRC 客户端可能需要手动接收文件，请参考您的软件帮助信息或 <a "
+"href=\"<page contact>\">联系我们</a> 帮助您。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/finding-tor.wml:129
@@ -238,5 +249,6 @@
"user and send trojaned software. Always validate the cryptographic signature "
"of any package before attempting to do an installation of the software."
msgstr ""
-"如使用镜像一样，使用 DCC 文件传输时<a href=\"<page verifying-signatures>\">验证数字签名</a> "
-"是非常重要的。恶意用户可以容易的伪装成 IRC 用户发送木马程序。因此在准备安装任何软件前都要验证数字签名。"
+"如使用镜像一样，使用 DCC 文件传输时<a href=\"<page verifying-signatures>\">验"
+"证数字签名</a> 是非常重要的。恶意用户可以容易的伪装成 IRC 用户发送木马程序。"
+"因此在准备安装任何软件前都要验证数字签名。"
Modified: translation/trunk/projects/website/zh_CN/1-high.index.po
===================================================================
--- translation/trunk/projects/website/zh_CN/1-high.index.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/1-high.index.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-08 18:49+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: 2009-12-09 12:17-0700\n"
"Last-Translator: yfdyh000 <yfdyh000@xxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -41,8 +41,8 @@
msgstr "<a href=\"<page overview>#thesolution\">什么是 Tor？</a>"
#. type: Content of: <div>
-#: /home/runa/tor/website/en/index.wml:20 /tmp/Y5WCsZ9WlL.xml:30
-#: /tmp/Y5WCsZ9WlL.xml:76
+#: /home/runa/tor/website/en/index.wml:20 /tmp/xyu6v4u4Vx.xml:30
+#: /tmp/xyu6v4u4Vx.xml:76
msgid "<hr />"
msgstr "<hr />"
@@ -66,8 +66,9 @@
"confidential business activities and relationships, and state security known "
"as <a href=\"<page overview>\">traffic analysis</a>."
msgstr ""
-"Tor 是自由软件和一个开放网络，帮助你抵御一种威胁到个人的自由与隐私、商业活动与业务关系的机密和国家安全的网络监视行为——<a href=\"<page "
-"overview>\">流量分析</a>。"
+"Tor 是自由软件和一个开放网络，帮助你抵御一种威胁到个人的自由与隐私、商业活动"
+"与业务关系的机密和国家安全的网络监视行为——<a href=\"<page overview>\">流量分"
+"析</a>。"
# ‘Internet 连接’，还是‘网络连接’，或者‘互联网连接’？
#. type: Content of: <div><p>
@@ -81,9 +82,11 @@
"browsers, instant messaging clients, remote login, and other applications "
"based on the TCP protocol."
msgstr ""
-"Tor 将你的通信通过一个由遍及全球的志愿者运行的中继（relay）所组成的分布式网络转发，以此来保护你的安全：它令监视你的 Internet "
-"连接的那些人无法知道你所访问的站点，它还令你所访问的站点无法知道你的物理位置。Tor 能与现有的许多应用程序配合工作，包括 Web "
-"浏览器、即时通讯客户端、远程登录和基于 TCP 协议的其他应用程序。"
+"Tor 将你的通信通过一个由遍及全球的志愿者运行的中继（relay）所组成的分布式网络"
+"转发，以此来保护你的安全：它令监视你的 Internet 连接的那些人无法知道你所访问"
+"的站点，它还令你所访问的站点无法知道你的物理位置。Tor 能与现有的许多应用程序"
+"配合工作，包括 Web 浏览器、即时通讯客户端、远程登录和基于 TCP 协议的其他应用"
+"程序。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/index.wml:45
@@ -96,9 +99,11 @@
"\">overview page</a> for a more detailed explanation of what Tor does, and "
"why this diversity of users is important."
msgstr ""
-"世界各地有成千上万的用户出于多种不同的原因在使用 Tor：记者和博客、人权工作者、执法人员、军人、企业、暴政之下的公民以及像你我一样的普通公民。<a "
-"href=\"<page torusers>\">谁使用 Tor？</a> 页面有典型的 Tor 用户的例子。<a href=\"<page "
-"overview>\">概述页面</a>对 Tor 的作用以及这一用户的多样性为什么重要有更详细的解释。"
+"世界各地有成千上万的用户出于多种不同的原因在使用 Tor：记者和博客、人权工作"
+"者、执法人员、军人、企业、暴政之下的公民以及像你我一样的普通公民。<a href="
+"\"<page torusers>\">谁使用 Tor？</a> 页面有典型的 Tor 用户的例子。<a href="
+"\"<page overview>\">概述页面</a>对 Tor 的作用以及这一用户的多样性为什么重要有"
+"更详细的解释。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/index.wml:53
@@ -107,8 +112,8 @@
"should <a href=\"<page download>#Warning\">understand what Tor does and does "
"not do for you</a>."
msgstr ""
-"请注意，Tor 不会奇迹般地加密所有 Internet 活动。你需要 <a href=\"<page download>#Warning\">知道 Tor "
-"能为你做什么、不能为你做什么</a>。"
+"请注意，Tor 不会奇迹般地加密所有 Internet 活动。你需要 <a href=\"<page "
+"download>#Warning\">知道 Tor 能为你做什么、不能为你做什么</a>。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/index.wml:58
@@ -122,10 +127,12 @@
"need funds to continue making the Tor network faster and easier to use while "
"maintaining good security."
msgstr ""
-"Tor 的安全性随着用户群的扩大和更多的志愿者 <a href=\"<page docs/tor-doc-relay>\">运行中继</a> "
-"而增强。（设置中继并没有你想象中的那么困难，而且能显著<a href=\"https://wiki.torproject.org/noreply/TheO";
-"nionRouter/TorFAQ#RelayAnonymity\">提高你自身的安全性</a>。）如果你对运行中继没有兴趣，<a href=\"<page "
-"volunteer>\">该项目的其他许多方面同样需要帮助</a>，我们也需要资金，在保持好的安全性的同时让 Tor 网络更快更易于使用。"
+"Tor 的安全性随着用户群的扩大和更多的志愿者 <a href=\"<page docs/tor-doc-"
+"relay>\">运行中继</a> 而增强。（设置中继并没有你想象中的那么困难，而且能显著"
+"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#RelayAnonymity\">提高你自身的安全性</a>。）如果你对运行中继没有兴趣，"
+"<a href=\"<page volunteer>\">该项目的其他许多方面同样需要帮助</a>，我们也需要"
+"资金，在保持好的安全性的同时让 Tor 网络更快更易于使用。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/index.wml:69
@@ -134,8 +141,8 @@
"to protect your Internet traffic from analysis. Please make a <a href="
"\"<page donate>\">tax-deductible donation.</a>"
msgstr ""
-"Tor 是一个在册的 501(c)(3) U.S. 非营利性组织，其使命是来保护您帮您抵御网络流量分析。请 <a href=\"<page "
-"donate>\">免税捐助</a>"
+"Tor 是一个在册的 501(c)(3) U.S. 非营利性组织，其使命是来保护您帮您抵御网络流"
+"量分析。请 <a href=\"<page donate>\">免税捐助</a>"
#. type: Content of: <div>
#: /home/runa/tor/website/en/index.wml:74
@@ -150,7 +157,8 @@
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/index.wml:79
msgid "07 December 2009: <a href=\"<page open-positions>\">Tor is hiring!</a>"
-msgstr "2009 年 12 月 7 日：<a href=\"<page open-positions>\">Tor 正在招聘！</a>"
+msgstr ""
+"2009 年 12 月 7 日：<a href=\"<page open-positions>\">Tor 正在招聘！</a>"
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/index.wml:80
@@ -159,8 +167,8 @@
"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
"the updates and changes."
msgstr ""
-"2009 年 7 月 28 日：稳定版 Tor 0.2.1.19 发布。更新和变化请阅读 <a "
-"href=\"http://archives.seul.org/or/announce/Aug-2009/msg00000.html\";>公告</a>。"
+"2009 年 7 月 28 日：稳定版 Tor 0.2.1.19 发布。更新和变化请阅读 <a href="
+"\"http://archives.seul.org/or/announce/Aug-2009/msg00000.html\";>公告</a>。"
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/index.wml:81
@@ -169,8 +177,8 @@
"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
"the updates and changes."
msgstr ""
-"2009 年 6 月 25 日：稳定版 Tor 0.2.0.35 发布。更新和变化请阅读 "
-"<ahref=\"http://archives.seul.org/or/announce/Jun-2009/msg00000.html\";>公告</a>。"
+"2009 年 6 月 25 日：稳定版 Tor 0.2.0.35 发布。更新和变化请阅读 <ahref="
+"\"http://archives.seul.org/or/announce/Jun-2009/msg00000.html\";>公告</a>。"
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/index.wml:83
@@ -179,8 +187,9 @@
"href=\"<page press/2009-03-12-performance-roadmap-press-release>\">Press "
"Release</a> for more information."
msgstr ""
-"2009 年 3 月 12 日：Tor 推出了旨在提高性能的路线图和行动计划。更多信息请参阅<ahref=\"<page press/2009-03-12"
-"-performance-roadmap-press-release>\">新闻稿</a>。"
+"2009 年 3 月 12 日：Tor 推出了旨在提高性能的路线图和行动计划。更多信息请参阅"
+"<ahref=\"<page press/2009-03-12-performance-roadmap-press-release>\">新闻稿</"
+"a>。"
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/index.wml:84
@@ -189,8 +198,8 @@
"\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for more "
"information."
msgstr ""
-"2008 年 12 月 19 日：Tor 公布了未来三年的开发路线图。更多信息请参阅<ahref=\"<page press/2008-12-19"
-"-roadmap-press-release>\">新闻稿</a>。"
+"2008 年 12 月 19 日：Tor 公布了未来三年的开发路线图。更多信息请参阅<ahref="
+"\"<page press/2008-12-19-roadmap-press-release>\">新闻稿</a>。"
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/index.wml:87
@@ -202,10 +211,10 @@
"publicity (if they want it), and get to influence the direction of our "
"research and development. <a href=\"<page donate>\">Please donate.</a>"
msgstr ""
-"我们正在积极寻找新的赞助商和资助。</b>如果你所在的组织对保持 Tor 网络可用和快速有兴趣，请<a href=\"<page "
-"contact>\">联系我们</a>。<a href=\"<page "
-"sponsors>\">Tor的赞助商</a>将获得私人关注、更好的支持、宣传（如果他们需要），还将影响我们研究与开发的走向。<a href=\"<page "
-"donate>\">请捐助</a>。"
+"我们正在积极寻找新的赞助商和资助。</b>如果你所在的组织对保持 Tor 网络可用和快"
+"速有兴趣，请<a href=\"<page contact>\">联系我们</a>。<a href=\"<page "
+"sponsors>\">Tor的赞助商</a>将获得私人关注、更好的支持、宣传（如果他们需要），"
+"还将影响我们研究与开发的走向。<a href=\"<page donate>\">请捐助</a>。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/index.wml:96
@@ -214,5 +223,5 @@
"index>\">Press Releases</a> | <a href=\"<page tormedia>\">Tor in "
"the News</a>"
msgstr ""
-"<a href=\"<page news>\">更多新闻</a> | <a href=\"<page "
-"press/index>\">新闻稿</a> | <a href=\"<page tormedia>\">Tor 相关报道</a>"
+"<a href=\"<page news>\">更多新闻</a> | <a href=\"<page press/index>"
+"\">新闻稿</a> | <a href=\"<page tormedia>\">Tor 相关报道</a>"
Added: translation/trunk/projects/website/zh_CN/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/zh_CN/2-medium.donate.po (rev 0)
+++ translation/trunk/projects/website/zh_CN/2-medium.donate.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -0,0 +1,390 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/en/donate.wml:9
+msgid "Thanks for your support!"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/en/donate.wml:13
+msgid "We accept donations of:"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/donate.wml:15
+msgid "<a href=\"#money\">Money</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/donate.wml:16
+msgid "<a href=\"#services\">Services</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/donate.wml:17
+msgid "<a href=\"#hardware\">Hardware</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/donate.wml:18
+msgid "<a href=\"#time\">Time</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/donate.wml:19
+msgid "<a href=\"#outcome\">What happens to my donation?</a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:26
+msgid ""
+"We offer a few ways to support online privacy and anonymity through "
+"donations. You can donate <a href=\"#money\">money</a>, <a href=\"#services"
+"\">services</a>, <a href=\"#hardware\">hardware</a>, and <a href=\"#time"
+"\">time</a>. Your tax-deductible donation helps ensure online anonymity and "
+"privacy continue to exist in the world."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/KgTjgDpwzn.xml:93
+msgid "<br />"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:34
+msgid ""
+"The Tor Project is a US 501[c][3] non-profit dedicated to the research, "
+"development, and education of online anonymity and privacy. Donations to "
+"The Tor Project may be tax deductible to persons who are in the US; or who "
+"pay taxes in countries with reciprocity with the US on charitable "
+"donations. We're happy to accept donations via paypal, checks, money "
+"orders, stock grants or other more sophisticated transations. Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:43
+msgid "<a id=\"relay\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:44
+msgid "<a class=\"anchor\" href=\"#relay\">Run a relay</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:45
+msgid ""
+"The easiest, most effective way to support online privacy and anonymity "
+"around the world is to run a relay. You join a set of committed people in "
+"the world already running a relay. The easiest way to speed up Tor is to "
+"add more relays to the network. Running a relay is as easy as <a href="
+"\"<page docs/tor-doc-relay>\">clicking a button</a>. Join the network. "
+"Support your online anonymity and privacy!"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:53
+msgid "<a id=\"money\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:54
+msgid "<a class=\"anchor\" href=\"#money\">Donate Money</a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:55
+msgid "<a class=\"anchor\" href=\"#paypal\">Subscription via PayPal</a>"
+msgstr ""
+
+#. type: Content of: <div><form><p>
+#: /home/runa/tor/website/en/donate.wml:57
+msgid ""
+"One of our core fundraising goals is not to annoy donors with repeated "
+"requests. Therefore, we advocate for a subscription-based approach: simply "
+"sign up for recurring monthly donations. Consistent donations let us worry "
+"less about fund-raising and focus on improving the Tor software and network. "
+"You can cancel your subscription at any time. You can become a member by "
+"clicking on this button (you will need a <a href=\"http://paypal.com/";
+"\">PayPal</a> account):"
+msgstr ""
+
+#. type: Content of: <div><form><select>
+#: /home/runa/tor/website/en/donate.wml:59
+msgid "<br /> <br /> Choose your currency: <select name=\"currency_code\">"
+msgstr ""
+
+#. type: Content of: <div><form><p><select><option>
+#: /home/runa/tor/website/en/donate.wml:63 /tmp/KgTjgDpwzn.xml:105
+msgid "$"
+msgstr ""
+
+#. type: Content of: <div><form><p><select><option>
+#: /home/runa/tor/website/en/donate.wml:64 /tmp/KgTjgDpwzn.xml:106
+msgid "€"
+msgstr ""
+
+#. type: Content of: <div><form><p><select><option>
+#: /home/runa/tor/website/en/donate.wml:65 /tmp/KgTjgDpwzn.xml:107
+msgid "£"
+msgstr ""
+
+#. type: Content of: <div><form>
+#: /home/runa/tor/website/en/donate.wml:66
+msgid "</select>"
+msgstr ""
+
+#. type: Content of: <div><form><dl><dt>
+#: /home/runa/tor/website/en/donate.wml:69
+msgid "<input type=\"radio\" name=\"a3\" value=\"250.00\" />250/month"
+msgstr ""
+
+#. type: Content of: <div><form><dl><dt>
+#: /home/runa/tor/website/en/donate.wml:70
+msgid "<input type=\"radio\" name=\"a3\" value=\"100.00\" />100/month"
+msgstr ""
+
+#. type: Content of: <div><form><dl><dt>
+#: /home/runa/tor/website/en/donate.wml:71
+msgid "<input type=\"radio\" name=\"a3\" value=\"50.00\" />50/month"
+msgstr ""
+
+#. type: Content of: <div><form><dl><dt>
+#: /home/runa/tor/website/en/donate.wml:72
+msgid ""
+"<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
+"month"
+msgstr ""
+
+#. type: Content of: <div><form><dl><dt>
+#: /home/runa/tor/website/en/donate.wml:73
+msgid "<input type=\"radio\" name=\"a3\" value=\"10.00\" />10/month"
+msgstr ""
+
+#. type: Content of: <div><form><dl><dt>
+#: /home/runa/tor/website/en/donate.wml:74
+msgid "<input type=\"radio\" name=\"a3\" value=\"5.00\" />5/month"
+msgstr ""
+
+#. type: Content of: <div><form>
+#: /home/runa/tor/website/en/donate.wml:77
+msgid ""
+"<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" "
+"name=\"t3\" value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /"
+"> <input type=\"hidden\" name=\"src\" value=\"1\" /> <input type=\"hidden\" "
+"name=\"no_shipping\" value=\"1\" /> <input type=\"hidden\" name=\"no_note\" "
+"value=\"1\" /> <input type=\"image\" src=\"images/btn_donateCC_LG.gif\" name="
+"\"submit\" alt=\"Make payments with PayPal - it's fast, free and secure!\"/> "
+"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" /> "
+"<input type=\"hidden\" name=\"business\" value=\"donations@xxxxxxxxxxxxxx\" /"
+"> <input type=\"hidden\" name=\"item_name\" value=\"Tor Project Membership"
+"\" /> <input type=\"hidden\" name=\"return\" value=\"https://www.torproject.";
+"org/donate#funds\"/> <input type=\"hidden\" name=\"cancel_return\" value="
+"\"https://www.torproject.org/donate\"/>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:94
+msgid "<a class=\"anchor\" href=\"#paypal\">Single donation via PayPal</a>"
+msgstr ""
+
+#. type: Content of: <div><form><p><select>
+#: /home/runa/tor/website/en/donate.wml:96
+msgid ""
+"You can also make a <b>one-time donation</b> (via PayPal, but doesn't "
+"require any account):<br /> <input type=\"radio\" name=\"amount\" value="
+"\"100.00\" />100 <input type=\"radio\" name=\"amount\" value=\"50.00\" />50 "
+"<input type=\"radio\" name=\"amount\" value=\"20.00\" checked=\"checked\" /"
+">20 <input type=\"radio\" name=\"amount\" value=\"10.00\" />10 <input type="
+"\"radio\" name=\"amount\" value=\"\" />other amount <select name="
+"\"currency_code\">"
+msgstr ""
+
+#. type: Content of: <div><form><p>
+#: /home/runa/tor/website/en/donate.wml:108
+msgid ""
+"</select> <input type=\"hidden\" name=\"no_shipping\" value=\"1\" /> <input "
+"type=\"image\" src=\"images/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make "
+"payments with PayPal - it's fast, free and secure!\"/> <input type=\"hidden"
+"\" name=\"cmd\" value=\"_xclick\" /> <input type=\"hidden\" name=\"business"
+"\" value=\"donations@xxxxxxxxxxxxxx\" /> <input type=\"hidden\" name="
+"\"item_name\" value=\"Tor\" /> <input type=\"hidden\" name=\"return\" value="
+"\"https://www.torproject.org/donate#funds\"/> <input type=\"hidden\" name="
+"\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:124
+msgid "If you want to send a check, money order, or cash, please send to:"
+msgstr ""
+
+#. type: Content of: <div><p><address>
+#: /home/runa/tor/website/en/donate.wml:127
+msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:131
+msgid ""
+"If you want a donation receipt for your non-paypal, non-check deposit, "
+"please specifically request one with your mailed donation."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:135
+msgid "<a id=\"services\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:136
+msgid "<a class=\"anchor\" href=\"#services\">Donate Services</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:137
+msgid ""
+"The Tor Project is always looking for services relating to technical needs, "
+"like bandwidth, colocation, hosted services, legal representation, or "
+"consulting. By donating services, you join our <a href=\"<page sponsors>"
+"\">many sponsors</a> in providing online privacy and anonymity. We're "
+"currently looking for scalable hosting services for reporting needs from "
+"large data sets and reliable high-bandwidth hosting. We may have hardware "
+"we can provide you for your service donation."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:144
+msgid ""
+"Can you write code? We're always looking for smart, motivated coders to "
+"either port Tor to new or old operating systems, or solve difficult online "
+"anonymity problems. Take a look at <a href=\"<page volunteer>#Coding\">our "
+"coding projects</a>."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:148
+msgid ""
+"Are you a creative person? Do you have a fantastic idea for a campaign? Are "
+"you someone who can come up with awesome artwork? We're always looking for "
+"new ways to promote Tor and get the word out that everyone needs their "
+"privacy and anonymity online."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:152
+msgid ""
+"Is your legal firm willing to defend Tor and its volunteers? Are you waiting "
+"for an interesting case to defend online privacy and anonymity?"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:155
+msgid ""
+"If any of the service ideas struck a nerve, contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:158
+msgid "<a id=\"hardware\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:159
+msgid "<a class=\"anchor\" href=\"#hardware\">Donate Hardware</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:160
+msgid ""
+"We're generally looking for donated hardware and support services that could "
+"be used to provide the infrastructure that supports Tor's operations, "
+"including website mirrors, database servers, build systems and legacy "
+"hardware for supporting packages on older Operating Systems; such as OS X "
+"10.2, OS X 10.3, Windows XP, Windows 7, IRIX, Redhat, CentOS, Fedora, "
+"Debian, etc. A number of service providers have an abundance of bandwidth "
+"capacity, but need hardware in order donate it to us."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:161
+msgid ""
+"By donating hardware, you're joining our <a href=\"<page sponsors>\">many "
+"sponsors</a> in providing online privacy and anonymity. If you want Tor to "
+"work on your architecture or hardware, a fine way to do this is to donate "
+"the hardware and operating system to us. Contact us at donations@torproject."
+"org for more details."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:164
+msgid "<a id=\"time\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:165
+msgid "<a class=\"anchor\" href=\"#time\">Donate Time</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:166
+msgid ""
+"We're always looking for excited volunteers to give talks or trainins at "
+"conferences, barcamps, and other meetings where people should learn about "
+"online privacy and anonymity with Tor. We're happy to work with you to help "
+"you better present Tor and online privacy and anonymity. Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:169
+msgid ""
+"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
+"\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:171
+msgid "<a class=\"anchor\" href=\"#outcome\">What happens to my donation?</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:172
+msgid ""
+"If you've just donated, thank you for your donation. Your funds are "
+"deposited into our general fund. You join our <a href=\"<page sponsors>"
+"\">many sponsors</a> in funding the future of Tor and online anonymity. In "
+"2008, the Tor Project spent and received its funds as follows:"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:175
+msgid ""
+"<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor Project?"
+"\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
+"spent?\"/>"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:179
+msgid ""
+"<strong>The Tor Project respects the confidentiality of our supporters, when "
+"requested. We do not lend, rent, or sell our lists of donors at any time.</"
+"strong>"
+msgstr ""
Modified: translation/trunk/projects/website/zh_CN/2-medium.overview.po
===================================================================
--- translation/trunk/projects/website/zh_CN/2-medium.overview.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/2-medium.overview.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: 2009-11-29 22:44+0800\n"
"Last-Translator: yfdyh000 <yfdyh000@xxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,6 @@
#. END SIDEBAR
#. type: Content of: <div>
-#. END SIDEBAR
#: /home/runa/tor/website/en/overview.wml:25
msgid "<hr />"
msgstr "<hr />"
@@ -76,8 +75,9 @@
"allow organizations and individuals to share information over public "
"networks without compromising their privacy."
msgstr ""
-"Tor 是一个由虚拟通道组成的网络使人们和团体来提高自己在互联网上的隐私和安全。同时它使软件开发人员能够创建具有内建隐私保护特性的新的通信工具。Tor "
-"为一系列应用的基础，使组织和个人在公共网络上分享信息而不必担心隐私受到威胁。"
+"Tor 是一个由虚拟通道组成的网络使人们和团体来提高自己在互联网上的隐私和安全。"
+"同时它使软件开发人员能够创建具有内建隐私保护特性的新的通信工具。Tor 为一系列"
+"应用的基础，使组织和个人在公共网络上分享信息而不必担心隐私受到威胁。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:38
@@ -91,10 +91,11 @@
"chat rooms and web forums for rape and abuse survivors, or people with "
"illnesses."
msgstr ""
-"个人使用 Tor 以防止网站追踪他们和他们的家庭成员，或连接到本地 ISP（互联网服务提供商）封锁的新闻网站、即时通讯服务等地方。Tor 的 <a "
-"href=\"<page docs/tor-hidden-service>\">隐匿服务</a> "
-"让用户能够发布网站和其他服务，而无需泄露站点的位置。个人还使用 Tor "
-"进行社会敏感通讯：例如为强奸和虐待案件的幸存者、或是患某些疾病的人设立的聊天室和论坛。"
+"个人使用 Tor 以防止网站追踪他们和他们的家庭成员，或连接到本地 ISP（互联网服务"
+"提供商）封锁的新闻网站、即时通讯服务等地方。Tor 的 <a href=\"<page docs/tor-"
+"hidden-service>\">隐匿服务</a> 让用户能够发布网站和其他服务，而无需泄露站点的"
+"位置。个人还使用 Tor 进行社会敏感通讯：例如为强奸和虐待案件的幸存者、或是患某"
+"些疾病的人设立的聊天室和论坛。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:49
@@ -106,7 +107,8 @@
"organization."
msgstr ""
"记者使用 Tor 与告密者和持不同政见者更安全地交流。非政府组织（NGOs）也在使用 "
-"Tor，当工作人员在国外时，他们可以连接自己的网站，而周围的人对他们的工作却一无所知。"
+"Tor，当工作人员在国外时，他们可以连接自己的网站，而周围的人对他们的工作却一无"
+"所知。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:57
@@ -121,9 +123,12 @@
"Which locations have employees consulting job-hunting websites? Which "
"research divisions are communicating with the company's patent lawyers?"
msgstr ""
-"独立媒体中心（Indymedia）之类的团体建议使用 Tor 来保护成员的在线隐私和安全。电子前沿基金会（EFF）之类的社会活动团体建议将 Tor "
-"作为维护公民在线自由的一种机制。公司使用 Tor 安全地从事竞争力分析，或者确保敏感的采购模式不被泄露。他们还用它来替代传统的虚拟专用网络（VPNs），"
-"后者会泄露精确的通信量和通信时间：最近员工在什么地点工作？在什么地点有员工访问求职网站？哪些研究分支在和公司的专利律师交流？"
+"独立媒体中心（Indymedia）之类的团体建议使用 Tor 来保护成员的在线隐私和安全。"
+"电子前沿基金会（EFF）之类的社会活动团体建议将 Tor 作为维护公民在线自由的一种"
+"机制。公司使用 Tor 安全地从事竞争力分析，或者确保敏感的采购模式不被泄露。他们"
+"还用它来替代传统的虚拟专用网络（VPNs），后者会泄露精确的通信量和通信时间：最"
+"近员工在什么地点工作？在什么地点有员工访问求职网站？哪些研究分支在和公司的专"
+"利律师交流？"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:70
@@ -134,8 +139,9 @@
"leaving government IP addresses in their web logs, and for security during "
"sting operations."
msgstr ""
-"美国海军的一个分支使用 Tor 实验开源的情报收集，它的一个小组最近在中东部署的时候也使用了 Tor。执法人员使用 "
-"Tor，一方面为了在访问和监视网站时不在网站的日志中留下政府部门的 IP 地址，另一方面为了特情引诱（sting operations）的安全。"
+"美国海军的一个分支使用 Tor 实验开源的情报收集，它的一个小组最近在中东部署的时"
+"候也使用了 Tor。执法人员使用 Tor，一方面为了在访问和监视网站时不在网站的日志"
+"中留下政府部门的 IP 地址，另一方面为了特情引诱（sting operations）的安全。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:78
@@ -146,10 +152,10 @@
"more populous and diverse the user base for Tor is, the more your anonymity "
"will be protected."
msgstr ""
-"Tor 的用户的多样性正是 <a "
-"href=\"http://freehaven.net/doc/fc03/econymics.pdf\";>使之如此安全的部分原因</a>。Tor 把你隐藏在 "
-"<a href=\"<page torusers>\">网络上的其他用户</a> 之中，所以 Tor "
-"的用户群越发庞大和复杂，你的匿名性就会得到越好的保护。"
+"Tor 的用户的多样性正是 <a href=\"http://freehaven.net/doc/fc03/econymics.pdf";
+"\">使之如此安全的部分原因</a>。Tor 把你隐藏在 <a href=\"<page torusers>\">网"
+"络上的其他用户</a> 之中，所以 Tor 的用户群越发庞大和复杂，你的匿名性就会得到"
+"越好的保护。"
#. type: Content of: <div>
#: /home/runa/tor/website/en/overview.wml:86
@@ -176,10 +182,13 @@
"reveal your national origin and professional affiliation to anyone observing "
"the network, even if the connection is encrypted."
msgstr ""
-"使用 Tor 能抵御一种普遍的网络监视行为——“流量分析”（traffic analysis）。流量分析可以用来在一个公共的网络上推断出谁在和谁交流。如"
-"果他人知道了你的网络流量的来源和目的地，他们就可以跟踪你的行为和兴趣。这会影响你的钱包，举个例子，电子商务网站可能会针对不同的国家和机构制定不同的价格。"
-"泄露你的身份和地点甚至会威胁你的工作和人身安全。举个例子，如果你在国外连接到你的雇主的电脑去接收和发送邮件，你就会在不经意间向任何监视网络的人泄露了你的"
-"国籍和职业——即使连接是加密的也没有用。"
+"使用 Tor 能抵御一种普遍的网络监视行为——“流量分析”（traffic analysis）。流量分"
+"析可以用来在一个公共的网络上推断出谁在和谁交流。如果他人知道了你的网络流量的"
+"来源和目的地，他们就可以跟踪你的行为和兴趣。这会影响你的钱包，举个例子，电子"
+"商务网站可能会针对不同的国家和机构制定不同的价格。泄露你的身份和地点甚至会威"
+"胁你的工作和人身安全。举个例子，如果你在国外连接到你的雇主的电脑去接收和发送"
+"邮件，你就会在不经意间向任何监视网络的人泄露了你的国籍和职业——即使连接是加密"
+"的也没有用。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:105
@@ -192,9 +201,11 @@
"what you're saying. That's because it focuses on the header, which "
"discloses source, destination, size, timing, and so on."
msgstr ""
-"流量分析的原理是什么？互联网上的数据包由两部分组成：数据有效载荷（data payload）和用来路由的报头（header）。有效载荷是正在发送的数据，"
-"它可能是一封邮件、一张网页或是一个音频文件。即便你加密通信中的有效载荷，流量分析一样能够揭露许多你在做的事，甚至有可能揭露你在说些什么。那是因为它所分析"
-"的是报头，报头记录着来源、目的地、数据大小、时间等等信息。"
+"流量分析的原理是什么？互联网上的数据包由两部分组成：数据有效载荷（data "
+"payload）和用来路由的报头（header）。有效载荷是正在发送的数据，它可能是一封邮"
+"件、一张网页或是一个音频文件。即便你加密通信中的有效载荷，流量分析一样能够揭"
+"露许多你在做的事，甚至有可能揭露你在说些什么。那是因为它所分析的是报头，报头"
+"记录着来源、目的地、数据大小、时间等等信息。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:115
@@ -206,8 +217,9 @@
"might involve sitting somewhere between sender and recipient on the network, "
"looking at headers."
msgstr ""
-"对于一个隐私意识强的人，一个基本问题是：通信的对方可以从报头得到有用的东西，授权的中间媒介（比如 "
-"ISP），有时甚至未授权的中间媒介，也可以这么做。一个非常简单的流量分析的形式是：藏身于网络上发送者和接收者之间的某个地方，偷看报头。"
+"对于一个隐私意识强的人，一个基本问题是：通信的对方可以从报头得到有用的东西，"
+"授权的中间媒介（比如 ISP），有时甚至未授权的中间媒介，也可以这么做。一个非常"
+"简单的流量分析的形式是：藏身于网络上发送者和接收者之间的某个地方，偷看报头。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:124
@@ -219,7 +231,8 @@
"attackers, since it only hides the content of Internet traffic, not the "
"headers."
msgstr ""
-"但是，更强大的流量分析同样存在。一些攻击者暗中监视互联网的多个部分，使用高深的统计技术跟踪许多不同的组织和个人的通信模式。加密并不能抵御这些攻击者，因为"
+"但是，更强大的流量分析同样存在。一些攻击者暗中监视互联网的多个部分，使用高深"
+"的统计技术跟踪许多不同的组织和个人的通信模式。加密并不能抵御这些攻击者，因为"
"加密隐藏的仅仅是流量的内容，而不是报头。"
#. type: Content of: <div>
@@ -232,7 +245,9 @@
msgid ""
"<a class=\"anchor\" href=\"#thesolution\">The solution: a distributed, "
"anonymous network</a>"
-msgstr "<a class=\"anchor\" href=\"#thesolution\">解决方案：一个分布式的、匿名的网络</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#thesolution\">解决方案：一个分布式的、匿名的网络"
+"</a>"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:136
@@ -247,9 +262,12 @@
"that cover your tracks so no observer at any single point can tell where the "
"data came from or where it's going."
msgstr ""
-"Tor 有助于降低简单的和高级的流量分析的风险，Tor 把你的流量分散到互联网上的多个地点，所以不存在单一的一点可以把你和你的目的地联系起来。这就好像用"
-"一条拐弯抹角的、难以辨认的路径甩掉跟踪你的人，然后定期擦掉你的脚印。在 Tor 网络上，来源和目的地不是用一条路径直接连接的，而是由一条通过数台中继的随"
-"机路径覆盖原始路径，数据包在这条路径上传输，因此，不存在任何单一一点上的观察者能够知道数据从哪里来、到哪里去。"
+"Tor 有助于降低简单的和高级的流量分析的风险，Tor 把你的流量分散到互联网上的多"
+"个地点，所以不存在单一的一点可以把你和你的目的地联系起来。这就好像用一条拐弯"
+"抹角的、难以辨认的路径甩掉跟踪你的人，然后定期擦掉你的脚印。在 Tor 网络上，来"
+"源和目的地不是用一条路径直接连接的，而是由一条通过数台中继的随机路径覆盖原始"
+"路径，数据包在这条路径上传输，因此，不存在任何单一一点上的观察者能够知道数据"
+"从哪里来、到哪里去。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:147
@@ -268,9 +286,11 @@
"keys for each hop along the circuit to ensure that each hop can't trace "
"these connections as they pass through."
msgstr ""
-"用 Tor 创建一条私有网络路径时，用户的软件或客户端通过网络上的中继递增地建立一条由若干加密连接组成的环路（circuit）。环路一次扩展一跳（hop"
-"），环路上的中继仅仅知道它从哪一个中继接收数据以及向哪一个中继发送数据。没有一台单独的中继会知道数据包的完整路径。客户端与环路上的每一跳都协商一组独立的"
-"密钥，这样可以保证数据通过任何一跳时都无法跟踪。"
+"用 Tor 创建一条私有网络路径时，用户的软件或客户端通过网络上的中继递增地建立一"
+"条由若干加密连接组成的环路（circuit）。环路一次扩展一跳（hop），环路上的中继"
+"仅仅知道它从哪一个中继接收数据以及向哪一个中继发送数据。没有一台单独的中继会"
+"知道数据包的完整路径。客户端与环路上的每一跳都协商一组独立的密钥，这样可以保"
+"证数据通过任何一跳时都无法跟踪。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:160
@@ -287,9 +307,10 @@
"link the connection's source and destination. Tor only works for TCP "
"streams and can be used by any application with SOCKS support."
msgstr ""
-"一旦环路建立完成，多种类型的数据可以在上面进行交换，不同种类的应用程序也可以在 Tor "
-"网络上部署。因为每一台中继最多只能知道环路中的一跳，窃听者或者被入侵的中继都无法通过流量分析把连接的来源和目的地联系起来。Tor 仅作用于 TCP "
-"数据流，任何支持 SOCKS 的应用程序都可以使用它。"
+"一旦环路建立完成，多种类型的数据可以在上面进行交换，不同种类的应用程序也可以"
+"在 Tor 网络上部署。因为每一台中继最多只能知道环路中的一跳，窃听者或者被入侵的"
+"中继都无法通过流量分析把连接的来源和目的地联系起来。Tor 仅作用于 TCP 数据流，"
+"任何支持 SOCKS 的应用程序都可以使用它。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:173
@@ -298,7 +319,8 @@
"happen within the same ten minutes or so. Later requests are given a new "
"circuit, to keep people from linking your earlier actions to the new ones."
msgstr ""
-"为了提高效率，Tor 为大约在相同的十分钟内发起的连接请求分配同一环路。以后的请求被分配不同的环路，这样他人就不能把你早先的行为和新的行为联系起来。"
+"为了提高效率，Tor 为大约在相同的十分钟内发起的连接请求分配同一环路。以后的请"
+"求被分配不同的环路，这样他人就不能把你早先的行为和新的行为联系起来。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:179
@@ -329,10 +351,12 @@
"docs/tor-hidden-service>\">configuring hidden services</a> and how the <a "
"href=\"<page hidden-services>\">hidden service protocol</a> works."
msgstr ""
-"Tor 同样使得用户能够在隐藏自身位置的前提下提供各类服务，例如 Web 发布和及时通讯服务器。其他 Tor 用户使用 Tor "
-"的“聚合点”（rendezvous points）连接到这些隐匿服务，互相都不知道对方的网络标识。Tor 用户能够使用这项隐匿服务功能建立网站，人们在网"
-"站上发布资料而不用担心遭到审查。没人能够确认到底是谁在运行网站，网站的运行者也不知道到底是谁发布了资料。了解更多有关 <a href=\"<page "
-"docs/tor-hidden-service>\">配置隐匿服务</a> 的信息以及 <a href=\"<page hidden-"
+"Tor 同样使得用户能够在隐藏自身位置的前提下提供各类服务，例如 Web 发布和及时通"
+"讯服务器。其他 Tor 用户使用 Tor 的“聚合点”（rendezvous points）连接到这些隐匿"
+"服务，互相都不知道对方的网络标识。Tor 用户能够使用这项隐匿服务功能建立网站，"
+"人们在网站上发布资料而不用担心遭到审查。没人能够确认到底是谁在运行网站，网站"
+"的运行者也不知道到底是谁发布了资料。了解更多有关 <a href=\"<page docs/tor-"
+"hidden-service>\">配置隐匿服务</a> 的信息以及 <a href=\"<page hidden-"
"services>\">隐匿服务协议</a> 的原理。"
#. type: Content of: <div>
@@ -354,8 +378,9 @@
"example, you can use web proxies such as Privoxy while web browsing to block "
"cookies and withhold information about your browser type."
msgstr ""
-"Tor 并不能解决所有匿名问题。它所关注的仅仅是保护数据的传输。如果你不想让你所访问的网站知道你的身份信息，你需要使用支持特定协议的软件。比如，浏览 "
-"Web 时你可以使用 Privoxy 之类的 Web 代理软件阻挡 cookies，隐藏浏览器的类型。"
+"Tor 并不能解决所有匿名问题。它所关注的仅仅是保护数据的传输。如果你不想让你所"
+"访问的网站知道你的身份信息，你需要使用支持特定协议的软件。比如，浏览 Web 时你"
+"可以使用 Privoxy 之类的 Web 代理软件阻挡 cookies，隐藏浏览器的类型。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:212
@@ -368,9 +393,11 @@
"chosen destination, he can use statistical analysis to discover that they "
"are part of the same circuit."
msgstr ""
-"同样，在保护匿名时要学得聪明些。不要在 Web 表单里输入你的名字和其他会泄露身份的信息。要知道，和其他速度快到可以进行 Web "
-"浏览的匿名网络一样，Tor对于端到端的计时攻击（end-to-end timing "
-"attacks）不提供保护：如果攻击者知道出自你电脑的流量，也知道到达你所选目的地的流量，他就可以使用统计分析发现它们是同一环路的一部分。"
+"同样，在保护匿名时要学得聪明些。不要在 Web 表单里输入你的名字和其他会泄露身份"
+"的信息。要知道，和其他速度快到可以进行 Web 浏览的匿名网络一样，Tor对于端到端"
+"的计时攻击（end-to-end timing attacks）不提供保护：如果攻击者知道出自你电脑的"
+"流量，也知道到达你所选目的地的流量，他就可以使用统计分析发现它们是同一环路的"
+"一部分。"
#. type: Content of: <div>
#: /home/runa/tor/website/en/overview.wml:221
@@ -396,11 +423,13 @@
"volunteer>\">volunteering</a> as a <a href=\"<page documentation>#Developers"
"\">developer</a>."
msgstr ""
-"今天，在互联网上提供一个可用的匿名网络是一项持续的挑战。我们希望软件能满足用户的需求。我们也需要网络以一种支持尽可能多的用户的方式运行。安全性和可用性并"
-"非互相矛盾：随着 Tor "
-"的可用性的增加，它会吸引更多的用户，用户的增加提高了每次通信的来源与目的地的可能性，从而增强了每个人的安全性。我们在进步，但我们需要你的帮助。请考虑 "
-"<a href=\"<page docs/tor-doc-relay>\">运行中继</a> 或者 <a href=\"<page "
-"volunteer>\">志愿</a> 作一名 <a href=\"<page documentation>#Developers\">开发者</a>。"
+"今天，在互联网上提供一个可用的匿名网络是一项持续的挑战。我们希望软件能满足用"
+"户的需求。我们也需要网络以一种支持尽可能多的用户的方式运行。安全性和可用性并"
+"非互相矛盾：随着 Tor 的可用性的增加，它会吸引更多的用户，用户的增加提高了每次"
+"通信的来源与目的地的可能性，从而增强了每个人的安全性。我们在进步，但我们需要"
+"你的帮助。请考虑 <a href=\"<page docs/tor-doc-relay>\">运行中继</a> 或者 <a "
+"href=\"<page volunteer>\">志愿</a> 作一名 <a href=\"<page "
+"documentation>#Developers\">开发者</a>。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/overview.wml:239
@@ -413,5 +442,7 @@
"additional diversity, enhancing Tor's ability to put control over your "
"security and privacy back into your hands."
msgstr ""
-"法律、政策和技术的当前趋势以前所未有的程度威胁着匿名，破坏着我们在线言论与阅读的自由。这些趋势也使得个人、组织、公司、政府间的通信更易分析，削弱了国家和"
-"关键基础设施的安全。每一个新的用户、每一台新的中继都会增加网络的多样性，Tor 由此更能帮助你把安全和隐私的控制权重新掌握在自己手中。"
+"法律、政策和技术的当前趋势以前所未有的程度威胁着匿名，破坏着我们在线言论与阅"
+"读的自由。这些趋势也使得个人、组织、公司、政府间的通信更易分析，削弱了国家和"
+"关键基础设施的安全。每一个新的用户、每一台新的中继都会增加网络的多样性，Tor "
+"由此更能帮助你把安全和隐私的控制权重新掌握在自己手中。"
Modified: translation/trunk/projects/website/zh_CN/3-low.people.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.people.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/3-low.people.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-08 18:49+0100\n"
+"POT-Creation-Date: 2009-12-18 23:17+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -84,35 +84,49 @@
#. type: Content of: <div><dl><dt>
#: /home/runa/tor/website/en/people.wml:39
-msgid "Roger Dingledine (Project Leader; Director)"
+msgid "Erinn Clark (Packaging and Build Automation)"
msgstr ""
#. type: Content of: <div><dl><dd>
#: /home/runa/tor/website/en/people.wml:39
msgid ""
+"Erinn is tackling the growing needs for easy to install and configure "
+"packages on a variety of operating systems. Also working on automating the "
+"build system and producing nightly builds for all operating systems we "
+"support."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:43
+msgid "Roger Dingledine (Project Leader; Director)"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:43
+msgid ""
"Original developer of Tor; now plays pretty much all the roles to keep "
"everything on track."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:42
+#: /home/runa/tor/website/en/people.wml:46
msgid "Matt Edman (Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:42
+#: /home/runa/tor/website/en/people.wml:46
msgid ""
"Lead developer for <a href=\"<page vidalia/index>\">Vidalia</a>, a cross-"
"platform Tor GUI included in the Windows and OS X bundles."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:45
+#: /home/runa/tor/website/en/people.wml:49
msgid "Christian Fromme (Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:45
+#: /home/runa/tor/website/en/people.wml:49
msgid ""
"Christian works on all things python for Tor. He enhanced and maintains a "
"slew of codebases for us, such as the get-tor email auto-responder, check."
@@ -120,12 +134,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:49
+#: /home/runa/tor/website/en/people.wml:53
msgid "Melissa Gilroy (CFO and Internal Audit)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:49
+#: /home/runa/tor/website/en/people.wml:53
msgid ""
"With a strong background in non-profit accounting and auditing, Melissa is "
"in charge of Tor's finances, audit compliance, and keeping Tor's financial "
@@ -133,12 +147,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:53
+#: /home/runa/tor/website/en/people.wml:57
msgid "Sebastian Hahn"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:53
+#: /home/runa/tor/website/en/people.wml:57
msgid ""
"Worked during the 2008 Google Summer of Code on a networking application to "
"automatically carry out tests for Tor and during the 2009 Google Summer of "
@@ -147,14 +161,14 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:57
+#: /home/runa/tor/website/en/people.wml:61
msgid ""
"Andrew Lewman (Executive Director; Director; <a href=\"<page press/index>"
"\">press contact</a>)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
msgid ""
"Manages the business operations of The Tor Project, Inc. Plays roles of "
"finance, advocacy, project management, and general support. General package "
@@ -162,12 +176,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:62
+#: /home/runa/tor/website/en/people.wml:66
msgid "Karsten Loesing (Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:62
+#: /home/runa/tor/website/en/people.wml:66
msgid ""
"Worked during the 2007 Google Summer of Code on <a href=\"<svnsandbox>doc/"
"spec/proposals/114-distributed-storage.txt\">distributing and securing the "
@@ -177,24 +191,24 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:70
+#: /home/runa/tor/website/en/people.wml:74
msgid "Nick Mathewson (Chief architect; Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:70
+#: /home/runa/tor/website/en/people.wml:74
msgid ""
"One of the three original designers of Tor; does a lot of the ongoing design "
"work. One of the two main developers, along with Roger."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:73
+#: /home/runa/tor/website/en/people.wml:77
msgid "Steven Murdoch (Researcher and Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:73
+#: /home/runa/tor/website/en/people.wml:77
msgid ""
"Researcher at the University of Cambridge, currently funded by The Tor "
"Project to improve the security, performance, and usability of Tor. Creator "
@@ -202,36 +216,36 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:78
+#: /home/runa/tor/website/en/people.wml:82
msgid "Peter Palfrader"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:78
+#: /home/runa/tor/website/en/people.wml:82
msgid ""
"Manages the Debian packages, runs one of the directory authorities, runs the "
"website and the wiki, and generally helps out a lot."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:81
+#: /home/runa/tor/website/en/people.wml:85
msgid "Martin Peck (Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:81
+#: /home/runa/tor/website/en/people.wml:85
msgid ""
"Working on a VM-based transparent proxying approach for Tor clients on "
"Windows."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:83
+#: /home/runa/tor/website/en/people.wml:87
msgid "Mike Perry (Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:83
+#: /home/runa/tor/website/en/people.wml:87
msgid ""
"Author of <a href=\"https://svn.torproject.org/svn/torflow/trunk/README";
"\">TorFlow</a>, a Tor controller that builds paths through the Tor network "
@@ -240,24 +254,24 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:88
+#: /home/runa/tor/website/en/people.wml:92
msgid "Karen Reilly (Development Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:88
+#: /home/runa/tor/website/en/people.wml:92
msgid ""
"Responsible for fundraising, advocacy, and general marketing and outreach "
"programs for Tor."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:91
+#: /home/runa/tor/website/en/people.wml:95
msgid "Paul Syverson"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:91
+#: /home/runa/tor/website/en/people.wml:95
msgid ""
"Inventor of <a href=\"http://www.onion-router.net/\";>Onion Routing</a>, "
"original designer of Tor along with Roger and Nick, and project leader for "
@@ -266,69 +280,69 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:98
+#: /home/runa/tor/website/en/people.wml:102
msgid "<a id=\"Board\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
msgid ""
"<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:103
+#: /home/runa/tor/website/en/people.wml:107
msgid "Ian Goldberg (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:103
+#: /home/runa/tor/website/en/people.wml:107
msgid ""
"Cryptographer, privacy expert, and professor; one of the designers of <a "
"href=\"http://www.cypherpunks.ca/otr/\";>Off-the-Record Messaging</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:106
+#: /home/runa/tor/website/en/people.wml:110
msgid "Xianghui (Isaac) Mao (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:106
+#: /home/runa/tor/website/en/people.wml:110
msgid ""
"Chinese blogging and privacy activist. His current activities can be found "
"at <a href=\"http://isaacmao.com/\";>his website</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:109
+#: /home/runa/tor/website/en/people.wml:113
msgid "Frank Rieger (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:109
+#: /home/runa/tor/website/en/people.wml:113
msgid "CTO of <a href=\"http://www.gsmk.de/\";>GSMK Cryptophone</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:111
+#: /home/runa/tor/website/en/people.wml:115
msgid "Wendy Seltzer (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:111
+#: /home/runa/tor/website/en/people.wml:115
msgid ""
"Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects.";
"org/\">ChillingEffects.org</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:114
+#: /home/runa/tor/website/en/people.wml:118
msgid "Fred von Lohmann (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:114
+#: /home/runa/tor/website/en/people.wml:118
msgid ""
"Fred is a Senior Intellectual Property Attorney at the Electronic Frontier "
"Foundation (EFF). His complete bio can be found at the <a href=\"http://www.";
@@ -336,27 +350,27 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:119
+#: /home/runa/tor/website/en/people.wml:123
msgid "Along with Roger, Nick, and Andrew listed above as Directors."
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
msgid "<a id=\"Summer\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:123
+#: /home/runa/tor/website/en/people.wml:127
msgid "<a class=\"anchor\" href=\"#Summer\">Summer students:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:126
+#: /home/runa/tor/website/en/people.wml:130
msgid "Christopher Davis"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:126
+#: /home/runa/tor/website/en/people.wml:130
msgid ""
"Adapts Polipo to depend upon the libevent library, making use of its event "
"loop, asynchronous DNS resolver, and utility library. (<a href=\"http://www.";
@@ -365,12 +379,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
msgid "Damian Johnson"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
msgid ""
"Builds a command-line application for monitoring Tor relays, providing real-"
"time status information such as the current configuration, bandwidth usage, "
@@ -379,12 +393,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:136
+#: /home/runa/tor/website/en/people.wml:140
msgid "Kory Kirk"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:136
+#: /home/runa/tor/website/en/people.wml:140
msgid ""
"Extends <a href=\"<page torbutton/index>\">Torbutton</a> by implementing "
"three feature requests, namely the <a href=\"https://bugs.torproject.org/";
@@ -397,12 +411,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:147
+#: /home/runa/tor/website/en/people.wml:151
msgid "Runa Sandvik"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:147
+#: /home/runa/tor/website/en/people.wml:151
msgid ""
"Improves usability of <a href=\"https://translation.torproject.org/";
"\">translating the website</a> by automatically converting wml files to po "
@@ -412,12 +426,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:154
+#: /home/runa/tor/website/en/people.wml:158
msgid "Stephen Tyree"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:154
+#: /home/runa/tor/website/en/people.wml:158
msgid ""
"Develops a plugin API for <a href=\"<page vidalia/index>\">Vidalia</a> and "
"creates a plugin to allow HerdictWeb integration, a project aiming at "
@@ -428,136 +442,136 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
msgid "<a id=\"Translators\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:166
+#: /home/runa/tor/website/en/people.wml:170
msgid "<a class=\"anchor\" href=\"#Translators\">Core translators:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:169
+#: /home/runa/tor/website/en/people.wml:173
msgid "Bogdan Drozdowski"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:169
+#: /home/runa/tor/website/en/people.wml:173
msgid "<a href=\"https://www.torproject.org/index.html.pl\";>Polish</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:171
+#: /home/runa/tor/website/en/people.wml:175
msgid "fredzupy"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:171
+#: /home/runa/tor/website/en/people.wml:175
msgid "<a href=\"https://www.torproject.org/index.html.fr\";>French</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:173
+#: /home/runa/tor/website/en/people.wml:177
msgid ""
"Ruben Garcia, plus further pages by <a href=\"http://www.greentranslations.";
"com/\">Green Crescent</a>"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
msgid "<a href=\"https://www.torproject.org/index.html.es\";>Spanish</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
msgid "Jens Kubieziel and Oliver Knapp"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
msgid "<a href=\"https://www.torproject.org/index.html.de\";>German</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
msgid "Pei Hanru and bridgefish"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
msgid ""
"<a href=\"https://www.torproject.org/index.html.zh-cn\";>Simplified Chinese</"
"a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
msgid "Jan Reister"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
msgid "<a href=\"https://www.torproject.org/index.html.it\";>Italian</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
msgid "Masaki Taniguchi"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
msgid "<a href=\"https://www.torproject.org/index.html.ja\";>Japanese</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:184
+#: /home/runa/tor/website/en/people.wml:188
msgid "Jan Woning"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:184
+#: /home/runa/tor/website/en/people.wml:188
msgid "<a href=\"https://www.torproject.org/index.html.nl\";>Dutch</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:186
+#: /home/runa/tor/website/en/people.wml:190
msgid "ygrek"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:186
+#: /home/runa/tor/website/en/people.wml:190
msgid "<a href=\"https://www.torproject.org/index.html.ru\";>Russian</a>."
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
msgid "<a id=\"Volunteers\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
msgid "<a class=\"anchor\" href=\"#Volunteers\">More volunteers:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:194
+#: /home/runa/tor/website/en/people.wml:198
msgid "Anonym"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:194
+#: /home/runa/tor/website/en/people.wml:198
msgid "Maintainer of the Incognito LiveCD."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
msgid "Kevin Bankston"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
msgid ""
"EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
"Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -565,24 +579,24 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:199
+#: /home/runa/tor/website/en/people.wml:203
msgid "Kasimir Gabert"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:199
+#: /home/runa/tor/website/en/people.wml:203
msgid ""
"Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
"statistics pages."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
msgid "Geoff Goodell"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
msgid ""
"Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
"\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -590,12 +604,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:205
+#: /home/runa/tor/website/en/people.wml:209
msgid "Aleksei Gorny"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:205
+#: /home/runa/tor/website/en/people.wml:209
msgid ""
"Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
"org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -603,83 +617,83 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
msgid "Robert Hogan"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
msgid ""
"Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:214
msgid "Fabian Keil"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:214
msgid ""
"One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
"and Privoxy still work well together."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:216
msgid "Julius Mittenzwei"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:216
msgid ""
"A lawyer with the CCC in Germany. Coordinates the German Tor community with "
"respect to legal questions and concerns."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:219
msgid "Shava Nerad"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:219
msgid ""
"Our former Development Director. She still works on PR and community "
"relations."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:217
+#: /home/runa/tor/website/en/people.wml:221
msgid "Lasse Øverlier"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:217
+#: /home/runa/tor/website/en/people.wml:221
msgid ""
"Writes research papers on Tor: attacks, defenses, and resource management, "
"especially for hidden services."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:223
msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:220
+#: /home/runa/tor/website/en/people.wml:224
msgid ""
"The most dedicated bug reporter we've ever heard from. He must read Tor "
"source code every day over breakfast."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:222
+#: /home/runa/tor/website/en/people.wml:226
msgid "tup (another pseudonym)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:222
+#: /home/runa/tor/website/en/people.wml:226
msgid ""
"Periodically adds new features for making Tor easier to use as a <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -688,24 +702,24 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:227
+#: /home/runa/tor/website/en/people.wml:231
msgid "Kyle Williams"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:227
+#: /home/runa/tor/website/en/people.wml:231
msgid ""
"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
"easier to set up and use."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:230
+#: /home/runa/tor/website/en/people.wml:234
msgid "Ethan Zuckerman"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:230
+#: /home/runa/tor/website/en/people.wml:234
msgid ""
"A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
"p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -714,7 +728,7 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:235
+#: /home/runa/tor/website/en/people.wml:239
msgid ""
"All our relay operators, people who write <a href=\"http://freehaven.net/";
"anonbib/\">research papers</a> about Tor, people who teach others about Tor, "
@@ -722,22 +736,22 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
msgid "<a id=\"Past\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:245
msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:244
+#: /home/runa/tor/website/en/people.wml:248
msgid "Domenik Bork"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:244
+#: /home/runa/tor/website/en/people.wml:248
msgid ""
"Worked on Configuration of Hidden Services with User Authorization in "
"Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -745,12 +759,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
msgid "Benedikt Boss"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
msgid ""
"Worked during the 2007 Google Summer of Code on <a href=\"https://svn.";
"torproject.org/svn/topf/trunk/README\">TOPF</a>, a fuzzer for Tor; mentored "
@@ -758,22 +772,22 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:250
+#: /home/runa/tor/website/en/people.wml:254
msgid "Ren Bucholz"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:250
+#: /home/runa/tor/website/en/people.wml:254
msgid "Our fine logo and images."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:255
msgid "Fallon Chen"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:255
msgid ""
"Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org/";
"cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>) and <a href="
@@ -783,42 +797,42 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
msgid "Bram Cohen"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
msgid "Helped design our congestion control mechanisms, in Tor's early days."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:263
msgid "Pat Double"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:263
msgid "Creator of the Incognito LiveCD."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:260
+#: /home/runa/tor/website/en/people.wml:264
msgid "Justin Hipple"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:260
+#: /home/runa/tor/website/en/people.wml:264
msgid "The other developer for Vidalia."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:261
+#: /home/runa/tor/website/en/people.wml:265
msgid "Christian King"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:261
+#: /home/runa/tor/website/en/people.wml:265
msgid ""
"Worked during the 2007 Google Summer of Code on making Tor relays stable on "
"Windows, by developing a <a href=\"https://svn.torproject.org/svn/libevent-";
@@ -826,70 +840,70 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:266
+#: /home/runa/tor/website/en/people.wml:270
msgid "Joe Kowalski"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:266
+#: /home/runa/tor/website/en/people.wml:270
msgid ""
"Original author and provider of the torstatus script formerly run on "
"nighteffect."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:272
msgid "Adam Langley"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:272
msgid "Our fine eventdns code."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
msgid "Rebecca MacKinnon"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
msgid ""
"Former Director of Tor. Co-Founder of <a href=\"http://www.";
"globalvoicesonline.org/\">Global Voices Online</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
msgid "Chris Palmer"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
msgid ""
"Our liaison and tech guy with EFF while EFF was funding us. Also helped "
"advocate and write end-user docs."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:273
+#: /home/runa/tor/website/en/people.wml:277
msgid "Matej Pfajfar"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:273
+#: /home/runa/tor/website/en/people.wml:277
msgid ""
"Author of the original onion routing code that Tor is based on, so we didn't "
"have to start from scratch."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:279
msgid "Johannes Renner"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:279
msgid ""
"Worked during the 2007 Google Summer of Code on modifying <a href=\"https://";
"svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to measure various "
@@ -897,23 +911,23 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:284
msgid "Scott Squires"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:284
msgid ""
"The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:282
+#: /home/runa/tor/website/en/people.wml:286
msgid "Camilo Viecco"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:282
+#: /home/runa/tor/website/en/people.wml:286
msgid ""
"Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
"vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -921,12 +935,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:289
msgid "Christian Wilms"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:289
msgid ""
"Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
"\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -934,12 +948,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:292
msgid "Jillian C. York"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:292
msgid ""
"<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
"blogger, and activist based in Boston. She blogs on the uses of Tor and "
Modified: translation/trunk/projects/website/zh_CN/4-optional.open-positions.po
===================================================================
--- translation/trunk/projects/website/zh_CN/4-optional.open-positions.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/4-optional.open-positions.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -34,17 +34,17 @@
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/open-positions.wml:16
-msgid "In particular, we're looking for two categories of people:"
+msgid "In particular, we're looking for a few people:"
msgstr ""
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/open-positions.wml:18
-msgid "<a href=\"#developer\">Software Developer</a>"
+msgid "<a href=\"#sysdev\">Systems Developer</a>"
msgstr ""
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/open-positions.wml:19
-msgid "<a href=\"#activist\">Activist/Outreach</a>"
+msgid "<a href=\"#windowsdev\">Microsoft Windows Developer</a>"
msgstr ""
#. type: Content of: <div><p>
@@ -80,79 +80,168 @@
"you should know how to keep other project members informed of your "
"progress), and we want you to know how to figure out what needs doing and "
"then take the initiative to do it. Most project members play more than one "
-"role, so combination developer/activist/grantwriters are very welcome."
+"role, so combination developer/activist are very welcome."
msgstr ""
#. type: Content of: <div>
#: /home/runa/tor/website/en/open-positions.wml:41
-msgid "<a id=\"developer\"></a>"
+msgid "<a id=\"sysdev\"></a>"
msgstr ""
#. type: Content of: <div><h3>
#: /home/runa/tor/website/en/open-positions.wml:42
-msgid "<a class=\"anchor\" href=\"#developer\">Developer</a>"
+msgid "<a class=\"anchor\" href=\"#sysdev\">Systems Developer</a>"
msgstr ""
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/open-positions.wml:45
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/open-positions.wml:44
msgid ""
-"The best way to get noticed as a good developer is to join the community and "
-"start helping out. We have a great core group of developers working on the "
-"Tor software itself as well as supporting software like Vidalia, Torbutton, "
-"etc."
+"<strong>New Secure Updater Features</strong>: <br /> Additional capabilities "
+"are needed for assisted updates of all the Tor related software for Windows "
+"and other operating systems. Some of the features to consider include:"
msgstr ""
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/open-positions.wml:52
+#. type: Content of: <div><ul><li><ol><li>
+#: /home/runa/tor/website/en/open-positions.wml:50
msgid ""
-"Periodically we get new funding to work on more development projects. Your "
-"goal should be to get into the list of <a href=\"<page people>#Core\">core "
-"project members</a> so we think of you when new funding arrives. We're "
-"particularly looking for Windows developers and people to help maintain <a "
-"href=\"<page vidalia/index>\">Vidalia</a>."
+"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
+"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
msgstr ""
+#. type: Content of: <div><ul><li><ol><li>
+#: /home/runa/tor/website/en/open-positions.wml:53
+msgid ""
+"Adding a level of indirection between the timestamp signatures and the "
+"package files included in an update. See the \"<a href=\"http://archives.";
+"seul.org/or/dev/Dec-2008/msg00010.html\">Thandy attacks / suggestions</a>\" "
+"thread on or-dev."
+msgstr ""
+
+#. type: Content of: <div><ul><li><ol><li>
+#: /home/runa/tor/website/en/open-positions.wml:57
+msgid ""
+"Support locale specific installation and configuration of assisted updates "
+"based on preference, host, or user account language settings. Familiarity "
+"with Windows codepages, unicode, and other character sets is helpful in "
+"addition to general win32 and posix API experience and Python proficiency."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/open-positions.wml:65
+msgid "<strong>Extend the Tor Secure Auto-Update Framework</strong>:"
+msgstr ""
+
+#. type: Content of: <div><ul><li><p>
+#: /home/runa/tor/website/en/open-positions.wml:66
+msgid ""
+"We've developed a secure auto-update framework, codenamed <a href=\"http://";
+"git.torproject.org/checkout/thandy/master/\">Thandy</a>. It needs some "
+"design work to be finished, some security decisions to be made, and then "
+"code written to actually get the software and infrastructure running. The "
+"primary goal is to get this working on Microsoft Windows operating systems. "
+"Secondary goal is to have this work with Apple OS X. The <a href=\"http://";
+"git.torproject.org/checkout/thandy/master/TODO\">TODO</a> file explains more "
+"of the goals."
+msgstr ""
+
+#. type: Content of: <div><ul><li><p>
+#: /home/runa/tor/website/en/open-positions.wml:75
+msgid ""
+"A person undertaking this project should have good C/C++ development "
+"experience. Previous experience with Qt is helpful, but not required. One "
+"should also have a good understanding of common security practices, such as "
+"package signature verification. Good writing ability is also important for "
+"this project, since a vital step of the project will be producing a design "
+"document to review and discuss with others prior to implementation."
+msgstr ""
+
#. type: Content of: <div>
-#: /home/runa/tor/website/en/open-positions.wml:59
-msgid "<a id=\"activist\"></a>"
+#: /home/runa/tor/website/en/open-positions.wml:85
+msgid "<a id=\"windowsdev\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/open-positions.wml:60
-msgid "<a class=\"anchor\" href=\"#activist\">Activist and Outreach</a>"
+#: /home/runa/tor/website/en/open-positions.wml:86
+msgid ""
+"<a class=\"anchor\" href=\"#windowsdev\">Microsoft Windows Developer</a>"
msgstr ""
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/open-positions.wml:63
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/open-positions.wml:87
msgid ""
-"There are a lot of excited people about there who want to help Tor — "
-"by running relays, helping users, writing documentation, working on add-on "
-"tools, and so on. We need to keep in touch with all of them, help them work "
-"with each other, and help them understand where they can be most useful."
+"This person needs to be very familiar with Windows at a system and network "
+"level. We're looking or someone to do two projects:"
msgstr ""
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/open-positions.wml:71
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/open-positions.wml:90
+msgid "<strong>Improving Polipo on Windows</strong>:"
+msgstr ""
+
+#. type: Content of: <div><ul><li><p>
+#: /home/runa/tor/website/en/open-positions.wml:91
msgid ""
-"Tor activists should understand Tor's role in the world, and they should be "
-"good at explaining to the world why privacy/security/anonymity are "
-"important. They should also be well-connected with other groups around the "
-"world who care about these issues."
+"Help port <a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/";
+"\">Polipo</a> to Windows. Example topics to tackle include:"
msgstr ""
+#. type: Content of: <div><ul><li><p><ol><li>
+#: /home/runa/tor/website/en/open-positions.wml:95
+msgid ""
+"the ability to asynchronously query name servers, find the system "
+"nameservers, and manage netbios and dns queries."
+msgstr ""
+
+#. type: Content of: <div><ul><li><p><ol><li>
+#: /home/runa/tor/website/en/open-positions.wml:97
+msgid ""
+"manage events and buffers natively (i.e. in Unix-like OSes, Polipo defaults "
+"to 25% of ram, in Windows it's whatever the config specifies)."
+msgstr ""
+
+#. type: Content of: <div><ul><li><p><ol><li>
+#: /home/runa/tor/website/en/open-positions.wml:100
+msgid ""
+"some sort of GUI config and reporting tool, bonus if it has a systray icon "
+"with right clickable menu options. Double bonus if it's cross-platform "
+"compatible."
+msgstr ""
+
+#. type: Content of: <div><ul><li><p><ol><li>
+#: /home/runa/tor/website/en/open-positions.wml:103
+msgid ""
+"allow the software to use the Windows Registry and handle proper Windows "
+"directory locations, such as \"C:\\Program Files\\Polipo\""
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/open-positions.wml:109
+msgid ""
+"<strong>Intermediate Level Network Device Driver</strong>: <br /> The "
+"WinPCAP device driver used by Tor VM for bridged networking does not support "
+"a number of wireless and non-Ethernet network adapters. Implementation of a "
+"intermediate level network device driver for win32 and 64bit would provide a "
+"way to intercept and route traffic over such networks. This project will "
+"require knowledge of and experience with Windows kernel device driver "
+"development and testing. Familiarity with Winsock and Qemu would also be "
+"helpful."
+msgstr ""
+
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/open-positions.wml:78
+#: /home/runa/tor/website/en/open-positions.wml:122
msgid ""
-"Like the developer positions above, the best way to get noticed for this "
-"position is to start helping out: join the <a href=\"<page "
-"documentation>#MailingLists\">mailing lists</a> and the <a href=\"<page "
-"documentation>#Support\">IRC channel</a>, help clean up our FAQ, and "
-"generally be useful. Once we notice you're competent and reliable, we'll add "
-"you to the <a href=\"<page contact>\">\"tor-assistants\"</a> list, and we "
-"can see where it goes from there."
+"The best way to get noticed as a good developer is to join the community and "
+"start helping out. We have a great core group of developers working on the "
+"Tor software itself as well as supporting software like Vidalia, Torbutton, "
+"etc."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/open-positions.wml:88
-msgid "In addition, we are looking to hire experienced grant-writers."
+#: /home/runa/tor/website/en/open-positions.wml:129
+msgid ""
+"Periodically we get new funding to work on more development projects. Your "
+"goal should be to get into the list of <a href=\"<page people>#Core\">core "
+"project members</a> so we think of you when new funding arrives. We're "
+"particularly looking for Qt developers and people to help maintain <a href="
+"\"<page vidalia/index>\">Vidalia</a>."
msgstr ""
Modified: translation/trunk/projects/website/zh_CN/4-optional.translation-overview.po
===================================================================
--- translation/trunk/projects/website/zh_CN/4-optional.translation-overview.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/4-optional.translation-overview.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
#. type: Content of: <div>
#: /home/runa/tor/website/en/translation-overview.wml:10
-#: /tmp/rAMr0QYhwu.xml:32 /tmp/rAMr0QYhwu.xml:177 /tmp/rAMr0QYhwu.xml:235
+#: /tmp/Z7aSaIwsFR.xml:25
msgid "<hr />"
msgstr ""
@@ -37,34 +37,18 @@
"happy to lend a hand."
msgstr ""
-#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/translation-overview.wml:23
-msgid "<a href=\"#TTP\">Using The Tor Translation Portal</a>"
-msgstr ""
-
-#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/translation-overview.wml:24
-msgid "<a href=\"#TranslatingVidalia\">Other Vidalia components</a>"
-msgstr ""
-
-#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/translation-overview.wml:25
-msgid ""
-"<a href=\"#TranslatingTor\">Translating the Tor website and documentation</a>"
-msgstr ""
-
#. type: Content of: <div>
-#: /home/runa/tor/website/en/translation-overview.wml:29
+#: /home/runa/tor/website/en/translation-overview.wml:22
msgid "<a id=\"TTP\"></a> <a id=\"TTPVidalia\"></a>"
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/translation-overview.wml:31
+#: /home/runa/tor/website/en/translation-overview.wml:24
msgid "<a class=\"anchor\" href=\"#TTP\">Using The Tor Translation Portal</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:35
+#: /home/runa/tor/website/en/translation-overview.wml:28
msgid ""
"The <a href=\"https://translation.torproject.org/\";>Tor Translation Portal</"
"a> is a website that lets users contribute translations online using their "
@@ -74,7 +58,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:43
+#: /home/runa/tor/website/en/translation-overview.wml:36
msgid ""
"You can check the status of all translations for a given project by visiting "
"each project page. The following statuses are updated in real time when new "
@@ -85,7 +69,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:53
+#: /home/runa/tor/website/en/translation-overview.wml:46
msgid ""
"To get started using our translation website, you need to sign up for an "
"account. Visit the <a href=\"https://translation.torproject.org/register.html";
@@ -96,7 +80,7 @@
msgstr ""
#. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/translation-overview.wml:61
+#: /home/runa/tor/website/en/translation-overview.wml:54
#, no-wrap
msgid ""
"Account created. You will be emailed login details and an activation code.\n"
@@ -104,14 +88,14 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:66
+#: /home/runa/tor/website/en/translation-overview.wml:59
msgid ""
"Shortly after you see this text an email will be sent to the email address "
"you provided. The email should look something like the following:"
msgstr ""
#. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/translation-overview.wml:69
+#: /home/runa/tor/website/en/translation-overview.wml:62
#, no-wrap
msgid ""
"A Pootle account has been created for you using this email address.\n"
@@ -125,7 +109,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:80
+#: /home/runa/tor/website/en/translation-overview.wml:73
msgid ""
"Once you've received the email, you'll need to activate your account by "
"visiting the <a href=\"https://translation.torproject.org/activate.html";
@@ -135,7 +119,7 @@
msgstr ""
#. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/translation-overview.wml:88
+#: /home/runa/tor/website/en/translation-overview.wml:81
#, no-wrap
msgid ""
"Redirecting to login Page...\n"
@@ -143,7 +127,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:93
+#: /home/runa/tor/website/en/translation-overview.wml:86
msgid ""
"When you login to your new account, you'll be prompted to configure your "
"basic language preferences on the <a href=\"https://translation.torproject.";
@@ -155,12 +139,12 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:103
+#: /home/runa/tor/website/en/translation-overview.wml:96
msgid "You're ready to translate!"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:107
+#: /home/runa/tor/website/en/translation-overview.wml:100
msgid ""
"At this point, you can select a project, such as <a href=\"https://";
"translation.torproject.org/projects/vidalia/\">Vidalia</a>. You'll see a "
@@ -180,7 +164,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:126
+#: /home/runa/tor/website/en/translation-overview.wml:119
msgid ""
"If you're able, please translate the string you see and click the 'Submit' "
"button. If you're unsure, click the 'Suggest' button. Feel free to leave "
@@ -189,7 +173,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:133
+#: /home/runa/tor/website/en/translation-overview.wml:126
msgid ""
"When you're finished, you need to commit your changes. Return to the page "
"with the <a href=\"https://translation.torproject.org/de/vidalia/index.html?";
@@ -203,21 +187,21 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:145
+#: /home/runa/tor/website/en/translation-overview.wml:138
msgid ""
"That's all there is to it! Be sure to go through the steps again and "
"contribute to Torbutton and Torcheck too."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:150
+#: /home/runa/tor/website/en/translation-overview.wml:143
msgid ""
-"If your language isn't in the list of options yet, send mail to <a href="
-"\"<page contact>\">the tor-translations team</a> and we'll add it for you."
+"If your language isn't in the list of options yet, send mail to <tt>tor-"
+"translation AT torproject.org</tt> and we'll add it for you."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:156
+#: /home/runa/tor/website/en/translation-overview.wml:148
msgid ""
"For more advanced users who like to translate without a web browser, you can "
"also download the .po file directly. You'll find this option after clicking "
@@ -234,102 +218,3 @@
"you can upload it by using the \"upload file\" form in the upper right hand "
"corner: simply select the file and click the 'Upload file' button."
msgstr ""
-
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/translation-overview.wml:173
-msgid "<a id=\"TranslatingVidalia\"></a>"
-msgstr ""
-
-#. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/translation-overview.wml:175
-msgid ""
-"<a class=\"anchor\" href=\"#TranslatingVidalia\">Other Vidalia translation "
-"efforts</a>"
-msgstr ""
-
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:180
-msgid ""
-"In addition to the main Vidalia interface, which is covered by the above <a "
-"href=\"#TTPVidalia\">Vidalia walkthrough</a>, we also need translations for "
-"the Win32 installer and the help documentation."
-msgstr ""
-
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:186
-msgid ""
-"The <b>Win32 installer</b> uses the NSI format and is found in the Vidalia "
-"subversion repository. The NSI format is very similar to normal gettext "
-"templates. The file format is quite simple. Essentially, it is text with "
-"the corresponding translations. This is a good place to get your feet wet "
-"with localization and a normal text editor. Currently this format is not "
-"supported by the translation portal. You'll only need a text editor and "
-"knowledge of two languages, English and whatever locale you'll be "
-"translating the original English into. You can download the NSI "
-"localization files from the Vidalia subversion repository. For more "
-"information on translating the Win32 installer, please see the corresponding "
-"instructional <a href=\"http://trac.vidalia-project.net/wiki/";
-"Translations#TranslateInstallers\"> page on the Vidalia wiki</a>. It's a "
-"useful page that explains step by step information for translation, encoding "
-"and submission for inclusion in the next release. You'll also notice that "
-"the wiki page lists translators - we're especially in need of Farsi and "
-"Hebrew translators. Perhaps you're the one?"
-msgstr ""
-
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:204
-msgid ""
-"Last but certainly not least, Vidalia requires diligent <a href=\"http://";
-"trac.vidalia-project.net/wiki/Translations#AvailableHelpTranslations\"> "
-"translation of its <b>help documents</b></a>. This is important to ensure "
-"that users fully understand the choices that they make and so they "
-"understand the choices the software makes on their behalf. We're currently "
-"looking for German and Bulgarian translators; perhaps you're the right "
-"person for the job?"
-msgstr ""
-
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:213
-msgid ""
-"Torbutton (like Vidalia and TorCheck) translation is managed by the <a href="
-"\"https://translation.torproject.org/\";>Tor Translation Portal</a>. You can "
-"easily view the status of all translations on the <a href=\"https://";
-"translation.torproject.org/projects/torbutton/\">Portal status page for "
-"Torbutton</a>. Torbutton is also <a href=\"https://svn.torproject.org/svn/";
-"translation/trunk/projects/torbutton/\">in subversion</a> like Vidalia and "
-"TorCheck. Please visit the Portal page for <a href=\"https://translation.";
-"torproject.org/projects/torbutton/\">Torbutton</a> and pick a locale to "
-"translate. (You'll have to create an account and log in.)"
-msgstr ""
-
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:225
-msgid ""
-"If you're unsure about how to use the <a href=\"https://translation.";
-"torproject.org/\">Tor Translation Portal</a> to translate Torbutton, please "
-"read <a href=\"#TTPVidalia\">our example walkthrough with Vidalia</a>. "
-"Torbutton uses the same system with the same processes."
-msgstr ""
-
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/translation-overview.wml:232
-msgid "<a id=\"TranslatingTor\"></a>"
-msgstr ""
-
-#. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/translation-overview.wml:233
-msgid ""
-"<a class=\"anchor\" href=\"#TranslatingTor\">Translating the Tor website and "
-"documentation</a>"
-msgstr ""
-
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation-overview.wml:238
-msgid ""
-"We've written some basic guidelines to help you translate the Tor website "
-"and documentation on our <a href=\"<page translation>\">main website "
-"translation page</a>. The guidelines there also provide good advice for the "
-"other translation items on this page. The current status of the website "
-"translations can be found on our <a href=\"<page translation-status>"
-"\">website translation status page</a>."
-msgstr ""
Modified: translation/trunk/projects/website/zh_CN/4-optional.translation.po
===================================================================
--- translation/trunk/projects/website/zh_CN/4-optional.translation.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/4-optional.translation.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -62,39 +62,6 @@
#. type: Content of: <div><ol><li>
#: /home/runa/tor/website/en/translation.wml:38
msgid ""
-"Look in <a href=\"<svnwebsite>en/\"><svnwebsite>en/</a> for a set of \".wml"
-"\" files. The most important ones to translate are listed as \"high priority"
-"\", \"medium priority\", and \"low priority\" on the <a href=\"<page "
-"translation-status>\">translation status</a> page. You can look at <a href="
-"\"<svnwebsite>de/\"><svnwebsite>de/</a> for examples of the desired "
-"translation formats."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/translation.wml:48
-msgid ""
-"The first line in the translated file should be<br /> \\# Based-On-Revision: "
-"13000<br /> where 13000 is the revision number of the original English page. "
-"This lets you easily spot when a page gets out of date. The revision number "
-"is found at the top on each page -- you can either look at the files in the "
-"<a href=\"<svnwebsite>en/\"><svnwebsite>en/</a> directory, or manually <a "
-"href=\"<page documentation>#Developers\">checkout</a> the latest version of "
-"the website."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/translation.wml:57
-msgid ""
-"The second line in the translated file should be the email address of the "
-"translator:<br /> \\# Last-Translator: abc at example.com<br /> so we can "
-"get ahold of you if the pages needs to be corrected or updated. (Since the "
-"pages will be posted on the web and spammers will find them, you may want to "
-"obfuscate your email address or use a separate one.)"
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/translation.wml:64
-msgid ""
"We would also like some translations for the diagrams on <a href=\"<page "
"overview>\">the overview page</a>. You can just send us the text that should "
"go in the diagrams, and we'll take care of making new versions of the "
@@ -102,35 +69,8 @@
msgstr ""
#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/translation.wml:69
+#: /home/runa/tor/website/en/translation.wml:43
msgid ""
-"Translated pages should link to the other translated pages. In general this "
-"is automatic: writing <code><page download></code> will automatically "
-"link to the translated version of that page if there is one, and the English "
-"version otherwise."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/translation.wml:74
-msgid ""
-"Use valid <a href=\"http://roselli.org/adrian/articles/character_charts.asp";
-"\">character entities</a>. Even though most browsers display the characters "
-"correctly these days, we want to be on the safe side, so we don't get bug "
-"reports from people who can't read the text. If you need to use a character "
-"set other than ISO-8859-1, add something like <code>CHARSET=\"UTF-8\"</code> "
-"to the end of the line that starts with <code>#include \"head.wmi\"</code>."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/translation.wml:82
-msgid ""
-"Keep your translation valid XHTML. Once it's in place, you can test your "
-"page at <a href=\"http://validator.w3.org/\";>validator.w3.org</a>."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/translation.wml:86
-msgid ""
"When you have some pages ready, send them to the <tt>tor-translation</tt> "
"alias on the <a href=\"<page contact>\">contact page</a>. (If you have "
"changes to existing pages, please use the diff tool to generate patch files, "
@@ -139,7 +79,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/translation.wml:94
+#: /home/runa/tor/website/en/translation.wml:51
msgid ""
"Other projects related to Tor also need translators. Please see our "
"translation portal for <a href=\"<page translation-overview>\">translating "
Modified: translation/trunk/projects/website/zh_CN/docs/1-high.tor-doc-windows.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/1-high.tor-doc-windows.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/docs/1-high.tor-doc-windows.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: 2009-11-27 11:55-0700\n"
"Last-Translator: yfdyh000 <yfdyh000@xxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -23,10 +23,8 @@
#. type: Content of: <div><div>
#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:12
-#: /tmp/KS2qOK2kHL.xml:30
-#: /tmp/KS2qOK2kHL.xml:66
-#: /tmp/KS2qOK2kHL.xml:105
-#: /tmp/KS2qOK2kHL.xml:148
+#: /tmp/HmYm8_5RQi.xml:34 /tmp/HmYm8_5RQi.xml:70 /tmp/HmYm8_5RQi.xml:109
+#: /tmp/HmYm8_5RQi.xml:152
msgid "<br />"
msgstr "<br />"
@@ -39,9 +37,9 @@
"read the <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</a> guide."
"</b>"
msgstr ""
-"<b>请注意，这里是提供在 Microsoft Windows (2000, XP, Vista, 7, and Server Editions) "
-"上运行 Tor 客户端的安装指导。如果你想贡献流量帮助网络增长（请这么做），阅读 <a href=\"<page docs/tor-doc-"
-"relay>\">配置一个中继</a> 指导。</b>"
+"<b>请注意，这里是提供在 Microsoft Windows (2000, XP, Vista, 7, and Server "
+"Editions) 上运行 Tor 客户端的安装指导。如果你想贡献流量帮助网络增长（请这么"
+"做），阅读 <a href=\"<page docs/tor-doc-relay>\">配置一个中继</a> 指导。</b>"
#. type: Content of: <div><div><p>
#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:22
@@ -51,24 +49,24 @@
"Tor on Windows</a>. Know of a better video, or one translated into your "
"language? Let us know!"
msgstr ""
-"自由之家制作了有关如何安装 Tor 的视频。你可以观看 <a "
-"href=\"http://tinyvid.tv/show/3lejztnthk2tm\";>TinyVid：在 Windows 如何安装 "
-"Tor</a>。知道更好的视频，或翻译成为您的语言之一？请告诉我们！"
+"自由之家制作了有关如何安装 Tor 的视频。你可以观看 <a href=\"http://tinyvid.";
+"tv/show/3lejztnthk2tm\">TinyVid：在 Windows 如何安装 Tor</a>。知道更好的视"
+"频，或翻译成为您的语言之一？请告诉我们！"
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:27
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:31
msgid "<hr /> <a id=\"installing\"></a>"
msgstr "<hr /> <a id=\"installing\"></a>"
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:29
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:33
msgid ""
"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
"a>"
msgstr "<a class=\"anchor\" href=\"#installing\">第一步：下载并安装 Tor</a>"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:33
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:37
msgid ""
"Microsoft Windows bundles contain <a href=\"<page index>\">Tor</a>, <a href="
"\"<page vidalia/index>\">Vidalia</a> (a GUI for Tor), <a href=\"https://";
@@ -81,17 +79,17 @@
"look for more options on the <a href=\"<page download>\">download page</a>."
msgstr ""
"Microsoft Windows 套件包含 <a href=\"<page index>\">Tor</a>，<a href=\"<page "
-"vidalia/index>\">Vidalia</a>（Tor 的图形用户界面），<a "
-"href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton</a>（Mozilla "
-"Firefox 的一个扩展）和 <a "
-"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a> "
-"（一种网络代理）整合了起来，并预先配置好能一起工作。下载 <a href=\"../<package-win32-bundle-"
-"stable>\">稳定版</a> 或 <a href=\"../<package-win32-bundle-alpha>\">测试版</a> 的 "
-"Windows 套件，<a href=\"<page download>\">下载页面</a> 有更多选择。"
+"vidalia/index>\">Vidalia</a>（Tor 的图形用户界面），<a href=\"https://addons.";
+"mozilla.org/firefox/2275/\">Torbutton</a>（Mozilla Firefox 的一个扩展）和 <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a> （一种网"
+"络代理）整合了起来，并预先配置好能一起工作。下载 <a href=\"../<package-win32-"
+"bundle-stable>\">稳定版</a> 或 <a href=\"../<package-win32-bundle-alpha>\">测"
+"试版</a> 的 Windows 套件，<a href=\"<page download>\">下载页面</a> 有更多选"
+"择。"
# splash 什么意思？
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:45
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:49
#, fuzzy
msgid ""
"<img alt=\"tor installer splash page\" src=\"../img/screenshot-win32-"
@@ -101,88 +99,95 @@
"splash.png\" />"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:47
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:51
msgid ""
"If you have previously installed Tor, Vidalia, or Polipo you can deselect "
"whichever components you do not need to install in the dialog shown below."
-msgstr "如果你以前安装过 Tor、Vidalia 或 Polipo，您可以在如下所示的对话框中取消您不需要安装的部分。"
+msgstr ""
+"如果你以前安装过 Tor、Vidalia 或 Polipo，您可以在如下所示的对话框中取消您不需"
+"要安装的部分。"
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:52
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:56
msgid ""
"<img alt=\"select components to install\" src=\"../img/screenshot-win32-"
"installer-components.png\" />"
msgstr ""
-"<img alt=\"选择要安装的组件\" src=\"../img/screenshot-win32-installer-components.png\" "
-"/>"
+"<img alt=\"选择要安装的组件\" src=\"../img/screenshot-win32-installer-"
+"components.png\" />"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:54
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:58
msgid ""
"After you have completed the installer, the components you selected will "
"automatically be started for you."
msgstr "在您完成安装程序后，您选择的组件会为您自动启动。"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:58
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:62
msgid ""
"Tor comes configured as a client by default. It uses a built-in default "
"configuration file, and most people won't need to change any of the "
"settings. Tor is now installed."
-msgstr "Tor 被配置为默认情况下的客户端。他使用内置的默认配置文件，大多数人不需要更改任何设置。Tor 安装完毕。"
+msgstr ""
+"Tor 被配置为默认情况下的客户端。他使用内置的默认配置文件，大多数人不需要更改"
+"任何设置。Tor 安装完毕。"
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:63
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:67
msgid "<hr /> <a id=\"using\"></a>"
msgstr "<hr /> <a id=\"using\"></a>"
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:65
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:69
msgid ""
"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to "
"use Tor</a>"
msgstr "<a class=\"anchor\" href=\"#using\">第二步：配置应用程序使用 Tor</a>"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:72
msgid ""
"After installing Tor and Polipo, you need to configure your applications to "
"use them. The first step is to set up web browsing."
-msgstr "在安装完 Tor 和 Polipo 后，你需要配置应用程序来使用它们。第一步是配置 Web 浏览器。"
+msgstr ""
+"在安装完 Tor 和 Polipo 后，你需要配置应用程序来使用它们。第一步是配置 Web 浏"
+"览器。"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:71
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:75
msgid ""
"You should use Tor with Firefox and Torbutton, for best safety. The bundle "
"installs the <a href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton "
"plugin</a> for you. Restart your Firefox, and you're all set:"
msgstr ""
-"您应该通过使用 Firefox 和 Torbutton 扩展让 Tor 获得最佳的安全性。该套件为您安装了 <a "
-"href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton 扩展</a>。重新启动 "
-"Firefox，就这么简单："
+"您应该通过使用 Firefox 和 Torbutton 扩展让 Tor 获得最佳的安全性。该套件为您"
+"安装了 <a href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton 扩展</"
+"a>。重新启动 Firefox，就这么简单："
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:77
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:81
msgid ""
"<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
"png\" border=\"1\"/> <br />"
msgstr ""
-"<img alt=\"Torbutton 用于 Firefox 的扩展\" src=\"../img/screenshot-torbutton.png\" "
-"border=\"1\"/> <br />"
+"<img alt=\"Torbutton 用于 Firefox 的扩展\" src=\"../img/screenshot-torbutton."
+"png\" border=\"1\"/> <br />"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:82
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:86
msgid ""
"If you plan to run Firefox on a different computer than Tor, see the <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/";
"TorFAQ#SocksListenAddress\">FAQ entry for running Tor on a different "
"computer</a>."
msgstr ""
-"如果你打算在没有安装 Tor 的计算机上使用 Firefox，见 <a href=\"https://wiki.torproject.org/norepl";
-"y/TheOnionRouter/TorFAQ#SocksListenAddress\">常见问题条目——在不同的计算机运行 Tor</a>。"
+"如果你打算在没有安装 Tor 的计算机上使用 Firefox，见 <a href=\"https://wiki.";
+"torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress\">常见问题条"
+"目——在不同的计算机运行 Tor</a>。"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:87
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:91
msgid ""
"To Torify other applications that support HTTP proxies, just point them at "
"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -193,36 +198,37 @@
"at SocksCap or <a href=\"http://www.freecap.ru/eng/\";>FreeCap</a>. (FreeCap "
"is free software; SocksCap is proprietary.)"
msgstr ""
-"要让其他支持 HTTP 代理的应用程序使用 Tor，将它们指向 Polipo 即可（也就是 localhost 端口 8118）。直接使用 "
-"SOCKS（即时通讯、Jabber、IRC 等），可将你的应用程序直接指向 Tor（localhost 端口 9050），但是请阅读 <a href=\""
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS\";>此FAQ "
-"条目</a> ——你得明白这么做可能是危险的。对于既不支持 SOCKS 也不支持 HTTP 的应用程序，考虑一下 SocksCap 或者 <a "
-"href=\"http://www.freecap.ru/eng/\";>FreeCap</a>。（FreeCap 是自由软件；SocksCap 不是。）"
+"要让其他支持 HTTP 代理的应用程序使用 Tor，将它们指向 Polipo 即可（也就是 "
+"localhost 端口 8118）。直接使用 SOCKS（即时通讯、Jabber、IRC 等），可将你的应"
+"用程序直接指向 Tor（localhost 端口 9050），但是请阅读 <a href=\"https://wiki.";
+"torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS\">此FAQ 条目</a> ——"
+"你得明白这么做可能是危险的。对于既不支持 SOCKS 也不支持 HTTP 的应用程序，考虑"
+"一下 SocksCap 或者 <a href=\"http://www.freecap.ru/eng/\";>FreeCap</a>。"
+"（FreeCap 是自由软件；SocksCap 不是。）"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:101
msgid ""
"For information on how to Torify other applications, check out the <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\";>Torify "
"HOWTO</a>."
msgstr ""
-"如何 Tor 化（Torify）其他应用程序的信息请查看 <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\";>怎么 "
-"Torify</a>。"
+"如何 Tor 化（Torify）其他应用程序的信息请查看 <a href=\"https://wiki.";
+"torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">怎么 Torify</a>。"
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:102
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:106
msgid "<hr /> <a id=\"verify\"></a>"
msgstr "<hr /> <a id=\"verify\"></a>"
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:104
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:108
msgid ""
"<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
msgstr "<a class=\"anchor\" href=\"#verify\">步骤三：请确保它在工作</a>"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:108
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:112
msgid ""
"Check to see that Vidalia is running. Vidalia uses a small green onion to "
"indicate Tor is running or a dark onion with a red \"X\" when Tor is not "
@@ -230,18 +236,19 @@
"your system tray and selecting \"Start\" or \"Stop\" from the menu as shown "
"below:"
msgstr ""
-"检查 Vidalia 是否正在运行。Vidalia 用一个绿色洋葱的图标指示 Tor 正在运行，Tor "
-"不运行时是一个暗红色“X”的灰色洋葱图标。你可以通过右键单击系统托盘中 Vidalia 的图标，从菜单选择“开始”或者“停止”来启动或终止 "
-"Tor，如下所示："
+"检查 Vidalia 是否正在运行。Vidalia 用一个绿色洋葱的图标指示 Tor 正在运行，"
+"Tor 不运行时是一个暗红色“X”的灰色洋葱图标。你可以通过右键单击系统托盘中 "
+"Vidalia 的图标，从菜单选择“开始”或者“停止”来启动或终止 Tor，如下所示："
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:115
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:119
msgid ""
"<img alt=\"Vidalia Tray Icon\" src=\"../img/screenshot-win32-vidalia.png\"/>"
-msgstr "<img alt=\"Vidalia 托盘图标\" src=\"../img/screenshot-win32-vidalia.png\"/>"
+msgstr ""
+"<img alt=\"Vidalia 托盘图标\" src=\"../img/screenshot-win32-vidalia.png\"/>"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:118
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:122
msgid ""
"Next, you should try using your browser with Tor and make sure that your IP "
"address is being anonymized. Click on <a href=\"https://check.torproject.org/";
@@ -250,13 +257,14 @@
"TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this FAQ entry</a> for more "
"suggestions on how to test your Tor.)"
msgstr ""
-"然后，你应该通过您的浏览器来验证你的 IP 地址是否已经匿名化了。点击 <a "
-"href=\"https://check.torproject.org/\";>Tor 探测器</a> 它是否认为你在使用 Tor。（如果这个站点下线了，看 "
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConne";
-"ctionPrivate\">此 FAQ条目</a> 有如何测试 Tor 的更多建议。）"
+"然后，你应该通过您的浏览器来验证你的 IP 地址是否已经匿名化了。点击 <a href="
+"\"https://check.torproject.org/\";>Tor 探测器</a> 它是否认为你在使用 Tor。（如"
+"果这个站点下线了，看 <a href=\"https://wiki.torproject.org/noreply/";
+"TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">此 FAQ条目</a> 有如何测试 Tor "
+"的更多建议。）"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:126
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:130
msgid ""
"If you have a personal firewall that limits your computer's ability to "
"connect to itself, be sure to allow connections from your local applications "
@@ -265,40 +273,43 @@
"443, and then see <a href=\"https://wiki.torproject.org/noreply/";
"TheOnionRouter/TorFAQ#FirewalledClient\">this FAQ entry</a>."
msgstr ""
-"如果您的个人防火墙限制您的计算机连接到它自己，一定要允许从本地应用程序到本地端口 8118 和 9050 "
-"的连接。如果你的防火墙阻挡向外的连接，那么至少让它能够连接 TCP 端口 80 和 443，然后阅读 <a href=\"https://wiki.tor";
-"project.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient\">此 FAQ 条目</a>。"
+"如果您的个人防火墙限制您的计算机连接到它自己，一定要允许从本地应用程序到本地"
+"端口 8118 和 9050 的连接。如果你的防火墙阻挡向外的连接，那么至少让它能够连接 "
+"TCP 端口 80 和 443，然后阅读 <a href=\"https://wiki.torproject.org/noreply/";
+"TheOnionRouter/TorFAQ#FirewalledClient\">此 FAQ 条目</a>。"
# FAQ该不该翻译为“常见问题”？
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:135
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:139
msgid ""
"If it's still not working, look at <a href=\"https://wiki.torproject.org/";
"noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
msgstr ""
-"如果仍然没有工作，看看 <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorF";
-"AQ#ItDoesntWork\">此 FAQ 条目</a> 寻找原因。"
+"如果仍然没有工作，看看 <a href=\"https://wiki.torproject.org/noreply/";
+"TheOnionRouter/TorFAQ#ItDoesntWork\">此 FAQ 条目</a> 寻找原因。"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:140
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:144
msgid ""
"Once it's working, learn more about <a href=\"<page download>#Warning\">what "
"Tor does and does not offer</a>."
-msgstr "一旦工作正常，请了解更多 <a href=\"<page download>#Warning\">Tor 提供什么，不提供什么</a>。"
+msgstr ""
+"一旦工作正常，请了解更多 <a href=\"<page download>#Warning\">Tor 提供什么，不"
+"提供什么</a>。"
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:148
msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
msgstr "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:147
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:151
msgid ""
"<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
msgstr "<a class=\"anchor\" href=\"#relay\">第四步：配置它为中继</a>"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:150
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:154
msgid ""
"The Tor network relies on volunteers to donate bandwidth. The more people "
"who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -307,11 +318,13 @@
"including rate limiting for bandwidth, exit policies so you can limit your "
"exposure to abuse complaints, and support for dynamic IP addresses."
msgstr ""
-"Tor 网络依靠志愿者们贡献带宽运行。运行中继的人越多，Tor 网络的速度就越快。如果你的网络连接速度达到每秒 20KB 以上，请帮忙运行一台中继以帮助 "
-"Tor。我们有许多特性使得 Tor 中继的运行简单且方便，包括带宽的速率限制、定制出口策略以避免滥用、以及对于动态 IP 地址的支持。"
+"Tor 网络依靠志愿者们贡献带宽运行。运行中继的人越多，Tor 网络的速度就越快。如"
+"果你的网络连接速度达到每秒 20KB 以上，请帮忙运行一台中继以帮助 Tor。我们有许"
+"多特性使得 Tor 中继的运行简单且方便，包括带宽的速率限制、定制出口策略以避免滥"
+"用、以及对于动态 IP 地址的支持。"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:158
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:162
msgid ""
"Having relays in many different places on the Internet is what makes Tor "
"users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -319,25 +332,28 @@
"since remote sites can't know whether connections originated at your "
"computer or were relayed from others."
msgstr ""
-"在互联网上的许多不同的地方用户运行了中继保护了 Tor 用户的安全。<a href=\"https://wiki.torproject.org/norep";
-"ly/TheOnionRouter/TorFAQ#RelayAnonymity\">你自身的匿名也能得到更好的保护</a>，因为站点不知道连接究竟来自你的"
-"电脑还是为他人传递。"
+"在互联网上的许多不同的地方用户运行了中继保护了 Tor 用户的安全。<a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\";>"
+"你自身的匿名也能得到更好的保护</a>，因为站点不知道连接究竟来自你的电脑还是为"
+"他人传递。"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:165
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:169
msgid ""
"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
"a> guide."
msgstr "阅读更详细的 <a href=\"<page docs/tor-doc-relay>\">配置中继</a> 指导。"
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:168
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:172
msgid "<hr />"
msgstr "<hr />"
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:170
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:174
msgid ""
"If you have suggestions for improving this document, please <a href=\"<page "
"contact>\">send them to us</a>. Thanks!"
-msgstr "如果你有改进本文档的建议，请 <a href=\"<page contact>\">发送给我们</a>。谢谢！"
+msgstr ""
+"如果你有改进本文档的建议，请 <a href=\"<page contact>\">发送给我们</a>。谢"
+"谢！"
Modified: translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/FbAjwe8In3.xml:24
-#: /tmp/FbAjwe8In3.xml:54 /tmp/FbAjwe8In3.xml:83 /tmp/FbAjwe8In3.xml:126
-#: /tmp/FbAjwe8In3.xml:164
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/Q_NsYkYh5m.xml:24
+#: /tmp/Q_NsYkYh5m.xml:54 /tmp/Q_NsYkYh5m.xml:86 /tmp/Q_NsYkYh5m.xml:129
+#: /tmp/Q_NsYkYh5m.xml:167
msgid "<br />"
msgstr ""
@@ -114,11 +114,12 @@
"torproject.org/svn/torbrowser/trunk/build-scripts/config/polipo.conf"
"\">Polipo configuration for Tor</a> and put it in place of your current "
"polipo config file (e.g. /etc/polipo/config or ~/.polipo). You'll need to "
-"restart Polipo for the changes to take effect."
+"restart Polipo for the changes to take effect. For example:<br /> <tt>/etc/"
+"init.d/polipo restart</tt>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:78
msgid ""
"If you prefer, you can instead use Privoxy with <a href=\"https://wiki.";
"torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -127,26 +128,26 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:83
msgid "<hr /> <a id=\"using\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:82
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
msgid ""
"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
"to use Tor</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
msgid ""
"After installing Tor and Polipo, you need to configure your applications to "
"use them. The first step is to set up web browsing."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
msgid ""
"You should use Tor with Firefox and Torbutton, for best safety. Simply "
"install the <a href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton "
@@ -154,14 +155,14 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
msgid ""
"<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
"png\" border=\"1\"> <br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:101
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:104
msgid ""
"If you plan to run Firefox on a different computer than Tor, see the <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -170,7 +171,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:107
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
msgid ""
"To Torify other applications that support HTTP proxies, just point them at "
"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -184,7 +185,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:118
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:121
msgid ""
"For information on how to Torify other applications, check out the <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\";>Torify "
@@ -192,12 +193,12 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126
msgid "<hr /> <a id=\"verify\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:125
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
msgid ""
"<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
msgstr ""
@@ -206,7 +207,7 @@
#. this site</a>PO4ASHARPEND
#. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
msgid ""
"Next, you should try using your browser with Tor and make sure that your IP "
"address is being anonymized. Click on <a href=\"https://check.torproject.org/";
@@ -217,7 +218,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:141
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:144
msgid ""
"If you have a personal firewall that limits your computer's ability to "
"connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -233,25 +234,25 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:156
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:159
msgid ""
"If it's still not working, look at <a href=\"https://wiki.torproject.org/";
"noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:160
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
msgid ""
"<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:166
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
msgid ""
"The Tor network relies on volunteers to donate bandwidth. The more people "
"who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -262,7 +263,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:174
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:177
msgid ""
"Having relays in many different places on the Internet is what makes Tor "
"users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -272,19 +273,19 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:181
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
msgid ""
"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
"a> guide."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:187
msgid "<hr />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
msgid ""
"If you have suggestions for improving this document, please <a href=\"<page "
"contact>\">send them to us</a>. Thanks!"
Modified: translation/trunk/projects/website/zh_CN/torbrowser/1-high.index.po
===================================================================
--- translation/trunk/projects/website/zh_CN/torbrowser/1-high.index.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/torbrowser/1-high.index.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: 2009-11-30 03:21+0800\n"
"Last-Translator: yfdyh000 <yfdyh000@xxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -34,8 +34,9 @@
"learning your physical location, and it lets you access sites which are "
"blocked."
msgstr ""
-"<strong>Tor</strong> 软件通过一个由志愿者们维护的分布式网络传输，保护你的信息安全：它可以阻止某些人试图知道你访问的网站，它可以防止"
-"你访问的网站知道你的真实物理位置，并且它可以让你访问被封锁的网站。"
+"<strong>Tor</strong> 软件通过一个由志愿者们维护的分布式网络传输，保护你的信息"
+"安全：它可以阻止某些人试图知道你访问的网站，它可以防止你访问的网站知道你的真"
+"实物理位置，并且它可以让你访问被封锁的网站。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/torbrowser/en/index.wml:21
@@ -48,10 +49,11 @@
"permanently, or if you don't use Windows, see the other ways to <a href="
"\"<page download>\">download Tor</a>."
msgstr ""
-"<strong>Tor 浏览器套件</strong> 让你可以在 Windows 下运行 Tor，并且无需安装任何软件。它可以在 USB "
-"闪存盘中独立运行，自带一个预先配置好的网络浏览器。<strong>Tor IM 浏览器套件</strong> 还可以让让即时通讯和聊天使用 "
-"Tor。如果您希望使用现有的网络浏览器，请考虑安装 Tor，或者如果您的操作系统不是 Windows，请看其他方式 <a href=\"<page "
-"download>\">下载 Tor</a>。"
+"<strong>Tor 浏览器套件</strong> 让你可以在 Windows 下运行 Tor，并且无需安装任"
+"何软件。它可以在 USB 闪存盘中独立运行，自带一个预先配置好的网络浏览器。"
+"<strong>Tor IM 浏览器套件</strong> 还可以让让即时通讯和聊天使用 Tor。如果您希"
+"望使用现有的网络浏览器，请考虑安装 Tor，或者如果您的操作系统不是 Windows，请"
+"看其他方式 <a href=\"<page download>\">下载 Tor</a>。"
#. type: Content of: <div><p>
#: /home/runa/tor/website/torbrowser/en/index.wml:33
@@ -61,95 +63,101 @@
"b0e2hzylie8r\">Tor Browser Bundle Tutorial</a>. Know of a better video or "
"one translated into your language? Let us know!"
msgstr ""
-"自由之家制作了一个关于如何找到和使用 Tor 浏览器套件的视频。你可以在 <a "
-"href=\"http://tinyvid.tv/show/b0e2hzylie8r\";>Tor 浏览器套件教程</a> "
-"观看视频。你知道更好的视频或者已翻译成您的语言之一？告诉我们！"
+"自由之家制作了一个关于如何找到和使用 Tor 浏览器套件的视频。你可以在 <a href="
+"\"http://tinyvid.tv/show/b0e2hzylie8r\";>Tor 浏览器套件教程</a> 观看视频。你知"
+"道更好的视频或者已翻译成您的语言之一？告诉我们！"
#. type: Content of: <div>
-#: /home/runa/tor/website/torbrowser/en/index.wml:39
+#: /home/runa/tor/website/torbrowser/en/index.wml:43
msgid "<a id=\"Download\"></a>"
msgstr "<a id=\"Download\"></a>"
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/torbrowser/en/index.wml:40
+#: /home/runa/tor/website/torbrowser/en/index.wml:44
msgid ""
"<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
"IM Browser Bundle</a>"
-msgstr "<a class=\"anchor\" href=\"#Download\">下载 Tor 浏览器套件以及 Tor IM 浏览器套件</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#Download\">下载 Tor 浏览器套件以及 Tor IM 浏览器"
+"套件</a>"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:42
+#: /home/runa/tor/website/torbrowser/en/index.wml:46
msgid ""
"To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the "
"file for your preferred language. This file can be saved wherever is "
"convenient, e.g. the Desktop or a USB flash drive."
msgstr ""
-"要开始使用 Tor 浏览器套件或 Tor IM 浏览器套件，下载您的首选语言的文件。这个文件可以保存在任何方便的地方，例如，桌面或 USB 闪存盘。"
+"要开始使用 Tor 浏览器套件或 Tor IM 浏览器套件，下载您的首选语言的文件。这个文"
+"件可以保存在任何方便的地方，例如，桌面或 USB 闪存盘。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:46
+#: /home/runa/tor/website/torbrowser/en/index.wml:50
msgid ""
"If you have an unreliable Internet connection, it may be easier for you to "
"download the bundle edition which is <a href=\"<page torbrowser/split>"
"\">split up</a> into smaller parts."
msgstr ""
-"如果您的 Internet 连接不稳定，可能你更容易下载套件的 <a href=\"<page torbrowser/split>\">分割版</a>。"
+"如果您的 Internet 连接不稳定，可能你更容易下载套件的 <a href=\"<page "
+"torbrowser/split>\">分割版</a>。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:48
+#: /home/runa/tor/website/torbrowser/en/index.wml:52
msgid ""
"Tor Browser Bundle for Windows with Firefox (version <version-"
"torbrowserbundle>, 16 MB)"
-msgstr "Tor 浏览器套件，含适用于 Windows 的 Firefox（版本 <version-torbrowserbundle>，16 MB）"
+msgstr ""
+"Tor 浏览器套件，含适用于 Windows 的 Firefox（版本 <version-"
+"torbrowserbundle>，16 MB）"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:52
+#: /home/runa/tor/website/torbrowser/en/index.wml:56
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_en-US.exe\">English "
"(en-US)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_en-US.exe."
"asc\" style=\"font-size: 90%;\">signature</a>)"
msgstr ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_en-US.exe\">英语 (en-"
-"US)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc\" "
-"style=\"font-size: 90%;\">数字签名</a>)"
+"US)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc"
+"\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:54
+#: /home/runa/tor/website/torbrowser/en/index.wml:58
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe\">ا"
"لعربية (ar)</a> (<a href=\"dist/"
"tor-browser-<version-torbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;"
"\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe\">阿拉伯语 (ar)</a> "
-"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe.asc\" style"
-"=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe\">阿拉伯语 (ar)"
+"</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe.asc\" "
+"style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:56
+#: /home/runa/tor/website/torbrowser/en/index.wml:60
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe\">Deutsch (de)</"
"a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe.asc\" style="
"\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe\">德语 (de)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe.asc\" style=\"font-"
-"size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe\">德语 (de)</a> "
+"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe.asc\" style="
+"\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:58
+#: /home/runa/tor/website/torbrowser/en/index.wml:62
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe\">E"
"spañol (es-ES)</a> (<a href=\"dist/"
"tor-browser-<version-torbrowserbundle>_es-ES.exe.asc\" style=\"font-size: "
"90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe\">西班牙语 (es-"
-"ES)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc\" "
-"style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe\">西班牙语 "
+"(es-ES)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe."
+"asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:60
+#: /home/runa/tor/website/torbrowser/en/index.wml:64
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe\">ف"
"ارسی (fa-IR)</a> (<a href=\"dist/tor-browser-"
@@ -157,91 +165,91 @@
"\">signature</a>)"
msgstr ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe\">波斯语 (fa-"
-"IR)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe.asc\" "
-"style=\"font-size: 90%;\">数字签名</a>)"
+"IR)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe.asc"
+"\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:62
+#: /home/runa/tor/website/torbrowser/en/index.wml:66
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe\">F"
"rançais (fr)</a> (<a href="
"\"dist/tor-browser-<version-torbrowserbundle>_fr.exe.asc\" style=\"font-"
"size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe\">法语 (fr)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe.asc\" style=\"font-"
-"size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe\">法语 (fr)</a> "
+"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe.asc\" style="
+"\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:64
+#: /home/runa/tor/website/torbrowser/en/index.wml:68
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe\">Italiano (it)"
"</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe.asc\" "
"style=\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe\">意大利语 (it)</a> "
-"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe.asc\" style"
-"=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe\">意大利语 (it)"
+"</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe.asc\" "
+"style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:66
+#: /home/runa/tor/website/torbrowser/en/index.wml:70
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl.exe\">Nederlands "
"(nl)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl.exe.asc\" "
"style=\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl.exe\">荷兰语 (nl)</a> "
-"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl.exe.asc\" style"
-"=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl.exe\">荷兰语 (nl)</"
+"a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl.exe.asc\" style="
+"\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:68
+#: /home/runa/tor/website/torbrowser/en/index.wml:72
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe\">Polish (pl)</"
"a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe.asc\" style="
"\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe\">波兰语 (pl)</a> "
-"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe.asc\" style"
-"=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe\">波兰语 (pl)</"
+"a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe.asc\" style="
+"\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:70
+#: /home/runa/tor/website/torbrowser/en/index.wml:74
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe\">P"
"ortuguês (pt-PT)</a> "
"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc\" style="
"\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe\">葡萄牙语 (pt-"
-"PT)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc\" "
-"style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe\">葡萄牙语 "
+"(pt-PT)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe."
+"asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:72
+#: /home/runa/tor/website/torbrowser/en/index.wml:76
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe\">Р"
"усский (ru)</a> (<a href=\"dist/"
"tor-browser-<version-torbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;"
"\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe\">俄文 (ru)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe.asc\" style=\"font-"
-"size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe\">俄文 (ru)</a> "
+"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe.asc\" style="
+"\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:74
+#: /home/runa/tor/website/torbrowser/en/index.wml:78
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe\">简"
"体字 (zh-CN)</a> (<a href=\"dist/tor-browser-<version-"
"torbrowserbundle>_zh-CN.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe\">简体中文 (zh-"
-"CN)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc\" "
-"style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe\">简体中文 "
+"(zh-CN)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe."
+"asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:78
+#: /home/runa/tor/website/torbrowser/en/index.wml:82
msgid ""
"Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
"torimbrowserbundle>, 25 MB)"
@@ -250,18 +258,18 @@
"torimbrowserbundle>，25 MB）"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:82
+#: /home/runa/tor/website/torbrowser/en/index.wml:86
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe"
"\">English (en-US)</a> (<a href=\"dist/tor-im-browser-<version-"
"torimbrowserbundle>_en-US.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe\">英语 (en-"
-"US)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe\">英语 "
+"(en-US)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-"
"US.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:84
+#: /home/runa/tor/website/torbrowser/en/index.wml:88
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe\">ا"
"لعربية (ar)</a> (<a href=\"dist/"
@@ -269,127 +277,127 @@
"90%;\">signature</a>)"
msgstr ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe\">阿拉伯语 "
-"(ar)</a> (<a href=\"dist/tor-im-browser-<version-"
-"torimbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"(ar)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe."
+"asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:86
+#: /home/runa/tor/website/torbrowser/en/index.wml:90
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe\">Deutsch "
"(de)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe."
"asc\" style=\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe\">德文 "
-"(de)</a> (<a href=\"dist/tor-im-browser-<version-"
-"torimbrowserbundle>_de.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe\">德文 (de)"
+"</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe.asc"
+"\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:88
+#: /home/runa/tor/website/torbrowser/en/index.wml:92
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe"
"\">Español (es-ES)</a> (<a "
"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe.asc\" "
"style=\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe\">西班牙语 "
-"(es-ES)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-"
-"ES.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe\">西班牙"
+"语 (es-ES)</a> (<a href=\"dist/tor-im-browser-<version-"
+"torimbrowserbundle>_es-ES.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:90
+#: /home/runa/tor/website/torbrowser/en/index.wml:94
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe"
"\">فارسی (fa-IR)</a> (<a href=\"dist/tor-"
"im-browser-<version-torimbrowserbundle>_fa-IR.exe.asc\" style=\"font-size: "
"90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe\">波斯语 "
-"(fa-IR)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-"
-"IR.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe\">波斯"
+"语 (fa-IR)</a> (<a href=\"dist/tor-im-browser-<version-"
+"torimbrowserbundle>_fa-IR.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:92
+#: /home/runa/tor/website/torbrowser/en/index.wml:96
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe\">F"
"rançais (fr)</a> (<a href="
"\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe.asc\" style=\"font-"
"size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe\">法语 "
-"(fr)</a> (<a href=\"dist/tor-im-browser-<version-"
-"torimbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe\">法语 (fr)"
+"</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe.asc"
+"\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:94
+#: /home/runa/tor/website/torbrowser/en/index.wml:98
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe\">Italiano "
"(it)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe."
"asc\" style=\"font-size: 90%;\">signature</a>)"
msgstr ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe\">意大利语 "
-"(it)</a> (<a href=\"dist/tor-im-browser-<version-"
-"torimbrowserbundle>_it.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"(it)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe."
+"asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:96
+#: /home/runa/tor/website/torbrowser/en/index.wml:100
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe"
"\">Nederlands (nl)</a> (<a href=\"dist/tor-im-browser-<version-"
"torimbrowserbundle>_nl.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
msgstr ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe\">荷兰语 "
-"(nl)</a> (<a href=\"dist/tor-im-browser-<version-"
-"torimbrowserbundle>_nl.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"(nl)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe."
+"asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:98
+#: /home/runa/tor/website/torbrowser/en/index.wml:102
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe\">Polish "
"(pl)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe."
"asc\" style=\"font-size: 90%;\">signature</a>)"
msgstr ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe\">波兰语 "
-"(pl)</a> (<a href=\"dist/tor-im-browser-<version-"
-"torimbrowserbundle>_pl.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"(pl)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe."
+"asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:100
+#: /home/runa/tor/website/torbrowser/en/index.wml:104
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe"
"\">Português "
"(pt-PT)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-"
"PT.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe\">葡萄牙语 "
-"(pt-PT)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-"
-"PT.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe\">葡萄牙"
+"语 (pt-PT)</a> (<a href=\"dist/tor-im-browser-<version-"
+"torimbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:102
+#: /home/runa/tor/website/torbrowser/en/index.wml:106
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe\">Р"
"усский (ru)</a> (<a href=\"dist/"
"tor-im-browser-<version-torimbrowserbundle>_ru.exe.asc\" style=\"font-size: "
"90%;\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe\">俄文 "
-"(ru)</a> (<a href=\"dist/tor-im-browser-<version-"
-"torimbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe\">俄文 (ru)"
+"</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe.asc"
+"\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbrowser/en/index.wml:104
+#: /home/runa/tor/website/torbrowser/en/index.wml:108
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe"
"\">简体字 (zh-CN)</a> (<a href=\"dist/tor-im-browser-"
"<version-torimbrowserbundle>_zh-CN.exe.asc\" style=\"font-size: 90%;"
"\">signature</a>)"
msgstr ""
-"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe\">简体中文 "
-"(zh-CN)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-"
-"CN.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe\">简体中"
+"文 (zh-CN)</a> (<a href=\"dist/tor-im-browser-<version-"
+"torimbrowserbundle>_zh-CN.exe.asc\" style=\"font-size: 90%;\">数字签名</a>)"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:108
+#: /home/runa/tor/website/torbrowser/en/index.wml:112
msgid ""
"See our instructions on <a href=\"https://wiki.torproject.org/noreply/";
"TheOnionRouter/VerifyingSignatures\">how to verify package signatures</a>, "
@@ -400,25 +408,26 @@
"we're currently working with Mozilla to see if they want us to change the "
"name to make this clearer."
msgstr ""
-"请查看 <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSig";
-"natures\">如何验证软件包的数字签名</a>，这样就可以确保您下载的文件是正确的，而不是被恶意篡改过的。另外，请注意，套件包中的 Firefox "
-"是从 <a href=\"http://www.mozilla.com/firefox/\";>原始的 Firefox</a> <a "
-"href=\"https://svn.torproject.org/svn/torbrowser/trunk/build-";
-"scripts/config/\">修改的</a> 版本；我们目前正为此事和 Mozilla 交涉，看看他们是不是需要我们修改 Firefox "
-"的名字以更明确地表明这一点。"
+"请查看 <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"VerifyingSignatures\">如何验证软件包的数字签名</a>，这样就可以确保您下载的文"
+"件是正确的，而不是被恶意篡改过的。另外，请注意，套件包中的 Firefox 是从 <a "
+"href=\"http://www.mozilla.com/firefox/\";>原始的 Firefox</a> <a href="
+"\"https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/\";>修"
+"改的</a> 版本；我们目前正为此事和 Mozilla 交涉，看看他们是不是需要我们修改 "
+"Firefox 的名字以更明确地表明这一点。"
#. type: Content of: <div>
-#: /home/runa/tor/website/torbrowser/en/index.wml:119
+#: /home/runa/tor/website/torbrowser/en/index.wml:123
msgid "<a id=\"Extraction\"></a>"
msgstr "<a id=\"Extraction\"></a>"
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/torbrowser/en/index.wml:120
+#: /home/runa/tor/website/torbrowser/en/index.wml:124
msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
msgstr "<a class=\"anchor\" href=\"#Extraction\">解压缩</a>"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:122
+#: /home/runa/tor/website/torbrowser/en/index.wml:126
msgid ""
"Download the file above, and save it somewhere, then double click on it. "
"Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -428,62 +437,67 @@
"choice. If you want to move it to a different computer or limit the traces "
"you leave behind, save it to a USB disk."
msgstr ""
-"下载上面的文件，并保存到某个地方，然后双击它。点一下标签是 <strong>\"...\"</strong> 的按钮 (1) "
-"然后选择套件要保存的位置，然后单击 <strong>OK</strong> (2)。你选择的位置需要至少 50 MB "
-"的空闲空间。如果你想将套件留在计算机上，将它保存到桌面是一个好主意。如果你想将其移动到另一台计算机或者尽可能减少你留下的痕迹，保存到 USB 闪存盘上。"
+"下载上面的文件，并保存到某个地方，然后双击它。点一下标签是 <strong>\"...\"</"
+"strong> 的按钮 (1) 然后选择套件要保存的位置，然后单击 <strong>OK</strong> "
+"(2)。你选择的位置需要至少 50 MB 的空闲空间。如果你想将套件留在计算机上，将它"
+"保存到桌面是一个好主意。如果你想将其移动到另一台计算机或者尽可能减少你留下的"
+"痕迹，保存到 USB 闪存盘上。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:130
+#: /home/runa/tor/website/torbrowser/en/index.wml:134
msgid ""
"Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
"minutes to complete."
-msgstr "点击 <strong>Extract</strong> (3) 开始解压缩。这可能需要几分钟的时间才能完成。"
+msgstr ""
+"点击 <strong>Extract</strong> (3) 开始解压缩。这可能需要几分钟的时间才能完"
+"成。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:133
+#: /home/runa/tor/website/torbrowser/en/index.wml:137
msgid ""
"<img src=\"img/screenshot1.png\" alt=\"Screenshot of extraction process\" />"
msgstr "<img src=\"img/screenshot1.png\" alt=\"解压缩过程的截图\" />"
#. type: Content of: <div>
-#: /home/runa/tor/website/torbrowser/en/index.wml:135
+#: /home/runa/tor/website/torbrowser/en/index.wml:139
msgid "<a id=\"Usage\"></a>"
msgstr "<a id=\"Usage\"></a>"
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/torbrowser/en/index.wml:136
+#: /home/runa/tor/website/torbrowser/en/index.wml:140
msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
msgstr "<a class=\"anchor\" href=\"#Usage\">使用</a>"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:138
+#: /home/runa/tor/website/torbrowser/en/index.wml:142
msgid ""
"Once extraction is complete, open the folder <strong>Tor Browser</strong> "
"from the location you saved the bundle."
-msgstr "解压缩完成后，从你保存套件的位置打开文件夹 <strong>Tor Browser</strong>。"
+msgstr ""
+"解压缩完成后，从你保存套件的位置打开文件夹 <strong>Tor Browser</strong>。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:140
+#: /home/runa/tor/website/torbrowser/en/index.wml:144
msgid ""
"Double click on the <strong>Start Tor Browser</strong> (4) application (it "
"may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
msgstr ""
-"双击 <strong>Start Tor Browser</strong> (4) 应用程序（在某些系统上，它也可能显示为 <strong>Start "
-"Tor Browser.exe</strong>。）"
+"双击 <strong>Start Tor Browser</strong> (4) 应用程序（在某些系统上，它也可能"
+"显示为 <strong>Start Tor Browser.exe</strong>。）"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:143
+#: /home/runa/tor/website/torbrowser/en/index.wml:147
msgid "The Vidalia window will shortly appear."
msgstr "Vidalia 的窗口很快就会出现。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:145
+#: /home/runa/tor/website/torbrowser/en/index.wml:149
msgid ""
"<img src=\"img/screenshot2.png\" alt=\"Screenshot of bundle startup\" />"
msgstr "<img src=\"img/screenshot2.png\" alt=\"套件启动的截图\" />"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:147
+#: /home/runa/tor/website/torbrowser/en/index.wml:151
msgid ""
"Once Tor is ready, Firefox will automatically be opened. Only web pages "
"visited through the included Firefox browser will be sent via Tor. Other web "
@@ -493,58 +507,63 @@
"while using the Tor Browser Bundle, and close existing Firefox windows "
"before starting."
msgstr ""
-"一旦 Tor 准备好了，Firefox 会自动打开。只有通过内置的 Firefox 浏览器浏览的网页才会通过 Tor。其他网页浏览器，如 "
-"Internet Explorer 不会受到影响。使用前请确保在浏览器的右下角提示了 <span style=\"color: #0a0\">\"Tor "
-"Enabled\"</span> (5) 。为了减少弄错的风险，请在使用 Tor 浏览器套件的过程中不要打开新的 "
+"一旦 Tor 准备好了，Firefox 会自动打开。只有通过内置的 Firefox 浏览器浏览的网"
+"页才会通过 Tor。其他网页浏览器，如 Internet Explorer 不会受到影响。使用前请确"
+"保在浏览器的右下角提示了 <span style=\"color: #0a0\">\"Tor Enabled\"</span> "
+"(5) 。为了减少弄错的风险，请在使用 Tor 浏览器套件的过程中不要打开新的 "
"Firefox，并且在开始使用前关闭现有的 Firefox 窗口。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:154
+#: /home/runa/tor/website/torbrowser/en/index.wml:158
msgid ""
"If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
"client will also be automatically opened."
msgstr "如果您安装了 Tor IM 浏览器套件，Pidgin 即时通讯客户端也将自动打开。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:156
+#: /home/runa/tor/website/torbrowser/en/index.wml:160
msgid ""
"Once you are finished browsing, close any open Firefox windows by clicking "
"on the <img src=\"img/close-button.png\" alt=\"Close button (×)\" /> "
"(6). For privacy reasons, the list of webpages you visited and any cookies "
"will be deleted."
msgstr ""
-"一旦你完成浏览，点击关闭任何打开的 Firefox 窗口 <img src=\"img/close-button.png\" alt=\"关闭按钮 "
-"(×)\" /> (6)。出于保护隐私的原因，您访问的网页列表和任何 Cookies 都将被删除。"
+"一旦你完成浏览，点击关闭任何打开的 Firefox 窗口 <img src=\"img/close-button."
+"png\" alt=\"关闭按钮 (×)\" /> (6)。出于保护隐私的原因，您访问的网页列表"
+"和任何 Cookies 都将被删除。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:161
+#: /home/runa/tor/website/torbrowser/en/index.wml:165
msgid "<img src=\"img/screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
msgstr "<img src=\"img/screenshot3a.png\" alt=\"Firefox 的截图\" />"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:163
+#: /home/runa/tor/website/torbrowser/en/index.wml:167
msgid ""
"With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
"the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on "
"the Pidgin icon (7), and choosing Quit (8)."
msgstr ""
-"如果使用了 Tor 浏览器套件，Vidalia 和 Tor 也将自动关闭。如果使用了 Tor IM 浏览器套件你需要手动关闭 Pidgin。右键点击 "
-"Pidgin 图标 (7), 并选择退出(Quit) (8)。"
+"如果使用了 Tor 浏览器套件，Vidalia 和 Tor 也将自动关闭。如果使用了 Tor IM 浏"
+"览器套件你需要手动关闭 Pidgin。右键点击 Pidgin 图标 (7), 并选择退出(Quit) "
+"(8)。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:165
+#: /home/runa/tor/website/torbrowser/en/index.wml:169
msgid "<img src=\"img/screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
msgstr "<img src=\"img/screenshot3b.png\" alt=\"Pidgin 的截图\" />"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:167
+#: /home/runa/tor/website/torbrowser/en/index.wml:171
msgid ""
"To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
"steps in <a href=\"#Usage\">\"Usage\"</a>."
-msgstr "要再次使用 Tor 浏览器套件或 Tor IM 浏览器套件，请重复步骤 <a href=\"#Usage\">\"使用\"</a>。"
+msgstr ""
+"要再次使用 Tor 浏览器套件或 Tor IM 浏览器套件，请重复步骤 <a href=\"#Usage\">"
+"\"使用\"</a>。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:169
+#: /home/runa/tor/website/torbrowser/en/index.wml:173
msgid ""
"Remember that Tor anonymizes the origin of your traffic, and it encrypts "
"everything inside the Tor network, but <a href=\"https://wiki.torproject.org/";
@@ -554,23 +573,24 @@
"would on the normal scary Internet — use HTTPS or other end-to-end "
"encryption and authentication."
msgstr ""
-"请记住，Tor 匿名通信的来源，并且它加密 Tor 网络中的所有数据，但是 <a href=\"https://wiki.torproject.org/n";
-"oreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">它不能加密 Tor "
-"网络与通信目的地之间的连接</a>。如果你正在传输敏感信息，你应该像你平时在互联网上一样谨慎 — 使用 HTTPS "
-"或者其他端到端的加密及认证。"
+"请记住，Tor 匿名通信的来源，并且它加密 Tor 网络中的所有数据，但是 <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";
+"\">它不能加密 Tor 网络与通信目的地之间的连接</a>。如果你正在传输敏感信息，你"
+"应该像你平时在互联网上一样谨慎 — 使用 HTTPS 或者其他端到端的加密及认"
+"证。"
#. type: Content of: <div>
-#: /home/runa/tor/website/torbrowser/en/index.wml:178
+#: /home/runa/tor/website/torbrowser/en/index.wml:182
msgid "<a id=\"Feedback\"></a>"
msgstr "<a id=\"Feedback\"></a>"
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/torbrowser/en/index.wml:179
+#: /home/runa/tor/website/torbrowser/en/index.wml:183
msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
msgstr "<a class=\"anchor\" href=\"#Feedback\">意见和建议</a>"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:181
+#: /home/runa/tor/website/torbrowser/en/index.wml:185
msgid ""
"The Tor Browser Bundle is under development and not yet complete. To "
"discuss improvements and submit comments, please use the <a href=\"http://";
@@ -580,65 +600,65 @@
"href=\"http://archives.seul.org/or/talk/\";>or-talk</a> 邮件列表。"
#. type: Content of: <div>
-#: /home/runa/tor/website/torbrowser/en/index.wml:185
+#: /home/runa/tor/website/torbrowser/en/index.wml:189
msgid "<a id=\"More\"></a>"
msgstr "<a id=\"More\"></a>"
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/torbrowser/en/index.wml:186
+#: /home/runa/tor/website/torbrowser/en/index.wml:190
msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
msgstr "<a class=\"anchor\" href=\"#More\">更多信息</a>"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:188
+#: /home/runa/tor/website/torbrowser/en/index.wml:192
msgid ""
"<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
"visit the <a href=\"<page index>\">Tor Project website</a>."
msgstr ""
-"<strong>什么是 Tor，为什么我需要它？</strong> 要了解更多关于 Tor，访问 <a href=\"<page index>\">Tor "
-"项目网站</a>。"
+"<strong>什么是 Tor，为什么我需要它？</strong> 要了解更多关于 Tor，访问 <a "
+"href=\"<page index>\">Tor 项目网站</a>。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:192
+#: /home/runa/tor/website/torbrowser/en/index.wml:196
msgid ""
"<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
"Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page torbrowser/"
"details>#contents\">learn more</a>)."
msgstr ""
-"<strong>什么是 Tor 浏览器套件？</strong> 它包含了 Tor、Vidalia、Polipo、Firefox 和 "
-"Torbutton（<a href=\"<page torbrowser/details>#contents\">了解更多</a>）。"
+"<strong>什么是 Tor 浏览器套件？</strong> 它包含了 Tor、Vidalia、Polipo、"
+"Firefox 和 Torbutton（<a href=\"<page torbrowser/details>#contents\">了解更多"
+"</a>）。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:196
+#: /home/runa/tor/website/torbrowser/en/index.wml:200
msgid ""
"<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
"Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
"torbrowser/details>#contents\">learn more</a>)."
msgstr ""
-"<strong>什么是 Tor IM 浏览器套件</strong> 它包含了 "
-"Tor、Vidalia、Polipo、Firefox、Torbutton、Pidgin 和 OTR （<a href=\"<page "
-"torbrowser/details>#contents\">了解更多</a>）。"
+"<strong>什么是 Tor IM 浏览器套件</strong> 它包含了 Tor、Vidalia、Polipo、"
+"Firefox、Torbutton、Pidgin 和 OTR （<a href=\"<page torbrowser/"
+"details>#contents\">了解更多</a>）。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:200
+#: /home/runa/tor/website/torbrowser/en/index.wml:204
msgid ""
"<strong>How can I make my own bundle?</strong> To download the source code "
"and learn how to build the bundle yourself, read the <a href=\"<page "
"torbrowser/details>#build\">build instructions</a>."
msgstr ""
-"<strong>我如何制作自己的套件？</strong> 要下载源代码，并学习如何创建自己的套件，请阅读 <a href=\"<page "
-"torbrowser/details>#build\">编译指导</a>。"
+"<strong>我如何制作自己的套件？</strong> 要下载源代码，并学习如何创建自己的套"
+"件，请阅读 <a href=\"<page torbrowser/details>#build\">编译指导</a>。"
#. type: Content of: <div><p>
-#: /home/runa/tor/website/torbrowser/en/index.wml:204
+#: /home/runa/tor/website/torbrowser/en/index.wml:208
msgid ""
"Tor Browser Bundle is partially based on <a href=\"http://portableapps.com/";
"apps/internet/firefox_portable\">Mozilla Firefox, Portable Edition</a> and "
"<a href=\"http://portableapps.com/apps/internet/pidgin_portable\";>Pidgin "
"Portable</a> from <a href=\"http://portableapps.com/\";>PortableApps.com</a>."
msgstr ""
-"Tor 浏览器套件是部分基于 <a href=\"http://portableapps.com/\";>PortableApps.com</a> 的 <a "
-"href=\"http://portableapps.com/apps/internet/firefox_portable\";>Mozilla "
-"Firefox、Portable Edition</a> 和 <a "
-"href=\"http://portableapps.com/apps/internet/pidgin_portable\";>Pidgin "
-"Portable</a>。"
+"Tor 浏览器套件是部分基于 <a href=\"http://portableapps.com/\";>PortableApps."
+"com</a> 的 <a href=\"http://portableapps.com/apps/internet/firefox_portable";
+"\">Mozilla Firefox、Portable Edition</a> 和 <a href=\"http://portableapps.";
+"com/apps/internet/pidgin_portable\">Pidgin Portable</a>。"
Modified: translation/trunk/projects/website/zh_CN/torbutton/3-low.options.po
===================================================================
--- translation/trunk/projects/website/zh_CN/torbutton/3-low.options.po 2009-12-18 22:14:19 UTC (rev 21264)
+++ translation/trunk/projects/website/zh_CN/torbutton/3-low.options.po 2009-12-18 22:21:11 UTC (rev 21265)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-18 23:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -128,12 +128,28 @@
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/torbutton/en/options.wml:69
-msgid "Block Tor/Non-Tor access to network from file:// urls (recommended)"
+msgid "Block Livemarks updates during Tor usage (recommended)"
msgstr ""
#. type: Content of: <div><ul><li><p>
#: /home/runa/tor/website/torbutton/en/options.wml:71
msgid ""
+"This setting causes Torbutton to disable your <a href=\"http://www.mozilla.";
+"com/firefox/livebookmarks.html\">Live bookmark</a> updates. Since most "
+"people use Live bookmarks for RSS feeds from their blog, their friends' "
+"blogs, the wikipedia page they edit, and other such things, these updates "
+"probably should not happen over Tor. This feature takes effect in Firefox "
+"3.5 and above only."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbutton/en/options.wml:79
+msgid "Block Tor/Non-Tor access to network from file:// urls (recommended)"
+msgstr ""
+
+#. type: Content of: <div><ul><li><p>
+#: /home/runa/tor/website/torbutton/en/options.wml:81
+msgid ""
"These settings prevent local html documents from transmitting local files to "
"arbitrary websites <a href=\"http://www.gnucitizen.org/blog/content-";
"disposition-hacking/\">under Firefox 2</a>. Since exit nodes can insert "
@@ -143,12 +159,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:77
+#: /home/runa/tor/website/torbutton/en/options.wml:87
msgid "Close all Non-Tor/Tor windows and tabs on toggle (optional)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:79
+#: /home/runa/tor/website/torbutton/en/options.wml:89
msgid ""
"These two settings allow you to obtain a greater degree of assurance that "
"after you toggle out of Tor, the pages are really gone and can't perform any "
@@ -160,12 +176,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:86
+#: /home/runa/tor/website/torbutton/en/options.wml:96
msgid "Isolate access to history navigation to Tor state (crucial)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:88
+#: /home/runa/tor/website/torbutton/en/options.wml:98
msgid ""
"This setting prevents both Javascript and accidental user clicks from "
"causing the session history to load pages that were fetched in a different "
@@ -175,12 +191,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:94
+#: /home/runa/tor/website/torbutton/en/options.wml:104
msgid "Block History Reads during Tor (crucial)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:96
+#: /home/runa/tor/website/torbutton/en/options.wml:106
msgid ""
"Based on code contributed by <a href=\"http://www.collinjackson.com/";
"\">Collin Jackson</a>, when enabled and Tor is enabled, this setting "
@@ -190,22 +206,22 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:102
+#: /home/runa/tor/website/torbutton/en/options.wml:112
msgid "Block History Reads during Non-Tor (recommended)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:104
+#: /home/runa/tor/website/torbutton/en/options.wml:114
msgid "This setting accomplishes the same but for your Non-Tor activity."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:106
+#: /home/runa/tor/website/torbutton/en/options.wml:116
msgid "Block History Writes during Tor (recommended)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:108
+#: /home/runa/tor/website/torbutton/en/options.wml:118
msgid ""
"This setting prevents the rendering engine from recording visited URLs, and "
"also disables download manager history. Note that if you allow writing of "
@@ -215,48 +231,48 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:114
+#: /home/runa/tor/website/torbutton/en/options.wml:124
msgid "Block History Writes during Non-Tor (optional)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:116
+#: /home/runa/tor/website/torbutton/en/options.wml:126
msgid ""
"This setting also disables recording any history information during Non-Tor "
"usage."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:119
+#: /home/runa/tor/website/torbutton/en/options.wml:129
msgid "Clear History During Tor Toggle (optional)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:121
+#: /home/runa/tor/website/torbutton/en/options.wml:131
msgid ""
"This is an alternate setting to use instead of (or in addition to) blocking "
"history reads or writes."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:124
+#: /home/runa/tor/website/torbutton/en/options.wml:134
msgid "Block Password+Form saving during Tor/Non-Tor"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:126
+#: /home/runa/tor/website/torbutton/en/options.wml:136
msgid ""
"These options govern if the browser writes your passwords and search "
"submissions to disk for the given state."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:129
+#: /home/runa/tor/website/torbutton/en/options.wml:139
msgid "Block Tor disk cache and clear all cache on Tor Toggle"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:131
+#: /home/runa/tor/website/torbutton/en/options.wml:141
msgid ""
"Since the browser cache can be leveraged to store unique identifiers, cache "
"must not persist across Tor sessions. This option keeps the memory cache "
@@ -264,34 +280,34 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:135
+#: /home/runa/tor/website/torbutton/en/options.wml:145
msgid "Block disk and memory cache during Tor"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:137
+#: /home/runa/tor/website/torbutton/en/options.wml:147
msgid ""
"This setting entirely blocks the cache during Tor, but preserves it for Non-"
"Tor usage."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:140
+#: /home/runa/tor/website/torbutton/en/options.wml:150
msgid "Clear Cookies on Tor Toggle"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:142
+#: /home/runa/tor/website/torbutton/en/options.wml:152
msgid "Fully clears all cookies on Tor toggle."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:144
+#: /home/runa/tor/website/torbutton/en/options.wml:154
msgid "Store Non-Tor cookies in a protected jar"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:146
+#: /home/runa/tor/website/torbutton/en/options.wml:156
msgid ""
"This option stores your persistent Non-Tor cookies in a special cookie jar "
"file, in case you wish to preserve some cookies. Based on code contributed "
@@ -301,12 +317,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:152
+#: /home/runa/tor/website/torbutton/en/options.wml:162
msgid "Store both Non-Tor and Tor cookies in a protected jar (dangerous)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:154
+#: /home/runa/tor/website/torbutton/en/options.wml:164
msgid ""
"This option stores your persistent Tor and Non-Tor cookies separate cookie "
"jar files. Note that it is a bad idea to keep Tor cookies around for any "
@@ -315,12 +331,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:159
+#: /home/runa/tor/website/torbutton/en/options.wml:169
msgid "Manage My Own Cookies (dangerous)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:161
+#: /home/runa/tor/website/torbutton/en/options.wml:171
msgid ""
"This setting allows you to manage your own cookies with an alternate "
"extension, such as <a href=\"https://addons.mozilla.org/firefox/addon/82";
@@ -332,12 +348,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:168
+#: /home/runa/tor/website/torbutton/en/options.wml:178
msgid "Do not write Tor/Non-Tor cookies to disk"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:170
+#: /home/runa/tor/website/torbutton/en/options.wml:180
msgid ""
"These settings prevent Firefox from writing any cookies to disk during the "
"corresponding Tor state. If cookie jars are enabled, those jars will exist "
@@ -345,12 +361,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:174
+#: /home/runa/tor/website/torbutton/en/options.wml:184
msgid "Disable DOM Storage during Tor usage (crucial)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:176
+#: /home/runa/tor/website/torbutton/en/options.wml:186
msgid ""
"Firefox has recently added the ability to store additional state and "
"identifiers in persistent tables, called <a href=\"http://developer.mozilla.";
@@ -359,12 +375,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:182
+#: /home/runa/tor/website/torbutton/en/options.wml:192
msgid "Clear HTTP auth sessions (recommended)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:184
+#: /home/runa/tor/website/torbutton/en/options.wml:194
msgid ""
"HTTP authentication credentials can be probed by exit nodes and used to both "
"confirm that you visit a certain site that uses HTTP auth, and also "
@@ -372,12 +388,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:186
+#: /home/runa/tor/website/torbutton/en/options.wml:196
msgid "Clear cookies on Tor/Non-Tor shutdown"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:188
+#: /home/runa/tor/website/torbutton/en/options.wml:198
msgid ""
"These settings install a shutdown handler to clear cookies on Tor and/or Non-"
"Tor browser shutdown. It is independent of your Clear Private Data settings, "
@@ -385,12 +401,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:192
+#: /home/runa/tor/website/torbutton/en/options.wml:202
msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:194
+#: /home/runa/tor/website/torbutton/en/options.wml:204
msgid ""
"This option augments the session store to prevent it from writing out Tor-"
"loaded tabs to disk. Unfortunately, this also disables your ability to undo "
@@ -401,25 +417,25 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:201
+#: /home/runa/tor/website/torbutton/en/options.wml:211
msgid "On normal startup, set state to: Tor, Non-Tor, Shutdown State"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:203
+#: /home/runa/tor/website/torbutton/en/options.wml:213
msgid ""
"This setting allows you to choose which Tor state you want the browser to "
"start in normally: Tor, Non-Tor, or whatever state the browser shut down in."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:206
+#: /home/runa/tor/website/torbutton/en/options.wml:216
msgid ""
"On crash recovery or session restored startup, restore via: Tor, Non-Tor"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:208
+#: /home/runa/tor/website/torbutton/en/options.wml:218
msgid ""
"When Firefox crashes, the Tor state upon restart usually is completely "
"random, and depending on your choice for the above option, may load a bunch "
@@ -428,12 +444,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:213
+#: /home/runa/tor/website/torbutton/en/options.wml:223
msgid "Prevent session store from saving Non-Tor/Tor-loaded tabs"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:215
+#: /home/runa/tor/website/torbutton/en/options.wml:225
msgid ""
"These two settings allow you to control what the Firefox Session Store "
"writes to disk. Since the session store state is used to automatically load "
@@ -443,12 +459,12 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:222
+#: /home/runa/tor/website/torbutton/en/options.wml:232
msgid "Set user agent during Tor usage (crucial)"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:224
+#: /home/runa/tor/website/torbutton/en/options.wml:234
msgid ""
"User agent masking is done with the idea of making all Tor users appear "
"uniform. A recent Firefox 2.0.0.4 Windows build was chosen to mimic for this "
@@ -462,24 +478,24 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:234
+#: /home/runa/tor/website/torbutton/en/options.wml:244
msgid "Spoof US English Browser"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:236
+#: /home/runa/tor/website/torbutton/en/options.wml:246
msgid ""
"This option causes Firefox to send http headers as if it were an English "
"browser. Useful for internationalized users."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/torbutton/en/options.wml:239
+#: /home/runa/tor/website/torbutton/en/options.wml:249
msgid "Don't send referrer during Tor Usage"
msgstr ""
#. type: Content of: <div><ul><li><p>
-#: /home/runa/tor/website/torbutton/en/options.wml:241
+#: /home/runa/tor/website/torbutton/en/options.wml:251
msgid ""
"This option disables the referrer header, preventing sites from determining "
"where you came from to visit them. This can break some sites, however. <a "