www philosophy/po/compromise.zh-cn.po philosoph...

[DENG Nan]

CVSROOT:        /web/www
Module name:    www
Changes by:     DENG Nan <monnand>      12/02/16 06:04:21

Modified files:
        philosophy/po  : compromise.zh-cn.po free-doc.zh-cn.po 
                         misinterpreting-copyright.zh-cn.po 
                         open-source-misses-the-point.zh-cn.po 
                         philosophy.zh-cn.po practical.zh-cn.po 
        po             : home.zh-cn.po 
        server/po      : body-include-2.zh-cn.po head-include-2.zh-cn.po 
Added files:
        licenses/po    : licenses.zh-cn.po 

Log message:
        cleaned fuzzy pages

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.zh-cn.po?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/misinterpreting-copyright.zh-cn.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/practical.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.153&r2=1.154
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-2.zh-cn.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/head-include-2.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: philosophy/po/compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/compromise.zh-cn.po   20 Sep 2011 17:16:34 -0000      1.9
+++ philosophy/po/compromise.zh-cn.po   16 Feb 2012 06:03:59 -0000      1.10
@@ -7,13 +7,12 @@
 msgstr ""
 "Project-Id-Version: compromise.html\n"
 "POT-Creation-Date: 2011-09-20 12:28-0300\n"
-"PO-Revision-Date: 2011-05-01 05:03-0400\n"
+"PO-Revision-Date: 2012-02-16 10:07+0800\n"
 "Last-Translator: Tony Yet <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-07-20 20:25-0300\n"
 "Language: zh\n"
 
 # type: Content of: <title>
@@ -368,6 +367,9 @@
 "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
 "\">\"'Nudge' is not enough\"</a>."
 msgstr ""
+"有关生活中其它领域中类似的观点，请参考 <a 
href=\"http://www.guardian.co.uk/";
+"commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\">\"'Nudge' "
+"is not enough\"</a>."
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -377,13 +379,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
-#| "contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
@@ -391,28 +386,16 @@
 msgstr ""
 "请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会与GNU的查询与问题（以英语）发送到<a 
href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
-"它方法</a> 联系自由软件基金会。 <br /> 
发现任何错误和链接或其它需要更正的地方"
-"（或任何建议），请发送邮件至 <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>。"
+"它方法</a> 联系自由软件基金会。"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
-#| "contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 msgid ""
 "Please send broken links and other corrections or suggestions to <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
-"请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会与GNU的查询与问题（以英语）发送到<a 
href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
-"它方法</a> 联系自由软件基金会。 <br /> 
发现任何错误和链接或其它需要更正的地方"
-"（或任何建议），请发送邮件至 <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>。"
+"发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: philosophy/po/free-doc.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/free-doc.zh-cn.po     24 Jan 2012 01:28:38 -0000      1.3
+++ philosophy/po/free-doc.zh-cn.po     16 Feb 2012 06:03:59 -0000      1.4
@@ -5,39 +5,50 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-doc.html\n"
+<<<<<<< free-doc.zh-cn.po
+"POT-Creation-Date: 2012-01-23 20:25-0500\n"
+"PO-Revision-Date: 2012-02-15 16:46+0800\n"
+=======
 "POT-Creation-Date: 2012-01-23 20:25-0500\n"
 "PO-Revision-Date: 2011-12-28 13:27-0500\n"
+>>>>>>> 1.3
 "Last-Translator: Li Fanxi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-09-20 12:29-0300\n"
 "Language: zh\n"
 "Plural-Forms: \n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#, fuzzy
-#| msgid ""
-#| "Free Software and Free Manuals - GNU Project - Free Software Foundation "
-#| "(FSF)"
 msgid ""
 "Why Free Software needs Free Documentation - GNU Project - Free Software "
 "Foundation (FSF)"
-msgstr "自由软件与自由手册 - GNU 工程 - 自由软件基金会 (FSF)"
+msgstr "为什么自由软件需要自由手册 - GNU 工程 - 
自由软件基金会 (FSF)"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
 msgid "Why Free Software needs Free Documentation"
 msgstr "为什么自由软件需要自由手册"
 
+<<<<<<< free-doc.zh-cn.po
 #. type: Content of: <div>
 msgid ""
 "<a href=\"http://defectivebydesign.org/ebooks.html\";>Join our mailing list "
 "about the dangers of eBooks</a>."
 msgstr ""
+"<a href=\"http://defectivebydesign.org/ebooks.html\";>关注我们有å…
³ç”µå­ä¹¦å±é™©æ€§"
+"的邮件列表</a> 。"
 
+=======
+#. type: Content of: <div>
+msgid ""
+"<a href=\"http://defectivebydesign.org/ebooks.html\";>Join our mailing list "
+"about the dangers of eBooks</a>."
+msgstr ""
+
+>>>>>>> 1.3
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid "<a href=\"/copyleft/fdl.html\">The GNU Free Documentation License</a>"
@@ -263,21 +274,14 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "We can also encourage commercial publishers to sell free, copylefted "
-#| "manuals instead of proprietary ones.  One way you can help this is to "
-#| "check the distribution terms of a manual before you buy it, and prefer "
-#| "copylefted manuals to non-copylefted ones."
 msgid ""
 "We can also encourage commercial publishers to sell free, copylefted manuals "
 "instead of proprietary ones.  One way you can help this is to check the "
 "distribution terms of a manual before you buy it, and prefer copylefted "
 "manuals to noncopylefted ones."
 msgstr ""
-"我们也可以鼓励商业出版社出售自由的或 <a 
href=\"/copyleft/\">Copyleft</a> 的手"
-"册来代替非自由的手册。您所能做的就是在购买一本手册前检查它的发行条款，优å
…ˆè€ƒ"
-"虑购买 Copyleft 的手册。"
+"我们也可以鼓励商业出版社出售自由的或Copyleft的手册来代替非自由的手册。您所能"
+"做的就是在购买一本手册前检查它的发行条款，优å…
ˆè€ƒè™‘è´­ä¹° Copyleft 的手册。"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -296,13 +300,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
-#| "contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
@@ -310,28 +307,16 @@
 msgstr ""
 "请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会与GNU的查询与问题（以英语）发送到<a 
href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
-"它方法</a> 联系自由软件基金会。 <br /> 
发现任何错误和链接或其它需要更正的地方"
-"（或任何建议），请发送邮件至 <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>。"
+"它方法</a> 联系自由软件基金会。"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
-#| "contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 msgid ""
 "Please send broken links and other corrections or suggestions to <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
-"请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会与GNU的查询与问题（以英语）发送到<a 
href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
-"它方法</a> 联系自由软件基金会。 <br /> 
发现任何错误和链接或其它需要更正的地方"
-"（或任何建议），请发送邮件至 <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>。"
+"发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -348,6 +333,9 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+"License</a> 许可证授权。"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: philosophy/po/misinterpreting-copyright.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/misinterpreting-copyright.zh-cn.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- philosophy/po/misinterpreting-copyright.zh-cn.po    16 Jan 2012 03:29:07 
-0000      1.27
+++ philosophy/po/misinterpreting-copyright.zh-cn.po    16 Feb 2012 06:03:59 
-0000      1.28
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: misinterpreting-copyright.html\n"
 "POT-Creation-Date: 2011-09-20 12:29-0300\n"
-"PO-Revision-Date: 2012-01-13 15:19-0500\n"
+"PO-Revision-Date: 2012-02-15 16:48+0800\n"
 "Last-Translator: Deng, Nan <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -397,8 +397,8 @@
 "(Here is <a href=\"http://www.juliansanchez.com/2011/02/04/the-trouble-with-";
 "balance-metaphors/\"> another critique of \"balance\"</a>.)"
 msgstr ""
-"（这里还有另外一篇批评&ldquo;平衡&rdquo;观点的<a 
href=\"http://www.";
-"juliansanchez.com/2011/02/04/the-trouble-with-balance-metaphors/\">æ–‡ç« </a>"
+"(这里有 <a 
href=\"http://www.juliansanchez.com/2011/02/04/the-trouble-with-";
+"balance-metaphors/\"> 另一个有关“平衡”的评论</a>。)"
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
@@ -919,8 +919,8 @@
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"To block these bills and rules requires political action.<a href="
-"\"#footnote2\">[2]</a>"
+"To block these bills and rules requires political action.<a href=\"#footnote2"
+"\">[2]</a>"
 msgstr "é˜»æ­¢è¿™äº›æ³•æ¡ˆå’Œè§„ç« éœ€è¦æˆ‘ä»¬çš„è¡ŒåŠ¨ã€‚<a 
href=\"#footnote2\">[2]</a>"
 
 # type: Content of: <h3>
@@ -1268,8 +1268,9 @@
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
 "contact</a> the FSF."
 msgstr ""
-"联系GNU或FSF，请发邮件至<a 
href=\"address@hidden">&lt;address@hidden&gt;</"
-"a>. 也可通过<a href=\"/contact/\">其他方式</a>联系我们。"
+"请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
+"它方法</a> 联系自由软件基金会。 "
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -1277,8 +1278,10 @@
 "Please send broken links and other corrections or suggestions to <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
-"<br />请将坏链接或其他意见或建议发送至<a 
href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>。"
+"联系GNU或FSF，请发邮件至<a 
href=\"address@hidden">&lt;address@hidden&gt;</"
+"a>. 也可通过<a href=\"/contact/\">其他方式</a>联系我们。<br 
/>请将坏链接或其"
+"他意见或建议发送至<a href=\"mailto:address@hidden";>&lt;web-"
+"address@hidden&gt;</a>。"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -1301,8 +1304,9 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
-"本文采用<a rel=\"license\" href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/\">CC署名-禁止演绎协议美国3.0版</a>授权"
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+"License</a> 许可证授权。"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -1316,10 +1320,6 @@
 msgid "Updated:"
 msgstr "更新："
 
-# type: Content of: <div><h4>
-#~ msgid "Translations of this page"
-#~ msgstr "其他语言"
-
 # type: Content of: <div><p>
 #~ msgid ""
 #~ "Verbatim copying and distribution of this entire article are permitted "
@@ -1327,6 +1327,10 @@
 #~ "copyright notice, are preserved."
 #~ msgstr "å…
è®¸å„种形式的原文转载，但需保留版权声明和本声明。"
 
+# type: Content of: <div><h4>
+#~ msgid "Translations of this page"
+#~ msgstr "其他语言"
+
 # type: Content of: <ol><li>
 #~ msgid ""
 #~ "<a id=\"footnote3\"></a>The Internet being the largest of the world's "

Index: philosophy/po/open-source-misses-the-point.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/open-source-misses-the-point.zh-cn.po 16 Jan 2012 09:27:10 
-0000      1.6
+++ philosophy/po/open-source-misses-the-point.zh-cn.po 16 Feb 2012 06:03:59 
-0000      1.7
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "POT-Creation-Date: 2011-09-20 12:30-0300\n"
-"PO-Revision-Date: 2012-01-13 15:35-0500\n"
+"PO-Revision-Date: 2012-02-15 16:54+0800\n"
 "Last-Translator: Nan Deng <address@hidden>\n"
 "Language-Team: Chinese (simplified)\n"
 "MIME-Version: 1.0\n"
@@ -213,7 +213,7 @@
 msgstr ""
 "可惜的是，在英语中，能替换 Free 的词都多少有点毛病
。我们考量了许多别人的建"
 "议，然而没有哪个比å…
¶ä»–çš„æ›´&rdquo;正确&ldquo;点（比如说，在某些情况下，法语和"
-"西班牙语中的&ldquo;libre&rdquo;一词更好点。可是印度的人就æ 
¹æœ¬ä¸è®¤è¯†è¿™ä¸ªè¯ï¼‰ã€‚"
+"西班牙语中的&rduo;libre&rdquo;一词更好点。可是印度的人就æ 
¹æœ¬ä¸è®¤è¯†è¿™ä¸ªè¯ï¼‰ã€‚"
 "每个可能替代&ldquo;Free 
Software&rdquo;的词多少都会有些语义方面的问题&mdash;"
 "这显然也包括&ldquo;开源软件&rdquo;（Open Source Software）。"
 
