Update Simplified Chinese translation.

1 files changed, 178 insertions, 160 deletions

diff --git a/desktop-docs/gpl/zh_CN/zh_CN.po b/desktop-docs/gpl/zh_CN/zh_CN.po
index 7b20a5ec..f12b9f9c 100644
--- a/desktop-docs/gpl/zh_CN/zh_CN.po
+++ b/desktop-docs/gpl/zh_CN/zh_CN.po
@@ -5,56 +5,78 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-gpl doc\n"
-"POT-Creation-Date: 2006-05-02 13:55+0200\n"
-"PO-Revision-Date: 2005-01-31 19:37+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2010-07-27 09:27+0000\n"
+"PO-Revision-Date: 2010-07-29 10:41+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:17 (title)
+#: C/gpl.xml:17(title)
 msgid "GNU General Public License"
 msgstr "GNU 通用公共许可证"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:19 (year)
+#: C/gpl.xml:19(year)
 msgid "2000"
 msgstr "2000"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:20 (holder)
+#: C/gpl.xml:20(holder)
 msgid "Free Software Foundation, Inc."
 msgstr "Free Software Foundation, Inc."
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:24 (surname)
+#: C/gpl.xml:24(surname)
 msgid "Free Software Foundation"
 msgstr "自由软件基金会"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:28 (para)
+#: C/gpl.xml:28(publishername)
+msgid "GNOME Documentation Project"
+msgstr "GNOME 文档项目"
+
+#: C/gpl.xml:33(revnumber)
+msgid "2"
+msgstr "2"
+
+#: C/gpl.xml:34(date)
+msgid "1991-06"
+msgstr "1991-06"
+
+#: C/gpl.xml:39(para)
 msgid ""
-"<address>Free Software Foundation, Inc. <street>59 Temple Place, Suite 330</"
-"street>, <city>Boston</city>, <state>MA</state><postcode>02111-1307</"
+"<address>Free Software Foundation, Inc. <street>51 Franklin Street, Fifth "
+"Floor</street>, <city>Boston</city>, <state>MA</state><postcode>02110-1301</"
 "postcode><country>USA</country></address>."
 msgstr ""
-"<address>Free Software Foundation, Inc. <street>59 Temple Place, Suite 330</"
-"street>, <city>Boston</city>, <state>MA</state><postcode>02111-1307</"
+"<address>Free Software Foundation, Inc. <street>51 Franklin Street, Fifth "
+"Floor</street>, <city>Boston</city>, <state>MA</state><postcode>02110-1301</"
 "postcode><country>USA</country></address>."
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:37 (para)
+#: C/gpl.xml:48(para)
 msgid ""
 "Everyone is permitted to copy and distribute verbatim copies of this license "
 "document, but changing it is not allowed."
 msgstr ""
 "允许任何人复制和发布这一许可证原始文档的副本，但绝对不允许对它进行任何修改。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:43 (releaseinfo)
+#: C/gpl.xml:54(releaseinfo)
 msgid "Version 2, June 1991"
 msgstr "1991年6月第二版"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:50 (title)
+#: C/gpl.xml:58(para)
+msgid ""
+"The licenses for most software are designed to take away your freedom to "
+"share and change it. By contrast, the GNU General Public License is intended "
+"to guarantee your freedom to share and change free software - to make sure "
+"the software is free for all its users."
+msgstr ""
+"大多数软件许可证决意剥夺你共享和修改软件的自由。与此相反，GNU 通用公共许可证"
+"力图保证你的共享和修改自由软件的自由 - 保证自由软件对所有用户是自由的。"
+
+#: C/gpl.xml:67(title)
 msgid "Preamble"
 msgstr "序言"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:52 (para)
+#: C/gpl.xml:69(para)
 msgid ""
 "The licenses for most software are designed to take away your freedom to "
 "share and change it. By contrast, the GNU General Public License is intended "
@@ -65,12 +87,13 @@ msgid ""
 "software is covered by the GNU Library General Public License instead.) You "
 "can apply it to your programs, too."
 msgstr ""
