www home.zh-cn.html licenses/po/license-list.fr...

[Yavor Doganov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   11/05/03 00:28:07

Modified files:
        .              : home.zh-cn.html 
        licenses/po    : license-list.fr.po license-list.pot 
        philosophy     : misinterpreting-copyright.zh-cn.html 
        philosophy/po  : compromise.zh-cn.po philosophy.zh-cn.po 
        server         : body-include-2.zh-cn.html 
        software       : devel.zh-cn.html 
        software/po    : software.zh-cn.po 
Added files:
        philosophy     : practical.zh-cn.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.zh-cn.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/misinterpreting-copyright.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/practical.zh-cn.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.zh-cn.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/software/devel.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11

Patches:
Index: home.zh-cn.html
===================================================================
RCS file: /web/www/www/home.zh-cn.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- home.zh-cn.html     2 May 2011 16:25:11 -0000       1.18
+++ home.zh-cn.html     3 May 2011 00:27:43 -0000       1.19
@@ -230,7 +230,7 @@
  <p><!-- timestamp start -->
 最后更新：
 
-$Date: 2011/05/02 16:25:11 $
+$Date: 2011/05/03 00:27:43 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- licenses/po/license-list.fr.po      2 Apr 2011 00:27:49 -0000       1.77
+++ licenses/po/license-list.fr.po      3 May 2011 00:27:47 -0000       1.78
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2011-04-01 20:27-0300\n"
+"POT-Creation-Date: 2011-05-02 20:25-0300\n"
 "PO-Revision-Date: 2010-03-21 16:00+0200\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <trad-...@april.org>\n"
@@ -3346,27 +3346,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-msgid ""
-"<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
-"bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</a>"
-msgstr ""
-"<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
-"bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</a>"
-
-# type: Content of: <dl><dd><p>
-#. type: Content of: <dl><dd><p>
-msgid ""
-"This license is non-free because it places various limitations on the kinds "
-"of modifications you can make.  For example, your modified software must run "
-"on Wince, and you are required to provide end user support for your software."
-msgstr ""
-"Cette licence n'est pas libre car elle impose diverses limitations sur le "
-"type de modifications que vous pouvez faire. Par exemple, votre logiciel "
-"modifi&eacute; doit pouvoir s'ex&eacute;cuter sous WinCE, et vous devez "
-"fournir une assistance aux utilisateurs de votre logiciel."
-
-# type: Content of: <dl><dt>
-#. type: Content of: <dl><dt>
 #, fuzzy
 #| msgid ""
 #| "<a id=\"Nokia\" href=\"http://opensource.org/licenses/nokia.html\";> Nokia "
@@ -4512,6 +4491,28 @@
 
 # type: Content of: <dl><dt>
 #~ msgid ""
+#~ "<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
+#~ "bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</"
+#~ "a>"
+#~ msgstr ""
+#~ "<a id=\"MsWECE-6.0\" href=\"http://msdn2.microsoft.com/en-us/embedded/";
+#~ "bb190212.aspx\">Microsoft Windows Embedded CE 6.0 Shared Source License</"
+#~ "a>"
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This license is non-free because it places various limitations on the "
+#~ "kinds of modifications you can make.  For example, your modified software "
+#~ "must run on Wince, and you are required to provide end user support for "
+#~ "your software."
+#~ msgstr ""
+#~ "Cette licence n'est pas libre car elle impose diverses limitations sur le "
+#~ "type de modifications que vous pouvez faire. Par exemple, votre logiciel "
+#~ "modifi&eacute; doit pouvoir s'ex&eacute;cuter sous WinCE, et vous devez "
+#~ "fournir une assistance aux utilisateurs de votre logiciel."
+
+# type: Content of: <dl><dt>
+#~ msgid ""
 #~ "<a href=\"http://www.osedu.org/licenses/ECL-2.0/\"; id=\"ECL2.0"
 #~ "\">Educational Community License 2.0</a>"
 #~ msgstr ""

Index: licenses/po/license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- licenses/po/license-list.pot        2 Apr 2011 00:27:49 -0000       1.48
+++ licenses/po/license-list.pot        3 May 2011 00:27:47 -0000       1.49
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-01 20:27-0300\n"
+"POT-Creation-Date: 2011-05-02 20:25-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <l...@li.org>\n"
@@ -2089,21 +2089,6 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"MsWECE-6.0\" "
-"href=\"http://msdn2.microsoft.com/en-us/embedded/bb190212.aspx\";>Microsoft "
-"Windows Embedded CE 6.0 Shared Source License</a>"
-msgstr ""
-
-#. type: Content of: <dl><dd><p>
-msgid ""
-"This license is non-free because it places various limitations on the kinds "
-"of modifications you can make.  For example, your modified software must run "
-"on Wince, and you are required to provide end user support for your "
-"software."
-msgstr ""
-
-#. type: Content of: <dl><dt>
-msgid ""
 "<a id=\"NASA\" href=\"http://www.opensource.org/licenses/nasa1.3\";> NASA "
 "Open Source Agreement</a>"
 msgstr ""

Index: philosophy/misinterpreting-copyright.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/misinterpreting-copyright.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/misinterpreting-copyright.zh-cn.html     30 Aug 2010 00:26:51 
-0000      1.4
+++ philosophy/misinterpreting-copyright.zh-cn.html     3 May 2011 00:27:50 
-0000       1.5
@@ -124,7 +124,7 @@
 <p>
 
这一法案同时也延长了即将出版作品的版权有效期。对于即将出版的作品，版权有效期由原来的75年延长到了95年。理论上讲，这也许确实能够激励更多的创新，但是任何声称需要这些额外鼓励的出版商，最好都拿出一个像样的2075年的预计资产负债表来说话。</p>
 <p>
-到头来，议会倒是没有对出版商的提议有什么问题：一个延长版权有效期的法律条文在1998年生效了。这就是&ldquo;松尼-波诺版权期延长法案&rdquo;（Sony
+到头来，议会也没有对出版商的提议有什么问题：一个延长版权有效期的法律条文在1998年生效了。这就是&ldquo;松尼-波诺版权期延长法案&rdquo;（Sony
 Bono Copyright Term Extension
 
Act）。此法案以其中一位支持者命名，这位松尼先生在法案生效前去世了。我们其实常常把它叫做&ldquo;米老鼠版权法案&rdquo;，因为我们都认为，真正推动这项法案，是为了让米老鼠这一角色的版权继续生效。波诺的遗孀继续了他的工作，并表示：</p>
 
@@ -212,8 +212,8 @@
 
 <h3>后记</h3>
 <p>
-我是个软件设计人员，并非法律专业的学者。我之所以关注版权，是因为在计算机网络领域中，版权问题不可避免
 <a
-href="#footnote3">[3]</a>。伴随着计算机和网络，我已走过了三十余个寒暑。作为一个普通用户，我珍视我们失去的每一份自由，也关注那些即将被剥夺的自由。而作为一个作者，我更有资格反对任何对创造者的粉饰神化。出版商对作者的鼓吹夸大，不过是为了能够扩张自己的权力。目的达成，兔死狗烹，作者将不得不把作品版权转让给出版商。</p>
+我是一个软件设计师，并非法律专业的学者。我之所以关注版权，是因为在计算机网络领域中，尤其是因特网上，版权问题是不可避免的。伴随着计算机和网络，我已走过了三十余个寒暑。作为一个普通用户，我珍视我们失去的每一份自由，也关注那些即将被剥夺的自由。而作为一个作者，我更有资格反对任何对<a
+href="words-to-avoid.html#Creator">创造者</a>的粉饰神化。出版商对作者的鼓吹夸大，不过是为了能够扩张自己的权力。目的达成，兔死狗烹，作者将不得不把作品版权转让给出版商。</p>
 <p>
 
文中所涉及的事实，你都可以去查证；其中的推理论证，也可仔细推敲。你更可以提出自己的观点意见。但请你至少听进我这句话：我，作为一个作者，没有任何资格可以凌驾于你们之上。倘若你愿为我的付出奖赏我些什么，我会诚挚感谢并欣然接受&mdash;然而，请时刻牢记，切勿因为作者的这些付出，而轻易将你们自己的自由拱手相让。</p>
 
@@ -269,9 +269,12 @@
 <div id="footer">
 
 <p>
-联系GNU或FSF，请发邮件至<a 
href="mailto=g...@gnu.org">&lt;g...@gnu.org&gt;</a>. 也可通过<a
-href="/contact/">其他方式</a>联系我们。<br 
/>请将坏链接或其他意见或建议发送至<a
-href="mailto:web-translat...@gnu.org";>&lt;web-translat...@gnu.org&gt;</a>。
+Please send FSF &amp; GNU inquiries to <a
+href="mailto:g...@gnu.org";>&lt;g...@gnu.org&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:webmast...@gnu.org";>&lt;webmast...@gnu.org&gt;</a>.
 </p>
 
 <p>
@@ -293,7 +296,7 @@
 <!-- timestamp start -->
 更新：
 
-$Date: 2010/08/30 00:26:51 $
+$Date: 2011/05/03 00:27:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/compromise.zh-cn.po   1 May 2011 09:58:35 -0000       1.5
+++ philosophy/po/compromise.zh-cn.po   3 May 2011 00:27:54 -0000       1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2010-11-12 20:27-0500\n"
+"POT-Creation-Date: 2011-04-29 20:27-0300\n"
 "PO-Revision-Date: 2011-05-01 05:03-0400\n"
 "Last-Translator: Tony Yet <t...@tedtochina.com>\n"
 "Language-Team: Chinese <www-zh-cn-translat...@gnu.org>\n"
@@ -16,11 +16,13 @@
 "Language: zh\n"
 
 # type: Content of: <title>
+#. type: Content of: <title>
 msgid ""
 "Avoiding Ruinous Compromises - GNU Project - Free Software Foundation (FSF)"
 msgstr "避免毁灭性的妥协 - GNU 工程 - 自由软件基金会 (FSF)"
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid ""
 "<em>&ldquo;Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
 "\">on September 27, 1983, I announced a plan</a> to create a completely free "
@@ -43,14 +45,17 @@
 "&rdquo;</em>&mdash;<b>理查德·斯托曼</b>"
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "Avoiding Ruinous Compromises"
 msgstr "避免毁灭性的妥协"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid "by <strong>Richard Stallman</strong>"
 msgstr "<strong>理查德·斯托曼</strong> 著"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "The free software movement aims for a social change: <a href=\"/philosophy/"
 "free-sw.html\">to make all software free</a> so that all software users are "
@@ -64,6 +69,7 @@
 "我们的任务就是要消除这种不公正的现象。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "The road to freedom is <a href=\"http://www.fsf.org/bulletin/2008/spring/the-";
 "last-mile-is-always-the-hardest/\"> a long road</a>.  It will take many "
@@ -78,6 +84,7 @@
 
"我们与其他怀有不同目标的人士达成妥协，我们的路会走得更容易。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Thus, the <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> makes "
 "compromises&mdash;even major ones.  For instance, we made compromises in the "
@@ -93,6 +100,7 @@
 "专利条款。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
 "compromise: we use it on certain chosen free libraries to permit their use "
@@ -111,6 +119,7 @@
 
"会对某些我们认同的群众运动进行支持，尽管我们并不完全认同他们所属的团体。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "But we reject certain compromises even though many others in our community "
 "are willing to make them.  For instance, we <a href=\"/philosophy/free-"
@@ -127,6 +136,7 @@
 
"</a>。我们认为，认同包含私有软件成分的发行版是一种毁灭性的妥协。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Compromises are ruinous if they would work against our aims in the long "
 "term.  That can occur either at the level of ideas or at the level of "
@@ -136,6 +146,7 @@
 "发生在思想上，也可能发生在行动上。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "At the level of ideas, ruinous compromises are those that reinforce the "
 "premises we seek to change.  Our goal is a world in which software users are "
@@ -150,6 +161,7 @@
 "他们只考虑实用的一面，比如价格的高低和是否好用。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Dale Carnegie's classic self-help book, <cite>How to Win Friends and "
 "Influence People</cite>, advises that the most effective way to persuade "
@@ -167,6 +179,7 @@
 
"的。通过向人们展示自由软件的这些特色，我们成功地吸引到了很多用户。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "If getting more people to use some free programs is as far as you aim to go, "
 "you might decide to keep quiet about the concept of freedom, and focus only "
@@ -178,6 +191,7 @@
 
"会提到那些容易为消费者理解的实用性的特性。这就是“开源”一词的意指。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "That approach can get us only part way to the goal of freedom.  People who "
 "use free software only because it is convenient will stick with it only as "
@@ -189,6 +203,7 @@
 
"弃。他们也会抵挡不住私有软件的诱惑，只要后者是好用的。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "The philosophy of open source presupposes and appeals to consumer values, "
 "and this affirms and reinforces them.  That's why we <a href=\"/philosophy/"
@@ -199,6 +214,7 @@
 "html\">不认同“开源软件”</a>的原因。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "To establish a free community fully and lastingly, we need to do more than "
 "get people to use some free software.  We need to spread the idea of judging "
@@ -213,6 +229,7 @@
 
"用性作为判断标准。只有这样，人们才不会受到那些以好用为诱饵的私有软件的蛊惑。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "To promote citizen values, we have to talk about them and show how they are "
 "the basis of our actions.  We must reject the Dale Carnegie compromise that "
@@ -223,6 +240,7 @@
 "们的行动产生影响。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "This is not to say we cannot cite practical advantage at all&mdash;we can "
 "and we do.  It becomes a problem only when the practical advantage steals "
@@ -236,6 +254,7 @@
 "em>。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "It's not enough to make our words accord with our ideals; our actions have "
 "to accord with them too.  So we must also avoid compromises that involve "
@@ -246,6 +265,7 @@
 "的妥协行为。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "For instance, experience shows that you can attract some users to <a href=\"/"
 "gnu/why-gnu-linux.html\">GNU/Linux</a> if you include some nonfree "
@@ -261,6 +281,7 @@
 "的驱动，以迎合某种硬件的需要。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "These compromises are tempting, but they undermine the goal.  If you "
 "distribute nonfree software, or steer people towards it, you will find it "
@@ -274,6 +295,7 @@
 "你口中言语的力量。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "The issue here is not whether people should be <em>able</em> or <em>allowed</"
 "em> to install nonfree software; a general-purpose system enables and allows "
@@ -290,6 +312,7 @@
 "事实上，私有软件就是问题本身。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "A ruinous compromise is not just a bad influence on others.  It can distort "
 "your own values, too, through cognitive dissonance.  If you have certain "
@@ -309,6 +332,7 @@
 
"们必须反对这样的妥协，以保证我们的价值评价是始终如一的。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "If you want to move to free software without compromising the goal of "
 "freedom, look at <a href=\"http://www.fsf.org/resources\";>the FSF's "
@@ -328,6 +352,7 @@
 
"时，请你向人们阐发自由与社区的理念，并由此展开深入的讨论。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "A road that lets you go faster is no improvement if it leads to the wrong "
 "place.  Compromise is essential to achieve an ambitious goal, but beware of "
@@ -338,16 +363,23 @@
 
 # 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>
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:g...@gnu.org\";>&lt;"
+#| "g...@gnu.org&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:webmast...@gnu.org\";>&lt;"
+#| "webmast...@gnu.org&gt;</a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:g...@gnu.org\";>&lt;"
 "g...@gnu.org&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:webmast...@gnu.org\";>&lt;webmasters@gnu."
-"org&gt;</a>."
+"contact</a> the FSF."
 msgstr ""
 
"请将有关自由软件基金会与GNU的查询与问题（以英语）发送到<a
 href=\"mailto:";
 "g...@gnu.org\">&lt;g...@gnu.org&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
@@ -356,6 +388,26 @@
 "webmast...@gnu.org&gt;</a>。"
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:g...@gnu.org\";>&lt;"
+#| "g...@gnu.org&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:webmast...@gnu.org\";>&lt;"
+#| "webmast...@gnu.org&gt;</a>."
+msgid ""
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:webmast...@gnu.org\";>&lt;webmast...@gnu.org&gt;</a>."
+msgstr ""
+"请将有关自由软件基金会与GNU的查询与问题（以英语）发送到<a
 href=\"mailto:";
+"g...@gnu.org\">&lt;g...@gnu.org&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
+"它方法</a> 联系自由软件基金会。 <br /> 
发现任何错误和链接或其它需要更正的地方"
+"（或任何建议），请发送邮件至 <a 
href=\"mailto:webmast...@gnu.org\";>&lt;"
+"webmast...@gnu.org&gt;</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 "
@@ -365,6 +417,7 @@
 "翻译手册</a>获取有关协调和提交翻译的相关事项"
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright &copy; 2008, 2009 <a href=\"http://www.stallman.org/\";>Richard "
 "Stallman</a>."
@@ -373,6 +426,7 @@
 "Stallman</a>."
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Richard Stallman is the founder of the Free Software Foundation.  You can "
 "copy and redistribute this article under the <a rel=\"license\" href="
@@ -385,14 +439,17 @@
 
 # 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>: Tony Yet 2010"
 
 # type: Content of: <div><p>
 #.  timestamp start 
+#. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "更新："
 
 # type: Content of: <div><h4>
+#. type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "其他语言"

Index: philosophy/po/philosophy.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/philosophy.zh-cn.po   1 May 2011 09:58:35 -0000       1.7
+++ philosophy/po/philosophy.zh-cn.po   3 May 2011 00:27:54 -0000       1.8
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2010-09-29 20:27-0300\n"
+"POT-Creation-Date: 2011-01-10 20:28-0500\n"
 "PO-Revision-Date: 2011-05-01 05:56-0400\n"
 "Last-Translator: Li Fanxi <lifa...@freemindworld.com>\n"
 "Language-Team: Chinese <www-zh-cn-translat...@gnu.org>\n"
@@ -45,6 +45,13 @@
 msgstr "以下是最新发表的有关自由软件和 GNU 工程的文章。"
 
 # type: Content of: <ul><li>
+#, fuzzy
+#| msgid "<a href=\"/philosophy/free-sw.html\">What is Free Software?</a>"
+msgid ""
+"<a href=\"/philosophy/practical.html\">The advantages of free software</a>"
+msgstr "<a href=\"/philosophy/free-sw.html\">What is Free Software?</a>"
+
+# type: Content of: <ul><li>
 msgid ""
 "<a href=\"/philosophy/assigning-copyright.html\">When a Company Asks For "
 "Your Copyright</a>"

Index: server/body-include-2.zh-cn.html
===================================================================
RCS file: /web/www/www/server/body-include-2.zh-cn.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/body-include-2.zh-cn.html    2 May 2011 16:25:51 -0000       1.16
+++ server/body-include-2.zh-cn.html    3 May 2011 00:27:56 -0000       1.17
@@ -11,7 +11,7 @@
          <h4>订阅<em>自由软件支持者</em></h4>
          <p>关注GNU和FSF; 每月更新</p>
          <form action="http://lists.fsf.org/mailman/subscribe/info-fsf"; 
method="post">
-         <p><input type="text" id="frmEmail" name="email" 
size="15"maxlength="80"
+         <p><input type="text" id="frmEmail" name="email" size="15" 
maxlength="80"
 value="y...@example.com" onfocus="this.value=''" /> &nbsp; <input
 type="submit" value="Ok" /></p>
          </form>

Index: software/devel.zh-cn.html
===================================================================
RCS file: /web/www/www/software/devel.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- software/devel.zh-cn.html   11 Jul 2010 08:27:03 -0000      1.4
+++ software/devel.zh-cn.html   3 May 2011 00:28:00 -0000       1.5
@@ -71,6 +71,12 @@
 
<p>倘若GNU软件开发人员需要shell登录，我们可以为他们提供此服务，让他们登录到GNU的机器上。不过需要注意，使用这样的登录账户既拥有权利，也同时肩负着责任。这些帐号必须只能用来做和GNU工程相关的工作。详情参考<a
 href="README.accounts.html">如何获得登录帐号</a>。</p>
 
+<p>在所登陆的计算机上，<a
+href="/software/gsrc/">gsrc</a>的开发者们维护着一个当前GNU软件包的资料库。这些软件均直接编译自各个软件的源代码。若要使用，请<tt>/gd/gnu/gnusys/live/setup</tt>。</p>
+
+<p>您也可以<a
+href="http://www.fsf.org/about/systems/sending-mail-via-fencepost";>使用一个GNU帐号来发邮件</a></p>
+
 
 <h3 id="Hydra">Hydra: 持续构建（Continuous 
builds）与可移植性测试</h3>
 
@@ -114,13 +120,14 @@
 
 <p>请将有关自由软件基金会(FSF) &amp; GNU 的查询 &amp; 
问题发送到<a
 href="mailto:g...@gnu.org";>&lt;g...@gnu.org&gt;</a>。也可以通过 <a
-href="/contact/">其他联系方法</a> 
联系自由软件基金会(FSF)。请将有关网页的建议发送到<a
+href="/contact/">其他联系方法</a> 联系自由软件基金会(FSF)。<br 
/>
+请将有关网页的建议发送到<a
 
href="mailto:web-translat...@gnu.org";>&lt;web-translat...@gnu.org&gt;</a>，其他问题发送到<a
 href="mailto:g...@gnu.org";>&lt;g...@gnu.org&gt;</a></p>
 
 <p>若您想翻译本文，请参看<a 
href="/server/standards/README.translations.html">翻译手册</a>。</p>
 
-<p>Copyright &copy; 2010 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 
 
<p>全文在保证完整性的前提下可以在任意媒体转载，但须保留此标注。</p>
 
@@ -134,7 +141,7 @@
  <p><!-- timestamp start -->
 更新
 
-$Date: 2010/07/11 08:27:03 $
+$Date: 2011/05/03 00:28:00 $
 
 <!-- timestamp end -->
 </p>
@@ -166,6 +173,8 @@
 <li><a href="/software/devel.html">English</a>&nbsp;[en]</li>
 <!-- Spanish -->
 <li><a href="/software/devel.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
+<!-- Polish -->
+<li><a href="/software/devel.pl.html">polski</a>&nbsp;[pl]</li>
 <!-- Brazilian Portuguese -->
 <li><a href="/software/devel.pt-br.html">portugu&#x0ea;s do 
Brasil</a>&nbsp;[pt-br]</li>
 <!-- Albanian -->

Index: software/po/software.zh-cn.po
===================================================================
RCS file: /web/www/www/software/po/software.zh-cn.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- software/po/software.zh-cn.po       1 May 2011 10:37:34 -0000       1.10
+++ software/po/software.zh-cn.po       3 May 2011 00:28:03 -0000       1.11
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.zh-cn.html\n"
-"POT-Creation-Date: 2010-12-15 12:27-0500\n"
+"POT-Creation-Date: 2011-04-04 20:27-0300\n"
 "PO-Revision-Date: 2011-05-01 06:37-0400\n"
 "Last-Translator: Li Fanxi <lifa...@freemindworld.com>\n"
 "Language-Team: Chinese <www-zh-cn-translat...@gnu.org>\n"
@@ -16,30 +16,37 @@
 "Language: zh\n"
 
 # type: Content of: <title>
+#. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
 msgstr "下载软件 - GNU 工程 - 自由软件基金会"
 
 # type: Content of: <h2>
+#. type: Content of: <h2>
 msgid "Download GNU"
 msgstr "下载 GNU 软件"
 
 # type: Content of: <div><h4>
+#. type: Content of: <div><h4>
 msgid "Download distributions"
 msgstr "下载 GNU/Linux 发行版"
 
 # type: Content of: <div><p><a>
+#. type: Content of: <div><p><a>
 msgid "<a href=\"/distros/free-distros.html\">"
 msgstr "<a href=\"/distros/free-distros.html\">"
 
 # type: Attribute 'alt' of: <div><p><a><img>
+#. type: Attribute 'alt' of: <div><p><a><img>
 msgid "GNU and Linux"
 msgstr "GNU 与 Linux"
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid "</a>"
 msgstr "</a>"
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid ""
 "<span class=\"highlight\">If you're looking for a whole system to install, "
 "see our <a href=\"/distros/free-distros.html\">list of GNU/Linux "
@@ -50,6 +57,7 @@
 "span>"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "If you're looking for a whole system to install, see our <a href=\"/distros/"
 "free-distros.html\">list of GNU/Linux distributions which are entirely free "
@@ -59,6 +67,7 @@
 "\">全部由自由软件组成的 GNU/Linux 发行版</a> 。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "To look for individual free software packages, both <acronym title=\"GNU's "
 "Not Unix!\">GNU</acronym> and non-GNU, please see the <a href=\"http://";
@@ -78,6 +87,7 @@
 "表。除此之外，还有一个<a 
href=\"/doc/doc.html\">自由软件文档链接</a> 列表。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "We also maintain a list of <a href=\"http://www.fsf.org/campaigns/priority.";
 "html\">high-priority free software projects</a>.  Please help with these "
@@ -91,6 +101,7 @@
 "\">帮助 GNU</a> 页面。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "If you are developing a GNU package, or you are thinking of starting, you "
 "may be interested in <a href=\"/software/devel.html\">GNU Software Developer "
@@ -107,6 +118,7 @@
 "licenses/licenses.html\">许可证</a> 页面。"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Finally, here is <a href=\"/software/for-windows.html\">a short list of free "
 "software for Microsoft Windows</a>, for the Windows user who would like to "
@@ -116,14 +128,17 @@
 "软件</a>　列表，提供给想在 Windows 
下使用自由软件的人们。"
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid "How to get GNU software"
 msgstr "如何获取 GNU 软件"
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid "GNU software is available by several different methods:"
 msgstr "GNU 软件常常以多种方式发布："
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"/order/ftp.html\">Download it from the web or via FTP</a>: we "
 "provide source code for all GNU software, free of charge.  (Please also make "
@@ -135,11 +150,13 @@
 "html\">捐款</a> ，以支持我们编写更多的自由软件。)"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Get a copy from a friend.  (Likewise please make a donation if you can.)"
 msgstr 
"从朋友那里获取。（同样，如果有能力，欢迎您捐款。）"
 
 # type: Content of: <p>
+#. type: Content of: <ul><li>
 msgid ""
 "Download a <a href=\"/distros/free-distros.html\">wholly free GNU/Linux "
 "distribution</a>."
@@ -148,6 +165,7 @@
 "\">全部由自由软件组成的 GNU/Linux 发行版</a> 。"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Buy a computer with a wholly free GNU/Linux system preinstalled from <a href="
 "\"/links/companies.html\">one of the companies</a> that offers this."
@@ -156,6 +174,7 @@
 "Linux 操作系统的计算机。"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "Get the development sources for a package and build them, to help with "
 "development.  Many GNU packages keep their development sources at the GNU "
@@ -169,10 +188,12 @@
 "全不使用，每个软件包的主页会提供这方面的信息。"
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid "<a name=\"allgnupkgs\" id=\"allgnupkgs\">All GNU packages</a>"
 msgstr ""
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Here is a list of all current GNU packages, using their package identifiers "
 "(rather than long names) for brevity, and sorted alphabetically.  If you "
@@ -181,10 +202,49 @@
 msgstr ""
 
 # type: Content of: <h3>
+#. type: Content of: <h3>
 msgid "Decommissioned GNU packages"
 msgstr "退役的 GNU 软件"
 
 # type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "GNU packages are occasionally decommissioned, generally because they've "
+#| "been superseded by, or integrated into, other packages.  If you have time "
+#| "and interest in resurrecting any of these, please contact &lt;"
+#| "<tt>maintain...@gnu.org</tt>&gt;.  Here is the list; we leave the old "
+#| "project pages up (when they existed): <a href=\"aroundme/\">aroundme</a>, "
+#| "<a href=\"gnu3dkit/\">3dkit</a>, <a href=\"abcsh/\">abcsh</a>, <a href="
+#| "\"awacs/\">awacs</a>, <a href=\"cfs-el/\">cfs-el</a>, <a href=\"checker/"
+#| "\">checker</a>, <a href=\"cons/\">cons</a>, <a href=\"dgs/\">dgs</a> "
+#| "(display&nbsp;ghostscript), <a href=\"dld/\">dld</a>, <a href=\"http://";
+#| "directory.fsf.org/project/DrGenius/\">dr.genius</a>, <a href=\"elib/"
+#| "\">elib</a>, <a href=\"ffp/\">ffp</a>, <a href=\"fhp/\">fhp</a>, <a href="
+#| "\"free/\">free&nbsp;(gnu.free)</a>, <a href=\"gcron/\">gcron</a> (see <a "
+#| "href=\"mcron/\">mcron</a>), <a href=\"gfe/\">gfe</a>, <a href=\"http://";
+#| "directory.fsf.org/GNU/ggv.html\">ggv</a> (see <a href=\"gv/\">gv</a>), <a "
+#| "href=\"http://www.ideacode.com//assets/gicqd/\";>gicqd</a>, <a href="
+#| "\"http://directory.fsf.org/project/giptables/\";>giptables</a>, <a href="
+#| "\"http://directory.fsf.org/project/gnochive/\";>gnochive</a>, gnotary, <a "
+#| "href=\"http://directory.fsf.org/project/gnotepad/\";>gnotepad+</a>, "
+#| "gnubios, gnucad, <a href=\"gnufi/\">gnufi</a>, gnupedia (see <a href="
+#| "\"http://wikipedia.org\";>wikipedia</a>), <a href=\"gnusql\">gnusql</a>, "
+#| "<a href=\"gnustep-db/\">gnustep-db</a>, <a href=\"gnuts/\">gnuts</a>, <a "
+#| "href=\"goose/\">goose</a>, <a href=\"gphoto/\">gphoto</a>, <a href="
+#| "\"graphics/\">graphics</a>, <a href=\"grover/\">grover</a>, <a href="
+#| "\"gtkeditor/\">gtkeditor</a>, <a href=\"gtkeyboard/\">gtkeyboard</a>, <a "
+#| "href=\"guss/\">guss</a>, <a href=\"hegemonie/\">hegemonie</a>, <a href="
+#| "\"lengualibre\">lengualibre</a>, leonardo, libopts (see <a href=\"autogen/"
+#| "\">autogen</a>), mana, <a href=\"messenger/\">messenger</a>, <a href="
+#| "\"mgcp/\">mgcp</a>, <a href=\"mll2html/\">mll2html</a>, <a href=\"obst/"
+#| "\">obst</a>, <a href=\"octal/\">octal</a>, p2c, <a href=\"patchwork/"
+#| "\">patchwork</a>, <a href=\"pips/\">pips</a>, <a href=\"poc/\">poc</a>, "
+#| "<a href=\"rat/\">rat</a>, <a href=\"songanizer/\">songanizer</a>, <a href="
+#| "\"sweater/\">sweater</a>, <a href=\"toutdoux/\">toutdoux</a>, <a href="
+#| "\"webpublish/\">webpublish</a>, <a href=\"xbase/\">xbase</a>, <a href="
+#| "\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/"
+#| "\">zebra</a>."
 msgid ""
 "GNU packages are occasionally decommissioned, generally because they've been "
 "superseded by, or integrated into, other packages.  If you have time and "
@@ -207,19 +267,18 @@
 "\">gnufi</a>, gnupedia (see <a href=\"http://wikipedia.org\";>wikipedia</a>), "
 "<a href=\"gnusql\">gnusql</a>, <a href=\"gnustep-db/\">gnustep-db</a>, <a "
 "href=\"gnuts/\">gnuts</a>, <a href=\"goose/\">goose</a>, <a href=\"gphoto/"
-"\">gphoto</a>, <a href=\"graphics/\">graphics</a>, <a href=\"grover/"
-"\">grover</a>, <a href=\"gtkeditor/\">gtkeditor</a>, <a href=\"gtkeyboard/"
-"\">gtkeyboard</a>, <a href=\"guss/\">guss</a>, <a href=\"hegemonie/"
-"\">hegemonie</a>, <a href=\"lengualibre\">lengualibre</a>, leonardo, libopts "
-"(see <a href=\"autogen/\">autogen</a>), mana, <a href=\"messenger/"
-"\">messenger</a>, <a href=\"mgcp/\">mgcp</a>, <a href=\"mll2html/"
-"\">mll2html</a>, <a href=\"obst/\">obst</a>, <a href=\"octal/\">octal</a>, "
-"p2c, <a href=\"patchwork/\">patchwork</a>, <a href=\"pips/\">pips</a>, <a "
-"href=\"poc/\">poc</a>, <a href=\"rat/\">rat</a>, <a href=\"songanizer/"
-"\">songanizer</a>, <a href=\"sweater/\">sweater</a>, <a href=\"toutdoux/"
-"\">toutdoux</a>, <a href=\"webpublish/\">webpublish</a>, <a href=\"xbase/"
-"\">xbase</a>, <a href=\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, "
-"<a href=\"zebra/\">zebra</a>."
+"\">gphoto</a>, <a href=\"graphics/\">graphics</a>, grover, <a href="
+"\"gtkeditor/\">gtkeditor</a>, <a href=\"gtkeyboard/\">gtkeyboard</a>, <a "
+"href=\"guss/\">guss</a>, <a href=\"hegemonie/\">hegemonie</a>, <a href="
+"\"lengualibre\">lengualibre</a>, leonardo, libopts (see <a href=\"autogen/"
+"\">autogen</a>), mana, <a href=\"messenger/\">messenger</a>, <a href=\"mgcp/"
+"\">mgcp</a>, <a href=\"mll2html/\">mll2html</a>, <a href=\"obst/\">obst</a>, "
+"<a href=\"octal/\">octal</a>, p2c, <a href=\"patchwork/\">patchwork</a>, <a "
+"href=\"pips/\">pips</a>, <a href=\"poc/\">poc</a>, <a href=\"rat/\">rat</a>, "
+"<a href=\"songanizer/\">songanizer</a>, <a href=\"sweater/\">sweater</a>, <a "
+"href=\"toutdoux/\">toutdoux</a>, <a href=\"webpublish/\">webpublish</a>, <a "
+"href=\"xbase/\">xbase</a>, <a href=\"xinfo/\">xinfo</a>, <a href=\"xmhtml/"
+"\">xmhtml</a>, <a href=\"zebra/\">zebra</a>."
 msgstr ""
 "部分 GNU 
软件由于被更好的软件代替或是被集成到别的软件包中而退役。如果您有时间"
 "和兴趣让它们恢复生机，请联系 
&lt;<tt>maintain...@gnu.org</tt>&gt;。下面是退役"
@@ -254,16 +313,42 @@
 
 # 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>
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:g...@gnu.org\";>&lt;"
+#| "g...@gnu.org&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:webmast...@gnu.org\";>&lt;"
+#| "webmast...@gnu.org&gt;</a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:g...@gnu.org\";>&lt;"
 "g...@gnu.org&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:webmast...@gnu.org\";>&lt;webmasters@gnu."
-"org&gt;</a>."
+"contact</a> the FSF."
+msgstr ""
+"请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a href=\"mailto:";
+"g...@gnu.org\">&lt;g...@gnu.org&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
+"它方法</a> 联系自由软件基金会。 <br 
/>发现任何错误和链接或其它需要更正的地方"
+"（或任何建议），请发送邮件至 <a 
href=\"mailto:webmast...@gnu.org\";>&lt;"
+"webmast...@gnu.org&gt;</a>。"
+
+# type: Content of: <div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:g...@gnu.org\";>&lt;"
+#| "g...@gnu.org&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:webmast...@gnu.org\";>&lt;"
+#| "webmast...@gnu.org&gt;</a>."
+msgid ""
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:webmast...@gnu.org\";>&lt;webmast...@gnu.org&gt;</a>."
 msgstr ""
 "请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a href=\"mailto:";
 "g...@gnu.org\">&lt;g...@gnu.org&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
@@ -272,6 +357,7 @@
 "webmast...@gnu.org&gt;</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 "
@@ -281,6 +367,7 @@
 "\">翻译手册</a> 获取有关协调和提交翻译的相关事项。"
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc."
@@ -289,6 +376,7 @@
 "2006, 2007, 2008, 2009, 2010 自由软件基金会"
 
 # type: Content of: <div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Verbatim copying and distribution of this entire article are permitted "
 "worldwide, without royalty, in any medium, provided this notice, and the "
@@ -299,6 +387,7 @@
 
 # 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<br />\n"
@@ -306,9 +395,11 @@
 
 # type: Content of: <div><p>
 #.  timestamp start 
+#. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最后更新："
 
 # type: Content of: <div><h4>
+#. type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "其它语言"

Index: philosophy/practical.zh-cn.html
===================================================================
RCS file: philosophy/practical.zh-cn.html
diff -N philosophy/practical.zh-cn.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/practical.zh-cn.html     3 May 2011 00:27:50 -0000       1.1
@@ -0,0 +1,103 @@
+
+
+<!--#include virtual="/server/header.zh-cn.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>自由软件的好处 &mdash; GNU工程 &mdash; 
自由软件基金会（FSF）</title>
+
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<h2>自由软件的好处</h2>
+
+<p><strong>Richard Stallman</strong> 著</p>
+
+
+<p><strong>不了解自由软件运动的人常常会问：自由软件到底有什么实际的好处。其实这是个挺奇怪的问题</strong></p>
+
+<p>非自由软件之所以不好，是因为它阻碍了你的自由。那么，问自由软件究竟有什么实际好处或优势，就好像在问不被手铐拷起来有什么实际好处一样。说起来，不被拷住确实有好处：</p>
+
+<ul>
+<li>好比说，没有手铐的话，你可以穿个普通的衬衫。</li>
+<li>再比如，你过机场安检的时候，不至于因为身上带着金属而让安检机器喳喳叫。</li>
+<li>你要是开个手动档的车，被手铐拷着可就不能扶着方向盘换档了。</li>
+<li>当然了，没有手铐的话你还可以扔棒球。</li>
+<li>没有手铐，你还可以背起一个双肩夸的背包。</li>
+</ul>
+
+<p>我们还能找出更多理由。不过仔细想想，我至于把所有的好处都列一遍，您才能意识到不被手铐拷起来是个莫大幸事吗？我看就不必了吧。自由这东西，你懂的，天赋之权，板上定钉。</p>
+
+<p>等到你想明白，非自由软件对你的自由意味着什么，想明白非自由软件到底根儿上是个什么东西，你也就用不着问自由软件究竟有啥实际好处了。</p>
+
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+*GNUN-SLOT: TRANSLATOR'S NOTES*</div>
+</div>
+
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<p>
+联系GNU或FSF，请发邮件至<a 
href="mailto=g...@gnu.org">&lt;g...@gnu.org&gt;</a>. 也可通过<a
+href="/contact/">其他方式</a>联系我们。
+<br />
+请将意见和建议发送至<a 
href="mailto:webmast...@gnu.org";>&lt;webmast...@gnu.org&gt;</a>
+</p>
+
+<p>若您想翻译本文，请参看<a
+href="/server/standards/README.translations.html">翻译手册</a>获取有关协调和提交翻译的相关事项。</p>
+
+<p>版权所有 &copy; 2010 Richard M. Stallman 。
+<br />
+本文允许在不变更内容的前提下无需使用费的全文复制和发布在全球任何媒体，但需保留此注记和版权声明
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<b>翻译：</b>邓楠 <br /></div>
+ <p><!-- timestamp start -->
+最后更新
+
+$Date: 2011/05/03 00:27:50 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<div id="translations">
+<h4>其他语言</h4>
+
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise web-translat...@gnu.org and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/philosophy/practical.html">English</a>&nbsp;[en]</li>
+<!-- Italian -->
+<li><a href="/philosophy/practical.it.html">italiano</a>&nbsp;[it]</li>
+<!-- Brazilian Portuguese -->
+<li><a href="/philosophy/practical.pt-br.html">portugu&ecirc;s do 
Brasil</a>&nbsp;[pt-br]</li>
+<!-- Russian -->
+<li><a 
href="/philosophy/practical.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
+</ul>
+</div>
+</div>
+</body>
+</html>