@@ -278,17 +278,17 @@
 #. type: Content of: <p>
 msgid ""
 "The <i>New York Times</i> has <a href=\"http://www.nytimes.com/external/";
-"gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-"
-"design-37415.html\"> run an article that stretches the meaning of the term</"
-"a> to refer to user beta testing&mdash;letting a few users try an early "
-"version and give confidential feedback&mdash;which proprietary software "
-"developers have practiced for decades."
+"gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-design-"
+"37415.html\"> run an article that stretches the meaning of the term</a> to "
+"refer to user beta testing&mdash;letting a few users try an early version "
+"and give confidential feedback&mdash;which proprietary software developers "
+"have practiced for decades."
 msgstr ""
 "还有更糟糕的，<i>纽约时报</i>发表了<a 
href=\"http://www.nytimes.com/external/";
-"gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-"
-"design-37415.html\">ä¸€ç¯‡æ–‡ç« </a>，把开源这词的意思完å…
¨æ‹§äº†ï¼Œæ–‡ä¸­å°†å¼€æºè½¯ä»¶è§£"
-"释为内测版软件&mdash;就是给一小撮用户做测试的抢å…
ˆç‰ˆè½¯ä»¶&mdash;这东西专有软件"
-"å¼€å‘è€…åœ¨å‡ åå¹´å‰å°±å‘å¸ƒè¿‡äº†ã€‚"
+"gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-design-"
+"37415.html\">ä¸€ç¯‡æ–‡ç« </a>，把开源这词的意思完å…
¨æ‹§äº†ï¼Œæ–‡ä¸­å°†å¼€æºè½¯ä»¶è§£é‡Šä¸ºå†…测"
+"版软件&mdash;就是给一小撮用户做测试的抢å…
ˆç‰ˆè½¯ä»¶&mdash;这东西专有软件开发者在"
+"å‡ åå¹´å‰å°±å‘å¸ƒè¿‡äº†ã€‚"
 
 #. type: Content of: <p>
 msgid ""
@@ -320,7 +320,7 @@
 msgstr ""
 "另外一个å…
³äºŽ&ldquo;开源&rdquo;的误解是：开源软件意味着&ldquo;不用 GNU 
GPL 许"
 
"可证&rdquo;。这个误解又常常版随着另外一个误解：&ldquo;自由软件就是使用
 GPL 许"
-"可证的软件&rdquo;。这显然是扭曲了自由软件和开源软件。GNU
 GPL 许可证也被认证为"
+"可证的软件&rdquol。这显然是扭曲了自由软件和开源软件。GNU
 GPL 许可证也被认证为"
 
"开源软件许可证。很多开源软件许可证也同时是自由软件许可证。"
 
 #. type: Content of: <p>
@@ -591,7 +591,7 @@
 msgstr ""
 "带有专有插件的软件，和含有专有软件的 GNU/Linux 
发行版之所以有生存和发展的空"
 "é—´ï¼Œå°±æ˜¯å› 
为我们社区中大多数人并没有坚守自己的自由。这并非巧合。大多数
 GNU/"
-"Linux 
用户是被&ldquo;开源&rdquo;一词吸引而来，而开源则没有把维护用户自由作为"
+"Linux 
用户是被&ldquo;开源&rldquo;一词吸引而来，而开源则没有把维护用户自由作为"
 "å…¶ç›®æ ‡ã€‚æ— è§†è‡ªç”±çš„è¨€è®ºå£å£ç›¸ä¼ ï¼Œæ¼ 
视自由的态度比比皆是。人人如此，互相影响。"
 "要扭转这æ 
·çš„局势，我们唯一能做的，就是更多地谈论自由，而非把它搁置一边。"
 
@@ -619,9 +619,9 @@
 
 #. type: Content of: <p>
 msgid ""
-"Joe Barr's article, <a href=\"http://www.itworld.com/";
-"LWD010523vcontrol4\">&ldquo;Live and let license,&rdquo;</a> gives his "
-"perspective on this issue."
+"Joe Barr's article, <a href=\"http://www.itworld.com/LWD010523vcontrol4";
+"\">&ldquo;Live and let license,&rdquo;</a> gives his perspective on this "
+"issue."
 msgstr ""
 "Joe Barr 的 <a 
href=\"http://www.itworld.com/LWD010523vcontrol4\";>è¿™ç¯‡æ–‡ç« </"
 "a> 阐述了他对于这个问题的立场。"
@@ -675,8 +675,9 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
-"本文采用<a rel=\"license\" href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/\">CC署名-禁止演绎协议美国3.0版</a>授权"
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+"License</a> 许可证授权。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: philosophy/po/philosophy.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.zh-cn.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/philosophy.zh-cn.po   29 Dec 2011 09:26:59 -0000      1.24
+++ philosophy/po/philosophy.zh-cn.po   16 Feb 2012 06:03:59 -0000      1.25
@@ -7,13 +7,12 @@
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
 "POT-Creation-Date: 2011-12-19 20:25-0500\n"
-"PO-Revision-Date: 2011-05-01 05:56-0400\n"
+"PO-Revision-Date: 2012-02-15 16:59+0800\n"
 "Last-Translator: Li Fanxi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-12-19 20:25-0500\n"
 "Language: zh\n"
 
 # type: Content of: <title>
@@ -29,19 +28,13 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Our development of the GNU free software operating system is motivated by "
-#| "the philosophy of the free software movement. This page provides an "
-#| "introduction to that philosophy, links to the latest articles we have on "
-#| "the subject, and links to further resources."
 msgid ""
 "Our development of the GNU free software operating system is motivated by "
 "the philosophy of the free software movement.  This page provides an "
 "introduction to that philosophy."
 msgstr ""
 "自由软件运动的的哲学，激励着我们不断进行 GNU 
自由软件的开发。本页面介绍 GNU "
-"çš„å“²å­¦ï¼Œå¹¶æä¾›äº†ä¸€äº›ç›¸å…³çš„æ–‡ç« å’Œèµ„æºé“¾æŽ¥ã€‚"
+"的哲学。"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -60,17 +53,19 @@
 
 #. type: Content of: <p>
 msgid "For further reading, please select a section from the menu above."
-msgstr ""
+msgstr "åœ¨ä¸Šé¢çš„èœå•ä¸­é€‰æ‹©ç›¸å…³çš„ç« èŠ‚äº†è§£è¿›ä¸€æ­¥çš„ä¿¡æ¯ã€‚"
 
 #. type: Content of: <p>
 msgid ""
 "We also maintain a list of <a href=\"/philosophy/latest-articles.html\">most "
 "recently added articles</a>."
 msgstr ""
+"我们维护了一个 <a 
href=\"/philosophy/latest-articles.html\">æœ€è¿‘æ›´æ–°çš„æ–‡ç« </"
+"a> 列表。"
 
 #. type: Content of: <h3>
 msgid "Introduction"
-msgstr ""
+msgstr "简介"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -79,12 +74,8 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"/gnu/gnu.html\">History of GNU, and discussion of GNU and Linux."
-#| "</a>"
 msgid "<a href=\"/gnu/gnu.html\">History of GNU/Linux</a>"
-msgstr "<a href=\"/gnu/gnu.html\">GNU 的历史，GNU 与 Linux。</a>"
+msgstr "<a href=\"/gnu/gnu.html\">GNU/Linux 的历史</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -131,25 +122,21 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"/philosophy/open-source-misses-the-point.html\">Why &ldquo;Open "
-#| "Source&rdquo; misses the point of Free Software</a>"
 msgid ""
 "<a href=\"/philosophy/open-source-misses-the-point.html\">Why \"Open Source"
 "\" misses the point of Free Software</a>"
 msgstr ""
-"<a href=\"/philosophy/open-source-misses-the-point.html\">Why &ldquo;Open "
-"Source&rdquo; misses the point of Free Software</a>"
+"<a 
href=\"/philosophy/open-source-misses-the-point.zh-cn.html\">开源究竟差哪"
+"了</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#, fuzzy
-#| msgid "<a href=\"/philosophy/free-sw.html\">What is Free Software?</a>"
 msgid ""
 "<a href=\"/philosophy/government-free-software.html\">Measures governments "
 "can use to promote free software</a>"
-msgstr "<a href=\"/philosophy/free-sw.html\">What is Free Software?</a>"
+msgstr ""
+"<a href=\"/philosophy/government-free-software.html\">Measures governments "
+"can use to promote free software</a>"
 
 # type: Content of: <p>
 #.  please leave both these ID attributes here. ... 
@@ -175,13 +162,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
-#| "contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
@@ -189,28 +169,16 @@
 msgstr ""
 "请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
-"它方法</a> 联系自由软件基金会。 <br 
/>发现任何错误和链接或其它需要更正的地方"
-"（或任何建议），请发送邮件至 <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>。"
+"它方法</a> 联系自由软件基金会。"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
-#| "contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 msgid ""
 "Please send broken links and other corrections or suggestions to <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
-"请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
-"它方法</a> 联系自由软件基金会。 <br 
/>发现任何错误和链接或其它需要更正的地方"
-"（或任何建议），请发送邮件至 <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>。"
+"发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -224,7 +192,7 @@
 
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr ""
+msgstr "版板所有 &copy; 2011 自由软件基金会"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -232,6 +200,9 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+"License</a> 许可证授权。"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: philosophy/po/practical.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/practical.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/practical.zh-cn.po    20 Sep 2011 17:18:06 -0000      1.6
+++ philosophy/po/practical.zh-cn.po    16 Feb 2012 06:03:59 -0000      1.7
@@ -1,4 +1,4 @@
-# Chinese translations for GNU.org
+# Simplified Chinese translation of 
http://www.gnu.org/philosophy/practical.html
 # Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnu.org package.
 # monnand <address@hidden>, 2011.
@@ -7,20 +7,15 @@
 msgstr ""
 "Project-Id-Version: practical.html\n"
 "POT-Creation-Date: 2011-09-20 12:30-0300\n"
-"PO-Revision-Date: 2011-05-05 01:21-0400\n"
+"PO-Revision-Date: 2012-02-15 17:06+0800\n"
 "Last-Translator: monnand <address@hidden>\n"
-"Language-Team: Chinese (simplified)\n"
+"Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-07-14 04:30-0300\n"
 "Language: zh_CN\n"
 
 #. type: Content of: <title>
-#, fuzzy
-#| msgid ""
-#| "The advantages of free software &mdash; GNU Project &mdash; Free Software "
-#| "Foundation (FSF)"
 msgid ""
 "The advantages of free software - GNU Project - Free Software Foundation "
 "(FSF)"
@@ -131,6 +126,9 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+"License</a> 许可证授权。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -142,12 +140,12 @@
 msgid "Updated:"
 msgstr "最后更新"
 
-#~ msgid "Translations of this page"
-#~ msgstr "其他语言"
-
 #~ msgid ""
 #~ "Verbatim copying and distribution of this entire article is permitted in "
 #~ "any medium, provided this notice is preserved."
 #~ msgstr ""
 #~ "æœ¬æ–‡å…è®¸åœ¨ä¸å˜æ›´å†…å®¹çš„å‰æä¸‹æ— éœ€ä½¿ç”¨è´¹çš„å…
¨æ–‡å¤åˆ¶å’Œå‘布在全球任何媒体，但需"
 #~ "保留此注记和版权声明"
+
+#~ msgid "Translations of this page"
+#~ msgstr "其他语言"

Index: po/home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- po/home.zh-cn.po    11 Feb 2012 01:28:40 -0000      1.153
+++ po/home.zh-cn.po    16 Feb 2012 06:04:05 -0000      1.154
@@ -7,14 +7,18 @@
 msgstr ""
 "Project-Id-Version: home.shtml\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< home.zh-cn.po
+"POT-Creation-Date: 2012-02-10 20:26-0500\n"
+"PO-Revision-Date: 2012-02-15 16:27+0800\n"
+=======
 "POT-Creation-Date: 2012-02-10 20:26-0500\n"
 "PO-Revision-Date: 2011-05-05 17:27+0800\n"
+>>>>>>> 1.153
 "Last-Translator: Li Fanxi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-09-27 04:25-0300\n"
 "Language: zh\n"
 "Plural-Forms: \n"
 
@@ -44,7 +48,7 @@
 
 #. type: Attribute 'title' of: <link>
 msgid "Planet GNU"
