[or-cvs] r23851: {translation} updated files from pootle (in translation/trunk/projects/website/po: ca de/torbrowser es es/press ru zh_CN zh_CN/docs zh_CN/tordnsel zh_CN/vidalia)

Mr. Pootle pootle at torproject.org
Sun Nov 21 21:21:26 UTC 2010


Author: pootle
Date: 2010-11-21 21:21:25 +0000 (Sun, 21 Nov 2010)
New Revision: 23851

Modified:
   translation/trunk/projects/website/po/ca/3-low.tshirt.po
   translation/trunk/projects/website/po/de/torbrowser/1-high.index.po
   translation/trunk/projects/website/po/es/1-high.bridges.po
   translation/trunk/projects/website/po/es/3-low.tshirt.po
   translation/trunk/projects/website/po/es/press/3-low.index.po
   translation/trunk/projects/website/po/ru/1-high.bridges.po
   translation/trunk/projects/website/po/zh_CN/1-high.bridges.po
   translation/trunk/projects/website/po/zh_CN/1-high.download.po
   translation/trunk/projects/website/po/zh_CN/1-high.index.po
   translation/trunk/projects/website/po/zh_CN/2-medium.donate.po
   translation/trunk/projects/website/po/zh_CN/2-medium.overview.po
   translation/trunk/projects/website/po/zh_CN/3-low.contact.po
   translation/trunk/projects/website/po/zh_CN/3-low.sponsors.po
   translation/trunk/projects/website/po/zh_CN/3-low.tshirt.po
   translation/trunk/projects/website/po/zh_CN/4-optional.running-a-mirror.po
   translation/trunk/projects/website/po/zh_CN/4-optional.translation.po
   translation/trunk/projects/website/po/zh_CN/docs/1-high.tor-doc-windows.po
   translation/trunk/projects/website/po/zh_CN/docs/3-low.debian.po
   translation/trunk/projects/website/po/zh_CN/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/po/zh_CN/tordnsel/3-low.index.po
   translation/trunk/projects/website/po/zh_CN/vidalia/4-optional.index.po
Log:
updated files from pootle

Modified: translation/trunk/projects/website/po/ca/3-low.tshirt.po
===================================================================
--- translation/trunk/projects/website/po/ca/3-low.tshirt.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/ca/3-low.tshirt.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -2,30 +2,30 @@
 # Copyright (C) YEAR The Tor Project, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 20:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2010-11-20 02:43+0200\n"
+"Last-Translator: Il_Tifossi <jaume172 at me.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/tshirt.wml:9
 msgid "Tor: T-shirt for Contributing"
-msgstr ""
+msgstr "Tor: Samarreta per a contribuir"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/tshirt.wml:10
 msgid "<hr />"
-msgstr ""
+msgstr "<hr />"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/tshirt.wml:12
@@ -33,13 +33,15 @@
 "You can get one of these fine Tor T-shirts for contributing to the Tor "
 "project. There are three primary ways of contributing:"
 msgstr ""
+"Pots aconseguir una d'aquestes boniques samarretes Tor contribuïnt al "
+"projecte Tor. Hi ha tres maneres principals de contribuir-hi:"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/tshirt.wml:16
 msgid ""
 "A large enough ($65+) <a href=\"<page donate>\">donation</a> to the Tor "
 "Project."
-msgstr ""
+msgstr "Una <a href=\"<page donate>\">donació</a> (més de 65$) al Projecte Tor."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/tshirt.wml:18

Modified: translation/trunk/projects/website/po/de/torbrowser/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/de/torbrowser/1-high.index.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/de/torbrowser/1-high.index.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,10 +7,10 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:47+0200\n"
-"PO-Revision-Date: 2010-07-24 16:07+0200\n"
+"PO-Revision-Date: 2010-10-16 23:31+0200\n"
 "Last-Translator: cpunk <tornode at cpunk.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,9 +24,8 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbrowser/en/index.wml:12
-#, fuzzy
 msgid "<hr/>"
-msgstr "<hr>"
+msgstr "<hr/>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:14
@@ -48,7 +47,6 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:21
-#, fuzzy
 msgid ""
 "The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Linux, "
 "or Mac OS X without needing to install any software.  It can run off a USB "
@@ -59,9 +57,9 @@
 "ways to <a href=\"<page download>\">download Tor</a>."
 msgstr ""
 "Mit dem <strong>Tor-Browser-Paket</strong> können Sie Tor auf Windows- und "
-"Linux-Systemen benutzen, ohne Software installieren zu müssen.Es startet von "
-"einem usb-Stick, beinhaltet einen vorkonfigurierten Webbrowser und ist in "
-"sich eigenständig. Das <strong>Tor-IM-Browser-Paket</strong> ermöglicht "
+"Linux-Systemen benutzen, ohne Software installieren zu müssen. Es startet "
+"von einem usb-Stick, beinhaltet einen vorkonfigurierten Webbrowser und ist "
+"in sich eigenständig. Das <strong>Tor-IM-Browser-Paket</strong> ermöglicht "
 "zusätzlich Instant Messaging und Chats über Tor. Wenn Sie lieber Ihren "
 "bereits installierten Webbrowser weiterhin nutzen, Tor dauerhaft "
 "installieren, oder kein Windows-System installiert haben, finden Sie hier "
@@ -69,16 +67,15 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:32
-#, fuzzy
 msgid ""
 "Freedom4Internet has produced a video on how to find and use the Tor Browser "
 "Bundle.  If you don't see a video below, view it at <a href=\"http://www."
 "youtube.com/thetorproject\">Youtube </a>.  Know of a better video or one "
 "translated into your language? Let us know!"
 msgstr ""
-"Freedom House hat ein Video darüber produziert, wie das Tor-Browser-Paket zu "
-"finden und zu benutzen ist.   Wird Ihnen unten kein Video angezeigt, können "
-"Sie es sich unter <a "
+"Freedom4Internet hat ein Video darüber produziert, wie das Tor-Browser-Paket "
+"zu finden und zu benutzen ist.   Wird Ihnen unten kein Video angezeigt, "
+"können Sie es sich unter <a "
 "href=\"http://www.youtube.com/thetorproject\">Youtube</a> ansehen.  Kennen Sie "
 "ein besseres Video, oder eins, das in Ihre Sprache übersetzt ist? Lassen "
 "Sie es uns wissen!"
@@ -711,131 +708,128 @@
 "BETA: Tor Browser Bundle for i386 Mac OS X with Firefox/Namoroka (custom-"
 "built Firefox) (version <version-torbrowserbundleosx>, 26 MB)"
 msgstr ""
+"BETA: Tor-Browser-Paket für i386 Mac OS X mit Firefox/Namoroka (custom-built "
+"Firefox) (version <version-torbrowserbundleosx>, 26 MB)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:147
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-"
 "US.zip\">English (en-US)</a> (<a href=\"dist/osx/TorBrowser-<version-"
 "torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc\" style=\"font-size: 90%;"
 "\">signature</a>)"
 msgstr ""
-"<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%;\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-"
+"US.zip\">English (en-US)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc\" style=\"font-size: 90%"
+";\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:149
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar."
 "zip\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a "
 "href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip."
 "asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe\">&#x0627;&#x0644"
-";&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a href=\"dist/tor-"
-"browser-<version-torbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%"
-";\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-ar.zip\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; "
+"(ar)</a> (<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-ar.zip.asc\" style=\"font-size: 90%;\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:151
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de."
 "zip\">Deutsch (de)</a> (<a href=\"dist/osx/TorBrowser-<version-"
 "torbrowserbundleosx>-dev-osx-i386-de.zip.asc\" style=\"font-size: 90%;"
 "\">signature</a>)"
 msgstr ""
-"<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%;\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-de.zip\">Deutsch (de)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-de.zip.asc\" style=\"font-size: 90%"
+";\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:153
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-"
 "ES.zip\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</"
 "a> (<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-"
 "es-ES.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-"
-"ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a> "
-"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc\" style"
-"=\"font-size: 90%;\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-"
+"ES.zip\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a> "
+"(<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386"
+"-es-ES.zip.asc\" style=\"font-size: 90%;\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:155
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa."
 "zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> (<a href=\"dist/osx/"
 "TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc\" style="
 "\"font-size: 90%;\">signature</a>)"
 msgstr ""
-"<a href=\"dist/tor-browser-<version-"
-"torbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a> "
-"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa.exe.asc\" style"
-"=\"font-size: 90%;\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> (<a "
+"href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-fa.zip.asc\" style=\"font-size: 90%;\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:157
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr."
 "zip\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</"
 "a> (<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-"
 "fr.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe\">&#x0046;&#x0072"
-";&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a> (<a href=\"dist"
-"/tor-browser-<version-torbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%"
-";\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.z"
+"ip\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; "
+"(fr)</a> (<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-fr.zip.asc\" style=\"font-size: 90%;\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:159
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it."
 "zip\">Italiano (it)</a> (<a href=\"dist/osx/TorBrowser-<version-"
 "torbrowserbundleosx>-dev-osx-i386-it.zip.asc\" style=\"font-size: 90%;"
 "\">signature</a>)"
 msgstr ""
-"<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%;\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-it.zip\">Italiano (it)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-it.zip.asc\" style=\"font-size: 90%"
+";\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:161
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl."
 "zip\">Nederlands (nl)</a> (<a href=\"dist/osx/TorBrowser-<version-"
 "torbrowserbundleosx>-dev-osx-i386-nl.zip.asc\" style=\"font-size: 90%;"
 "\">signature</a>)"
 msgstr ""
-"<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%;\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-nl.zip\">Nederlands (nl)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-nl.zip.asc\" style=\"font-size: 90%"
+";\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:163
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl."
 "zip\">Polish (pl)</a> (<a href=\"dist/osx/TorBrowser-<version-"
 "torbrowserbundleosx>-dev-osx-i386-pl.zip.asc\" style=\"font-size: 90%;"
 "\">signature</a>)"
 msgstr ""
