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

[DENG Nan]

CVSROOT:        /web/www
Module name:    www
Changes by:     DENG Nan <monnand>      11/05/01 09:58:41

Modified files:
        philosophy/po  : compromise.zh-cn.po 
                         misinterpreting-copyright.zh-cn.po 
                         philosophy.zh-cn.po 

Log message:
        unfuzyy & translate the messages

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/misinterpreting-copyright.zh-cn.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- compromise.zh-cn.po 30 Apr 2011 00:27:52 -0000      1.4
+++ compromise.zh-cn.po 1 May 2011 09:58:35 -0000       1.5
@@ -6,22 +6,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2011-04-29 20:27-0300\n"
-"PO-Revision-Date: 2010-08-05 15:57+0800\n"
+"POT-Creation-Date: 2010-11-12 20:27-0500\n"
+"PO-Revision-Date: 2011-05-01 05:03-0400\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"
+"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 "
@@ -40,21 +39,18 @@
 
"年纪念的一部分，我写下本文，提醒这个社区的朋友们，如何才能避å
…æ¯ç­æ€§çš„妥协。"
 "é™¤äº†é¿å…è¿™äº›å¦¥åä»¥å¤–ï¼Œä½ è¿˜æœ‰å¾ˆå¤šé€”å¾„å¯ä»¥<a 
href=\"/help/\">帮助GNU</a>和自由"
 "软件。其中最简单的一个方式是<a 
href=\"https://www.fsf.org/associate/";
-"support_freedom/join_fsf?referrer=4052\">åŠ å…
¥è‡ªç”±è½¯ä»¶åŸºé‡‘会</a>成为准会员。"
+"support_freedom/join_fsf?referrer=4052\">åŠ å…
¥è‡ªç”±è½¯ä»¶åŸºé‡‘会</a>成为会员。"
 "&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 "
@@ -68,7 +64,6 @@
 "我们的任务就是要消除这种不公正的现象。"
 
 # 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 "
@@ -83,7 +78,6 @@
 "我们与其他怀有不同目æ 
‡çš„人士达成妥协，我们的路会走得更容易。"
 
 # 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 "
@@ -99,7 +93,6 @@
 "专利条款。"
 
 # 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 "
@@ -118,7 +111,6 @@
 "会对某些我们认同的群众运动进行支持，尽管我们并不完å…
¨è®¤åŒä»–们所属的团体。"
 
 # 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-"
@@ -135,7 +127,6 @@
 "</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 "
@@ -145,7 +136,6 @@
 "发生在思想上，也可能发生在行动上。"
 
 # 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 "
@@ -160,7 +150,6 @@
 "ä»–ä»¬åªè€ƒè™‘å®žç”¨çš„ä¸€é¢ï¼Œæ¯”å¦‚ä»·æ ¼çš„é«˜ä½Žå’Œæ˜¯å¦å¥½ç”¨ã€‚"
 
 # 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 "
@@ -178,7 +167,6 @@
 
"的。通过向人们展示自由软件的这些特色，我们成功地吸引到了很多用户。"
 
 # 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 "
@@ -190,7 +178,6 @@
 "会提到那些容易为消费者
理解的实用性的特性。这就是“开源”一词的意指。"
 
 # 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 "
@@ -202,7 +189,6 @@
 "弃。他们也会抵挡不住私有软件的诱惑，只要后者
是好用的。"
 
 # 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/"
@@ -213,7 +199,6 @@
 "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 "
@@ -228,7 +213,6 @@
 "ç”¨æ€§ä½œä¸ºåˆ¤æ–­æ ‡å‡†ã€‚åªæœ‰è¿™æ 
·ï¼Œäººä»¬æ‰ä¸ä¼šå—到那些以好用为诱饵的私有软件的蛊惑。"
 
 # 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 "
@@ -239,14 +223,6 @@
 "们的行动产生影响。"
 
 # type: Content of: <p>