-msgstr ""
+msgstr "Planet GNU"
 
 # type: Attribute 'title' of: <link>
 #. type: Attribute 'title' of: <link>
@@ -73,11 +77,22 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+<<<<<<< home.zh-cn.po
+"GNU is a Unix-like operating system that is <a href=\"/philosophy/free-sw."
+"html\">free software</a>&mdash;it respects your freedom.  You can install <a "
+"href=\"/distros/free-distros.html\">Linux-based versions of GNU</a> which "
+"are entirely free software."
+msgstr ""
+"GNU 是一个由 <a href=\"/philosophy/free-sw.html\">自由软件</a> 
构成的类 Unix "
+"操作系统 &mdash; è‡ªç”±è½¯ä»¶å°Šé‡ä½ çš„è‡ªç”±ã€‚ä½ å¯ä»¥é€‰æ‹©å®‰è£…
一个完全由自由软件构成"
+"的 <a href=\"/distros/free-distros.html\">基于 Linux å†…æ ¸çš„ GNU 
系统</a>。"
+=======
 "GNU is a Unix-like operating system that is <a href=\"/philosophy/free-sw."
 "html\">free software</a>&mdash;it respects your freedom.  You can install <a "
 "href=\"/distros/free-distros.html\">Linux-based versions of GNU</a> which "
 "are entirely free software."
 msgstr ""
+>>>>>>> 1.153
 
 # type: Content of: <ul><li>
 #. type: Content of: <div><div><p><a>
@@ -94,6 +109,9 @@
 msgid "</a>"
 msgstr "</a>"
 
+<<<<<<< home.zh-cn.po
+# type: Content of: <table><tr><td><p>
+=======
 # type: Content of: <table><tr><td><p>
 #. type: Content of: <div><div><p>
 #, fuzzy
@@ -113,6 +131,7 @@
 "em>， <em>g</em> 和 <em>n</em> 之间没有å…
ƒéŸ³ï¼Œæ‰€ä»¥åªæœ‰ä¸€ä¸ªéŸ³èŠ‚。"
 
 # type: Content of: <div><div><p>
+>>>>>>> 1.153
 #. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
@@ -121,22 +140,62 @@
 #| "tools&mdash;plus a program to allocate resources and talk to the "
 #| "hardware, known as a kernel."
 msgid ""
+<<<<<<< home.zh-cn.po
+"The <a href=\"/gnu/gnu.html\">GNU Project</a> was launched in 1984 to "
+"develop the GNU system.  The name &ldquo;GNU&rdquo; is a recursive acronym "
+"for &ldquo;GNU's Not Unix!&rdquo;.  <a href=\"/pronunciation/pronunciation."
+"html\"> \"GNU\" is pronounced <em>g'noo</em></a>, as one syllable, like "
+"saying \"grew\" but replacing the <em>r</em> with <em>n</em>."
+msgstr ""
+"<a href=\\\"/gnu/gnu.html\\\">GNU 工程</a> 创始于一九å…
«å››å¹´ï¼Œæ—¨åœ¨å¼€å‘一个完"
+"整 GNU 系统。GNU这个名字是 “GNU's Not Unix!” 
的递归首字母缩写词。<a href=\"/"
+"pronunciation/pronunciation.html\"> \"GNU\" 的发音为 
<em>g'noo</em></a>，只有"
+"一个音节，发音很像 “grew”，但需要把其中的 <em>r</em> 
音替换为 <em>n</em> 音。"
+=======
 "A Unix-like operating system is a <a href=\"/software/\">software "
 "collection</a> of applications, libraries, and developer tools, plus a "
 "program to allocate resources and talk to the hardware, known as a kernel."
 msgstr ""
 "类 Unix 操作系统通过 <a href=\"/software/\">一系列</a> 
应用程序、系统库和开发"
 "工具构建, å¹¶åŠ ä¸Šç”¨äºŽèµ„æºåˆ†é…å’Œç¡¬ä»¶ç®¡ç†çš„å†…æ ¸ã€‚"
+>>>>>>> 1.153
 
+# type: Content of: <div><div><p>
 #. type: Content of: <div><div><p>
 msgid ""
+<<<<<<< home.zh-cn.po
+"A Unix-like operating system is a <a href=\"/software/\">software "
+"collection</a> of applications, libraries, and developer tools, plus a "
+"program to allocate resources and talk to the hardware, known as a kernel."
+=======
 "<a href=\"/software/hurd/hurd.html\">The Hurd, GNU's own kernel</a>, is some "
 "way from being ready for daily use.  Thus, GNU is typically used today with "
 "a kernel called Linux.  This combination is the <a href=\"/gnu/linux-and-gnu."
 "html\"> <strong>GNU/Linux operating system</strong></a>.  GNU/Linux is used "
 "by millions, though many <a href=\"/gnu/gnu-linux-faq.html\"> call it \"Linux"
 "\" by mistake</a>."
+>>>>>>> 1.153
 msgstr ""
+<<<<<<< home.zh-cn.po
+"ç±» Unix 操作系统是由一系列应用程序、系统库和开发工å…
·æž„成的 <a href=\"/"
+"software/\">软件集合</a> , å¹¶åŠ ä¸Šç”¨äºŽèµ„æºåˆ†é…
å’Œç¡¬ä»¶ç®¡ç†çš„å†…æ ¸ã€‚"
+
+#. type: Content of: <div><div><p>
+msgid ""
+"<a href=\"/software/hurd/hurd.html\">The Hurd, GNU's own kernel</a>, is some "
+"way from being ready for daily use.  Thus, GNU is typically used today with "
+"a kernel called Linux.  This combination is the <a href=\"/gnu/linux-and-gnu."
+"html\"> <strong>GNU/Linux operating system</strong></a>.  GNU/Linux is used "
+"by millions, though many <a href=\"/gnu/gnu-linux-faq.html\"> call it \"Linux"
+"\" by mistake</a>."
+msgstr ""
+"<a href=\"/software/hurd/hurd.html\">GNU è‡ªå·±çš„å†…æ ¸ Hurd</a> 
仍在开发中，离实"
+"ç”¨è¿˜æœ‰ä¸€å®šçš„è·ç¦»ã€‚å› æ­¤ï¼ŒçŽ°åœ¨çš„ GNU 通常使用 Linux 内æ 
¸ã€‚è¿™æ ·çš„ç»„åˆå³ä¸º<a "
+"href=\"/gnu/linux-and-gnu.html\"> <strong>GNU/Linux 
操作系统</strong></a>。已"
+"经有上百万人在使用 
GNU/Linux，但他们中的很多人把它误称为<a href=\"/gnu/gnu-"
+"linux-faq.html\">“Linux”</a>。"
+=======
+>>>>>>> 1.153
 
 # type: Content of: <ul><li>
 #. type: Content of: <div><div><p>
@@ -145,24 +204,21 @@
 
 # type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><div><h4><a>
-#, fuzzy
-#| msgid ""
-#| "For more news, see <a href=\"http://planet.gnu.org/\";>Planet GNU</a>."
 msgid ""
 "<a href=\"http://planet.gnu.org/\";>Planet GNU</a> <a href=\"http://planet.";
 "gnu.org/rss20.xml\">"
 msgstr ""
-"更多新闻，请访问 <a 
href=\"http://planet.gnu.org/\";>planet.gnu.org</a>。"
+"<a href=\"http://planet.gnu.org/\";>Planet GNU</a> <a href=\"http://planet.";
+"gnu.org/rss20.xml\">"
 
 #. type: Attribute 'alt' of: <div><div><div><h4><a><img>
 msgid "RSS Feed"
-msgstr ""
+msgstr "RSS 订阅"
 
 # type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><div><p>
 msgid "For more news, see <a href=\"http://planet.gnu.org/\";>Planet GNU</a>."
-msgstr ""
-"更多新闻，请访问 <a 
href=\"http://planet.gnu.org/\";>planet.gnu.org</a>。"
+msgstr "更多新闻，请访问 <a href=\"http://planet.gnu.org/\";>Planet 
GNU</a>。"
 
 #. type: Content of: <div><div><div><h4>
 msgid "GNU Guile"
@@ -304,36 +360,24 @@
 
 # type: Content of: <div><ul><li>
 #. type: Content of: <div><div><ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"http://www.openrightsgroup.org/orgwiki/index.php/Net_Neutrality";
-#| "\"> Support the efforts on net neutrality in Europe</a>, <a href=\"http://";
-#| "www.savetheinternet.com\" title=\"Net neutrality in the United States of "
-#| "America\">in the USA</a> and <a href=\"http://www.neutrality.ca\"; title="
-#| "\"Net neutrality in Canada\">in Canada</a>."
 msgid ""
 "Support the efforts on net neutrality in Europe, <a href=\"http://www.";
 "savetheinternet.com\" title=\"Net neutrality in the United States of America"
 "\">in the USA</a> and <a href=\"http://www.neutrality.ca\"; title=\"Net "
 "neutrality in Canada\">in Canada</a>."
 msgstr ""
-"<a href=\"http://www.openrightsgroup.org/orgwiki/index.php/Net_Neutrality\";> "
-"支持欧洲 </a> 、 <a href=\"http://www.savetheinternet.com\"; 
title=\"美国的网"
-"络中立行动\">美国</a> 和 <a href=\"http://www.neutrality.ca\"; 
title=\"Net "
-"neutrality in Canada\"> åŠ æ‹¿å¤§ </a> 的网络中立行动。"
+"支持欧洲、 <a href=\"http://www.savetheinternet.com\"; 
title=\"美国的网络中立"
+"行动\">美国</a> 和 <a href=\"http://www.neutrality.ca\"; title=\"åŠ 
拿大的网络"
+"中立行动\"> åŠ æ‹¿å¤§ </a> 的网络中立行动。"
 
 # type: Content of: <div><ul><li>
 #. type: Content of: <div><div><ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"http://www.aful.org/communiques/univ-offers-me-windows";
-#| "\">Students! Claim a refund on your unused Microsoft Windows licences</a>"
 msgid ""
 "Students! <a href=\"http://www.aful.org/communiques/univ-offers-me-windows";
 "\">Claim a refund on your unused Microsoft Windows licences</a>."
 msgstr ""
-"<a href=\"http://www.aful.org/communiques/univ-offers-me-windows\";> 
学生们！ "
-"ä¸ºä½ ä»¬æœªä½¿ç”¨çš„ Microsoft Windows 许可证索取退款 </a>"
+"<a 
href=\"http://www.aful.org/communiques/univ-offers-me-windows\";>学生们！ "
+"ä¸ºä½ ä»¬æœªä½¿ç”¨çš„ Microsoft Windows 许可证索取退款</a>"
 
 # type: Content of: <div><div><ul><li>
 #. type: Content of: <div><div><ul><li>
@@ -349,14 +393,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "<strong>Can you contribute to any of these <a href=\"http://www.fsf.org/";
-#| "campaigns/priority-projects/\">High Priority Projects</a>?</strong> GNU "
-#| "PDF, Gnash, coreboot, free distributions of GNU/Linux, GNU Octave, "
-#| "drivers for network routers, reversible debugging in GDB, automatic "
-#| "transcription, PowerVR drivers, and also free software replacements for "
-#| "Skype, OpenDWG libraries, RARv3, and Oracle Forms."
 msgid ""
 "<strong>Can you contribute to any of these <a href=\"http://www.fsf.org/";
 "campaigns/priority-projects/\">High Priority Projects</a>?</strong> Gnash, "
@@ -366,30 +402,12 @@
 "and Oracle Forms."
 msgstr ""
 "<strong>您能为这些 <a 
href=\"http://www.fsf.org/campaigns/priority-projects/";
-"\">高优先级的项目</a>åšå‡ºè´¡çŒ®ç ï¼Ÿ</strong> GNU PDF, Gnash, 
coreboot, 自由的 "
-"GNU/Linux 发行版, GNU Octave, 
网络路由器驱动，GDBçš„åå‘è°ƒè¯•ï¼Œè‡ªåŠ¨è§†é¢‘ç¼–ç è½¬"
-"换，PowerVR驱动，还有 Skype, OpenDWG 库, RARv3 和 Oracle Forms 
的自由软件替代"
-"品。"
+"\">高优先级的项目</a>åšå‡ºè´¡çŒ®ç ï¼Ÿ</strong> Gnash, coreboot, 
自由的 GNU/Linux "
+"发行版, GNU Octave, 
网络路由器驱动，GDBçš„åå‘è°ƒè¯•ï¼Œè‡ªåŠ¨è§†é¢‘ç¼–ç è½¬æ¢ï¼ŒPowerVR 
"
+"驱动，还有 Skype, OpenDWG 库和 Oracle Forms 
的自由软件替代品。"
 
 # type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "<strong>Can you help take over an <a href=\"/server/takeaction."