-"<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%;\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-pl.zip\">Polish (pl)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-pl.zip.asc\" style=\"font-size: 90%"
+";\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:165
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-"
 "PT.zip\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;"
@@ -843,42 +837,39 @@
 "torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc\" style=\"font-size: 90%;"
 "\">signature</a>)"
 msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe\">&#x0050;&#x0"
-"06f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc\" style"
-"=\"font-size: 90%;\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-P"
+"T.zip\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x00"
+"73; (pt-PT)</a> (<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-pt-PT.zip.asc\" style=\"font-size: 90%;\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:167
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru."
 "zip\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a "
 "href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip."
 "asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe\">&#x0420;&#x0443"
-";&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a href=\"dist/tor-"
-"browser-<version-torbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%"
-";\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-ru.zip\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; "
+"(ru)</a> (<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-ru.zip.asc\" style=\"font-size: 90%;\">Signatur</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:169
-#, fuzzy
 msgid ""
 "<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-"
 "CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"dist/osx/TorBrowser-"
 "<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc\" style=\"font-"
 "size: 90%;\">signature</a>)"
 msgstr ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-"
-"CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"dist/tor-browser"
-"-<version-torbrowserbundle>_zh-CN.exe.asc\" style=\"font-size: 90%"
-";\">Signatur</a>)"
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-"
+"CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"dist/osx/TorBrowser"
+"-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc\" style=\"font-size: "
+"90%;\">Signatur</a>)"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:175
-#, fuzzy
 msgid ""
 "See our instructions on <a href=\"<page verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -891,12 +882,12 @@
 "Bitte beachten Sie unsere Anleitung, <a href=\"<page verifying-"
 "signatures>\">wie Signaturen überprüft werden können</a>. Damit können Sie "
 "sicher gehen, diejenige Datei heruntergeladen zu haben, die wir Ihnen "
-"anbieten wollten. Beachten Sie außerdem, dass die von uns angebotene "
+"anbieten wollten.   Beachten Sie außerdem, dass die von uns angebotene "
 "Firefox-Version in den Paketen gegenüber dem <a "
 "href=\"http://www.mozilla.com/firefox/\">Standard-Firefox</a> <a "
-"href=\"https://svn.torproject.org/svn/torbrowser/trunk/build-"
-"scripts/config/\">angepasst</a> wurde; Wir beraten derzeit mit Mozilla, ob "
-"wir den Namen ändern sollten, um dies deutlicher zu machen. "
+"href=\"<torbrowserrepo>/build-scripts/config/\">angepasst</a> wurde; Wir "
+"beraten derzeit mit Mozilla, ob wir den Namen ändern sollten, um dies "
+"deutlicher zu machen. "
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbrowser/en/index.wml:185
@@ -930,13 +921,12 @@
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbrowser/en/index.wml:195
 msgid "<a id=\"Mac OS X\"></a>"
-msgstr ""
+msgstr "<a id=\"Mac OS X\"></a>"
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/torbrowser/en/index.wml:196
-#, fuzzy
 msgid "<a class=\"anchor\" href=\"#Linux\">Mac OS X instructions</a>"
-msgstr "<a class=\"anchor\" href=\"#Linux\">Anleitung für Linux</a>"
+msgstr "<a class=\"anchor\" href=\"#Linux\">Anleitung für Mac OS X</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:197

Modified: translation/trunk/projects/website/po/es/1-high.bridges.po
===================================================================
--- translation/trunk/projects/website/po/es/1-high.bridges.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/es/1-high.bridges.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,10 +7,10 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:47+0200\n"
-"PO-Revision-Date: 2010-09-29 01:32+0200\n"
-"Last-Translator: carolyn anhalt <carolyn at anhalt.org>\n"
+"PO-Revision-Date: 2010-10-12 19:20+0200\n"
+"Last-Translator: Ricardo A. <ra.hermosillac at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: translation/trunk/projects/website/po/es/3-low.tshirt.po
===================================================================
--- translation/trunk/projects/website/po/es/3-low.tshirt.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/es/3-low.tshirt.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -2,25 +2,25 @@
 # Copyright (C) YEAR The Tor Project, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 20:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2010-11-01 00:59+0200\n"
+"Last-Translator: amark035 <amarkiewitz at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/tshirt.wml:9
 msgid "Tor: T-shirt for Contributing"
-msgstr ""
+msgstr "Tor: Camiseta por Contribución"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/tshirt.wml:10
@@ -33,6 +33,8 @@
 "You can get one of these fine Tor T-shirts for contributing to the Tor "
 "project. There are three primary ways of contributing:"
 msgstr ""
+"Tú puedes obtener un camiseta fino de Tor por un contribucíon para el "
+"Proyecto de Tor. Hay tres modos primarios para contribuir:"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/tshirt.wml:16
@@ -40,6 +42,8 @@
 "A large enough ($65+) <a href=\"<page donate>\">donation</a> to the Tor "
 "Project."
 msgstr ""
+"Un <a href=\"<page donate>\">contribucíon</a> suficientemente grande ($65+) "
+"para el Proyecto de Tor."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/tshirt.wml:18

Modified: translation/trunk/projects/website/po/es/press/3-low.index.po
===================================================================
--- translation/trunk/projects/website/po/es/press/3-low.index.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/es/press/3-low.index.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,10 +7,10 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:47+0200\n"
-"PO-Revision-Date: 2010-09-29 23:10+0200\n"
-"Last-Translator: Alexia Prichard <alexia at prichard.net>\n"
+"PO-Revision-Date: 2010-11-01 01:17+0200\n"
+"Last-Translator: amark035 <amarkiewitz at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,6 +44,9 @@
 "press/2010-09-16-ten-things-circumvention-tools>\">Ten Things to Look for in "
 "a Circumvention Tool</a>."
 msgstr ""
+"16 de Septiembre 2010. Tor anuncia un articulo sobre <a href=\"<page "
+"press/2010-09-16-ten-things-circumvention-tools>\"> Diez Cosas Tú debe Buscar "
+"en un Instrumento de Burlar </a>."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/press/en/index.wml:28

Modified: translation/trunk/projects/website/po/ru/1-high.bridges.po
===================================================================
--- translation/trunk/projects/website/po/ru/1-high.bridges.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/ru/1-high.bridges.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,10 +7,10 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:47+0200\n"
-"PO-Revision-Date: 2010-08-29 11:38+0200\n"
-"Last-Translator: vitaliy <vitolink at gmail.com>\n"
+"PO-Revision-Date: 2010-11-14 22:49+0200\n"
+"Last-Translator: carolyn anhalt <carolyn at anhalt.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -125,7 +125,6 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:55
-#, fuzzy
 msgid ""
 "Freedom4Internet has produced a video on how to get and use Tor bridges.  "
 "You can view it at <a href=\"http://www.youtube.com/thetorproject\">Youtube: "
@@ -133,12 +132,12 @@
 "video/2009-using-a-bridge-relay-to-access-tor.ogv\">directly</a>.  Know of a "
 "better video, or one translated into your language? Let us know!"
 msgstr ""
-"Работники Freedom House создали видео ролик о том, как использовать мосты "
-"Tor. Вы можете посмотреть его <a "
-"href=\"http://www.youtube.com/thetorproject\">здесь</a> или скачать <a "
-"href=\"http://media.torproject.org/video/2009-using-a-bridge-relay-to-access-"
-"tor.ogv\">здесь</a>. Вам известно о другом видео или переведенном на ваш "
-"язык? Сообщите нам!"
+"Freedom4Internet создали видео ролик о том, как использовать мосты Tor. Вы "
+"можете посмотреть его <a "
+"href=\"http://www.youtube.com/thetorproject\">Youtube: Freedom4Internet</a> "
+"или скачать <a href=\"http://media.torproject.org/video/2009-using-a-bridge-"
+"relay-to-access-tor.ogv\">здесь</a>. Вам известно о другом видео или "
+"переведенном на ваш язык? Сообщите нам!"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:62

Modified: translation/trunk/projects/website/po/zh_CN/1-high.bridges.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/1-high.bridges.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/1-high.bridges.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:47+0200\n"
-"PO-Revision-Date: 2010-01-31 16:45-0700\n"
-"Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
+"PO-Revision-Date: 2010-11-08 14:48+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:9
@@ -57,14 +58,13 @@
 "recognize Tor connections. So you should try to use Tor without bridges "
 "first, since it might work."
 msgstr ""
-"网桥对于 Tor 的反屏蔽战役来讲是一个进步。但很有可能在 ISP 过滤了 Internet 的情况下,您仍能够不使用网桥功能而直接连接 "
-"Tor。许多屏蔽程序通过搜寻那些未加密的 Tor目录请求来识别您是否在使用 Tor,但 Tor 0.2.0.23-rc "
+"网桥对于 Tor 的反屏蔽战役来讲是一个进步。但仍然有可能在 ISP 过滤了 Internet 的情况下,您仍能够不使用网桥功能而直接连接 "
+"Tor。许多屏蔽程序通过搜寻那些未加密的 Tor 目录请求来识别您是否在使用 Tor,但 Tor 0.2.0.23-rc "
 "或更高版本默认使用加密的目录请求。这一变化意味着大多数屏蔽程序将不能识别 Tor 连接。因此,您应该首先尝试不使用网桥功能来连接 "
 "Tor,也许在不使用网桥功能的情况下您仍然能够连接 Tor 网络。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:33
-#, fuzzy
 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 "
@@ -77,10 +77,10 @@
 "using the <a href=\"<page download>#Dev\">latest 0.2.1.x or 0.2.2.x bundle "
 "for your platform</a>."
 msgstr ""