-"大多数软件许可证决意剥夺你的共享和修改软件的自由。相反，GNU 通用公共许可证力"
-"图保证你的共享和修改自由软件的自由——保证自由软件对所有用户"
-"是自由的。本许可证，库通用许可证，适用于一些特殊设计的自由软件基金会软件和那"
-"些库的开发者决定适用本许可证的库。你也可以把它用于你开发的库。"
+"大多数软件许可证决意剥夺你共享和修改软件的自由。相反，GNU 通用公共许可证力图"
+"保证你的共享和修改自由软件的自由——保证自由软件对所有用户是自由的。这份通用公"
+"共许可证适用于绝大多数自由软件基本会开发的软件和任何其他承诺使用它的程序。(自"
+"由软件基金会开发的某些其他程序受 GNU 库通用公共许可证约束。)您也可以将它用于"
+"自己的程序。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:64 (para)
+#: C/gpl.xml:81(para)
 msgid ""
 "When we speak of free software, we are referring to freedom, not price. Our "
 "General Public Licenses are designed to make sure that you have the freedom "
@@ -79,49 +102,47 @@ msgid ""
 "can change the software or use pieces of it in new free programs; and that "
 "you know you can do these things."
 msgstr ""
-"当我们谈到自由软件时，我们指的是自由而不是价格。我们的 GNU 通"
-"用公共许可证决意保证你有发布自由软件的自由(如果你愿意，你可以对此项服务收取一"
-"定的费用)；保证你能收到源程序或者在你需要时能够得到它；保证你能修改软件或将它"
-"的一部分用于新的自由软件；而且还保证你知道你能做这些事情。"
+"当我们谈到自由软件时，我们指的是自由而不是价格。我们的 GNU 通用公共许可证决意"
+"保证你有发布自由软件的自由(如果你愿意，你可以对此项服务收取一定的费用)；保证"
+"你能收到源程序或者在你需要时能够得到它；保证你能修改软件或将它的一部分用于新"
+"的自由软件；而且还保证你知道你能做这些事情。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:73 (para)
+#: C/gpl.xml:90(para)
 msgid ""
 "To protect your rights, we need to make restrictions that forbid anyone to "
 "deny you these rights or to ask you to surrender the rights. These "
 "restrictions translate to certain responsibilities for you if you distribute "
 "copies of the software, or if you modify it."
 msgstr ""
-"为了保护你的权利，我们需要作出规定：禁止任何人不承认你的权利，或者要求你放弃"
-"这些权利。如果你修改了库或者发布了库的副本，这些规定就转化为你的责任。"
+"为了保护你的权利，我们需要作出规定：禁止任何人否认你的权利，或者要求你放弃这"
+"些权利。如果你修改了软件或者发布了软件的副本，这些规定就转化为你的责任。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:80 (para)
+#: C/gpl.xml:97(para)
 msgid ""
 "For example, if you distribute copies of such a program, whether gratis or "
 "for a fee, you must give the recipients all the rights that you have. You "
 "must make sure that they, too, receive or can get the source code. And you "
 "must show them these terms so they know their rights."
 msgstr ""
-"例如，如果你发布这样一个库的副本，不管是收费的还是免费的，你必须将你具有的一"
-"切权利给予你的接受者；你必须保证他们能收到或得到源程序；如果你把该库与某个程"
-"序进行连接，你必须把完整的目标文件提供给接受者，以使他们在修改了库并重新进行"
-"了编译之后可以重新与该库进行连接。并且将这些条款给他们看，使他们知道他们有这"
-"样的权利。"
+"例如，如果你发布这样一个程序的副本，不管是收费的还是免费的，你必须将你具有的"
+"一切权利给予你的接受者；你必须保证他们能收到或得到源程序；并且你必须向他们展"
+"示这些条款，使他们了解自己的权利。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:92 (para)
+#: C/gpl.xml:109(para)
 msgid "copyright the software, and"
-msgstr "给软件以版权保护。"
+msgstr "给软件以版权保护，并"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:97 (para)
+#: C/gpl.xml:114(para)
 msgid ""
 "offer you this license which gives you legal permission to copy, distribute "
 "and/or modify the software."
 msgstr "给你提供许可证。它给你复制，发布和修改这些软件的法律许可。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:87 (para)
+#: C/gpl.xml:104(para)
 msgid "We protect your rights with two steps: <placeholder-1/>"
 msgstr "我们采取两项措施来保护你的权利：<placeholder-1/>"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:105 (para)
+#: C/gpl.xml:122(para)
 msgid ""
 "Also, for each author's protection and ours, we want to make certain that "
 "everyone understands that there is no warranty for this free software. If "