-#| "html#unmaint\">unmaintained GNU package</a>?</strong> <a href=\"/software/"
-#| "alive/\">alive</a>, <a href=\"/software/dotgnu-forum/\">dotgnu-forum</a>, "
-#| "<a href=\"/software/dr-geo/\">dr-geo</a>, <a href=\"/software/ggradebook/"
-#| "\">ggradebook</a>, <a href=\"/software/gift/\">gift</a>, <a href=\"/"
-#| "software/gleem/\">gleem</a>, <a href=\"/software/gnu-queue/\">gnu-queue</"
-#| "a>, <a href=\"/software/goldwater/\">goldwater</a>, <a href=\"/software/"
-#| "halifax/\">halifax</a>, <a href=\"/software/leg/\">leg</a>, <a href=\"/"
-#| "software/maverik/\">maverik</a>, <a href=\"/software/orgadoc/\">orgadoc</"
-#| "a>, <a href=\"/software/pgccfd/\">pgccfd</a>, <a href=\"/software/"
-#| "polyxmass/\">polyxmass</a>, <a href=\"/software/quickthreads/"
-#| "\">quickthreads</a>, <a href=\"/software/snakecharmer/\">snakecharmer</"
-#| "a>, <a href=\"/software/sxml/\">sxml</a>, <a href=\"/software/trueprint/"
-#| "\">trueprint</a> are all looking for maintainers. <a href=\"/server/"
-#| "takeaction.html#unmaint\">More information</a>."
 msgid ""
 "<strong>Can you take over an <a href=\"/server/takeaction.html#unmaint"
 "\">unmaintained GNU package</a>?</strong> <a href=\"/software/alive/"
@@ -418,8 +436,9 @@
 "a>, <a href=\"/software/polyxmass/\">polyxmass</a>, <a href=\"/software/"
 "quickthreads/\">quickthreads</a>, <a href=\"/software/snakecharmer/"
 "\">snakecharmer</a>, <a href=\"/software/sxml/\">sxml</a>, <a href=\"/"
-"software/trueprint/\">trueprint</a> 这些项目正在寻找维护人。 <a 
href=\"/"
-"server/takeaction.html#unmaint\">更多信息</a>."
+"software/trueprint/\">trueprint</a> 这些项目正在 <a href=\"/server/"
+"takeaction.html#unmaint\">寻找维护人</a>。我们还需要为 <a 
href=\"/server/"
+"takeaction.html#python_configure\">Python 软件包提供 GNU 
configure</a>。"
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -440,8 +459,8 @@
 "Software Foundation</a>, Inc."
 msgstr ""
 "版权所有 &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
2005, "
-"2006, 2007, 2008, 2009, 2010, 2011 <a 
href=\"http://www.fsf.org\";>自由软件基"
-"金会</a>"
+"2006, 2007, 2008, 2009, 2010, 2011, 2012 <a 
href=\"http://www.fsf.org\";>自由"
+"软件基金会</a>"
 
 # type: Content of: <table><tr><td><p>
 #. type: Content of: <div><p>
@@ -460,12 +479,15 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+"License</a> 许可证授权。"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
-msgstr "<b>翻译</b>: 刘昭宏，潘永之，李凡希 2007, 2008, 2009, 
2010, 2011"
+msgstr "<b>翻译</b>: 刘昭宏，潘永之，李凡希 2007, 2008, 2009, 
2010, 2011, 2012"
 
 # type: Content of: <div><p>
 #.  timestamp start 
@@ -473,6 +495,9 @@
 msgid "Updated:"
 msgstr "最后更新："
 
+<<<<<<< home.zh-cn.po
+# type: Content of: <div><ul><li>
+=======
 # type: Content of: <table><tr><td><p>
 #~ msgid ""
 #~ "<a href=\"/gnu/gnu.html\">The GNU Project</a> was launched in 1984 to "
@@ -512,29 +537,13 @@
 #~| msgid ""
 #~| "<a href=\"http://www.fsf.org/campaigns/priority.html#coreboot\";> "
 #~| "Coreboot (campaign for a free BIOS)</a>"
+>>>>>>> 1.153
 #~ msgid ""
-#~ "<a href=\"http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/";
-#~ "\">Stand up for your freedom to install free software!</a>"
-#~ msgstr ""
-#~ "<a href=\"http://www.fsf.org/campaigns/priority.html#coreboot\";> Coreboot "
-#~ "( 自由BIOS行动 ) </a>"
-
-# type: Content of: <div><div><h3>
-#~ msgid "GNUs Flashes"
-#~ msgstr "GNU 快讯"
-
-# type: Content of: <ul><li>
-#, fuzzy
-#~| msgid "<a href=\"/graphics/graphics.html\">GNU Art</a>"
-#~ msgid "<a href=\"/graphics/gnuolantern.html\">"
-#~ msgstr "<a href=\"/graphics/graphics.html\"> GNU 艺术 </a>"
-
-# type: Content of: <div><h4>
-#~ msgid ""
-#~ "<a href=\"/server/standards/README.translations.html\">Translations</a> "
-#~ "of this page"
+#~ "<a href=\"http://ma.aclu.org/site/R?i=GFduzww44T4ttMzabqwBig..\";>Shame on "
+#~ "Massachusetts for censoring the Internet</a>"
 #~ msgstr ""
-#~ "本页的 <a href=\"/server/standards/README.translations.html\"> 翻译 
</a>"
+#~ "<a 
href=\"http://ma.aclu.org/site/R?i=GFduzww44T4ttMzabqwBig..\";>为马萨诸"
+#~ "塞州实施 Internet 审查感到羞耻</a>"
 
 # type: Content of: <div><ul><li>
 #~ msgid ""
@@ -545,26 +554,43 @@
 #~ "<a 
href=\"http://www.fsf.org/tasks/noscript\";>帮助我们修改NoScript的代ç 
ï¼Œ"
 #~ "使它可以检测和阻止非自由的JavaScriptä»£ç ã€‚</a>"
 
-# type: Content of: <div><div><ul><li><ul><li>
-#, fuzzy
-#~| msgid ""
-#~| "<strong><a href=\"http://www.fsf.org/campaigns\";>Support current FSF "
-#~| "campaigns</a></strong>."
+# type: Content of: <table><tr><td><p>
 #~ msgid ""
-#~ "<strong><a href=\"http://www.fsf.org/campaigns/tal-patents/petition";
-#~ "\">Sign our petition to ask This American Life to support free formats!</"
-#~ "a></strong>"
+#~ "<a href=\"/gnu/gnu.html\">The GNU Project</a> was launched in 1984 to "
+#~ "develop the GNU operating system, a complete Unix-like operating system "
+#~ "which is <a href=\"/philosophy/free-sw.html\">free software</a>&mdash;"
+#~ "software which respects your freedom."
 #~ msgstr ""
-#~ "<strong><a href=\"http://www.fsf.org/campaigns\";>支持正在进行的 FSF 
行动</"
-#~ "a></strong>."
+#~ "<a href=\"/gnu/gnu.html\">GNU 工程</a> 创始于一九å…
«å››å¹´ï¼Œæ—¨åœ¨å¼€å‘一个完整"
+#~ "的类似于 Unix 的操作系统 &mdash; GNU 操作系统，这个系统å…
¨éƒ¨ç”± <a href=\"/"
+#~ "philosophy/free-sw.html\">自由软件</a> 构成，自由软件充
分尊重您的自由。"
 
-# type: Content of: <div><ul><li>
 #~ msgid ""
-#~ "<a href=\"http://ma.aclu.org/site/R?i=GFduzww44T4ttMzabqwBig..\";>Shame on "
-#~ "Massachusetts for censoring the Internet</a>"
+#~ "GNU is <a href=\"/gnu/gnu-linux-faq.html\">often used with a kernel "
+#~ "called Linux</a>, and here is a <a href=\"/distros/free-distros.html"
+#~ "\">list of ready-to-install GNU/Linux distributions</a> which are "
+#~ "entirely free software.  <a href=\"/software/hurd/hurd.html\">The Hurd, "
+#~ "GNU's kernel</a>, is actively developed, but is still some way from being "
+#~ "ready for daily use."
 #~ msgstr ""
-#~ "<a 
href=\"http://ma.aclu.org/site/R?i=GFduzww44T4ttMzabqwBig..\";>为马萨诸"
-#~ "塞州实施 Internet 审查感到羞耻</a>"
+#~ "目前，GNU <a href=\"/gnu/gnu-linux-faq.html\">通常使用 Linux 内æ 
¸</a>，这"
+#~ "里有一个完全由自由软件组成的<a 
href=\"/distros/free-distros.html\"> 可以直"
+#~ "接安装使用的 GNU/Linux 发行版</a> 列表。<a 
href=\"/software/hurd/\">GNU的"
+#~ "å†…æ ¸ - Hurd</a> 
正在积极的开发中，但仍未达到可以日常使用的程度。"
+
+# type: Content of: <table><tr><td><p>
+#~ msgid ""
+#~ "The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> "
+#~ "is the <strong>GNU/Linux operating system</strong>, now used by millions "
+#~ "and sometimes incorrectly called simply &ldquo;Linux&rdquo;."
+#~ msgstr ""
+#~ "由 <a href=\"/gnu/linux-and-gnu.html\">GNU 和 Linux</a> 组成的 "
+#~ "<strong>GNU/Linux 操作系统</strong>, 
目前有数百万用户，但它常常被错误的简"
+#~ "称为“Linux”。"
+
+# type: Content of: <div><div><h3>
+#~ msgid "GNUs Flashes"
+#~ msgstr "GNU 快讯"
 
 # type: Content of: <div><p>
 #~ msgid ""
@@ -575,6 +601,13 @@
 #~ "æœ¬æ–‡å…è®¸åœ¨ä¸å˜æ›´å†…å®¹çš„å‰æä¸‹æ— éœ€ä½¿ç”¨è´¹åœ°å…
¨æ–‡å¤åˆ¶å’Œå‘布在全球任何媒体，但需"
 #~ "保留此注记和版权声明。 "
 
+# type: Content of: <div><h4>
+#~ msgid ""
+#~ "<a href=\"/server/standards/README.translations.html\">Translations</a> "
+#~ "of this page"
+#~ msgstr ""
+#~ "本页的 <a href=\"/server/standards/README.translations.html\"> 翻译 
</a>"
+
 # type: Content of: <div><ul><li>
 #~ msgid ""
 #~ "<a href=\"http://yourfreedom.hmg.gov.uk/repealing-unnecessary-laws/";
@@ -763,6 +796,14 @@
 
 # type: Content of: <div><div><ul><li><ul><li>
 #~ msgid ""
+#~ "<a href=\"http://www.fsf.org/campaigns/priority.html#coreboot\";> Coreboot "
+#~ "(campaign for a free BIOS)</a>"
+#~ msgstr ""
+#~ "<a href=\"http://www.fsf.org/campaigns/priority.html#coreboot\";> Coreboot "
+#~ "( 自由BIOS行动 ) </a>"
+
+# type: Content of: <div><div><ul><li><ul><li>
+#~ msgid ""
 #~ "<a href=\"http://www.fsf.org/campaigns/priority.html#skypereplacement\";> "
 #~ "free replacement for skype</a>"
 #~ msgstr ""
@@ -1012,6 +1053,10 @@
 #~ msgstr "<a href=\"/fun/fun.html\"> GNU 趣事 </a>"
 
 # type: Content of: <ul><li>
+#~ msgid "<a href=\"/graphics/graphics.html\">GNU Art</a>"
+#~ msgstr "<a href=\"/graphics/graphics.html\"> GNU 艺术 </a>"
+
+# type: Content of: <ul><li>
 #~ msgid "<a href=\"/music/music.html\">Music &amp; Songs</a>"
 #~ msgstr "<a href=\"/music/music.html\"> 音乐 &amp; 歌曲 </a>"
 