-"注意:Tor 也可能因其它原因而不能工作。最新版本的 <a href=\"<page torbrowser/index>\">WindowsTor "
-"浏览器套件</a>试图给予您更好的关于 Tor 故障原因的提示。当您遇到问题时,您也应该仔细阅读 <ahref=\"https://wiki.torpro"
-"ject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">FAQ:关于 Tor 使用常见问题</a> "
-"。如果您觉得问题很明显是被屏蔽了,或您就是想试一试网桥功能,请您继续阅读。请确定您正在使用<a href=\"<page "
+"注意:Tor 也可能因其它原因而不能工作。最新版本的 <a href=\"<page torbrowser/index>\">Windows Tor "
+"浏览器套件</a>会给您更多关于 Tor 无法连接的提示。当您遇到问题时,您也应该仔细阅读<wiki>TorFAQ#IinstalledTorandPo"
+"lipobutitsnotworking.\">FAQ:关于 Tor 使用常见问题</a> "
+"。如果您觉得问题很明显是被屏蔽了,或您就只是想试一试网桥功能(因为您不确定或就是喜欢冒险),请您继续阅读。请确定您正在使用<a href=\"<page "
 "download>#Dev\">最新版 0.2.1.x 或 0.2.2.x </a>的 Tor 软件。"
 
 #. type: Content of: <div><p>
@@ -93,9 +93,9 @@
 "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 ""
-"要使用网桥,您必须找到一个网桥地址。此外,您得将 Tor 配置为使用这个网桥。您可以用 Vidalia(Tor 的 GUI 控制程序)来配置。如果您的 "
-"Internet 使用了代理,您也要在 Vidalia "
-"中配置同样的代理。如果您认为不需要代理,也可不配置。可以试一试是否需要代理,如果有问题,可以向我们求助。"
+"要使用网桥,您必须找到一个网桥地址。此外,您得将 Tor 设置为使用这个网桥。您可以用 Vidalia(Tor 的控制程序)来设置。如果您的 "
+"Internet 使用了代理,您也要在 Vidalia 中设置同样的代理。如果您认为不需要代理来连接 "
+"Internet,也可不配置。可以试一试是否需要代理,如果有问题,可以向我们寻求帮助。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:55
@@ -106,6 +106,11 @@
 "video/2009-using-a-bridge-relay-to-access-tor.ogv\">directly</a>.  Know of a "
 "better video, or one translated into your language? Let us know!"
 msgstr ""
+"Freedom4Internet(Freedom for Internet,自由的Internet)是一个如何获得和使用 Tor "
+"网桥的视频。您可以在<a href=\"http://www.youtube.com/thetorproject\">Youtube: "
+"Freedom4Internet</a>观看,或直接在<a "
+"href=\"http://media.torproject.org/video/2009-using-a-bridge-relay-to-access-"
+"tor.ogv\">下载</a>它。如果你知道更好的视频,或者有一个是使用你语言播放的视频,请告诉我们。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:62
@@ -117,8 +122,8 @@
 "bridges</a> too."
 msgstr ""
 "现在,您可以通过访问 <a href=\"https://bridges.torproject.org/\">https://bridges.torproj"
-"ect.org/</a>来获取网桥地址。如果该网页被屏蔽了,且您也没有任何代理或其它方法访问该页面,请参考<a "
-"href=\"#FindingMore\">查找网桥的其它方法</a> 。"
+"ect.org/</a>来获取网桥地址。如果该网页被屏蔽了,且您也没有任何代理或其它方法访问该页面,这里有<a "
+"href=\"#FindingMore\">获取网桥的其它方法</a>。"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:69
@@ -133,7 +138,7 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:74
 msgid "As an example, you'll get a bridge entry that looks like the following:"
-msgstr "例如,您得到一个网桥地址如下:"
+msgstr "比如说,您得到一个网桥地址,就像下面这个:"
 
 #. type: Content of: <div><pre>
 #: /home/runa/tor/website/en/bridges.wml:77
@@ -156,9 +161,9 @@
 "is the port: <tt>'443'</tt><br /> The third element, the fingerprint, is "
 "optional: <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br />"
 msgstr ""
-"理解网桥地址的含义并非必须,但却比较有用。如果您愿意,您可以跳过本节。<br />第一部分是 IP "
+"您并不需要理解网桥地址每部分的含义,但如果您理解了,就会比较有用。若您需要,您可以略过本节。<br />第一部分是 IP "
 "地址:<tt>'141.201.27.48'</tt><br />第二部分是端口:<tt>'443'</tt><br "
-"/>第三部分是指纹(可选):<tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br />"
+"/>第三部分是指纹(这是可选的一项):<tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br />"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:91
@@ -276,12 +281,17 @@
 "如果您愿意提供帮助,但是无法运行<a href=\"<page docs/tor-doc-relay>\">普通的 "
 "Tor中继</a>,您可以运行一个网桥中继。您可以用以下任何一种方式配置:"
 
+# 如果有人看到,请教 to be...部分如何翻译
+# by Jonchil
 #. type: Content of: <div><p><ul><li>
 #: /home/runa/tor/website/en/bridges.wml:148
+#, fuzzy
 msgid ""
 "manually <a href=\"<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean"
 "\">edit your torrc file</a> to be just these four lines:<br />"
 msgstr ""
+"手动<a href=\"<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean\">编辑您的 torrc "
+"文件</a> to be just these four lines:<br />"
 
 #. type: Content of: <div><p><ul><li><pre>
 #: /home/runa/tor/website/en/bridges.wml:151
@@ -313,7 +323,6 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:163
-#, fuzzy
 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="
@@ -321,8 +330,8 @@
 "forwarding</a>."
 msgstr ""
 "如果您在启动时看到“Could not bind to 0.0.0.0:443: Permission denied”这样的错误,您需要挑选一个 "
-"1023 以上的端口作为 ORPort(例如 8080),或者,配置<ahref=\"https://wiki.torproject.org/norepl"
-"y/TheOnionRouter/TorFAQ#ServerForFirewalledClients\">复杂的端口转发</a>。"
+"1023 以上的端口作为 ORPort(例如 8080),或者配置<ahref=\"https://wiki.torproject.org/noreply"
+"/TheOnionRouter/TorFAQ#ServerForFirewalledClients\">更多复杂的 端口映射</a>。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:170

Modified: translation/trunk/projects/website/po/zh_CN/1-high.download.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/1-high.download.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/1-high.download.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:46+0200\n"
-"PO-Revision-Date: 2010-02-18 21:59-0700\n"
-"Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
+"PO-Revision-Date: 2010-11-09 07:01+0200\n"
+"Last-Translator: J.FS <jin.w.fseer at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 # NEEDHELP: 如何区别翻译 bundle 和 package?之前将 bundle 翻作“捆绑软件包”,
 # 将 package 翻作“软件包”,这样翻译似乎不妥。
@@ -253,6 +254,7 @@
 "我们发布测试版的目的是让你帮我们测试新的特性并修正错误。即使它们比上面列出的稳定版的版本号要高,但这些下载它们存在严重的可靠性问题和安全问题的可能性高得"
 "多。请随时准备 <a href=\"https://bugs.torproject.org/\">报告错误</a>。"
 
+# 由于项目的变更,现在Tor使用Polipo
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:154
 msgid ""
@@ -262,10 +264,10 @@
 "\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a>, which are "
 "supporting applications distributed under the GNU GPL."
 msgstr ""
-"Tor 是 <a href=\"http://www.fsf.org/\">自由软件</a> 根据 <a "
+"Tor 是 <a href=\"http://www.fsf.org/\">自由软件</a> ,根据 <a "
 "href=\"<gitblob>LICENSE\">3-clause BSD 许可证</a> 发布。Tor 套件还包括遵循 GNU GPL 发布的 <a "
 "href=\"<page vidalia/index>\">Vidalia</a> 和 <a "
-"href=\"http://www.privoxy.org/\">Privoxy</a>。"
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a>。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:161
@@ -423,6 +425,9 @@
 "href=\"<page torusers>\">diverse</a> their interests, the less dangerous it "
 "will be that you are one of them."
 msgstr ""
+"Tor会尝试阻止攻击者辨识您访问的地址,但它不能防范别人监听您的通信从而判断您是否使用Tor。通过使用<a href=\"<page "
+"bridges>\">Tor 网桥中继</a>而非直接连到Tor网络,可以减少(但不能完全避免)这些危险。最好的解决方案是社会学上的:您身边使用Tor的人"
+"越多、他们关注的热点越丰富,藏身其间您的危险就越小。"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/en/download.wml:263

Modified: translation/trunk/projects/website/po/zh_CN/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/1-high.index.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/1-high.index.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:46+0200\n"
-"PO-Revision-Date: 2010-03-30 16:49-0600\n"
-"Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
+"PO-Revision-Date: 2010-11-08 14:50+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/index.wml:11
@@ -107,7 +108,6 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/index.wml:58
-#, fuzzy
 msgid ""
 "Tor's security improves as its user base grows and as more people volunteer "
 "to <a href=\"<page docs/tor-doc-relay>\">run relays</a>. (It isn't nearly as "
@@ -120,7 +120,7 @@
 "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 网络更快更易于使用。"
+"volunteer>\">该项目的其他许多方面同样需要帮助</a>,我们也需要资金,在保持良好安全性的同时让 Tor 网络更快更易于使用。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/index.wml:69
@@ -142,6 +142,8 @@
 msgid "<a class=\"anchor\" href=\"#News\">News</a>"
 msgstr "<a class=\"anchor\" href=\"#News\">新闻</a>"
 
+# 这里应该属于定期维护的新闻部分,我也不知该不该翻译出来,应该定期需要维护的,暂时留空
+# by Jonchil
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:79
 msgid ""
@@ -149,6 +151,8 @@
 "circumvention-tools>\">Ten Things to Look for in a Circumvention Tool</a>."
 msgstr ""
 
+# 这里同上,也属于定期维护部分,暂时打上模糊记号
+# by Jonchil
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:82
 #, fuzzy
