[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[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)



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@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@ADDRESS>\n"
+"PO-Revision-Date: 2010-11-20 02:43+0200\n"
+"Last-Translator: Il_Tifossi <jaume172@xxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-10-12 19:20+0200\n"
+"Last-Translator: Ricardo A. <ra.hermosillac@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@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@ADDRESS>\n"
+"PO-Revision-Date: 2010-11-01 00:59+0200\n"
+"Last-Translator: amark035 <amarkiewitz@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-01 01:17+0200\n"
+"Last-Translator: amark035 <amarkiewitz@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-14 22:49+0200\n"
+"Last-Translator: carolyn anhalt <carolyn@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-08 14:48+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-09 07:01+0200\n"
+"Last-Translator: J.FS <jin.w.fseer@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-08 14:50+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-02 17:06+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-10-30 12:16+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-08 14:51+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-10-31 16:46+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@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@ADDRESS>\n"
+"PO-Revision-Date: 2010-11-02 16:58+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-02 15:40+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-08 19:42+0200\n"
+"Last-Translator: J.FS <jin.w.fseer@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@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@ADDRESS>\n"
+"PO-Revision-Date: 2010-11-09 07:12+0200\n"
+"Last-Translator: J.FS <jin.w.fseer@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-10-30 11:55+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-10-24 10:51+0200\n"
+"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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>)"