Index: server/po/body-include-2.zh-cn.po
===================================================================
RCS file: /web/www/www/server/po/body-include-2.zh-cn.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/po/body-include-2.zh-cn.po   7 Dec 2011 20:01:00 -0000       1.26
+++ server/po/body-include-2.zh-cn.po   16 Feb 2012 06:04:12 -0000      1.27
@@ -8,19 +8,16 @@
 "Project-Id-Version: body-include-2.html\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-12-07 15:00-0500\n"
-"PO-Revision-Date: 2011-05-03 03:45-0400\n"
+"PO-Revision-Date: 2012-02-15 13:54+0800\n"
 "Last-Translator: Li Fanxi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Outdated-Since: 2011-09-13 20:25-0300\n"
 "Language: zh\n"
 
 # type: Content of: <body><div><div><div><h1>
 #. type: Content of: <div><div><h1>
-#, fuzzy
-#| msgid "<a href=\"/\">The GNU Operating System</a>"
 msgid "<a href=\"/\">The GNU Operating System</a>"
 msgstr "<a href=\"/home.zh-cn.html\">GNU 操作系统</a>"
 
@@ -40,19 +37,13 @@
 #.  <input name="_qf_default" type="hidden" value="Edit:cancel" />
 #.  
 #. type: Content of: <div><div><div><a>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"https://www.fsf.org/associate/support_freedom?referrer=4052";
-#| "\">Join&nbsp;the&nbsp;FSF!</a>"
 msgid ""
 "<a href=\"https://my.fsf.org/associate/support_freedom?referrer=10189\";>"
-msgstr ""
-"<a 
href=\"https://www.fsf.org/associate/support_freedom?referrer=4052\";>今天"
-"å°±åŠ å…¥ FSF！</a>"
+msgstr "<a 
href=\"https://my.fsf.org/associate/support_freedom?referrer=10189\";>"
 
 #. type: Attribute 'alt' of: <div><div><div><a><img>
 msgid "Help us raise $300,000 for free software by January 30th"
-msgstr ""
+msgstr "帮助自由软件在 1 月 30 日前募集到 300000 美元"
 
 # type: Content of: <div><div><div>
 #.  </div>
@@ -89,10 +80,8 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/doc/doc.html\">Documentation</a>"
 msgid "<a href=\"/education/education.html\">Education</a>"
-msgstr "<a href=\"/doc/doc.html\">文档</a>"
+msgstr "<a href=\"/education/education.html\">教育</a>"
 
 # type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><div><ul><li>
@@ -118,38 +107,23 @@
 "<a 
href=\"https://www.fsf.org/associate/support_freedom?referrer=4052\";>今天"
 "å°±åŠ å…¥ FSF！</a>"
 
-# type: Content of: <body><div><div><div><ul><li>
-#, fuzzy
-#~| msgid "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
-#~ msgid ""
-#~ "Sign up for the <a href=\"http://www.fsf.org/fss\";>Free Software "
-#~ "Supporter</a>"
-#~ msgstr "<a href=\"http://www.fsf.org/\";>自由软件基金会</a>"
+# type: Content of: <div><div><div><h4>
+#~ msgid "Sign up for the <em>Free Software Supporter</em>"
+#~ msgstr "订阅<em>自由软件支持者</em>"
 
 # type: Content of: <div><div><div><p>
-#, fuzzy
-#~| msgid "A monthly update on GNU and the FSF"
-#~ msgid "A monthly email newsletter about GNU and Free Software"
+#~ msgid "A monthly update on GNU and the FSF"
 #~ msgstr "关注GNU和FSF; 每月更新"
 
 # type: Content of: <div><div><div><form><p>
-#, fuzzy
-#~| msgid ""
-#~| "<input type=\"text\" id=\"frmEmail\" name=\"email\" size=\"15\" "
-#~| "maxlength=\"80\" value=\"address@hidden" onfocus=\"this.value=''\" /> "
-#~| "&nbsp; <input type=\"submit\" value=\"Ok\" />"
 #~ msgid ""
-#~ "<input type=\"text\" id=\"frmEmail\" name=\"email-Primary\" size=\"15\" "
-#~ "maxlength=\"80\" /> &nbsp; <input type=\"submit\" name=\"_qf_Edit_next\" "
-#~ "value=\"Ok\" />"
+#~ "<input type=\"text\" id=\"frmEmail\" name=\"email\" size=\"15\" maxlength="
+#~ "\"80\" value=\"address@hidden" onfocus=\"this.value=''\" /> &nbsp; "
+#~ "<input type=\"submit\" value=\"Ok\" />"
 #~ msgstr ""
-#~ "<input type=\"text\" id=\"frmEmail\" name=\"email\" size=\"15"
-#~ "\"                           maxlength=\"80\" value=\"address@hidden" "
-#~ "onfocus=\"this.value=''\" /> &nbsp; <input type=\"submit\" value=\"Ok\" />"
-
-# type: Content of: <div><div><div><h4>
-#~ msgid "Sign up for the <em>Free Software Supporter</em>"
-#~ msgstr "订阅<em>自由软件支持者</em>"
+#~ "<p><input type=\"text\" id=\"frmEmail\" name=\"email\" size=\"15"
+#~ "\"maxlength=\"80\" value=\"address@hidden" onfocus=\"this.value=''\"> "
+#~ "&nbsp;<input type=\"submit\" value=\"Ok\"></p>"
 
 # type: Content of: <div><div><div><a>
 #~ msgid ""
@@ -206,3 +180,7 @@
 # type: Content of: <body><div><div><div><ul><li>
 #~ msgid "<a href=\"/distros/free-distros.html\">Free GNU/Linux distros</a>"
 #~ msgstr "<a href=\"/distros/free-distros.html\">自由的 GNU/Linux 
发行版</a>"
+
+# type: Content of: <body><div><div><div><ul><li>
+#~ msgid "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
+#~ msgstr "<a href=\"http://www.fsf.org/\";>自由软件基金会</a>"

Index: server/po/head-include-2.zh-cn.po
===================================================================
RCS file: /web/www/www/server/po/head-include-2.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/po/head-include-2.zh-cn.po   22 Nov 2010 17:27:55 -0000      1.7
+++ server/po/head-include-2.zh-cn.po   16 Feb 2012 06:04:13 -0000      1.8
@@ -34,11 +34,6 @@
 #~ msgid "@import url('/print.css');"
 #~ msgstr "@import url('/print.css');"
 
-# type: Content of: <style>
-#, fuzzy
-#~| msgid "@import url('/print.css');"
-#~ msgid "@import url('http://static.fsf.org/mini.css');"
-#~ msgstr "@import url('/print.css');"
 
 # type: Content of: <body><div>
 #, fuzzy

Index: licenses/po/licenses.zh-cn.po
===================================================================
RCS file: licenses/po/licenses.zh-cn.po
diff -N licenses/po/licenses.zh-cn.po
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ licenses/po/licenses.zh-cn.po       16 Feb 2012 06:03:52 -0000      1.1
@@ -0,0 +1,879 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <address@hidden>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: licenses.html\n"
+"POT-Creation-Date: 2011-11-29 04:25-0500\n"
+"PO-Revision-Date: 2012-02-16 00:34-0500\n"
+"Last-Translator: Li Fanxi <address@hidden>\n"
+"Language-Team: Chinese <address@hidden>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+
+# type: Content of: <title>
+#. type: Content of: <title>
+msgid "Licenses - GNU Project - Free Software Foundation (FSF)"
+msgstr "许可证 - GNU 工程 - 自由软件基金会 (FSF)"
+
+# type: Content of: <h2>
+#. type: Content of: <h2>
+msgid "Licenses"
+msgstr "许可证"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Published software should be <a href=\"/philosophy/free-sw.html\">free "
+"software</a>.  To make it free software, you need to release it under a free "
+"software license.  We normally use the <a href=\"#GPL\">GNU General Public "
+"License</a> (GNU GPL), but occasionally we use <a href=\"/licenses/license-"
+"list.html#SoftwareLicenses\">other free software licenses</a>.  We use only "
+"licenses that are compatible with the GNU GPL for GNU software."
+msgstr ""
+"任何软件都应当以 <a 
href=\"/philosophy/free-sw.html\">自由软件</a> 发布。要让"
+"ä¸€ä¸ªè½¯ä»¶æˆä¸ºè‡ªç”±è½¯ä»¶ï¼Œä½ 
需要把它以自由软件许可证发布。我们通常使用 <a href="
+"\"#GPL\">GNU 通用公共许可证</a> (GNU GPL) 
发布软件，但有时我们也使用 <a href="
+"\"/licenses/license-list.html#SoftwareLicenses\">å…
¶å®ƒè‡ªç”±è½¯ä»¶è®¸å¯è¯</a> 发布"
+"软件。在 GNU 软件包中，我们只使用与GNU GPLå…
¼å®¹çš„许可证。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Documentation for free software should be <a href=\"/philosophy/free-doc.html"
+"\">free documentation</a>, so that people can redistribute it and improve it "
+"along with the software it describes.  To make it free documentation, you "
+"need to release it under a free documentation license.  We normally use the "
+"<a href=\"#FDL\">GNU Free Documentation License</a> (GNU FDL), but "
+"occasionally we use <a href=\"/licenses/license-list."
+"html#DocumentationLicenses\">other free documentation licenses</a>."
+msgstr ""
+"自由软件的文档应当是 <a 
href=\"/philosophy/free-doc.html\">自由文档</a> ，以"
+"便人们可以随着软件的改进去更新它或是重新发布它。要把文档以自由文档的形式发"
+"布，需要使用自由文档许可证。我们通常使用 <a 
href=\"#FDL\">GNU 自由文档许可证"
+"</a> (GNU FDL) ，但少数情况下我们也使用 <a 
href=\"/licenses/license-list."
+"html#DocumentationLicenses\">其它的自由文档许可证</a> 。"
+
+#. type: Content of: <p>
+msgid ""
+"If you've started a new project and you're not sure what license to use, <a "
+"href=\"/licenses/license-recommendations.html\">&ldquo;How to choose a "
+"license for your own work&rdquo;</a> details our recommendations in an easy-"
+"to-follow guide.  If you just want a quick list reference, we have a page "
+"that names our <a href=\"/licenses/recommended-copylefts.html\">recommended "
+"copyleft licenses</a>."
+msgstr ""
+"å¦‚æžœä½ 
开展了一个新的项目，并不太确定应该选用何种许可证，<a 
href=\"/licenses/"
+"license-recommendations.html\">&ldquo;å¦‚ä½•ä¸ºä½ 
的作用选择一个许可证&rdquo;</"
+"a> ä¸€æ–‡å¯ä»¥ä»¥ä¸€ç§ç®€å•ä¸”å®¹æ˜“éµå¾ªçš„æ–¹å¼ç»™ä½ 
ä»¥å¸®åŠ©ã€‚å¦‚æžœä½ åªæ˜¯éœ€è¦ä¸€ä¸ªç”¨äºŽå¿«é€Ÿå‚"
+"考的许可证列表，可以访问我们的 <a 
href=\"/licenses/recommended-copylefts.html"
+"\">推荐的 Copyleft 许可证</a> 页面。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Our documentation licenses are currently being revised, and we welcome your "
+"comments on the proposed texts. Please visit <a href=\"http://gplv3.fsf.org";
+"\">our license update site</a> to read the current drafts and participate in "
+"the process."
+msgstr ""
+"我们正在进一步修订我们的文档许可证，我们欢迎听到您对提案的建议。请访问
 <a "