@@ -158,19 +162,19 @@
 "floods.  Read the <a href=\"<blog>tor-02126-stable-released\">full "
 "announcement</a> for the list of changes."
 msgstr ""
-"2009 年 10 月 10 日:稳定版 Tor 0.2.1.20 发布。更新和变化请阅读 <a "
-"href=\"https://blog.torproject.org/blog/tor-02120-released\">公告</a>。"
+"2010 年 5 月 2 日:稳定版 Tor 0.2.1.20 发布。修正了一些 OpenSSL "
+"兼容性问题和使得中继保证自身不会连接溢出。更新列表请阅读<a href=\"<blog>tor-02126-stable-"
+"released\">完整声明</a> "
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:87
-#, fuzzy
 msgid ""
 "29 March 2010: Tor and Printfection announce The Tor Store.  More details "
 "are available in the <a href=\"<page press/2010-03-25-tor-store-press-"
 "release>\">press release</a>."
 msgstr ""
-"2009 年 3 月 12 日:Tor 推出了旨在提高性能的路线图和行动计划。更多信息请参阅<ahref=\"<page press/2009-03-12"
-"-performance-roadmap-press-release>\">新闻稿</a>。"
+"2010 年 3 月 29 日:Tor 和 Printfection 发布了 The Tor Store。更多细节已经可参见<a href=\"<page "
+"press/2010-03-25-tor-store-press-release>\">press release</a>。"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:90

Modified: translation/trunk/projects/website/po/zh_CN/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/2-medium.donate.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/2-medium.donate.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-15 17:57+0200\n"
-"PO-Revision-Date: 2010-02-18 22:03-0700\n"
-"Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
+"PO-Revision-Date: 2010-11-02 17:06+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/code/website/en/donate.wml:9
@@ -121,14 +122,12 @@
 
 #. type: Content of: <div><h3>
 #: /home/runa/code/website/en/donate.wml:56
-#, fuzzy
 msgid ""
 "<a class=\"anchor\" href=\"#paypal\">Subscription via Givv, or PayPal</a>"
-msgstr "<a class=\"anchor\" href=\"#paypal\">通过 PayPal 定期捐助</a>"
+msgstr "<a class=\"anchor\" href=\"#paypal\">通过 Givv 或 PayPal 捐赠</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/en/donate.wml:57
-#, fuzzy
 msgid ""
 "One of our core fundraising goals is not to annoy donors with repeated "
 "requests.  Therefore, we advocate for a subscription-based approach: simply "
@@ -136,9 +135,8 @@
 "less about fund-raising and focus on improving the Tor software and network. "
 "You can cancel your subscription at any time. There are two ways to donate:"
 msgstr ""
-"我们筹集资金的一个核心目标是不要不断地打搅捐助人,要求捐助。为此,我们提倡一种基于预定的方法:注册每月定期捐助即可。及时的捐助能使我们更少地因为筹集资金"
-"而担忧,从而将注意力集中在 Tor 软件和网络的改进上。您可以随时随地取消预定。请点击下面的按钮注册(您需要一个 <a "
-"href=\"http://paypal.com/\">PayPal</a> 帐号):"
+"我们筹集资金的一个核心宗旨是不要不断地骚扰捐助人来要求捐助。为此,我们提倡一种基于捐助的方法:注册并每月定期捐助即可。固定的捐助能使我们更少地因为筹集资"
+"金而担忧,从而将注意力集中在 Tor 软件和网络的改进上。您可以随时随地取消预定。我们提供两种方式来捐助"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/code/website/en/donate.wml:65
@@ -154,9 +152,8 @@
 
 #. type: Content of: <div><form><select>
 #: /home/runa/code/website/en/donate.wml:70
-#, fuzzy
 msgid "<br /> Choose your currency: <select name=\"currency_code\">"
-msgstr "<br /><br />选择您的货币种类:<select name=\"currency_code\">"
+msgstr "<br />选择您的货币种类:<select name=\"currency_code\">"
 
 #. type: Content of: <div><ol><form><p><select><option>
 #: /home/runa/code/website/en/donate.wml:73 /tmp/xNFJ_pmKb6.xml:145
@@ -241,15 +238,14 @@
 
 #. type: Content of: <div><h3>
 #: /home/runa/code/website/en/donate.wml:103
-#, fuzzy
 msgid ""
 "<a class=\"anchor\" href=\"#paypal\">Single donation via Amazon or PayPal</a>"
-msgstr "<a class=\"anchor\" href=\"#paypal\">通过 PayPal 的一次性捐助</a>"
+msgstr "<a class=\"anchor\" href=\"#paypal\">通过 Amazon 或 PayPal 的一次性捐助</a>"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/code/website/en/donate.wml:106
 msgid "through Amazon Payments:"
-msgstr ""
+msgstr "通过 Amazon 捐助"
 
 #. type: Content of: <div><ol><div><table><tr><form>
 #: /home/runa/code/website/en/donate.wml:111
@@ -271,16 +267,32 @@
 "name=\"abandonUrl\" value=\"https://www.torproject.org/donate.html.en#outcome"
 "\" />"
 msgstr ""
+"<input type=\"hidden\" name=\"immediateReturn\" value=\"1\" /> <input "
+"type=\"hidden\" name=\"collectShippingAddress\" value=\"0\" /> <input "
+"type=\"hidden\" name=\"signatureVersion\" value=\"2\" /> <input type=\"hidden\" "
+"name=\"signatureMethod\" value=\"HmacSHA256\" /> <input type=\"hidden\" "
+"name=\"minimumDonationAmount\" value=\"USD 10\" /> <input type=\"hidden\" "
+"name=\"accessKey\" value=\"11SEM03K88SD016FS1G2\" /> <input type=\"hidden\" "
+"name=\"signature\" value=\"Q+R9ErF8Kcz7GFQ/CYw8aSEYlWa/otVLgxVACPvHcJM=\" /> "
+"<input type=\"hidden\" name=\"isDonationWidget\" value=\"1\" /> <input "
+"type=\"hidden\" name=\"description\" value=\"Supporting Online Anonymity &amp; "
+"Privacy\" /> <input type=\"hidden\" name=\"amazonPaymentsAccountId\" "
+"value=\"XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1\" /> <input type=\"hidden\" "
+"name=\"returnUrl\" value=\"https://www.torproject.org/donate.html.en#outcome\" "
+"/> <input type=\"hidden\" name=\"processImmediate\" value=\"1\" /> <input "
+"type=\"hidden\" name=\"cobrandingStyle\" value=\"logo\" /> <input type=\"hidden\" "
+"name=\"abandonUrl\" value=\"https://www.torproject.org/donate.html.en#outcome\" "
+"/>"
 
 #. type: Content of: <div><ol><div><table><tr><form><td>
 #: /home/runa/code/website/en/donate.wml:125 /tmp/xNFJ_pmKb6.xml:127
 msgid "&nbsp;"
-msgstr ""
+msgstr "&nbsp;"
 
 #. type: Content of: <div><ol><div><table><tr><form><td>
 #: /home/runa/code/website/en/donate.wml:126
 msgid "<input type=\"text\" name=\"amount\" size=\"8\" value=\"10\" />"
-msgstr ""
+msgstr "<input type=\"text\" name=\"amount\" size=\"8\" value=\"10\" />"
 
 #. type: Content of: <div><ol><div><table><tr><form><td>
 #: /home/runa/code/website/en/donate.wml:128
@@ -288,11 +300,14 @@
 "<input type=\"image\" src=\"http://g-ecx.images-amazon.com/images/G/01/asp/"
 "golden_small_donate_withmsg_whitebg.gif\" border=\"0\" />"
 msgstr ""
+"<input type=\"image\" src=\"http://g-ecx.images-"
+"amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif\" "
+"border=\"0\" />"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/code/website/en/donate.wml:134
 msgid "Through PayPal:"
-msgstr ""
+msgstr "通过 PayPal:"
 
 #. type: Content of: <div><ol><form><p><select>
 #: /home/runa/code/website/en/donate.wml:136
@@ -341,17 +356,17 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/code/website/en/donate.wml:166
-#, fuzzy
 msgid ""
 "The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
-msgstr "The Tor Project<br />122 Scott Circle<br />Dedham, MA 02026-6416 USA"
+msgstr ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 
 #. type: Content of: <div>
 #: /home/runa/code/website/en/donate.wml:172
 msgid ""
 "If in Europe, feel free to donate to the <a href=\"http://ccc.de/\">Chaos "
 "Computer Club</a> on behalf of Tor:"
-msgstr ""
+msgstr "如果您在欧洲,请允许通过<a href=\"http://ccc.de/\">Chaos Computer Club</a>来捐助 Tor。"
 
 #. type: Content of: <div><p><address>
 #: /home/runa/code/website/en/donate.wml:175
@@ -359,6 +374,8 @@
 "Wau Holland Stiftung<br /> IBAN DE03 5204 0021 0277 281202<br /> SWIFT BIC "
 "COBADEFF520"
 msgstr ""
+"Wau Holland Stiftung<br /> IBAN DE03 5204 0021 0277 281202<br /> SWIFT BIC "
+"COBADEFF520"
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/en/donate.wml:181
@@ -503,26 +520,24 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/en/donate.wml:229
-#, fuzzy
 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 ""
-"如果您刚刚捐助,首先,谢谢您!您的捐助将存入我们的普通资金。您加入到了我们的 Tor 和在线匿名的 <a href=\"<page "
-"sponsors>\">许多赞助者</a> 之中。在 2008 年,Tor 项目的资金来源及其用途如下:"
+"如果您刚刚捐助,首先,谢谢您!您的捐助将存入我们的普通资金。您将会加入到我们的 Tor 和在线匿名的 <a href=\"<page "
+"sponsors>\">赞助者</a> 之中。在 2008 年,Tor 项目的资金来源及其用途如下:"
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/en/donate.wml:232
-#, fuzzy
 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 ""