@@ -131,11 +152,11 @@ msgid ""
 "reputations."
 msgstr ""
 "同样，为了保护发布者，我们需要清楚地让每个人明白，自由库软件没有担保(no "
-"warranty)。如果由于其他某个人修改了库，并继续加以传播。我们需要它的接受者明"
+"warranty)。如果由于其他某个人修改了软件，并继续加以传播，我们需要它的接受者明"
 "白：他们所得到的并不是原来的版本。任何由其他人引入的任何问题，不应损害原作者"
 "的声誉。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:114 (para)
+#: C/gpl.xml:131(para)
 msgid ""
 "Finally, any free program is threatened constantly by software patents. We "
 "wish to avoid the danger that redistributors of a free program will "
@@ -147,21 +168,21 @@ msgstr ""
 "再发布者以个人名义获得专利许可证。从而在事实上将软件变为私有。为防止这一点，"
 "我们必须明确：任何专利必须以允许每个人自由使用为前提，否则就不准许有专利。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:122 (para)
+#: C/gpl.xml:139(para)
 msgid ""
 "The precise terms and conditions for copying, distribution and modification "
 "follow."
 msgstr "关于复制、发行和修改的精确条款与条件在下面给出。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:130 (title)
+#: C/gpl.xml:147(title)
 msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr "复制、发布和修改的条款和条件"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:133 (title)
+#: C/gpl.xml:150(title)
 msgid "Section 0"
-msgstr "第0节"
+msgstr "第 0 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:134 (para)
+#: C/gpl.xml:151(para)
 msgid ""
 "This License applies to any program or other work which contains a notice "
 "placed by the copyright holder saying it may be distributed under the terms "
@@ -173,15 +194,15 @@ msgid ""
 "translation is included without limitation in the term <quote>modification</"
 "quote>.) Each licensee is addressed as <quote>you</quote>."
 msgstr ""
-"此许可证适用于任何包含版权所有者声明的程序和其他作品，版权所有者在声明中明"
-"确说明程序和作品可以在GPL条款的约束下发布。下面提到的<quote>程序</quote>指的"
-"是任何这样的程序或作品。而<quote>基于程序的作品</quote>指的是程序或者任何受版"
-"权法约束的衍生作品。也就是说包含程序或程序的一部分的作品。可以是原封不动的，"
-"或经过修改的和/或翻译成其他语言的<quote>程序</quote>。在下文中，翻译包含在"
+"此许可证适用于任何包含版权所有者声明的程序和其他作品，版权所有者在声明中明确"
+"说明程序和作品可以在GPL条款的约束下发布。下面提到的<quote>程序</quote>指的是"
+"任何这样的程序或作品。而<quote>基于程序的作品</quote>指的是程序或者任何受版权"
+"法约束的衍生作品。也就是说包含程序或程序的一部分的作品。可以是原封不动的，或"
+"经过修改的和/或翻译成其他语言的<quote>程序</quote>。在下文中，翻译包含在"
 "<quote>修改</quote>的条款中。每个许可证接受人(licensee)用<quote>你</quote>来"
 "称呼。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:146 (para)
+#: C/gpl.xml:163(para)
 msgid ""
 "Activities other than copying, distribution and modification are not covered "
 "by this License; they are outside its scope. The act of running the Program "
@@ -192,13 +213,13 @@ msgid ""
 msgstr ""
 "许可证条款不适用于复制，发布和修改以外的活动。这些活动超出这些条款的范围。运"
 "行程序的活动不受条款的限止。仅当程序的输出构成基于程序作品的内容时，这一条款"
-"才适用(如果只运行程序就无关)。"
+"才适用(如果只运行程序就无关)。判断是否成立取决于程序的行为。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:156 (title)
+#: C/gpl.xml:173(title)
 msgid "Section 1"
-msgstr "第1节"
+msgstr "第 1 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:157 (para)
+#: C/gpl.xml:174(para)
 msgid ""
 "You may copy and distribute verbatim copies of the Program's source code as "
 "you receive it, in any medium, provided that you conspicuously and "
@@ -207,11 +228,11 @@ msgid ""
 "License and to the absence of any warranty; and give any other recipients of "
 "the Program a copy of this License along with the Program."
 msgstr ""