+"href=\"http://gplv3.fsf.org\";> 许可证更新网站 </a> 阅
读最新的草案并参与到修订"
+"过程中。"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "Common Resources for our Software Licenses"
+msgstr "自由软件许可证的常用资源"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"We have a number of resources to help people understand and use our various "
+"licenses:"
+msgstr 
"我们列出以下资源帮助人们理解和使用我们的各种许可证："
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/gpl-faq.html\">Frequently Asked Questions about the GNU "
+"licenses</a>"
+msgstr "<a href=\"/licenses/gpl-faq.html\">有关 GNU 
许可证的常见问题</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/gpl-howto.html\">How to use GNU licenses for your own "
+"software</a>"
+msgstr ""
+"<a href=\"/licenses/gpl-howto.html\">å¦‚ä½•ä¸ºä½ è‡ªå·±çš„è½¯ä»¶ä½¿ç”¨ GNU 
许可证</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/gpl-violation.html\">What to do if you see a violation "
+"of a GNU license</a>"
+msgstr ""
+"<a href=\"/licenses/gpl-violation.html\">发现违反 GNU 许可证的情
å†µä½ è¯¥æ€Žä¹ˆåš"
+"</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/philosophy/university.html\">Releasing Free Software if you work "
+"at a university</a>"
+msgstr ""
+"<a href=\"/philosophy/university.html\">å¦‚æžœä½ åœ¨é«˜æ 
¡å·¥ä½œï¼Œè¯·å‘布自由软件</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/why-assign.html\">Why the FSF gets copyright assignments "
+"from contributors</a>"
+msgstr ""
+"<a 
href=\"/licenses/why-assign.html\">为什么自由软件基金会可以从自由软件贡献"
+"者获得版权</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/graphics/license-logos.html\">GNU license logos</a> to use with "
+"your project"
+msgstr ""
+"å¯ä»¥åœ¨ä½ çš„é¡¹ç›®ä¸­ä½¿ç”¨çš„ <a 
href=\"/graphics/license-logos.html\">GNU è®¸å¯è¯æ ‡"
+"识</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/license-list.html#LicensingMailingList\">&lt;"
+"address@hidden&gt; mailing list</a> for general licensing help"
+msgstr ""
+"有关许可证的问题，可以发送至<a href=\"/licenses/license-list."
+"html#LicensingMailingList\">&lt;address@hidden&gt; 邮件列表</a> "
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "The GNU General Public License"
+msgstr "GNU 通用公共许可证"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"The GNU General Public License is often called the GNU GPL for short; it is "
+"used by most GNU programs, and by more than half of all free software "
+"packages.  The latest version is version 3."
+msgstr ""
+"GNU 通用公共许可证常常被缩写为 GNU GPL，大部分 GNU 
的程序和超过一半的自由软件"
+"使用这种许可证。GNU GPL 的最新版本是3。"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"The GNU General Public License is available in these formats: <a href=\"/"
+"licenses/gpl.html\">HTML</a>, <a href=\"/licenses/gpl.txt\">plain text</a>, "
+"<a href=\"/licenses/gpl.odt\">ODF</a>, <a href=\"/licenses/gpl.dbk"
+"\">Docbook</a>, <a href=\"/licenses/gpl.texi\">Texinfo</a>, and <a href=\"/"
+"licenses/gpl.tex\">LaTeX</a>.  These documents are not formatted for "
+"standalone publishing, and are intended to be included in another document."
+msgstr ""
+"GNU 通用公共许可证文本： <a href=\"/licenses/gpl.html\">HTML</a>， 
<a href="
+"\"/licenses/gpl.txt\">纯文本</a>， <a 
href=\"/licenses/gpl.odt\">ODF</a>， "
+"<a href=\"/licenses/gpl.dbk\">Docbook</a>， <a href=\"/licenses/gpl.texi"
+"\">Texinfo</a>， 及 <a href=\"/licenses/gpl.tex\">LaTeX</a>。 
以上文档的排版"
+"不是为独立的出版所设计，适合把它们包含在å…
¶å®ƒæ–‡æ¡£ä¸­ã€‚"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid "<a href=\"/licenses/quick-guide-gplv3.html\">A Quick Guide to GPLv3</a>"
+msgstr "<a href=\"/licenses/quick-guide-gplv3.html\">GPLv3 快速指南</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/old-licenses/old-licenses.html#GPL\">Older versions of "
+"the GNU GPL</a>"
+msgstr ""
+"<a href=\"/licenses/old-licenses/old-licenses.html#GPL\"> GNU GPL 
的早期版本"
+"</a>"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "The GNU Lesser General Public License"
+msgstr "GNU 宽通用公共许可证"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"The GNU Lesser General Public License is used by a few (not by any means "
+"all) GNU libraries.  The latest version is version 3."
+msgstr ""
+"一小部分（不是全部）的GNU 库使用GNU 宽通用公共许可证 
(GNU LGPL)。GNU LGPL 的"
+"最新版本是3。"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"The GNU Lesser General Public License text is available in these formats: <a "
+"href=\"/licenses/lgpl.html\">HTML</a>, <a href=\"/licenses/lgpl.txt\">plain "
+"text</a>, <a href=\"/licenses/lgpl.dbk\">Docbook</a>, and <a href=\"/"
+"licenses/lgpl.texi\">Texinfo</a>.  These documents are not formatted for "
+"standalone publishing, and are intended to be included in another document."
+msgstr ""
+"GNU 宽通用公共许可证文本： <a 
href=\"/licenses/lgpl.html\">HTML</a>， <a "
+"href=\"/licenses/lgpl.txt\">纯文本</a>， <a href=\"/licenses/lgpl.dbk"
+"\">Docbook</a>， 及 <a href=\"/licenses/lgpl.texi\">Texinfo</a>。 
以上文档的"
+"排版不是为独立的出版所设计，适合把它们包含在å…
¶å®ƒæ–‡æ¡£ä¸­ã€‚"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/why-not-lgpl.html\">Why you shouldn't use the Lesser GPL "
+"for your next library</a>"
+msgstr ""
+"<a 
href=\"/licenses/why-not-lgpl.html\">为什么我们不应该在新的开发库中使用
 "