-"<img src=\"images/2008-funding-chart.png\" alt=\"谁提供资金?\"/><img src=\"images/2008"
-"-expenses-chart.png\" alt=\"资金如何使用?\"/>"
+"<img src=\"images/2008-funding-chart.png\" alt=\"谁捐助了 Tor 项目?\"/><img "
+"src=\"images/2008-expenses-chart.png\" alt=\"资金如何使用?\"/>"
 
 #. type: Content of: <div>
 #: /home/runa/code/website/en/donate.wml:237

Modified: translation/trunk/projects/website/po/zh_CN/2-medium.overview.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/2-medium.overview.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/2-medium.overview.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -82,7 +82,6 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/en/overview.wml:38
-#, fuzzy
 msgid ""
 "Individuals use Tor to keep websites from tracking them and their family "
 "members, or to connect to news sites, instant messaging services, or the "

Modified: translation/trunk/projects/website/po/zh_CN/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/3-low.contact.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/3-low.contact.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 20:45+0200\n"
-"PO-Revision-Date: 2010-05-11 22:20-0600\n"
-"Last-Translator: carolyn anhalt <carolyn at anhalt.org>\n"
+"PO-Revision-Date: 2010-10-30 12:16+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/contact.wml:9
@@ -76,7 +77,6 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/contact.wml:38
-#, fuzzy
 msgid ""
 "<tt>tor-webmaster</tt> can fix typos on the website, change wrong statements "
 "or directions on the website, and add new sections and paragraphs that you "

Modified: translation/trunk/projects/website/po/zh_CN/3-low.sponsors.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/3-low.sponsors.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/3-low.sponsors.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-15 17:57+0200\n"
-"PO-Revision-Date: 2009-12-13 06:20-0700\n"
-"Last-Translator: Mini Dragon <projecteurs at gmail.com>\n"
+"PO-Revision-Date: 2010-11-08 14:51+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/code/website/en/sponsors.wml:9
@@ -39,7 +40,6 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/en/sponsors.wml:19
-#, fuzzy
 msgid "An anonymous North American NGO (2008-2010)"
 msgstr "一个匿名的北美非政府组织 (2008-2009)"
 
@@ -54,6 +54,8 @@
 "<a href=\"http://www.bbg.gov/\">Broadcasting Board of Governors</a> "
 "(2006-2010)"
 msgstr ""
+"<a href=\"http://www.bbg.gov/\">Broadcasting Board of Governors</a> "
+"(2006-2010)"
 
 #. type: Content of: <div><h3>
 #: /home/runa/code/website/en/sponsors.wml:27
@@ -68,7 +70,7 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/en/sponsors.wml:30
 msgid "<a href=\"http://www.nsf.gov/\">National Science Foundation</a>"
-msgstr ""
+msgstr "<a href=\"http://www.nsf.gov/\">国家科学基金会</a>"
 
 #. type: Content of: <div><h3>
 #: /home/runa/code/website/en/sponsors.wml:33
@@ -92,17 +94,18 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/en/sponsors.wml:41
-#, fuzzy
 msgid ""
 "<a href=\"http://chacs.nrl.navy.mil/\">Naval Research Laboratory</a> "
 "(2006-2010)"
-msgstr "<a href=\"http://chacs.nrl.navy.mil/\">美国海军研究实验室</a> (2006-2009)"
+msgstr "<a href=\"http://chacs.nrl.navy.mil/\">海军研究实验室</a> (2006-2010)"
 
+# 定期维护部分,时间定期要改,以下同上,不知是否需要直接提交翻译,故勾选 模糊
+# by Jonchil
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/en/sponsors.wml:42
 #, fuzzy
 msgid "An anonymous North American ISP (2009-2010)"
-msgstr "一个不愿意透露名字的北美网络营运商(2009)"
+msgstr "一个不愿意透露名字的北美网络营运商(2009-2010)"
 
 #. type: Content of: <div><h3>
 #: /home/runa/code/website/en/sponsors.wml:45

Modified: translation/trunk/projects/website/po/zh_CN/3-low.tshirt.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/3-low.tshirt.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/3-low.tshirt.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 20:45+0200\n"
-"PO-Revision-Date: 2009-12-10 09:24-0700\n"
-"Last-Translator: Pei Hanru <peihanru+comment at gmail.com>\n"
+"PO-Revision-Date: 2010-10-31 16:46+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/tshirt.wml:9
@@ -53,7 +54,6 @@
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/tshirt.wml:22
-#, fuzzy
 msgid ""
 "Help out in <a href=\"<page volunteer>\">other ways</a>. <a href=\"<page "
 "translation>\">Maintain a translation for the website</a>. Write a good <a "
@@ -64,7 +64,7 @@
 msgstr ""
 "以<a href=\"<page volunteer>\">其他方式</a>帮助我们。<a href=\"<page translation>\">维护网站的翻"
 "译</a>。写一个好的<ahref=\"https://wiki.torproject.org/noreply/TheOnionRouter/Suppor"
-"tPrograms\">支持程序而且使很多人都用它</a>。研究 Tor 以及匿名,解决我们的一些<a "
+"tPrograms\">支持程序并让很多人都用它</a>。研究 Tor 以及匿名,解决我们的一些<a "
 "href=\"https://bugs.torproject.org/\">错误</a>,或者成为一名 Tor 的拥护者。"
 
 #. type: Content of: <div><p>
@@ -79,14 +79,13 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/tshirt.wml:39
-#, fuzzy
 msgid ""
 "You can choose between the traditional black and our conversation-starting "
 "bright green. You can also see the shirts <a href=\"<wiki>TorShirt\">in "
 "action</a> &mdash; add your own photos there too."
 msgstr ""
-"你可以选择传统的黑色,或者我们特制的醒目的、引人关注的鲜亮的绿色。你也可以看看这些<ahref=\"https://wiki.torproject.org"
-"/noreply/TheOnionRouter/TorShirt\">穿在身上</a>的T 恤衫——请把你的照片也加到这里来!"
+"你可以选择传统的黑色,或者我们特制的醒目的、引人关注的鲜亮的绿色。你也可以看看这些<a href=\"<wiki>穿在身上</a>&mdash;的T "
+"恤衫——请把你的照片也加到这里来!"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/en/tshirt.wml:46

Modified: translation/trunk/projects/website/po/zh_CN/4-optional.running-a-mirror.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/4-optional.running-a-mirror.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/4-optional.running-a-mirror.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -2,30 +2,30 @@
 # Copyright (C) YEAR The Tor Project, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-15 17:57+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2010-11-02 16:58+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/code/website/en/running-a-mirror.wml:9
 msgid "Tor: Running a Mirror"
-msgstr ""
+msgstr "Tor:运行一个镜像"
 
 #. type: Content of: <div>
 #: /home/runa/code/website/en/running-a-mirror.wml:10
 msgid "<hr />"
-msgstr ""
+msgstr "<hr />"
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/en/running-a-mirror.wml:12
@@ -36,6 +36,9 @@
 "setup and ongoing maintenance a minimal effort.  The Tor website and "
 "distribution directory currently require 5.0 GB of disk space."
 msgstr ""
+"感谢您愿意为 Tor 网站运行一个镜像。我们所有的镜像都会公开列表在<a href=\"<page "
+"mirrors>\">我们的镜像</a>页面中。我们已经有了很多命令和配置示例来帮您开始安装和持续维护一个最小化镜像。Tor "
+"网站和分发服务器目录要求5.0 GB的可用磁盘空间。"
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/en/running-a-mirror.wml:20
@@ -44,9 +47,12 @@
 "everything a mirror should share with the world: <br /> <br /> <tt> rsync -"
 "av --delete rsync://rsync.torproject.org/tor tor-mirror/ </tt>"
 msgstr ""
+"如果您愿意运行一个镜像,他简单的像一个下载命令一样,然后您就能向全世界分享该镜像:<br /> <br /> <tt> rsync -av "
+"--delete rsync://rsync.torproject.org/tor tor-mirror/ </tt>。"
 
 #. type: Content of: <div><p><p>
 #: /home/runa/code/website/en/running-a-mirror.wml:28
+#, fuzzy
 msgid ""
 "In order to assure we have reliable and up to date mirrors, please ensure "
 "your mirror does at least the following:<br/><br/> Updates <b>no less</b> "
@@ -57,11 +63,15 @@
 "your server have issues.<br/><br/> It is highly recommended for all mirror "
 "operators to subscribe to"
 msgstr ""
+"为了确保我们有一个可靠和及时更新的镜像,请确保您的镜像务必至少做到如下:<br/><br/><b>至少</b>每六小时更新一次,但不要每小时都更新。<b"
+"r/><br/>为\"Directory Index / Indexes\"在 /dist 目录中留出空间。<br/><br/>Allows "
+"\"Multiviews\" or equivalent for language "
+"localization。<br/><br/>拥有一个可用的联系邮件在当您的服务器有问题时管理交流。<br/><br/>我们强烈建议所有的镜像运营者加入"
 
 #. type: Content of: <div><p><A>
 #: /home/runa/code/website/en/running-a-mirror.wml:43 /tmp/OYCKlMYlWL.xml:87
 msgid "tor-mirrors mailing list"
-msgstr ""
+msgstr "Tor - mirrors 邮件列表。"
 
 #. type: Content of: <div><p><p>
 #: /home/runa/code/website/en/running-a-mirror.wml:44

Modified: translation/trunk/projects/website/po/zh_CN/4-optional.translation.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/4-optional.translation.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/4-optional.translation.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 20:45+0200\n"
-"PO-Revision-Date: 2010-01-31 16:56-0700\n"
-"Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
+"PO-Revision-Date: 2010-11-02 15:40+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/translation.wml:9
@@ -32,7 +33,7 @@
 "If you want to help translate the Tor website and documentation into other "
 "languages, here are some guidelines to help you do this as efficiently as "
 "possible."