-"只要你在每一副本上明显和恰当地出版版权声明和不承担担保的声明，保持此许可证"
-"的声明和没有担保的声明完整无损，并和程序一起给每个其他的程序接受者一份许可证"
-"的副本，你就可以用任何媒体复制和发布你收到的原始的程序的源代码。"
+"只要你在每一副本上明显和恰当地出版版权声明和不承担担保的声明，保持此许可证的"
+"声明和没有担保的声明完整无损，并和程序一起给每个其他的程序接受者一份许可证的"
+"副本，你就可以用任何媒体复制和发布你收到的原始的程序的源代码。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:166 (para)
+#: C/gpl.xml:183(para)
 msgid ""
 "You may charge a fee for the physical act of transferring a copy, and you "
 "may at your option offer warranty protection in exchange for a fee."
@@ -219,17 +240,17 @@ msgstr ""
 "你可以为转让副本的实际行动收取一定费用。你也有权选择提供担保以换取一定的费"
 "用。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:173 (title)
+#: C/gpl.xml:190(title)
 msgid "Section 2"
-msgstr "第2节"
+msgstr "第 2 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:182 (para)
+#: C/gpl.xml:199(para)
 msgid ""
 "You must cause the modified files to carry prominent notices stating that "
 "you changed the files and the date of any change."
 msgstr "你必须在修改的文件中附有明确的说明：你修改了这一文件及具体的修改日期。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:188 (para)
+#: C/gpl.xml:205(para)
 msgid ""
 "You must cause any work that you distribute or publish, that in whole or in "
 "part contains or is derived from the Program or any part thereof, to be "
@@ -239,19 +260,20 @@ msgstr ""
 "你必须使你发布或出版的作品(它包含程序的全部或一部分，或包含由程序的全部或部分"
 "衍生的作品)允许第三方作为整体按许可证条款免费使用。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:206 (title)
+#: C/gpl.xml:223(title)
 msgid "Exception:"
 msgstr "例外："
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:207 (para)
+#: C/gpl.xml:224(para)
 msgid ""
 "If the Program itself is interactive but does not normally print such an "
 "announcement, your work based on the Program is not required to print an "
 "announcement."
-msgstr "如果原始程序以交互方式工作，它并不打印这样的声明，你的基于"
-"程序的作品也就不用打印声明。"
+msgstr ""
+"如果原始程序以交互方式工作，它并不打印这样的声明，你的基于程序的作品也就不用"
+"打印声明。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:196 (para)
+#: C/gpl.xml:213(para)
 msgid ""
 "If the modified program normally reads commands interactively when run, you "
 "must cause it, when started running for such interactive use in the most "
@@ -259,14 +281,14 @@ msgid ""
 "copyright notice and a notice that there is no warranty (or else, saying "
 "that you provide a warranty) and that users may redistribute the program "
 "under these conditions, and telling the user how to view a copy of this "
-"License. <note><placeholder-1/><placeholder-2/></note>"
+"License. <placeholder-1/>"
 msgstr ""
 "如果修改的程序在运行时以交互方式读取命令，你必须使它在开始进入常规的交互使用"
 "方式时打印或显示声明：包括适当的版权声明和没有担保的声明(或者你提供担保的声"
 "明)；用户可以按此许可证条款重新发布程序的说明；并告诉用户如何看到这一许可证的"
-"副本。"
+"副本。<placeholder-1/>"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:174 (para)
+#: C/gpl.xml:191(para)
 msgid ""
 "You may modify your copy or copies of the Program or any portion of it, thus "
 "forming a work based on the Program, and copy and distribute such "
@@ -274,13 +296,11 @@ msgid ""
 "link> above, provided that you also meet all of these conditions: "
 "<placeholder-1/>"
 msgstr ""
-"你可以修改程序的一个或几个副本或程序的任何部分，以此形成基于程序的作品。只"
-"要你同时满足下面的所有条件，你就可以按前面<link linkend=\"sect1\">第1节</"
-"link>的要求复制和发布这一经过修改"
-"的程序或作品："
-"<placeholder-1/>"
+"你可以修改程序的一个或几个副本或程序的任何部分，以此形成基于程序的作品。只要"
+"你同时满足下面的所有条件，你就可以按前面<link linkend=\"sect1\">第1节</link>"
+"的要求复制和发布这一经过修改的程序或作品：<placeholder-1/>"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:219 (para)
+#: C/gpl.xml:236(para)
 msgid ""
 "These requirements apply to the modified work as a whole. If identifiable "
 "sections of that work are not derived from the Program, and can be "