+"LGPL</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/old-licenses/old-licenses.html#GPL\">Older versions of "
+"the GNU LGPL</a>"
+msgstr ""
+"<a href=\"/licenses/old-licenses/old-licenses.html#GPL\">GNU LGPL 
的早期版本"
+"</a>"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "The GNU Affero General Public License"
+msgstr "GNU Affero 通用公共许可证"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"The GNU Affero General Public License is based on the GNU GPL, but has an "
+"additional term to allow users who interact with the licensed software over "
+"a network to receive the source for that program.  We recommend that people "
+"consider using the GNU AGPL for any software which will commonly be run over "
+"a network.  The latest version is version 3."
+msgstr ""
+"GNU Affero 通用公共许可证 (GNU AGPL) 基于 GNU GPLï¼Œä½†å®ƒæ·»åŠ 
了一些条款以允许用"
+"户获取那些通过网络访问的应用的源代ç 
ã€‚我们建议考虑对于那些通过网络被他人使用"
+"的软件采用GNU AGPL。GNU AGPL 的最新版本是3。"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"The GNU Affero General Public License text is available in these formats: <a "
+"href=\"/licenses/agpl.html\">HTML</a>, <a href=\"/licenses/agpl.txt\">plain "
+"text</a>, <a href=\"/licenses/agpl.dbk\">Docbook</a>, <a href=\"/licenses/"
+"agpl.texi\">Texinfo</a>, and <a href=\"/licenses/agpl.tex\">LaTeX</a>.  "
+"These documents are not formatted for standalone publishing, and are "
+"intended to be included in another document."
+msgstr ""
+"GNU Affero 通用公共许可证的文本： <a 
href=\"/licenses/agpl.html\">HTML</a>， "
+"<a href=\"/licenses/agpl.txt\">纯文本</a>， <a href=\"/licenses/agpl.dbk"
+"\">Docbook</a>， <a href=\"/licenses/agpl.texi\">Texinfo</a>， 及 <a 
href=\"/"
+"licenses/agpl.tex\">LaTeX</a>　。以上文档的排版不是为独立的出版所设计，适合把"
+"它们包含在其它文档中。"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid "<a href=\"/licenses/why-affero-gpl.html\">Why the Affero GPL</a>"
+msgstr "<a href=\"/licenses/why-affero-gpl.html\">为什么要使用 Affero 
GPL</a>"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "The GNU Free Documentation License"
+msgstr "GNU 自由文档许可证"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"The GNU Free Documentation License is a form of copyleft intended for use on "
+"a manual, textbook or other document to assure everyone the effective "
+"freedom to copy and redistribute it, with or without modifications, either "
+"commercially or non-commercially.  The latest version is 1.3."
+msgstr ""
+"GNU 自由文档许可证 (GNU FDL) 
是Copyleft的一种形式，用于在手册、教材或其它文档"
+"上以保证任何人都可以自由的复制和发布它们，不管是否对它们进行了修改，也不管是"
+"不是进行商业化使用。GNU FDL 的最新版本是1.3。"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"The GNU Free Documentation License text is available in these formats: <a "
+"href=\"/licenses/fdl.html\">HTML</a>, <a href=\"/licenses/fdl.txt\">plain "
+"text</a>, <a href=\"/licenses/fdl.xml\">Docbook</a>, <a href=\"/licenses/fdl."
+"texi\">Texinfo</a>, and <a href=\"/licenses/fdl.tex\">LaTeX</a>.  These "
+"documents are not formatted for standalone publishing, and are intended to "
+"be included in another document."
+msgstr ""
+"GNU 自由文档许可证文本： <a href=\"/licenses/fdl.html\">HTML</a>， 
<a href="
+"\"/licenses/fdl.txt\">纯文本</a>， <a 
href=\"/licenses/fdl.xml\">Docbook</"
+"a>， <a href=\"/licenses/fdl.texi\">Texinfo</a>， 及 <a 
href=\"/licenses/fdl."
+"tex\">LaTeX</a>。以上文档的排版不是为独立的出版所设计，适合把它们åŒ
…含在其它文"
+"档中。"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/why-gfdl.html\">Why publishers should use the GNU FDL</a>"
+msgstr "<a href=\"/licenses/why-gfdl.html\">为什么出版商应当使用 GNU 
FDL</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/fdl.html#addendum\">How to use the GNU FDL for your "
+"documentation</a>"
+msgstr ""
+"<a href=\"/licenses/fdl.html#addendum\">å¦‚ä½•å¯¹ä½ è‡ªå·±çš„æ–‡æ¡£ä½¿ç”¨ GNU 
FDL</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid "<a href=\"/licenses/fdl-howto.html\">Tips on using the GNU FDL</a>"
+msgstr "<a href=\"/licenses/fdl-howto.html\">GNU FDL 使用技巧</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/fdl-howto-opt.html\">How to use the optional features of "
+"the GNU FDL</a>"
+msgstr ""
+"<a href=\"/licenses/fdl-howto-opt.html\">如何使用 GNU FDL 
的额外功能</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/old-licenses/old-licenses.html#FDL\"> Older versions of "
+"the GNU FDL</a>"
+msgstr ""
+"<a href=\"/licenses/old-licenses/old-licenses.html#FDL\"> GNU FDL 
的早期版本"
+"</a>"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "Exceptions to GNU Licenses"
+msgstr "GNU 许可证的例外情况"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Some GNU programs have additional permissions or special exceptions to "
+"specific terms in one of the main licenses.  Since some of those are "
+"commonly used or inspire a lot of questions on their own, we've started "
+"collecting them on our <a href=\"/licenses/exceptions.html\">exceptions "
+"page</a>."
+msgstr ""
+"一些 GNU ç¨‹åºåœ¨å…¶ä¸»è®¸å¯è¯è§„å®šçš„æ¡æ¬¾å¤–å¢žåŠ 
了一些额外的许可或例外。由于这种情况"
+"常常出现或可能带来一些它们自己的问题，我们把这些情
况收集汇总在 <a href=\"/"
+"licenses/exceptions.html\">许可证例外情况</a> 页面。"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "License URLs"
+msgstr "许可证相关链接"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"When linking to our licenses, it's usually best to link to the latest "
+"version; hence the standard URLs such as <tt>http://www.gnu.org/licenses/gpl.";
+"html</tt> have no version number.  Occasionally, however, you may want to "
+"link to a specific version of a given license.  In those situations, you can "
+"use the following links [<a href=\"#urlskip\">skip links</a>]:"
+msgstr ""
+"å½“éœ€è¦é“¾æŽ¥åˆ°æˆ‘ä»¬çš„è®¸å¯è¯æ—¶ï¼Œåº”å½“é“¾æŽ¥åˆ°æœ€æ–°çš„ç‰ˆæœ¬ã€‚å› 
æ­¤ï¼Œæ ‡å‡†çš„é“¾æŽ¥åœ°å€ä¸­éƒ½ä¸"
+"包含版本号，比如：<tt>http://www.gnu.org/licenses/gpl.html</tt> 
。然而，在少"
+"数情
况下，也许您需要链接到某种许可证的指定版本。在这种情
况下，您可以使用下面"
+"的链接地址 [<a href=\"#urlskip\">跳过链接</a>] ："
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+msgid "GNU General Public License (GPL)"
+msgstr "GNU 通用公共许可证 (GPL)"
+
+# type: Content of: <dl><dd>
+#. type: Content of: <dl><dd>
+msgid ""
+"<a href=\"http://www.gnu.org/licenses/gpl-3.0.html\";>GPLv3</a>, <a href="
+"\"http://www.gnu.org/licenses/gpl-2.0.html\";>GPLv2</a>, <a href=\"http://www.";
+"gnu.org/licenses/gpl-1.0.html\">GPLv1</a>"
+msgstr ""
+"<a href=\"http://www.gnu.org/licenses/gpl-3.0.html\";>GPLv3</a>, <a href="
+"\"http://www.gnu.org/licenses/gpl-2.0.html\";>GPLv2</a>, <a href=\"http://www.";
+"gnu.org/licenses/gpl-1.0.html\">GPLv1</a>"
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+msgid "GNU Lesser General Public License (LGPL)"
+msgstr "GNU 宽通用公共许可证 (LGPL)"
+
+# type: Content of: <dl><dd>
+#. type: Content of: <dl><dd>
+msgid ""
+"<a href=\"http://www.gnu.org/licenses/lgpl-3.0.html\";>LGPLv3</a>, <a href="
+"\"http://www.gnu.org/licenses/lgpl-2.1.html\";>LGPLv2.1</a>"
+msgstr ""
+"<a href=\"http://www.gnu.org/licenses/lgpl-3.0.html\";>LGPLv3</a>, <a href="
+"\"http://www.gnu.org/licenses/lgpl-2.1.html\";>LGPLv2.1</a>"
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+msgid "GNU Affero General Public License (AGPL)"
+msgstr "GNU Affero 通用共公许可证 (AGPL)"
+
+# type: Content of: <dl><dd>
+#. type: Content of: <dl><dd>
+msgid ""
+"<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\";>GNU AGPLv3</a> (The <a "
+"href=\"http://www.affero.org/oagpl.html\";>Affero General Public License "
+"version 1</a> is not a GNU license, but it was designed to serve a purpose "
+"much like the GNU AGPL's.)"
+msgstr ""
+"<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\";>GNU AGPLv3</a> (<a "
+"href=\"http://www.affero.org/oagpl.html\";>Affero 通用公å…
±è®¸å¯è¯ç¬¬ä¸€ç‰ˆ</a> 不"
+"是一个 GNU è®¸å¯è¯ï¼Œä½†å®ƒè®¾è®¡çš„ç›®æ ‡ä¸Ž GNU AGPL 相似。)"
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
+msgid "GNU Free Documentation License (FDL)"
+msgstr "GNU 自由文档许可证 (FDL)"
+
+# type: Content of: <dl><dd>
+#. type: Content of: <dl><dd>
+msgid ""
+"<a href=\"http://www.gnu.org/licenses/fdl-1.3.html\";>FDLv1.3</a>, <a href="
+"\"http://www.gnu.org/licenses/fdl-1.2.html\";>FDLv1.2</a>, <a href=\"http://";
+"www.gnu.org/licenses/fdl-1.1.html\">FDLv1.1</a>"
+msgstr ""
+"<a href=\"http://www.gnu.org/licenses/fdl-1.3.html\";>FDLv1.3</a>, <a href="
+"\"http://www.gnu.org/licenses/fdl-1.2.html\";>FDLv1.2</a>, <a href=\"http://";
+"www.gnu.org/licenses/fdl-1.1.html\">FDLv1.1</a>"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"<a name=\"urlskip\"></a>Stable links to each license's alternative formats "
+"are available on its respective page.  Not every version of every license is "
+"available in every format.  If you need one that is missing, please <a href="
+"\"mailto:address@hidden";>email us</a>."
+msgstr ""
+"<a name=\"urlskip\"></a>指向每种许可证的其它æ 
¼å¼çš„链接在各许可证页面上提供。"
+"ä¸æ˜¯æ‰€æœ‰è®¸å¯è¯çš„æ‰€æœ‰ç‰ˆæœ¬éƒ½æœ‰ç›¸åŒçš„å„ç§æ ¼å¼ã€‚å¦‚æžœä½ 
éœ€è¦æŸç§æ ¼å¼çš„æ–‡æœ¬ä½†æˆ‘ä»¬æ²¡"
+"有提供，请 <a href=\"mailto:address@hidden";>发邮件给我们</a>。 "
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid "See also the <a href=\"old-licenses/\">old licenses page</a>."
+msgstr "<a href=\"old-licenses/\">其它早期版本的许可证页面</a> 。"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "Unofficial Translations"
+msgstr "许可证的非官方翻译"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Legally speaking, the original (English) version of the licenses is what "
+"specifies the actual distribution terms for GNU programs and others that use "
+"them. But to help people better understand the licenses, we give permission "
+"to publish translations into other languages provided that they follow our "
+"regulations for unofficial translations:"
+msgstr ""
+"从法律意义上，GNU 程序或其它软件使用的 GNU 
许可证条款应当以原始的语言版本（英"
+"语）为准。但是，为了帮助更多的人理解我们的许可证，我们å
…è®¸åœ¨æˆ‘们的规范下发布"
+"经过翻译的其它语言版本的非官方许可证文本。"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/translations.html\">List of unofficial translations</a>"
+msgstr "<a 
href=\"/licenses/translations.html\">许可证非官方翻译的列表</a>"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/translations.html#rules\">How to create an unofficial "
+"translation</a>"
+msgstr ""
+"<a 
href=\"/licenses/translations.html#rules\">如何进行许可证的非官方翻译</a>"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "Verbatim Copying and Distribution"
+msgstr "逐字复制与分发"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"The standard copyright terms for GNU web pages is now the <a href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a>.  It used to be (and for a few pages "
+"still is): <em><span class=\"highlight\">Verbatim copying and distribution "
+"of this entire article are permitted worldwide, without royalty, in any "
+"medium, provided this notice is preserved</span>.</em> Please note the "
+"following commentary about this &ldquo;verbatim license&rdquo; by Eben "
+"Moglen:"
+msgstr ""
+"GNU ç½‘é¡µçš„æ ‡å‡†ç‰ˆæƒè¯´æ˜Žä¸ºï¼š 本页面采用 <a rel=\"license\" 
href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a> 
许可证授权。这个授权说明曾经是："
+"<em><span class=\"highlight\">æœ¬æ–‡å…è®¸åœ¨ä¸å˜æ›´å†…å®¹çš„å‰æä¸‹æ— 
需使用费的全文复"
+"制和发布在å…
¨çƒä»»ä½•åª’体，但需保留此注记和版权声明</span> 。</em> 
请注意下面的 "
+"Eben Moglen 写的注释："
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"&ldquo;Our intention in using the phrase &lsquo;verbatim copying in any "
+"medium&rsquo; is not to require retention of page headings and footers or "
+"other formatting features.  Retention of weblinks in both hyperlinked and "
+"non-hyperlinked media (as notes or some other form of printed URL in non-"
+"HTML media) is required&rdquo;."
+msgstr ""
+"&ldquo;我们使用 &lsquo;在任何媒体上不变更内容的å…
¨æ–‡å¤åˆ¶&rsquo; 这个表述的目的"
+"å¹¶ä¸è¦æ±‚å¿…é¡»ä¿ç•™ç±»ä¼¼é¡µé¢æ ‡é¢˜ã€è„šæ³¨æˆ–è€…å…¶ä»–æ 
¼å¼åŒ–特性。但是要求在超链接或者非"
+"超链接媒体(如说明或者其他印刷形式的非超
文本媒体)上保留网页链接。 &rdquo;"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "List of Free Software Licenses"
+msgstr "自由软件许可证列表"
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"/licenses/license-list.html\">List of Free Software Licenses</a>"
+msgstr "<a 
href=\"/licenses/license-list.html\">自由软件许可证列表</a>"
+
+# type: Content of: <ul><li><p>
+#. type: Content of: <ul><li><p>
+msgid ""
+"If you are contemplating writing a new license, please contact the FSF by "
+"writing to <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
+"a>. The proliferation of different free software licenses means increased "
+"work for users in understanding the licenses; we may be able to help you "
+"find an existing Free Software license that meets your needs."
+msgstr ""
+"如果您正在考虑撰写一份新的许可证，请发邮件到 <a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a> è”ç³»è‡ªç”±è½¯ä»¶åŸºé‡‘ä¼šã€‚ä¸æ–­çš„åˆ›é€ 
新的许可证"
+"会让用户花更多的精力去理解各种不同的自由软件许可证，我们也许可以帮助您找到一"
+"个现有的自由软件许可证来满足您的需求。"
+
+# type: Content of: <ul><li><p>
+#. type: Content of: <ul><li><p>
+msgid ""
+"If that isn't possible, if you really need a new license, with our help you "
+"can ensure that the license really is a Free Software license and avoid "
+"various practical problems."
+msgstr ""
+"如果您确实需要一种新的许可证，我们可以帮助您确保它是一份真正的自由软件许可证"
+"以避免各种现实中的问题。"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "What Is Copyleft?"
+msgstr "什么是Copyleft？"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"<a href=\"/copyleft/copyleft.html\"><em>Copyleft</em></a> is a general "
+"method for making a program free software and requiring all modified and "
+"extended versions of the program to be free software as well."
+msgstr ""
+"<a href=\"/copyleft/copyleft.html\"><em>Copyleft</em></a> 
是一种让程序或其它"
+"作品保持自由的通用方法，它要求所有对Copyleft程序的修改和扩展都保持自由。<"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"The simplest way to make a program free is to put it in the <a href=\"/"
+"philosophy/categories.html#PublicDomainSoftware\">public domain</a>, "
+"uncopyrighted.  This allows people to share the program and their "
+"improvements, if they are so minded.  But it also allows uncooperative "
+"people to convert the program into <a href=\"/philosophy/categories."
+"html#ProprietarySoftware\">proprietary software</a>.  They can make changes, "
+"many or few, and distribute the result as a proprietary product.  People who "
+"receive the program in that modified form do not have the freedom that the "
+"original author gave them; the middleman has stripped it away."
+msgstr ""
+"让程序成为自由软件的简单的方法是把它放弃版权放到 <a 
href=\"/philosophy/"
+"categories.html#PublicDomainSoftware\">公共领域</a> 
中。这使得他人在需要的时"
+"候可以共享这个软件及其对它的改进。但这也使得å…
¶å®ƒä¸€äº›ä¸åˆä½œçš„人们把它们转变成 "
+"<a href=\"/philosophy/categories.html#ProprietarySoftware\">私有软件</a> 
。他"
+"们可以或多或少的进行修改，并把成果作为商业产品。这些修改过的程序不再像它们的"
+"åŽŸå§‹ä½œè€…æ‰€æœŸæœ›çš„é‚£æ ·å…
è®¸ç”¨æˆ·è‡ªç”±çš„使用，这种自由被中间商剥夺了。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"In the <a href=\"/gnu/thegnuproject.html\">GNU project</a>, our aim is to "
+"give <em>all</em> users the freedom to redistribute and change GNU "
+"software.  If middlemen could strip off the freedom, we might have many "
+"users, but those users would not have freedom.  So instead of putting GNU "
+"software in the public domain, we &ldquo;copyleft&rdquo; it.  Copyleft says "
+"that anyone who redistributes the software, with or without changes, must "
+"pass along the freedom to further copy and change it.  Copyleft guarantees "
+"that every user has freedom."
+msgstr ""
+"在 <a href=\"/gnu/thegnuproject.html\">GNU 工程</a> 中，我们的目æ 
‡æ˜¯è®© <em>所"
+"有的</em> 用户可以自由的重新分发或修改 GNU 
软件。如果中间商可以剥夺自由，我们"
+"可能会有很多的用户，但这些用户便不再拥有自由。所以我们并不把
 GNU 软件发布到公"