-msgstr ""
+msgstr "如果您想要帮助将 Tor 网站和文档翻译成其他语言,这里有一些指导来帮助您尽可能有效率的工作。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation.wml:19
@@ -43,6 +44,9 @@
 "stuck, please contact us via email: <tt>tor-translation AT torproject.org</"
 "tt>."
 msgstr ""
+"如果您想要帮助翻译 Tor 计划以及相关信息,请访问我们的<a href=\"<page translation-"
+"overview>\">翻译概览</a>来获得一些更清晰或您需要的帮助。如果您有什么困惑,请通过<tt>tor-translation AT "
+"torproject.org</tt>邮件来联系我们。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation.wml:26
@@ -51,7 +55,7 @@
 "pages will still be helpful.  Also, rather than just translating each page "
 "word by word, please try to translate the ideas so they make the most sense "
 "in your language."
-msgstr ""
+msgstr "注意,即使您无法将足够多的页面翻译成您的语言,一部分页面也将会很有帮助。所以,不如就一点点的来翻译,请尽量使您的翻译在母语中有意义。"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/translation.wml:33
@@ -61,6 +65,8 @@
 "go in the diagrams, and we'll take care of making new versions of the "
 "pictures."
 msgstr ""
+"我们也希望您能翻译一些<a href=\"<page "
+"overview>\">概览</a>中的图解。您可以将这些文字注解发送给我们,而我们也会注意更新这些图解。"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/translation.wml:38
@@ -71,6 +77,9 @@
 "if possible.)  If you plan to stick around and keep maintaining them, let us "
 "know and we'll be happy to give you an SVN account to manage them directly."
 msgstr ""
+"当您准备好了一些页面的时候,请将他们发送到<tt>Tor - 翻译</tt>的<a href=\"<page contact>\">联系方式</a>。(如果"
+"您对当前页面有一些改动,请使用比较工具生成补丁文件,如果有可能的话)。如果您计划维护它们,请让我们知道,而且我们也很高兴给您一个 SVN "
+"帐户来直接管理它们"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation.wml:46
@@ -79,3 +88,5 @@
 "translation portal for <a href=\"<page translation-overview>\">translating "
 "other useful and related software</a>."
 msgstr ""
+"其他与 Tor 相关的计划也需要翻译。请查看我们准备的翻译计划<a href=\"<page translation-"
+"overview>\">翻译其余有用和相关的软件</a>."

Modified: translation/trunk/projects/website/po/zh_CN/docs/1-high.tor-doc-windows.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/docs/1-high.tor-doc-windows.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/docs/1-high.tor-doc-windows.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,20 +7,21 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:47+0200\n"
-"PO-Revision-Date: 2010-06-26 19:47-0600\n"
-"Last-Translator: hhyyjj169 <hhyyjj163 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-08 19:42+0200\n"
+"Last-Translator: J.FS <jin.w.fseer at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:11
 msgid ""
 "Running the <a href=\"<page index>\">Tor</a> client on Microsoft Windows"
-msgstr "Running the <a href=\"<page index>\">Tor</a> Microsoft Windows 客户端"
+msgstr "运行<a href=\"<page index>\">Tor</a> Microsoft Windows 客户端"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:12
@@ -44,7 +45,6 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:22
-#, fuzzy
 msgid ""
 "Freedom4Internet has produced a video on how to install Tor.  You can view "
 "it at <a href=\"http://media.torproject.org/video/2009-install-and-use-tor."
@@ -52,7 +52,7 @@
 "translated into your language? Let us know!"
 msgstr ""
 "自由之家制作了有关如何安装 Tor 的视频。你可以观看 <a "
-"href=\"http://tinyvid.tv/show/3lejztnthk2tm\">TinyVid:在 Windows 如何安装 "
+"href=\"http://tinyvid.tv/show/3lejztnthk2tm\">TinyVid:如何在 Windows 中安装 "
 "Tor</a>。如果你知道更好的视频或中文版的教学视频,请告诉我们!"
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/po/zh_CN/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/docs/3-low.debian.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/docs/3-low.debian.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -20,7 +20,7 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:11
 msgid "<a id=\"debian\"></a>"
-msgstr ""
+msgstr "<a id=\"debian\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/debian.wml:12
@@ -33,7 +33,7 @@
 #: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/48vw1i6Sdr.xml:41
 #: /tmp/48vw1i6Sdr.xml:107 /tmp/48vw1i6Sdr.xml:142
 msgid "<br />"
-msgstr ""
+msgstr "<br />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:17
@@ -48,7 +48,7 @@
 "Note that this might not always give you the latest stable Tor version, but "
 "you will receive important security fixes. To make sure that you're running "
 "the latest stable version of Tor, see option two below."
-msgstr ""
+msgstr "请注意,这并不会为您提供最新稳定版的Tor,但会提供给您重要的安全更新。为了确认您正在使用最新稳定版的Tor,请查阅第二步"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:30 /tmp/48vw1i6Sdr.xml:88
@@ -61,20 +61,20 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:35
 msgid "<hr /> <a id=\"ubuntu\"></a> <a id=\"packages\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"ubuntu\"></a> <a id=\"packages\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/debian.wml:39
 msgid ""
 "<a class=\"anchor\" href=\"#ubuntu\">Option two: Tor on Ubuntu or Debian</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#ubuntu\">二:在Ubuntu或Debian运行Tor</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:44
 msgid ""
 "<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained "
 "and out of date. That means you'll be missing stability and security fixes."
-msgstr ""
+msgstr "<b>请勿使用Ubuntu社区源中的软件包。</b>他们都是未经维护的和老旧版本。那意味着您会错过稳定版本和安全更新。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:50
@@ -82,53 +82,53 @@
 "You'll need to set up our package repository before you can fetch Tor. "
 "First, you need to figure out the name of your distribution. Here's a quick "
 "mapping:"
-msgstr ""
+msgstr "在使用Tor之前,您需要设定我们的软件源。首先,您需要确认您发行版的名称。这里是快速链接:"
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:54
 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\""
-msgstr ""
+msgstr "Ubuntu 10.04 或 Trisquel 4.0 是 \"lucid\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:55
 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\""
-msgstr ""
+msgstr "Ubuntu 9.10 或 Trisquel 3.5 是 \"karmic\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:56
 msgid "Ubuntu 9.04 is \"jaunty\""
-msgstr ""
+msgstr "Ubuntu 9.04 是 \"jaunty\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:57
 msgid "Ubuntu 8.10 is \"intrepid\""
-msgstr ""
+msgstr "Ubuntu 8.10 是 \"intrepid\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:58
 msgid "Ubuntu 8.04 is \"hardy\""
-msgstr ""
+msgstr "Ubuntu 8.04 是 \"hardy\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid "Debian Etch is \"etch\""
-msgstr ""
+msgstr "Debian Etch 是 \"etch\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:60
 msgid "Debian Lenny is \"lenny\""
-msgstr ""
+msgstr "Debian Lenny 是 \"lenny\""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:63
 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />"
-msgstr ""
+msgstr "然后,添加下行到您的<tt>/etc/apt/sources.list</tt>文件中:<br />"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:67
 #, no-wrap
 msgid "deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
-msgstr ""
+msgstr "deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:69
@@ -137,6 +137,8 @@
 "lucid, karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
 "DISTRIBUTION&gt;."
 msgstr ""
+"您应当用发行版名称(如 etch, lenny, sid, lucid, karmic, jaunty, intrepid, hardy "
+"或别的一些)来替换 &lt;DISTRIBUTION&gt; 字段。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:73
@@ -152,13 +154,15 @@
 "gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
 "gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n"
 msgstr ""
+"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
+"gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:79
 msgid ""
 "Now refresh your sources and install Tor by running the following commands "
 "(as root) at your command prompt:"
-msgstr ""
+msgstr "现在请刷新您的软件源并在终端中用下列命令(以root权限)安装Tor:"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:82
@@ -167,6 +171,8 @@
 "apt-get update\n"
 "apt-get install tor tor-geoipdb\n"
 msgstr ""
+"apt-get update\n"
+"apt-get install tor tor-geoipdb\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:94
@@ -181,14 +187,14 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:102
 msgid "<hr /> <a id=\"development\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"development\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/debian.wml:105
 msgid ""
 "<a class=\"anchor\" href=\"#development\">Option three: Using the "
 "development branch of Tor on Debian or Ubuntu</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#development\">三:使用Debian 或 Ubuntu的Tor的开发分支</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:109
@@ -197,6 +203,8 @@
 "branch</a> of Tor instead (more features and more bugs), you need to add a "
 "different set of lines to your <tt>/etc/apt/sources.list</tt> file:<br />"
 msgstr ""
+"如果您想使用Tor的<a href=\"<page download>#packagediff\">开发分支</a>(更多新特性和问题),您需要添加不同的源"
+"到您的<tt>/etc/apt/sources.list</tt>文件中:<br />"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:114
@@ -205,6 +213,9 @@
 "deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
 "deb     http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main\n"
 msgstr ""
+"deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
+"deb     http://deb.torproject.org/torproject.org "
+"experimental-&lt;DISTRIBUTION&gt; main\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:117
@@ -212,11 +223,13 @@
 "where you again substitute the name of your distro (etch, lenny, sid, lucid, "
 "karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
+"仍然使用您相应发行版的名称(如 etch, lenny, sid, lucid, karmic, jaunty, intrepid, hardy)替代 "
+"&lt;DISTRIBUTION&gt;。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:123
 msgid "Then run the following commands at your command prompt:"
-msgstr ""
+msgstr "然后,请在您的终端中运行下列命令:"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:125
@@ -227,16 +240,20 @@
 "apt-get update\n"
 "apt-get install tor tor-geoipdb\n"
 msgstr ""
+"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
+"gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n"
+"apt-get update\n"
+"apt-get install tor tor-geoipdb\n"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:138
 msgid "<hr /> <a id=\"source\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"source\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/debian.wml:141
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#source\">从源中编译</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:145
@@ -244,6 +261,7 @@
 "If you want to build your own debs from source you must first add an "
 "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>."
 msgstr ""