@@ -298,7 +318,7 @@ msgstr ""
 "布时，作为整体它将受到许可证条款约束。准予其他许可证持有人的使用范围扩大到整"
 "个产品。也就是每个部分，不管它是谁写的。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:230 (para)
+#: C/gpl.xml:247(para)
 msgid ""
 "Thus, it is not the intent of this section to claim rights or contest your "
 "rights to work written entirely by you; rather, the intent is to exercise "
@@ -308,7 +328,7 @@ msgstr ""
 "因此，本条款的意图不在于索取权利；或剥夺全部由你写成的作品的权利。而是履行权"
 "利来控制基于程序的集体作品或衍生作品的发布。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:236 (para)
+#: C/gpl.xml:253(para)
 msgid ""
 "In addition, mere aggregation of another work not based on the Program with "
 "the Program (or with a work based on the Program) on a volume of a storage "
@@ -318,11 +338,11 @@ msgstr ""
 "此外，将与程序无关的作品和该程序或基于程序的作品一起放在存贮体或发布媒体的同"
 "一卷上，并不导致将其他作品置于此许可证的约束范围之内。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:244 (title)
+#: C/gpl.xml:261(title)
 msgid "Section 3"
-msgstr "第3节"
+msgstr "第 3 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:254 (para)
+#: C/gpl.xml:271(para)
 msgid ""
 "Accompany it with the complete corresponding machine-readable source code, "
 "which must be distributed under the terms of <link linkend=\"sect1"
@@ -330,11 +350,10 @@ msgid ""
 "customarily used for software interchange; or,"
 msgstr ""
 "在通常用作软件交换的媒体上，和目标码一起附有机器可读的完整的源码。这些源码的"
-"发布应符合上面<link linkend=\"sect1"
-"\">第1节</link>和<link linkend=\"sect1"
+"发布应符合上面<link linkend=\"sect1\">第 1 节</link>和<link linkend=\"sect1"
 "\">第2节</link>的要求。或者"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:261 (para)
+#: C/gpl.xml:278(para)
 msgid ""
 "Accompany it with a written offer, valid for at least three years, to give "
 "any third party, for a charge no more than your cost of physically "
@@ -343,10 +362,10 @@ msgid ""
 "and 2 above on a medium customarily used for software interchange; or,"
 msgstr ""
 "在通常用作软件交换的媒体上，和目标码一起，附有给第三方提供相应的机器可读的源"
-"码的书面报价。有效期不少于3年，费用不超过实际完成源程序发布的实际成本。源码的"
-"发布应符合上面的第1节和第2节的要求。或者"
+"码的书面报价。有效期不少于 3 年，费用不超过实际完成源程序发布的实际成本。源码"
+"的发布应符合上面的第 1 节和第 2 节的要求。或者"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:270 (para)
+#: C/gpl.xml:287(para)
 msgid ""
 "Accompany it with the information you received as to the offer to distribute "
 "corresponding source code. (This alternative is allowed only for "
@@ -357,7 +376,7 @@ msgstr ""
 "和目标码一起，附有你收到的发布源码的报价信息。(这一条款只适用于非商业性发布，"
 "而且你只收到程序的目标码或可执行代码和以上第二款要求提供的报价。)"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:246 (para)
+#: C/gpl.xml:263(para)
 msgid ""
 "You may copy and distribute the Program (or a work based on it, under <link "
 "linkend=\"sect2\">Section 2</link>) in object code or executable form under "
@@ -365,13 +384,12 @@ msgid ""
 "\"sect2\">2</link> above provided that you also do one of the following: "
 "<placeholder-1/>"
 msgstr ""
-"你可以以目标码或可执行形式复制或发布程序(或符合<link "
-"linkend=\"sect2\">第2节</link>的基于程序的作品)，只"
-"要你遵守前面的<link linkend=\"sect1"
-"\">第1节</link>和<link linkend=\"sect1"
-"\">第2节</link>，并同时满足下列三款中的一款：<placeholder-1/>"
+"你可以以目标码或可执行形式复制或发布程序(或符合<link linkend=\"sect2\">第2节"
+"</link>的基于程序的作品)，只要你遵守前面的<link linkend=\"sect1\">第 1 节</"
+"link>和<link linkend=\"sect1\">第 2 节</link>，并同时满足下列三款中的一款："
+"<placeholder-1/>"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:280 (para)
+#: C/gpl.xml:297(para)
 msgid ""
 "The source code for a work means the preferred form of the work for making "
 "modifications to it. For an executable work, complete source code means all "