+"共领域，我们对它保留“Copyleft”。所谓 Copyleft 
是指任何人都可以重新分发软件，"
+"不管有没有进行修改，但必须同时保留软件所å…
·æœ‰çš„自由特性。Copyleft是为了保证所"
+"有用户都拥有自由的权力。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Copyleft also provides an <a href=\"/philosophy/pragmatic.html\">incentive</"
+"a> for other programmers to add to free software.  Important free programs "
+"such as the GNU C++ compiler exist only because of this."
+msgstr ""
+"Copyleft 同时也 <a href=\"/philosophy/pragmatic.html\">鼓励</a> 了å…
¶å®ƒçš„程序"
+"å‘˜åŠ å…¥è‡ªç”±è½¯ä»¶å¼€å‘çš„è¡Œåˆ—ã€‚åƒ GNU C++ 编译器这æ 
·çš„重要的软件之所以存在，也是为"
+"了这一点。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Copyleft also helps programmers who want to contribute <a href=\"/software/"
+"software.html#HelpWriteSoftware\">improvements</a> to <a href=\"/philosophy/"
+"free-sw.html\">free software</a> get permission to do that.  These "
+"programmers often work for companies or universities that would do almost "
+"anything to get more money.  A programmer may want to contribute her changes "
+"to the community, but her employer may want to turn the changes into a "
+"proprietary software product."
+msgstr ""
+"除此之外，Copyleft 也帮助那些希望对 <a 
href=\"/prep/tasks.html\">完善</a> <a "
+"href=\"/philosophy/free-sw.html\">自由软件</a> 
作出贡献的程序员得到贡献的权"
+"力。这些程序员通常是为那一些一心想挣钱的å…
¬å¸æˆ–大学工作。程序员可能希望把他的"
+"努力贡献到自由软件社区，但他的老板可能希望把这些工作变成商业的软件产品。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"When we explain to the employer that it is illegal to distribute the "
+"improved version except as free software, the employer usually decides to "
+"release it as free software rather than throw it away."
+msgstr ""
+"当我们向老板解释说如果不把这些改进的版本作为自由软件发布是非法的时候，他们往"
+"往会决定把它们作为自由软件发布而不是把它们抛弃。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"To copyleft a program, we first state that it is copyrighted; then we add "
+"distribution terms, which are a legal instrument that gives everyone the "
+"rights to use, modify, and redistribute the program's code <em>or any "
+"program derived from it</em> but only if the distribution terms are "
+"unchanged.  Thus, the code and the freedoms become legally inseparable."
+msgstr ""
+"一个程序遵循 Copyleft，我们首å…
ˆå£°æ˜Žå®ƒæ˜¯æœ‰ç‰ˆæƒçš„ï¼›ç„¶åŽï¼Œæˆ‘ä»¬ç»™å®ƒåŠ 上发布的规"
+"则，这个规则就是一个法律声明，它赋与所有人有使用、修改和重新发布程序的代ç
  "
+"<em>及其衍生作品</em> 
的权力，但要求在这个过程中这个发布规则是不可以改变的。"
+"è¿™æ ·çš„è¯ï¼Œä»£ç å’Œè‡ªç”±æƒåŠ›åœ¨æ³•å¾‹ä¸Šå°±ä¸å¯åˆ†å‰²äº†ã€‚"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Proprietary software developers use copyright to take away the users' "
+"freedom; we use copyright to guarantee their freedom.  That's why we reverse "
+"the name, changing &ldquo;copyright&rdquo; into &ldquo;copyleft&rdquo;."
+msgstr ""
+"商业软件开发人员通过版权剥夺了用户的自由，我们使用版权来给予他它自由。这就是"
+"为什么我们把“版权(Copyright)”改称为“Copyleft”。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Copyleft is a general concept; there are many ways to fill in the details.  "
+"In the GNU Project, the specific distribution terms that we use are "
+"contained in the GNU General Public License, the GNU Lesser General Public "
+"License and the GNU Free Documentation License."
+msgstr ""
+"Copyleft æ˜¯ä¸€ç§é€šç”¨çš„æ¦‚å¿µï¼Œä½ 
只能通过定义它的细节来使用它。在 GNU 工程中，我"
+"们使用 GNU 通用公共许可证、GNU 宽通用公共许可证和 GNU 
自由文档许可证来定义和"
+"发布这个概念的具体条款。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"The appropriate license is included in many manuals and in each GNU source "
+"code distribution."
+msgstr "相应的许可证应当与所有的 GNU 软件源代ç 
å’Œæ‰‹å†Œä¸€åŒå‘布。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"The GNU GPL is designed so that you can easily apply it to your own program "
+"if you are the copyright holder.  You don't have to modify the GNU GPL to do "
+"this, just add notices to your program which refer properly to the GNU GPL. "
+"Please note that you must use the entire text of the GPL, if you use it.  It "
+"is an integral whole, and partial copies are not permitted.  (Likewise for "
+"the LGPL, AGPL, and FDL.)"
+msgstr ""
+"å‡å¦‚ä½ æ˜¯è‘—ä½œæƒæ‰€æœ‰äººçš„è¯ï¼ŒGNU GPL 
è¢«è®¾è®¡æˆå¾ˆå®¹æ˜“è¿ç”¨åˆ°ä½ çš„ä½œå“ä¸­ã€‚ä½ ä¸ç”¨åŽ»ä¿®"
+"改 GNU GPLï¼Œä½ åªéœ€è¦åœ¨æºä»£ç æ–‡ä»¶ä¸­é€‚å½“çš„è¡¨æ˜Žå¼•ç”¨ GNU GPL 
就可以了。请注意如果"
+"ä½ ä½¿ç”¨ GPL ï¼Œä½ å¿…é¡»è¯¥è®¸å¯è¯æ–‡æœ¬çš„å…
¨æ–‡ã€‚任何许可证（不管是 LGPL， AGPL 还是 "
+"FDL）都是一个整体，不允许只使用它的一部分。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"Using the same distribution terms for many different programs makes it easy "
+"to copy code between various different programs.  Since they all have the "
+"same distribution terms, there is no need to think about whether the terms "
+"are compatible.  The Lesser GPL includes a provision that lets you alter the "
+"distribution terms to the ordinary GPL, so that you can copy code into "
+"another program covered by the GPL."
+msgstr ""
+"对很多不同的程序使用相同的发布条款可以使得在这些程序中相互复制代ç
 å˜å¾—容易。"
+"å› ä¸ºå®ƒä»¬éƒ½å…·æœ‰ç›¸åŒçš„å‘å¸ƒæ¡æ¬¾ï¼Œä½ 
就不需要去考虑这些条款是否相互兼容。LGPL 第二"
+"ç‰ˆè®¸å¯è¯å…è®¸ä½ æŠŠå‘å¸ƒæ¡æ¬¾æ”¹ä¸ºæ ‡å‡†çš„ GPL è®¸å¯è¯ï¼Œæ‰€ä»¥ä½ 
可以把 LPGL çš„ä»£ç åº”ç”¨åˆ°"
+"其它 GPL 的程序中去。"
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
+msgid "Licenses for Other Types of Works"
+msgstr "其它类型作品的许可证"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"We believe that published software and documentation should be <a href=\"/"
+"philosophy/free-doc.html\">free software and free documentation</a>.  We "
+"recommend making all sorts of educational and reference works free also, "
+"using free documentation licenses such as the <a href=\"#FDL\">GNU Free "
+"Documentation License</a> (GNU FDL)."
+msgstr ""
+"我们认为所有软件或文档应当以 <a 
href=\"/philosophy/free-doc.html\">自由软件和"
+"自由文档</a> 
形式发布。我们建议各种教育和参考资源也应该是自由的，对它们应当使"
+"用 <a href=\"#FDL\">GNU 自由文档许可证</a> (GNU FDL)。"
+
+#. type: Content of: <p>
+msgid ""
+"For essays of opinion and scientific papers, we recommend either the <a href="
+"\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
+"Attribution-NoDerivs 3.0 United States License</a>, or the simple &ldquo;"
+"verbatim copying only&rdquo; license stated above."
+msgstr ""
+"å¯¹äºŽè§‚ç‚¹è®ºè¿°æˆ–ç§‘æŠ€è®ºæ–‡ï¼Œæˆ‘ä»¬å»ºè®®ä½¿ç”¨ä¸Žæœ¬é¡µé¢ä¸€æ ·çš„ 
<a href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a> 许可证授权，或者
上面所描述过的简要的 "
+"&ldquo; 仅允许全文复制 &rdquo; 许可证。"
+
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid ""
+"We don't take the position that artistic or entertainment works must be "
+"free, but if you want to make one free, we recommend the <a href=\"http://";
+"artlibre.org/licence/lalgb.html\">Free Art License</a>."
+msgstr ""
+"æˆ‘ä»¬ä¸è®¤ä¸ºè‰ºæœ¯ä½œå“å’Œå¨±ä¹ä½œå“ä¹Ÿå¿…é¡»æ˜¯è‡ªç”±çš„ï¼Œä½†å¦‚æžœä½ 
希望把它自由发布，我们建"
+"è®®ä½ å‚è€ƒ <a 
href=\"http://artlibre.org/licence/lalgb.html\";>自由艺术许可证</"
+"a> 。"
+
+# type: Content of: <div>
+#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
+#. type: Content of: <div>
+msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
+msgstr " "
+
+# type: Content of: <div><p>
+#. type: Content of: <div><p>
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
+"to contact</a> the FSF."
+msgstr ""
+"请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
+"它方法</a> 联系自由软件基金会。"
+
+# type: Content of: <div><p>
+#. type: Content of: <div><p>
+msgid ""
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
+msgstr ""
+"发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>。"
+
+# type: Content of: <div><p>
+#. type: Content of: <div><p>
+msgid ""
+"Please see the <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> for information on coordinating and submitting "
+"translations of this article."
+msgstr ""
+"若您想翻译本文，请参看 <a 
href=\"/server/standards/README.translations.html"
+"\">翻译手册</a> 获取有关协调和提交翻译的相关事项。"
+
+#. type: Content of: <div><p>
+msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgstr "版权所有 &copy; 2011 自由软件基金会"
+
+#. type: Content of: <div><p>
+msgid ""
+"This page is licensed under a <a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+"NoDerivs 3.0 United States License</a>."
+msgstr ""
+"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+"License</a> 许可证授权。"
+
+# type: Content of: <div><div>
+#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
+#. type: Content of: <div><div>
+msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
+msgstr ""
+"<b>翻译</b>: 李凡希 2010\n"
+"<b>å®¡æ ¡</b>: Nan Deng"
+
+# type: Content of: <div><p>
+#.  timestamp start 
+#. type: Content of: <div><p>
+msgid "Updated:"
+msgstr "最后更新："
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "For essays of opinion and scientific papers, we recommend the simple "
+#~ "&ldquo;verbatim copying only&rdquo; license that is used for this web "
+#~ "page."
+#~ msgstr ""
+#~ "对于观点论述或科技论文，我们建议使用与本页面一æ 
·çš„简单的 &ldquo; 仅允许全"
+#~ "文复制 &rdquo; 许可证。"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, "
+#~ "2006, 2007, 2008 Free Software Foundation, Inc.,"
+#~ msgstr ""
+#~ "版权所有 &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, "
+#~ "2006, 2007, 2008 自由软件基金会"
+
+# type: Content of: <div><address>
+#~ msgid "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
+#~ msgstr "地址：51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Verbatim copying and distribution of this entire article is permitted in "
+#~ "any medium without royalty provided this notice is preserved."
+#~ msgstr ""
+#~ "æœ¬æ–‡å…è®¸åœ¨ä¸å˜æ›´å†…å®¹çš„å‰æä¸‹æ— éœ€ä½¿ç”¨è´¹çš„å…
¨æ–‡å¤åˆ¶å’Œå‘布在全球任何媒体，但需"
+#~ "保留此注记和版权声明。"
+
+# type: Content of: <div><h4>
+#~ msgid "Translations of this page"
+#~ msgstr "其它翻译"