+"如果您想要自己从源中编译软件包,您首先需要添加合适的 <tt>deb-src</tt> 行到 <tt>sources.list</tt> 文件中。"
 
 #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND
 #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND
@@ -258,6 +276,13 @@
 "deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
 "deb-src http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main\n"
 msgstr ""
+"\n"
+"deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
+"\n"
+"\n"
+"deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
+"deb-src http://deb.torproject.org/torproject.org "
+"experimental-&lt;DISTRIBUTION&gt; main\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:155
@@ -273,11 +298,13 @@
 "apt-get install build-essential fakeroot devscripts\n"
 "apt-get build-dep tor\n"
 msgstr ""
+"apt-get install build-essential fakeroot devscripts\n"
+"apt-get build-dep tor\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:161
 msgid "Then you can build Tor in ~/debian-packages:"
-msgstr ""
+msgstr "然后您可以在 ~/debian-packages: 中编译Tor"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:163
@@ -289,26 +316,31 @@
 "debuild -rfakeroot -uc -us\n"
 "cd ..\n"
 msgstr ""
+"mkdir ~/debian-packages; cd ~/debian-packages\n"
+"apt-get source tor\n"
+"cd tor-*\n"
+"debuild -rfakeroot -uc -us\n"
+"cd ..\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:169
 msgid "Now you can install the new package:"
-msgstr ""
+msgstr "现在您可以安装新软件包了"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:171
 #, no-wrap
 msgid "sudo dpkg -i tor_*.deb\n"
-msgstr ""
+msgstr "sudo dpkg -i tor_*.deb\n"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:181
 msgid "<hr />"
-msgstr ""
+msgstr "<hr />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:183
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"
-msgstr ""
+msgstr "如果您有好的建议来丰富该文档<a href=\"<page contact>\">请发送给我们</a>。感谢!"

Modified: translation/trunk/projects/website/po/zh_CN/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/docs/3-low.tor-doc-unix.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/docs/3-low.tor-doc-unix.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -2,32 +2,32 @@
 # Copyright (C) YEAR The Tor Project, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-09 13:47+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2010-11-09 07:12+0200\n"
+"Last-Translator: J.FS <jin.w.fseer at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:11
 msgid "Running the <a href=\"<page index>\">Tor</a> client on Linux/BSD/Unix"
-msgstr ""
+msgstr "在 Linux/BSD/Unix 上运行<a href=\"<page index>\">Tor</a>的客户端"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/weSMLJ2Cmo.xml:24
 #: /tmp/weSMLJ2Cmo.xml:54 /tmp/weSMLJ2Cmo.xml:88 /tmp/weSMLJ2Cmo.xml:131
 #: /tmp/weSMLJ2Cmo.xml:169
 msgid "<br />"
-msgstr ""
+msgstr "<br />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:15
@@ -37,18 +37,20 @@
 "(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a "
 "relay</a> guide.</b>"
 msgstr ""
+"<b>注意:以下只是安装、运行Tor 客户端程序的说明。如果您想为他人提供中继,从而扩大Tor 的网络(我们期待着您这样做),请参阅导引 <a "
+"href=\"<page docs/tor-doc-relay>\">配置中继</a> </b>"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:21
 msgid "<hr /> <a id=\"installing\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"installing\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:23
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
 "a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#installing\">第一步:Tor的下载、安装</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:27
@@ -58,6 +60,9 @@
 "etc there too. If you're using Ubuntu, don't use the default packages: use "
 "<a href=\"<page docs/debian>#ubuntu\">our deb repository</a> instead."
 msgstr ""
+"可以在<a href=\"<page download-unix>\">下载</a>页面找到最新的Tor "
+"发行版,包括Debian、Redhat、Gentoo、*BSD 等版本。如果您使用Ubuntu,请不要使用包管理器默认提供的版本,用<a "
+"href=\"<page docs/debian>#ubuntu\">我们Debian仓库</a>中的代替。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:34
@@ -70,6 +75,12 @@
 "tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
 "it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
+"如果您想直接由源码构建,首先安装<a "
+"href=\"http://www.monkey.org/~provos/libevent/\">libevent</a>,并确认您已安装 openssl "
+"和 zlib(可能的话,包括其 -devel 包)。然后运行::<br /> <tt>tar xzf tor-<稳定版本号>.tar.gz; cd "
+"tor-<稳定版本号></tt><br /> <tt>./configure &amp;&amp; make</tt><br /> "
+"现在您可以通过<tt>src/or/tor</tt>运行Tor,或者键入<tt>make "
+"install</tt>(可能需要root权限)将其安装在/usr/local/ 下,以便今后可以直接运行<tt>tor</tt>。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:45
@@ -77,25 +88,27 @@
 "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 ""
+msgstr "Tor 默认是作为客户端配置的,使用一份内置的配置文件作为默认设置。大多数情况下,不需要更改其中的任何设置。Tor 的安装到此结束。"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:50
 msgid "<hr /> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>"
 
+# Web Browsing 是否 仅限于浏览网页?
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:53
+#, fuzzy
 msgid ""
 "<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web "
 "Browsing</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#polipo\">第二步:安装Polipo以实现网页浏览</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56
 msgid ""
 "After installing Tor, you need to configure your applications to use it."
-msgstr ""
+msgstr "安装完Tor 以后,您需要配置您的软件以使用它联网。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60
@@ -108,6 +121,11 @@
 "Polipo with Tor. You should uninstall privoxy at this point (e.g. apt-get "
 "remove privoxy or yum remove privoxy), so they don't conflict."
 msgstr ""
+"首先是web浏览。从您最信任的源安装<a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a>。Polipo "
+"是一个web缓存代理,具有强大的http管道功能,适合Tor 隐藏自身的需要。(注意:使用Polipo 1.0.4或更新的版本。较老的版本缺少SOCKS "
+"支持,无法与Tor 协同工作。)您需要卸载privoxy (apt-get remove privoxy 或 yum remove "
+"privoxy)以防它们相互冲突。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
@@ -120,6 +138,10 @@
 "changes to take effect. For example:<br /> <tt>/etc/init.d/polipo restart</"
 "tt>"
 msgstr ""
+"当您由软件包或源码中成功安装了Polipo 后,<b>您需要配置Polipo 为使用Tor 的模式。下载我们的 <a "
+"href=\"<torbrowserrepo>/build-scripts/config/polipo.conf\">Polipo配置(使用Tor)</a>"
+",用它替换您当前的Polipo配置文件(位于/etc/polipo/config 或~/.polipo)。要使这些变更生效,您需要重启Polipo "
+"。比如,通过键入<br /> <tt>/etc/init.d/polipo restart</tt>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
@@ -129,25 +151,28 @@
 "configuration</a>. But since the config files both use port 8118, you "
 "shouldn't run both Polipo and Privoxy at the same time."
 msgstr ""
+"如果您更喜欢用Privoxy ,您可以使用<a href=\"https://wiki.torproject.org/noreply/TheOnionRo"
+"uter/PrivoxyConfig\">Privoxy "
+"配置示例</a>。但由于两份配置文件都使用了8118端口,您不应同时运行Polipo和Privoxy。"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
 msgid "<hr /> <a id=\"using\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"using\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#using\">第三步:配置应用软件 以使用Tor</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
 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 ""
+msgstr "安装Tor 和Polipo 后,您可以配置您的应用软件以使用它们。首先是浏览器的设置:"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
@@ -156,6 +181,9 @@
 "install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
 "plugin</a>, restart your Firefox, and you're all set:"
 msgstr ""
+"最安全的方式是使用Firefox 及Torbutton 插件。只需安装<a "
+"href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
+"插件</a>并重启Firefox即可:"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
@@ -163,7 +191,10 @@
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"> <br />"
 msgstr ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-"
+"torbutton.png\" border=\"1\"> <br />"
 
+# 链接 https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress 疑是过时。
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
 msgid ""
@@ -172,6 +203,9 @@
 "TorFAQ#SocksListenAddress\"> FAQ entry for running Tor on a different "
 "computer</a>."
 msgstr ""
+"如果您想让Firefox 联接到另一台运行Tor 的计算机,参看 <a href=\"https://wiki.torproject.org/norepl"
+"y/TheOnionRouter/TorFAQ#SocksListenAddress\"> FAQ : 在另一台计算机上运行Tor </a>(\"Can I "
+"install Tor on a central server, and have my clients connect to it? \")"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
@@ -186,6 +220,12 @@
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO#socat"
 "\">socat</a>."
 msgstr ""
+"为了让其它支持HTTP代理的程序也用上Tor,只需将其代理指向Polipo(localhost:8118 "
+"端口)。若需要直接使用SOCKS代理(即时通讯如Jabber,IRC等),您可以将其直接指向Tor(localhost:9051 "
+"端口),但这可能是不安全的!参见其<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter"
+"/TorFAQ#SOCKSAndDNS\">FAQ</a>。对于不支持HTTP及SOCKETS代理的程序,参考<a "
+"href=\"http://tsocks.sourceforge.net/\">tsocks</a>  或<a href=\"https://wiki.tor"
+"project.org/noreply/TheOnionRouter/TorifyHOWTO#socat\">socat</a>。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
@@ -194,18 +234,22 @@
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
 "HOWTO</a>."
 msgstr ""
+"想了解如何配置其它程序,参见<a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
+"HOWTO</a>。"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
 msgid "<hr /> <a id=\"verify\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"verify\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#verify\">第四步:确定其正常运行</a>"
 
+# https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate 链接可能已失效。
 #. PO4ASHARPBEGIN<a href="http://ipchicken.com/">
 #. this site</a>PO4ASHARPEND
 #. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
@@ -219,6 +263,10 @@
 "TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this FAQ entry</a> for more "
 "suggestions on how to test your Tor.)"
 msgstr ""