@@ -389,7 +407,7 @@ msgstr ""
 "运行的操作系统的主要组成部分(如编译程序、内核等)。除非这些组成部分和可执行作"
 "品结合在一起。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:290 (para)
+#: C/gpl.xml:307(para)
 msgid ""
 "If distribution of executable or object code is made by offering access to "
 "copy from a designated place, then offering equivalent access to copy the "
@@ -401,11 +419,11 @@ msgstr ""
 "一地点的访问和复制源码可以算作源码的发布，即使第三方不强求与目标码一起复制源"
 "码。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:299 (title)
+#: C/gpl.xml:316(title)
 msgid "Section 4"
-msgstr "第4节"
+msgstr "第 4 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:301 (para)
+#: C/gpl.xml:318(para)
 msgid ""
 "You may not copy, modify, sublicense, or distribute the Program except as "
 "expressly provided under this License. Any attempt otherwise to copy, "
@@ -419,11 +437,11 @@ msgstr ""
 "束许可证赋予你的权利。然而，对那些从你那里按许可证条款得到副本和权利的人们，"
 "只要他们继续全面履行条款，许可证赋予他们的权利仍然有效。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:311 (title)
+#: C/gpl.xml:328(title)
 msgid "Section 5"
-msgstr "第5节"
+msgstr "第 5 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:313 (para)
+#: C/gpl.xml:330(para)
 msgid ""
 "You are not required to accept this License, since you have not signed it. "
 "However, nothing else grants you permission to modify or distribute the "
@@ -433,16 +451,16 @@ msgid ""
 "this License to do so, and all its terms and conditions for copying, "
 "distributing or modifying the Program or works based on it."
 msgstr ""
-"你没有在许可证上签字，因而你没有必要一定接受这一许可证。然而，没有任何其他"
-"东西赋予你修改和发布程序及其衍生作品的权利。如果你不接受许可证，这些行为是法"
-"律禁止的。因此，如果你修改或发布程序(或任何基于程序的作品)，你就表明你接受这"
-"一许可证以及它的所有有关复制，发布和修改程序或基于程序的作品的条款和条件。"
+"你没有在许可证上签字，因而你没有必要一定接受这一许可证。然而，没有任何其他东"
+"西赋予你修改和发布程序及其衍生作品的权利。如果你不接受许可证，这些行为是法律"
+"禁止的。因此，如果你修改或发布程序(或任何基于程序的作品)，你就表明你接受这一"
+"许可证以及它的所有有关复制，发布和修改程序或基于程序的作品的条款和条件。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:324 (title)
+#: C/gpl.xml:341(title)
 msgid "Section 6"
-msgstr "第6节 "
+msgstr "第 6 节 "
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:326 (para)
+#: C/gpl.xml:343(para)
 msgid ""
 "Each time you redistribute the Program (or any work based on the Program), "
 "the recipient automatically receives a license from the original licensor to "
@@ -451,15 +469,15 @@ msgid ""
 "exercise of the rights granted herein. You are not responsible for enforcing "
 "compliance by third parties to this License."
 msgstr ""
-"每当你重新发布程序(或任何基于程序的作品)时，接受者自动从原始许可证颁发者那"
-"里接到受这些条款和条件支配的复制，发布或修改程序的许可证。你不可以对接受者履"
-"行这里赋予他们的权利强加其他限制。你也没有强求第三方履行许可证条款的义务。"
+"每当你重新发布程序(或任何基于程序的作品)时，接受者自动从原始许可证颁发者那里"
+"接到受这些条款和条件支配的复制，发布或修改程序的许可证。你不可以对接受者履行"
+"这里赋予他们的权利强加其他限制。你也没有强求第三方履行许可证条款的义务。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:336 (title)
+#: C/gpl.xml:353(title)
 msgid "Section 7"
-msgstr "第7节"
+msgstr "第 7 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:338 (para)
+#: C/gpl.xml:355(para)
 msgid ""
 "If, as a consequence of a court judgment or allegation of patent "
 "infringement or for any other reason (not limited to patent issues), "
@@ -474,14 +492,14 @@ msgid ""
 "it and this License would be to refrain entirely from distribution of the "
 "Program."
 msgstr ""