-#. type: Content of: <p>
-#, fuzzy
-#| 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 "
-#| "the scene and pushes freedom into the background.  Therefore, when we "
-#| "cite the practical advantages of free software, we reiterate frequently "
-#| "that those are just <em>additional, secondary reasons</em> to prefer it."
 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 "
@@ -254,13 +230,12 @@
 "the practical advantages of free software, we reiterate frequently that "
 "those are just <em>additional, secondary</em> reasons to prefer it."
 msgstr ""
-"但这不是说我们不可提及自由软件的实用性。我们是可以这么做的，我们已经在这么做"
-"了。但一旦人们忽视了自由，而只强调实用性的时候，问题就出现了。所以当我们提到"
-"自由软件的实用性的时候，我们反复强调的一点是，比起我们的价值选择，实用性只是"
-"<em>次要的</em>。"
+"但这不是说我们不可提及自由软件的实用性。我们显然是可以这么做的。但一旦人们忽"
+"视了自由，而纯粹只强调实用性的时候，问题就出现了。所以当我们提到自由软件的实"
+"用性的时候，我们反复强调的一点是，比起我们的价值选择，实用性只是<em>次要的</"
+"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 "
@@ -271,7 +246,6 @@
 "的妥协行为。"
 
 # 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 "
@@ -287,7 +261,6 @@
 "的驱动，以迎合某种硬件的需要。"
 
 # 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 "
@@ -301,7 +274,6 @@
 "ä½ å£ä¸­è¨€è¯­çš„åŠ›é‡ã€‚"
 
 # 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 "
@@ -318,7 +290,6 @@
 "事实上，私有软件就是问题本身。"
 
 # 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 "
@@ -338,7 +309,6 @@
 "们必须反对这æ 
·çš„妥协，以保证我们的价值评价是始终如一的。"
 
 # 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 "
@@ -358,7 +328,6 @@
 "æ—¶ï¼Œè¯·ä½ å‘äººä»¬é˜å‘è‡ªç”±ä¸Žç¤¾åŒºçš„ç†å¿µï¼Œå¹¶ç”±æ­¤å±•å¼€æ·±å…
¥çš„讨论。"
 
 # 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 "
@@ -369,23 +338,16 @@
 
 # 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: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 "
-"contact</a> the FSF."
+"contact</a> the FSF.  <br /> Please send broken links and other corrections "
+"or suggestions to <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
 msgstr ""
 "请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会与GNU的查询与问题（以英语）发送到<a 
href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
@@ -394,26 +356,6 @@
 "address@hidden&gt;</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>。"
-
-# 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 "
@@ -423,7 +365,6 @@
 "翻译手册</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>."
@@ -432,7 +373,6 @@
 "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="
@@ -445,17 +385,14 @@
 
 # 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: misinterpreting-copyright.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/misinterpreting-copyright.zh-cn.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- misinterpreting-copyright.zh-cn.po  30 Aug 2010 00:26:56 -0000      1.19
+++ misinterpreting-copyright.zh-cn.po  1 May 2011 09:58:35 -0000       1.20
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: misinterpreting-copyright.html\n"
 "POT-Creation-Date: 2010-08-21 04:25-0300\n"
-"PO-Revision-Date: 2010-08-28 16:00-0400\n"
+"PO-Revision-Date: 2011-05-01 05:49-0400\n"
 "Last-Translator: Deng, Nan <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -604,7 +604,7 @@
 "Mickey Mouse from expiring.  Bono's widow, who served the rest of his term, "
 "made this statement:"
 msgstr ""
-"到头来，议会倒是没有对出版商的提议有什么问题：一个延长版权有效期的法律条文在"
+"到头来，议会也没有对出版商的提议有什么问题：一个延长版权有效期的法律条文在"
 
"1998年生效了。这就是&ldquo;松尼-波诺版权期延长法案&rdquo;（Sony
 Bono "
 "Copyright Term Extension Act）。此法案以其中一位支持者