+"接下来,您可以尝试用您已经设置了Tor的浏览器验证您的IP是否已经匿名:点击网址 <a "
+"href=\"https://check.torproject.org/\">检测 Tor</a>,看它是否检出您使用了Tor。(如果该网址不可用,可在<a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnect"
+"ionPrivate\">这条 FAQ</a>中找到更多测试的办法。)"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
@@ -235,6 +283,11 @@
 "file in your favorite text editor and insert \"allow_ypbind=1\".  Restart "
 "your machine for this change to take effect."
 msgstr ""
+"您的个人防火墙可能阻止您的电脑连接到自身(包括基于 Fedora Core 4 的 SELinux 都有这种情况),请确保本地程序能连接到Polipo("
+"本地端口8118)和Tor(本地端口9050);如果您的防火墙阻止了对外的连接,请至少允许到TCP端口80及443的连接,其余参见<a href=\"ht"
+"tps://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient\">这条 "
+"FAQ</a>。 若您的SELinux配置不支持Tor或代理服务正常运行,可在 /etc/selinux/targeted 下建立 "
+"booleans.local 文件。在该文件中插入一行\"allow_ypbind=1\"。重启计算机使其可用。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
@@ -242,18 +295,22 @@
 "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/Tor"
+"FAQ#ItDoesntWork\">这条 FAQ</a> 。"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#relay\">第五步:配置为中继</a>"
 
+# each way 理解为 上、下行
+# exposure to abuse complaints 怎么理解?
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
 msgid ""
@@ -264,6 +321,8 @@
 "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网络就能越快。如果您有上、下行均大于20 kb/s的带宽,请也将您的Tor配置为中继以支持To"
+"r网络的维持和发展。我们采取了很多措施以确保成为Tor中继简捷、方便:限制传输比率以节省带宽,制订退出策略以减少滥用,以及对动态IP的支持。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
@@ -274,22 +333,25 @@
 "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/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\">您也能得到更好"
+"的匿名</a>。"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
-msgstr ""
+msgstr "在我们<a href=\"<page docs/tor-doc-relay>\">配置中继</a>页面下有更详细的资料。"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
 msgid "<hr />"
-msgstr ""
+msgstr "<hr />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"
-msgstr ""
+msgstr "如果您对这篇文章有更好的建议,请将它<a href=\"<page contact>\">发给我们</a>。感激不尽!"

Modified: translation/trunk/projects/website/po/zh_CN/tordnsel/3-low.index.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/tordnsel/3-low.index.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/tordnsel/3-low.index.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-15 17:57+0200\n"
-"PO-Revision-Date: 2009-11-27 09:01-0700\n"
-"Last-Translator: yfdyh000 <yfdyh000 at yahoo.com.cn>\n"
+"PO-Revision-Date: 2010-10-30 11:55+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h1>
 #: /home/runa/code/website/tordnsel/en/index.wml:10
@@ -40,51 +41,61 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/tordnsel/en/index.wml:19
+#, fuzzy
 msgid ""
 "Previous DNSELs scraped Tor's network directory for exit node IP addresses, "
 "but this method fails to list nodes that don't advertise their exit address "
 "in the directory. TorDNSEL actively tests through these nodes to provide a "
 "more accurate list."
 msgstr ""
+"以前的 DNSELs 为了出口节点地址来设法取得 Tor 的网络目录,但这种方式无法在目录中列出他们的出口地址。TorDNSEL "
+"是通过主动测试节点来提供更多更精确的列表"
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/tordnsel/en/index.wml:24
+#, fuzzy
 msgid ""
 "The full background and rationale for TorDNSEL is described in the official "
 "<a href=\"<gitblob>doc/contrib/torel-design.txt\">design document</a>. The "
 "current service only supports the first query type mentioned in that "
 "document."
 msgstr ""
+"关于 TorDNSEL 完整的背景和原理描述请参看官方<a href=\"<gitblob>doc/contrib/torel-"
+"design.txt\">开发文档</a>。当前服务仅支持文档中提到的第一种查询模式"
 
 #. type: Content of: <div><h2>
 #: /home/runa/code/website/tordnsel/en/index.wml:29
 msgid "How can I query the public TorDNSEL service?"
-msgstr ""
+msgstr "如何查询公共 TorDNESL 服务?"
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/tordnsel/en/index.wml:31
 msgid "Using the command line tool dig, users can ask type 1 queries like so:"
-msgstr ""
+msgstr "使用命令行工具 dig ,用户可以请求模式一查询,像这样:"
 
 #. type: Content of: <div><pre>
 #: /home/runa/code/website/tordnsel/en/index.wml:33
 #, no-wrap
 msgid "dig 209.137.169.81.6667.4.3.2.1.ip-port.exitlist.torproject.org"
-msgstr ""
+msgstr "dig 209.137.169.81.6667.4.3.2.1.ip-port.exitlist.torproject.org"
 
 #. type: Content of: <div><h2>
 #: /home/runa/code/website/tordnsel/en/index.wml:35
 msgid "What do the received answers mean?"
-msgstr ""
+msgstr "返回信息代表什么意思?"
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/tordnsel/en/index.wml:37
+#, fuzzy
 msgid ""
 "A request for the A record \"209.137.169.81.6667.4.3.2.1.ip-port.exitlist."
 "torproject.org\" would return 127.0.0.2 if there's a Tor node that can exit "
 "through 81.169.137.209 to port 6667 at 1.2.3.4. If there isn't such an exit "
 "node, the DNSEL returns NXDOMAIN."
 msgstr ""
+"A记录中的A请求\"209.137.169.81.6667.4.3.2.1.ip-port.exitlist.torproject.org\"会返回 "
+"127.0.0.2,如果有 Tor节点,则exit through 81.169.137.209 to port 6667 at "
+"1.2.3.4.如果没有出口节点,DNSEL 会返回 NXDOMAIN."
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/tordnsel/en/index.wml:43

Modified: translation/trunk/projects/website/po/zh_CN/vidalia/4-optional.index.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/vidalia/4-optional.index.po	2010-11-21 21:19:36 UTC (rev 23850)
+++ translation/trunk/projects/website/po/zh_CN/vidalia/4-optional.index.po	2010-11-21 21:21:25 UTC (rev 23851)
@@ -7,14 +7,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-15 17:57+0200\n"
-"PO-Revision-Date: 2010-03-04 23:45-0700\n"
-"Last-Translator: Mini Dragon <projecteurs at gmail.com>\n"
+"PO-Revision-Date: 2010-10-24 10:51+0200\n"
+"Last-Translator: jonchil <abcd666 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/code/website/vidalia/en/index.wml:11
@@ -71,45 +72,41 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/code/website/vidalia/en/index.wml:41
-#, fuzzy
 msgid ""
 "The most recent stable release is: <a href=\"https://trac.vidalia-project."
 "net/milestone/Vidalia%20<version-vidalia-stable>\"><version-vidalia-stable></"
 "a>"
 msgstr ""
 "最新的稳定版本是:<a href=\"https://trac.vidalia-project.net/milestone/Vidalia%"
-"200.2.7\">0.2.7</a>"
+"200.2.10\">0.2.10</a>"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/vidalia/en/index.wml:47
-#, fuzzy
 msgid ""
 "<a href=\"dist/vidalia-<version-vidalia-stable>.msi\">Windows Installer</a> "
 "(<a href=\"dist/vidalia-<version-vidalia-stable>.msi.asc\">sig</a>)"
 msgstr ""
-"<a href=\"dist/vidalia-0.2.7.msi\">Windows 安装文件</a> (<a "
-"href=\"dist/vidalia-0.2.7.msi.asc\">文件签名</a>)"
+"<a href=\"dist/vidalia-0.2.10.msi\">Windows 安装文件</a> (<a "
+"href=\"dist/vidalia-0.2.10.msi.asc\">文件签名</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/vidalia/en/index.wml:51
-#, fuzzy
 msgid ""
 "<a href=\"dist/vidalia-<version-vidalia-stable>-i386.dmg\">Mac OS X x86 "
 "Only</a> (<a href=\"dist/vidalia-<version-vidalia-stable>-i386.dmg.asc"
 "\">sig</a>)"
 msgstr ""
-"<a href=\"dist/vidalia-0.2.7-i386.dmg\">Mac OS X 仅 x86</a> (<a "
-"href=\"dist/vidalia-0.2.7-i386.dmg.asc\">文件签名</a>)"
+"<a href=\"dist/vidalia-0.2.10-i386.dmg\">Mac OS X 仅 x86</a> (<a "
+"href=\"dist/vidalia-0.2.10-i386.dmg.asc\">文件签名</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/vidalia/en/index.wml:55
-#, fuzzy
 msgid ""
 "<a href=\"dist/vidalia-<version-vidalia-stable>-ppc.dmg\">Mac OS X PPC-only</"
 "a> (<a href=\"dist/vidalia-<version-vidalia-stable>-ppc.dmg.asc\">sig</a>)"
 msgstr ""
-"<a href=\"dist/vidalia-0.2.7-ppc.dmg\">Mac OS X 仅限 PPC 架构</a> (<a "
-"href=\"dist/vidalia-0.2.7-ppc.dmg.asc\">文件签名</a>)"
+"<a href=\"dist/vidalia-0.2.9-ppc.dmg\">Mac OS X 仅 PPC</a> (<a "
+"href=\"dist/vidalia-0.2.9-ppc.dmg.asc\">文件签名</a>)"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/vidalia/en/index.wml:59
@@ -120,7 +117,6 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/code/website/vidalia/en/index.wml:62
-#, fuzzy
 msgid ""
 "<a href=\"dist/vidalia-<version-vidalia-stable>.tar.gz\">Source Tarball</a> "
 "(<a href=\"dist/vidalia-<version-vidalia-stable>.tar.gz.asc\">sig</a>)"



More information about the tor-commits mailing list