-"如果由于法院判决或违反专利的指控或任何其他原因(不限于专利问题)的结果，强加"
-"于你的条件(不管是法院判决、协议或其他)和许可证的条件有冲突。他们也不能用许可"
-"证条款为你开脱。在你不能同时满足本许可证规定的义务及其他相关的义务时，作为结"
+"如果由于法院判决或违反专利的指控或任何其他原因(不限于专利问题)的结果，强加于"
+"你的条件(不管是法院判决、协议或其他)和许可证的条件有冲突。他们也不能用许可证"
+"条款为你开脱。在你不能同时满足本许可证规定的义务及其他相关的义务时，作为结"
 "果，你可以根本不发布程序。例如，如果某一专利许可证不允许所有那些直接或间接从"
 "你那里接受副本的人们在不付专利费的情况下重新发布程序，唯一能同时满足两方面要"
 "求的办法是停止发布程序。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:350 (para)
+#: C/gpl.xml:367(para)
 msgid ""
 "If any portion of this section is held invalid or unenforceable under any "
 "particular circumstance, the balance of the section is intended to apply and "
@@ -490,7 +508,7 @@ msgstr ""
 "如果本条款的任何部分在特定的环境下无效或无法实施，就使用条款的其余部分。并将"
 "条款作为整体用于其他环境。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:356 (para)
+#: C/gpl.xml:373(para)
 msgid ""
 "It is not the purpose of this section to induce you to infringe any patents "
 "or other property right claims or to contest validity of any such claims; "
@@ -508,17 +526,17 @@ msgstr ""
 "慨的供献。作者/捐献者有权决定他/她是否通过任何其他系统发布软件。许可证持有人"
 "不能强制这种选择。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:366 (para)
+#: C/gpl.xml:383(para)
 msgid ""
 "This section is intended to make thoroughly clear what is believed to be a "
 "consequence of the rest of this License."
 msgstr "本节的目的在于明确说明许可证其余部分可能产生的结果。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:373 (title)
+#: C/gpl.xml:390(title)
 msgid "Section 8"
-msgstr "第8节"
+msgstr "第 8 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:375 (para)
+#: C/gpl.xml:392(para)
 msgid ""
 "If the distribution and/or use of the Program is restricted in certain "
 "countries either by patents or by copyrighted interfaces, the original "
@@ -528,26 +546,26 @@ msgid ""
 "In such case, this License incorporates the limitation as if written in the "
 "body of this License."
 msgstr ""
-"如果由于专利或者由于有版权的接口问题使程序在某些国家的发布和/或使用受到限"
-"止，将此程序置于许可证约束下的原始版权拥有者可以增加限止发布地区的条款，将这"
-"些国家明确排除在外。并在这些国家以外的地区发布程序。在这种情况下，许可证包含"
-"的限止条款和许可证正文一样有效。"
+"如果由于专利或者由于有版权的接口问题使程序在某些国家的发布和/或使用受到限止，"
+"将此程序置于许可证约束下的原始版权拥有者可以增加限止发布地区的条款，将这些国"
+"家明确排除在外。并在这些国家以外的地区发布程序。在这种情况下，许可证包含的限"
+"止条款和许可证正文一样有效。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:385 (title)
+#: C/gpl.xml:402(title)
 msgid "Section 9"
-msgstr "第9节"
+msgstr "第 9 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:387 (para)
+#: C/gpl.xml:404(para)
 msgid ""
 "The Free Software Foundation may publish revised and/or new versions of the "
 "General Public License from time to time. Such new versions will be similar "
 "in spirit to the present version, but may differ in detail to address new "
 "problems or concerns."
 msgstr ""
-"自由软件基金会可能随时出版通用公共许可证的修改版或新版。新版和当前的版本在"
-"原则上保持一致，但在提到新问题时或有关事项时，在细节上可能出现差别。"
+"自由软件基金会可能随时出版通用公共许可证的修改版或新版。新版和当前的版本在原"
+"则上保持一致，但在提到新问题时或有关事项时，在细节上可能出现差别。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:393 (para)
+#: C/gpl.xml:410(para)
 msgid ""
 "Each version is given a distinguishing version number. If the Program "
 "specifies a version number of this License which applies to it and "
@@ -561,11 +579,11 @@ msgstr ""
 "新的版本</quote>。你有权选择遵循指定的版本或自由软件基金会以后出版的新版本，"
 "如果程序未指定许可证版本，你可选择自由软件基金会已经出版的任何版本。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:403 (title)