命名，这位松尼先生在法"
 "案生效前去世了。我们其实常常把它叫做&ldquo;ç±³è€é¼ 
版权法案&rdquo;ï¼Œå› ä¸ºæˆ‘ä»¬éƒ½"
@@ -844,8 +844,8 @@
 
 # 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>
@@ -1076,12 +1076,12 @@
 "by publishers to justify increased copyright powers for authors&mdash;powers "
 "which these authors will then sign away to publishers."
 msgstr ""
-"我是个软件设计人员，并非法律专业的学者。我之所以å…
³æ³¨ç‰ˆæƒï¼Œæ˜¯å› 为在计算机网络"
-"领域中，版权问题不可避免 <a 
href=\"#footnote3\">[3]</a>。伴随着计算机和网络，"
-"我已走过了三十余个寒暑。作为一个普通用户，我珍视我们失去的每一份自由，也å
…³æ³¨"
-"那些即将被剥夺的自由。而作为一个作者，我更有资æ 
¼åå¯¹ä»»ä½•å¯¹åˆ›é€ 者的粉饰神化。"
-"å‡ºç‰ˆå•†å¯¹ä½œè€…çš„é¼“å¹å¤¸å¤§ï¼Œä¸è¿‡æ˜¯ä¸ºäº†èƒ½å¤Ÿæ‰©å¼ 
自己的权力。目的达成，兔死狗烹，作"
-"者将不得不把作品版权转让给出版商。"
+"我是一个软件设计师，并非法律专业的学者。我之所以å…
³æ³¨ç‰ˆæƒï¼Œæ˜¯å› 为在计算机网络"
+"é¢†åŸŸä¸­ï¼Œå°¤å…¶æ˜¯å› ç‰¹ç½‘ä¸Šï¼Œç‰ˆæƒé—®é¢˜æ˜¯ä¸å¯é¿å…
çš„。伴随着计算机和网络，我已走过了"
+"三十余个寒暑。作为一个普通用户，我珍视我们失去的每一份自由，也å
…³æ³¨é‚£äº›å³å°†è¢«"
+"å‰¥å¤ºçš„è‡ªç”±ã€‚è€Œä½œä¸ºä¸€ä¸ªä½œè€…ï¼Œæˆ‘æ›´æœ‰èµ„æ ¼åå¯¹ä»»ä½•å¯¹<a 
href=\"words-to-avoid."
+"html#Creator\">åˆ›é€ è€…</a>的粉饰神化。出版商对作者
的鼓吹夸大，不过是为了能够扩"
+"å¼ è‡ªå·±çš„æƒåŠ›ã€‚ç›®çš„è¾¾æˆï¼Œå…”æ­»ç‹—çƒ¹ï¼Œä½œè€…
将不得不把作品版权转让给出版商。"
 
 # type: Content of: <p>
 msgid ""

Index: philosophy.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy.zh-cn.po 11 Jan 2011 01:30:30 -0000      1.6
+++ philosophy.zh-cn.po 1 May 2011 09:58:35 -0000       1.7
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2011-01-10 20:28-0500\n"
-"PO-Revision-Date: 2010-08-26 20:58-0400\n"
+"POT-Creation-Date: 2010-09-29 20:27-0300\n"
+"PO-Revision-Date: 2011-05-01 05:56-0400\n"
 "Last-Translator: Li Fanxi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -45,23 +45,20 @@
 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>"
 msgstr ""
+"<a href=\"/philosophy/assigning-copyright.html\">When a Company Asks For "
+"Your Copyright (英文)</a>"
 
 # type: Content of: <ul><li>
 msgid ""
 "<a href=\"/philosophy/google-engineering-talk.html\">GNU &amp; The Free "
 "Software Foundation - Engineering Tech Talk at Google</a>"
 msgstr ""
+"<a href=\"/philosophy/google-engineering-talk.html\">GNU &amp; The Free "
+"Software Foundation - Engineering Tech Talk at Google </a>"
 
 # type: Content of: <ul><li>
 msgid ""