+#: C/gpl.xml:420(title)
 msgid "Section 10"
-msgstr "第10节"
+msgstr "第 10 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:405 (para)
+#: C/gpl.xml:422(para)
 msgid ""
 "If you wish to incorporate parts of the Program into other free programs "
 "whose distribution conditions are different, write to the author to ask for "
@@ -575,21 +593,21 @@ msgid ""
 "preserving the free status of all derivatives of our free software and of "
 "promoting the sharing and reuse of software generally."
 msgstr ""
-"如果你愿意将程序的一部分结合到其他自由程序中，而它们的发布条件不同。写信"
-"给作者，要求准予使用。如果是自由软件基金会加以版权保护的软件，写信给自由软件"
-"基金会。我们有时会作为例外的情况处理。我们的决定受两个主要目标的指导。这两个"
-"主要目标是：我们的自由软件的衍生作品继续保持自由状态。以及从整体上促进软件的"
-"共享和重复利用。"
+"如果你愿意将程序的一部分结合到其他自由程序中，而它们的发布条件不同。写信给作"
+"者，要求准予使用。如果是自由软件基金会加以版权保护的软件，写信给自由软件基金"
+"会。我们有时会作为例外的情况处理。我们的决定受两个主要目标的指导。这两个主要"
+"目标是：我们的自由软件的衍生作品继续保持自由状态。以及从整体上促进软件的共享"
+"和重复利用。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:415 (title)
+#: C/gpl.xml:432(title)
 msgid "NO WARRANTY"
 msgstr "无保证"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:416 (subtitle)
+#: C/gpl.xml:433(subtitle)
 msgid "Section 11"
-msgstr "第11节"
+msgstr "第 11 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:418 (para)
+#: C/gpl.xml:435(para)
 msgid ""
 "BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE "
 "PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE "
@@ -601,17 +619,17 @@ msgid ""
 "PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR "
 "CORRECTION."
 msgstr ""
-"由于程序准予免费使用，在适用法准许的范围内，对程序没有担保。除非另有书面"
-"说明，版权所有者和/或其他提供程序的人们<quote>一样</quote>不提供任何类型的担"
+"由于程序准予免费使用，在适用法准许的范围内，对程序没有担保。除非另有书面说"
+"明，版权所有者和/或其他提供程序的人们<quote>一样</quote>不提供任何类型的担"
 "保。不论是明确的，还是隐含的。包括但不限于隐含的适销和适合特定用途的保证。全"
 "部的风险，如程序的质量和性能问题都由你来承担。如果程序出现缺陷，你承担所有必"
 "要的服务、修复和改正的费用。"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:429 (title)
+#: C/gpl.xml:446(title)
 msgid "Section 12"
-msgstr "第12节"
+msgstr "第 12 节"
 
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:431 (para)
+#: C/gpl.xml:448(para)
 msgid ""
 "IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL "
 "ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE "
@@ -623,13 +641,13 @@ msgid ""
 "EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF "
 "SUCH DAMAGES."
 msgstr ""
-"除非适用法或书面协议的要求，在任何情况下，任何版权所有者或任何按许可证条"
-"款修改和发布程序的人们都不对你的损失负有任何责任。包括由于使用或不能使用程序"
-"引起的任何一般的，特殊的，偶然发生的或重大的损失(包括但不限于数据的损失，或者"
-"数据变得不精确，或者你或第三方的持续的损失，或者程序不能和其他程序协调运行"
-"等)。即使版权所有者和其他人提到这种损失的可能性也不例外。"
+"除非适用法或书面协议的要求，在任何情况下，任何版权所有者或任何按许可证条款修"
+"改和发布程序的人们都不对你的损失负有任何责任。包括由于使用或不能使用程序引起"
+"的任何一般的，特殊的，偶然发生的或重大的损失(包括但不限于数据的损失，或者数据"
+"变得不精确，或者你或第三方的持续的损失，或者程序不能和其他程序协调运行等)。即"
+"使版权所有者和其他人提到这种损失的可能性也不例外。"
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: /tmp/doc-l10n/cvs/desktop-gpl.HEAD/C/gpl.xml:0 (None)
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/gpl.xml:0(None)
 msgid "translator-credits"
 msgstr "Funda Wang <fundawang@linux.net.cn>, 2006."