add Chinese lang-options

11 files changed, 224 insertions, 788 deletions

diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index b7fc62923..516695cc2 100644
--- a/po/zh_CN/bookinfo.po
+++ b/po/zh_CN/bookinfo.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-05-01 18:59+0000\n"
-"PO-Revision-Date: 2005-08-15 09:45+0800\n"
+"PO-Revision-Date: 2006-05-13 16:54+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgid ""
 "status of the translation, the people behind it, how to contact the team, "
 "etc. See build/lang-options/README on how to enable this paragraph. Its "
 "condition is \"bookinfo_langteam\"."
-msgstr ""
+msgstr "Debian 安装手册简体中文版翻译项目由 Carlos Z.F. Liu 发起组织，参加翻译和校对的人员有(按字母和拼音排列)：Carlos Liu, Huaxia Zhao, Kov Tchai, Ming Hua，szjungle, wide288, 胡海星，吴鲁加，解彦博，肖圣文。GPL 简体中文版取自：http://gnu.freehostingguru.com/gpl/ 。"
 
 #. Tag: holder
 #: bookinfo.xml:53
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 1eb0d8e20..bae6069e8 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-04-28 19:33+0000\n"
-"PO-Revision-Date: 2006-03-22 21:59+0800\n"
+"PO-Revision-Date: 2006-05-13 11:10+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -3621,13 +3621,11 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:2935
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The boot floppy, which normally scans all floppies it can to find the root "
 "floppy, can be overridden by this parameter to only look at the one device."
-msgstr ""
-"引导映像通常会扫描所有的软盘和 USB 存储设备来找到根软盘。它也可以通过此参数来"
-"只查找一个设备。"
+msgstr "引导软盘，它通常会扫描所有的软盘来找到根软盘，可以通过此参数设置只查找一个设备。"
 
 #. Tag: term
 #: boot-installer.xml:2945
@@ -4308,16 +4306,3 @@ msgstr ""
 "      and ideas you had during the initial install.&gt;\n"
 "</screen></informalexample> 在 bug 报告内，请说明问题所在，包括内核挂起后最后"
 "见到的内核消息。说明进入问题状态时您进行的步骤。"
-
-#~ msgid ""
-#~ "In case your computer doesn't support booting from USB memory devices, "
-#~ "you can still use a single floppy to do the initial boot and then switch "
-#~ "to USB. Boot your system as described in <xref linkend=\"floppy-boot\"/>; "
-#~ "the kernel on the boot floppy should detect your USB stick automatically. "
-#~ "When it asks for the root floppy, simply press &enterkey;. You should see "
-#~ "&d-i; starting."
-#~ msgstr ""
-#~ "如果您的计算机不支持从 USB 存储设备引导，您也可以采用单张软盘来初始化引导"
-#~ "并且切换至 USB。根据 <xref linkend=\"floppy-boot\"/>; 在引导软盘的内核应该"
-#~ "能够自动检测您的 USB 盘。当它要求根(root)软盘的时候，只需简单敲入 "
-#~ "&enterkey;。您应该看到 &d-i; 开始运行。"
diff --git a/po/zh_CN/gpl.po b/po/zh_CN/gpl.po
index 4f4a45a0c..890b259ca 100644
--- a/po/zh_CN/gpl.po
+++ b/po/zh_CN/gpl.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-05-04 19:49+0000\n"
-"PO-Revision-Date: 2005-08-02 10:43+0800\n"
+"PO-Revision-Date: 2006-05-13 16:53+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
 #: gpl.xml:4
 #, no-c-format
 msgid "GNU General Public License"
-msgstr "GNU General Public License(此许可证只有英文原文具有法律效力)"
+msgstr "GNU 通用公共授权"
 
 #. Tag: para
 #: gpl.xml:6
@@ -32,7 +32,7 @@ msgid ""
 "that uses the GNU GPL--only the original English text of the GNU GPL does "
 "that. However, we hope that this translation will help {language} speakers "
 "understand the GNU GPL better."
-msgstr ""
+msgstr "This is an unofficial translation of the GNU General Public License into Chinese. It was not published by the Free Software Foundation, and does not legally state the distribution terms for software that uses the GNU GPL--only the original English text of the GNU GPL does that. However, we hope that this translation will help Chinese speakers understand the GNU GPL better."
 
 #. Tag: para
 #: gpl.xml:22
@@ -47,17 +47,17 @@ msgid ""
 "software that uses the GNU GPL--only the original English text of the GNU "
 "GPL does that. However, we hope that this translation will help {language} "
 "speakers understand the GNU GPL better."
-msgstr ""
+msgstr "这是一份 GNU 通用公共授权非正式的中文翻译。它并非由自由软件基金会所发表，亦非使用 GNU 通用公共授权的软件的法定发布条款─只有 GNU 通用公共授权英文原文的版本始具有此等效力。然而，我们希望这份翻译能帮助中文的使用者更了解 GNU 通用公共授权。"
 
 #. Tag: para
 #: gpl.xml:37
 #, no-c-format
 msgid "Version 2, June 1991"
-msgstr "Version 2, June 1991"
+msgstr "第二版, 1991 年 6 月"
 
 #. Tag: screen
 #: gpl.xml:41
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
 "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n"
@@ -65,14 +65,17 @@ msgid ""
 "Everyone is permitted to copy and distribute verbatim copies\n"
 "of this license document, but changing it is not allowed."
 msgstr ""
-"Everyone is permitted to copy and distribute verbatim copies of this license "
-"document, but changing it is not allowed."
+"著作权所有 (C) 1989，1991 Free Software Foundation, Inc.\n"
+"51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n"
+"\n"
+"允许每个人复制和发布本授权文件的完整副本，\n"
+"但不允许对它进行任何修改。"
 
 #. Tag: title
 #: gpl.xml:45
 #, no-c-format
 msgid "Preamble"
-msgstr "Preamble"
+msgstr "导言"
 
 #. Tag: para
 #: gpl.xml:46
@@ -86,15 +89,7 @@ msgid ""
 "program whose authors commit to using it. (Some other Free Software "
 "Foundation software is covered by the gnu Library General Public License "
 "instead.) You can apply it to your programs, too."
-msgstr ""
-"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 &mdash; to make "
-"sure the software is free for all its users. This General Public License "
-"applies to most of the Free Software Foundation's software and to any other "
-"program whose authors commit to using it. (Some other Free Software "
-"Foundation software is covered by the gnu Library General Public License "
-"instead.) You can apply it to your programs, too."
+msgstr "大多数软件授权声明是设计用以剥夺您共享与修改软件的自由。相反地，GNU 通用公共授权力图保证您分享与修改自由软件的自由-确保软件对所有的使用者都是自由的。通用公共授权适用于大多数自由软件基金会的软件，以及任何作者指定使用本授权的其他软件。（有些自由软件基金会的软件，则适用 GNU 函式库通用公共授权规定。）您也可以让您的软件适用本授权规定。"
 
 #. Tag: para
 #: gpl.xml:58
@@ -106,13 +101,7 @@ msgid ""
 "wish), that you receive source code or can get it if you want it, that you "
 "can change the software or use pieces of it in new free programs; and that "
 "you know you can do these things."
-msgstr ""
-"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 "
-"to distribute copies of free software (and charge for this service if you "
-"wish), that you receive source code or can get it if you want it, that you "
-"can change the software or use pieces of it in new free programs; and that "
-"you know you can do these things."
+msgstr "当我们在谈论自由软件时，我们所指的是自由，而不是价格。我们的通用公共授权是设计用以确保使您拥有发布自由软件备份的自由（以及您可以决定此一服务是否收费），确保您能收到源码或者在您需要时能得到它，确保您能变更软件或将它的一部分用于新的自由软件；并且确保您知道您可以做上述的这些事情。"
 
 #. Tag: para
 #: gpl.xml:68
@@ -122,11 +111,7 @@ msgid ""
 "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 ""
-"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 "为了保障您的权利，我们需要作出限制：禁止任何人否认您上述的权利，或者要求您放弃这些权利。如果您发布软件的副本，或者对之加以修改，这些限制就转化成为您的责任。"
 
 #. Tag: para
 #: gpl.xml:75
@@ -136,11 +121,7 @@ msgid ""
 "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 ""
-"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 "例如，假如您发布此类程序的副本，无论是免费或收取费用，您必须将您所享有的一切权利给予收受者。您也必须确保他们也能收到或得到原始程序码。而且您必须向他们展示这些条款的內容，使他们知到他们所享有的权利。"
 
 #. Tag: para
 #: gpl.xml:83
@@ -149,10 +130,7 @@ msgid ""
 "We protect your rights with two steps: (1) copyright the software, and (2) "
 "offer you this license which gives you legal permission to copy, distribute "
 "and/or modify the software."
-msgstr ""
-"We protect your rights with two steps: (1) copyright the software, and (2) "
-"offer you this license which gives you legal permission to copy, distribute "
-"and/or modify the software."
+msgstr "我们采取两项措施來保护您的权利：(1)以著作权保护软件，以及(2)提供您本授权，赋与您复制、发布并且／或者修改软件的法律许可。"
 
 #. Tag: para
 #: gpl.xml:89
@@ -164,13 +142,7 @@ msgid ""
 "recipients to know that what they have is not the original, so that any "
 "problems introduced by others will not reflect on the original authors' "
 "reputations."
-msgstr ""
-"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 "
-"the software is modified by someone else and passed on, we want its "
-"recipients to know that what they have is not the original, so that any "
-"problems introduced by others will not reflect on the original authors' "
-"reputations."
+msgstr "同时，为了保护作者与我们（按：指自由软件基金会），我们想要确定每个人都明白，自由软件是沒有担保责任的。如果软件被他人修改并加以传播，我们需要其收受者知道，他们所得到的并非原始版本，因此由他人所引出的任何问题对原作者的声誉将不会有任何的影响。"
 
 #. Tag: para
 #: gpl.xml:98
@@ -181,12 +153,7 @@ msgid ""
 "individually obtain patent licenses, in effect making the program "
 "proprietary. To prevent this, we have made it clear that any patent must be "
 "licensed for everyone's free use or not licensed at all."
-msgstr ""
-"Finally, any free program is threatened constantly by software patents. We "
-"wish to avoid the danger that redistributors of a free program will "
-"individually obtain patent licenses, in effect making the program "
-"proprietary. To prevent this, we have made it clear that any patent must be "
-"licensed for everyone's free use or not licensed at all."
+msgstr "最后，所有自由软件不断地受到软件专利的威胁。我们希望能避免自由软件的再发布者以个人名义取得专利授权而使程序专有化的风险。为了防止上述的情事发生，我们在此明确声明：任何专利都必须为了每个人的自由使用而核准，否则就不应授与专利。"
 
 #. Tag: para
 #: gpl.xml:107
@@ -194,25 +161,23 @@ msgstr ""
 msgid ""
 "The precise terms and conditions for copying, distribution and modification "
 "follow."
-msgstr ""
-"The precise terms and conditions for copying, distribution and modification "
-"follow."
+msgstr "以下是有关复制、发布及修改的明确条款及条件。"
 
 #. Tag: title
 #: gpl.xml:115
 #, no-c-format
 msgid "GNU GENERAL PUBLIC LICENSE"
-msgstr "GNU GENERAL PUBLIC LICENSE"
+msgstr "GNU 通用公共授权"
 
 #. Tag: emphasis
 #: gpl.xml:118
 #, no-c-format
 msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+msgstr "复制、发布与修改的条款与条件"
 
 #. Tag: para
 #: gpl.xml:121
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">0.</emphasis> This License applies to any program or "
 "other work which contains a notice placed by the copyright holder saying it "
@@ -223,16 +188,7 @@ msgid ""
 "it, either verbatim or with modifications and/or translated into another "
 "language. (Hereinafter, translation is included without limitation in the "
 "term \"modification\".) Each licensee is addressed as \"you\"."
-msgstr ""
-"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 "
-"of this General Public License. The \"Program\", below, refers to any such "
-"program or work, and a \"work based on the Program\" means either the "
-"Program or any derivative work under copyright law: that is to say, a work "
-"containing the Program or a portion of it, either verbatim or with "
-"modifications and/or translated into another language. (Hereinafter, "
-"translation is included without limitation in the term \"modification\".) "
-"Each licensee is addressed as \"you\"."
+msgstr "<emphasis role=\"bold\">0.</emphasis> 凡著作权人在其程序或其他著作中声明，该程序或著作会在通用公共授权条款下发布，本授权对其均有适用。以下所称的\"程序\"，是指任何一种适用通用公共授权的程序或著作；并且一个\"基于本程序的著作\"，则指本程序或任何基于著作权法所产生的衍生著作，换言之，是指包含本程序全部或一部的著作，不论是完整的或经过修改的程序，以及（或）翻译成其他语言的程序（以下\"修改\"一词包括但不限于翻译行为在內）。被授权人则称为\"您\"。"
 
 #. Tag: para
 #: gpl.xml:134
@@ -244,17 +200,11 @@ msgid ""
 "contents constitute a work based on the Program (independent of having been "
 "made by running the Program). Whether that is true depends on what the "
 "Program does."
-msgstr ""
-"Activities other than copying, distribution and modification are not covered "
-"by this License; they are outside its scope. The act of running the Program "
-"is not restricted, and the output from the Program is covered only if its "
-"contents constitute a work based on the Program (independent of having been "
-"made by running the Program). Whether that is true depends on what the "
-"Program does."
+msgstr "本授权不适用于复制、发布与修改以外的行为；这些行为不在本授权范围内。执行本程序的行为并不受限制，而本程序的输出只有在其內容构成基于本程序所生的著作（而非只是因为执行本程序所造成）时，始受本授权拘束。至于程序的输出內容是否构成本程序的衍生著作，则取决于本程序的具体用途。"
 
 #. Tag: para
 #: gpl.xml:143
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">1.</emphasis> You may copy and distribute verbatim "
 "copies of the Program's source code as you receive it, in any medium, "
@@ -263,13 +213,7 @@ msgid ""
 "notices that refer to this 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 ""
-"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 "
-"appropriately publish on each copy an appropriate copyright notice and "
-"disclaimer of warranty; keep intact all the notices that refer to this "
-"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 "<emphasis role=\"bold\">1.</emphasis> 您可以对所收受的本程序源代码，无论以何种媒介，复制与发布其完整的复制物，然而您必须符合以下要件：以显著及适当的方式在每一份复制物上发布适当的著作权标示及无担保声明；维持所有有关本授权以及无担保声明的原貌；并将本授权的副本连同本程序一起交付予其他任何一位本程序的收受者。"
 
 #. Tag: para
 #: gpl.xml:154
@@ -277,51 +221,39 @@ msgstr ""
 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."
-msgstr ""
-"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."
+msgstr "您可以对让与复制物的实际行为收取一定的费用，您也可以自由决定是否提供担保以作为对价的交换。"
 
 #. Tag: para
 #: gpl.xml:160
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">2.</emphasis> 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 modifications or work under the terms of "
 "Section 1 above, provided that you also meet all of these conditions:"
-msgstr ""
-"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 "
-"modifications or work under the terms of Section 1 above, provided that you "
-"also meet all of these conditions:"
+msgstr "<emphasis role=\"bold\">2.</emphasis> 您可以修改本程序的一个或数个复制物或者本程序的任何部份，以此形成基于本程序所生的著作，并依前述第一条规定，复制与发布此一修改过的程序或著作，但您必须符合以下要件："
 
 #. Tag: para
 #: gpl.xml:169
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You must cause the modified files to carry prominent notices stating that "
 "you changed the files and the date of any change."
-msgstr ""
-"a) You must cause the modified files to carry prominent notices stating that "
-"you changed the files and the date of any change."
+msgstr "您必须在所修改的挡案上附加显著的标示，阐明您修改过这些挡案，以及修改日期。"
 
 #. Tag: para
 #: gpl.xml:175
-#, fuzzy, no-c-format
+#, no-c-format
 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 "
 "licensed as a whole at no charge to all third parties under the terms of "
 "this License."
-msgstr ""
-"b) 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 "
-"licensed as a whole at no charge to all third parties under the terms of "
-"this License."
+msgstr "您必须就您所发布或发行的著作，无论是包含本程序全部或一部的著作，或者是自本程序或其任何部份所衍生的著作，整体授权所有第三人依本授权规定使用，且不得因此项授权行为而收取任何费用。"
 
 #. Tag: para
 #: gpl.xml:183
-#, fuzzy, no-c-format
+#, no-c-format
 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 "
@@ -332,16 +264,7 @@ msgid ""
 "License. (Exception: 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 ""
-"c) If the modified program normally reads commands interactively when run, "
-"you must cause it, when started running for such interactive use in the most "
-"ordinary way, to print or display an announcement including an appropriate "
-"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. (Exception: 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 "若经过修改的程序在执行时通常以交互方式读取命令时，您必须在最常被使用的方式下，于开始进入这种交互式使用时，列印或展示以下宣告：适当的著作权标示及无担保声明（或者声明您提供担保）、使用者可以依这些条件再发布此程序，以及告知使用者如何浏览本授权的副本。（例外：若本程序本身是以交互的方式执行，然而通常却不会列印该宣告时，则您基于本程序所生的著作便无需列印该宣告。）"
 
 #. Tag: para
 #: gpl.xml:197
@@ -356,16 +279,7 @@ msgid ""
 "the whole must be on the terms of this License, whose permissions for other "
 "licensees extend to the entire whole, and thus to each and every part "
 "regardless of who wrote it."
-msgstr ""
-"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 "
-"reasonably considered independent and separate works in themselves, then "
-"this License, and its terms, do not apply to those sections when you "
-"distribute them as separate works. But when you distribute the same sections "
-"as part of a whole which is a work based on the Program, the distribution of "
-"the whole must be on the terms of this License, whose permissions for other "
-"licensees extend to the entire whole, and thus to each and every part "
-"regardless of who wrote it."
+msgstr "这些要求对修改过的著作是整体适用的。倘著作中可识別的一部份并非衍生自本程序，并且可以合理地认为是一独立的、个別的著作，则当您将其作为个別著作加以发布时，本授权及其条款将不适用于该部分。然而当您将上述部分，作为基于本程序所生著作的一部而发布时，整个著作的发布必须符合本授权条款的规定，而本授权对于其他被授权人所为的许可及于著作整体。"
 
 #. Tag: para
 #: gpl.xml:210
@@ -375,11 +289,7 @@ msgid ""
 "rights to work written entirely by you; rather, the intent is to exercise "
 "the right to control the distribution of derivative or collective works "
 "based on the Program."
-msgstr ""
-"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 "
-"the right to control the distribution of derivative or collective works "
-"based on the Program."
+msgstr "因此，本条规定的意图不在于主张或剥夺您对于完全由您所完成著作的权利；应该說，本条规定意在行使对基于程序所生的之衍生著作或集合著作发布行为的控制权。"
 
 #. Tag: para
 #: gpl.xml:217
@@ -389,68 +299,48 @@ msgid ""
 "the Program (or with a work based on the Program) on a volume of a storage "
 "or distribution medium does not bring the other work under the scope of this "
 "License."
-msgstr ""
-"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 "
-"or distribution medium does not bring the other work under the scope of this "
-"License."
+msgstr "此外，非基于本程序所生的其他著作与本程序（或基于本程序所生的著作）在同一储存或发布的媒介上的单纯聚集行为，并不会使该著作因此受本授权条款约束。"
 
 #. Tag: para
 #: gpl.xml:224
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">3.</emphasis> You may copy and distribute the "
 "Program (or a work based on it, under Section 2) in object code or "
 "executable form under the terms of Sections 1 and 2 above provided that you "
 "also do one of the following:"
-msgstr ""
-"You may copy and distribute the Program (or a work based on it, under "
-"Section 2) in object code or executable form under the terms of Sections 1 "
-"and 2 above provided that you also do one of the following:"
+msgstr "<emphasis role=\"bold\">3.</emphasis> 您可以依前述第一、二条规定，复制与发布本程序（或第二条所述基于本程序所产生的著作）的目的码或可执行形式，但您必须符合以下要件："
 
 #. Tag: para
 #: gpl.xml:233
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Accompany it with the complete corresponding machine-readable source code, "
 "which must be distributed under the terms of Sections 1 and 2 above on a "
 "medium customarily used for software interchange; or,"
-msgstr ""
-"a) Accompany it with the complete corresponding machine-readable source "
-"code, which must be distributed under the terms of Sections 1 and 2 above on "
-"a medium customarily used for software interchange; or,"
+msgstr "附上完整、相对应的机器可判读源码，而这些源码必须依前述第一、二条规定在经常用以作为软件交换的媒介物上发布；或"
 
 #. Tag: para
 #: gpl.xml:241
-#, fuzzy, no-c-format
+#, no-c-format
 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 "
 "performing source distribution, a complete machine-readable copy of the "
 "corresponding source code, to be distributed under the terms of Sections 1 "
 "and 2 above on a medium customarily used for software interchange; or,"
-msgstr ""
-"b) 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 "
-"performing source distribution, a complete machine-readable copy of the "
-"corresponding source code, to be distributed under the terms of Sections 1 "
-"and 2 above on a medium customarily used for software interchange; or,"
+msgstr "附上至少三年有效的书面报价文件，提供任何第三人在支付不超过实际发布源码所需成本的费用下，取得相同源码的完整机器可读复制物，并依前述第一、二条规定在经常用以作为软件交换的媒介物上发布该复制物；或"
 
 #. Tag: para
 #: gpl.xml:251
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Accompany it with the information you received as to the offer to distribute "
 "corresponding source code. (This alternative is allowed only for "
 "noncommercial distribution and only if you received the program in object "
 "code or executable form with such an offer, in accord with Subsection b "
 "above.)"
-msgstr ""
-"c) Accompany it with the information you received as to the offer to "
-"distribute corresponding source code. (This alternative is allowed only for "
-"noncommercial distribution and only if you received the program in object "
-"code or executable form with such an offer, in accord with Subsection b "
-"above.)"
+msgstr "附上您所收受有关发布相同源码的报价资讯。（本项选择仅在非赢利发布、且仅在您依前述b项方式自该书面报价文件收受程序目的码或可执行形式时，始有适用。）"
 
 #. Tag: para
 #: gpl.xml:260
@@ -465,16 +355,7 @@ msgid ""
 "either source or binary form) with the major components (compiler, kernel, "
 "and so on) of the operating system on which the executable runs, unless that "
 "component itself accompanies the executable."
-msgstr ""
-"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 "
-"the source code for all modules it contains, plus any associated interface "
-"definition files, plus the scripts used to control compilation and "
-"installation of the executable. However, as a special exception, the source "
-"code distributed need not include anything that is normally distributed (in "
-"either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that "
-"component itself accompanies the executable."
+msgstr "著作的源码，是指对著作进行修改时适用的形式。对于一个可执行的著作而言，完整的源码是指著作中所包含所有模组的全部源码，加上相关介面的定义挡，还加上用以控制该著作编译与安裝的描述。然而，特別的例外情况是，所发布的源码并不需包含任何通常会随著所执行作业系统的主要组成部分（编译器、核心等等）而发布的软件（无论以源码或二进位格式），除非该部分本身即附加在可执行程序中。"
 
 #. Tag: para
 #: gpl.xml:273
@@ -485,16 +366,11 @@ msgid ""
 "source code from the same place counts as distribution of the source code, "
 "even though third parties are not compelled to copy the source along with "
 "the object code."
-msgstr ""
-"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 "
-"source code from the same place counts as distribution of the source code, "
-"even though third parties are not compelled to copy the source along with "
-"the object code."
+msgstr "若可执行码或目的码的发布方式，是以指定的地点提供存取位置供人复制，则提供可自相同地点复制源码的使用机会，视同对于源码的发布，然而第三人并不因此而负有将目的码连同源码一起复制的义务。"
 
 #. Tag: para
 #: gpl.xml:281
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">4.</emphasis> You may not copy, modify, sublicense, "
 "or distribute the Program except as expressly provided under this License. "
@@ -503,17 +379,11 @@ msgid ""
 "However, parties who have received copies, or rights, from you under this "
 "License will not have their licenses terminated so long as such parties "
 "remain in full compliance."
-msgstr ""
-"You may not copy, modify, sublicense, or distribute the Program except as "
-"expressly provided under this License. Any attempt otherwise to copy, "
-"modify, sublicense or distribute the Program is void, and will automatically "
-"terminate your rights under this License. However, parties who have received "
-"copies, or rights, from you under this License will not have their licenses "
-"terminated so long as such parties remain in full compliance."
+msgstr "<emphasis role=\"bold\">4.</emphasis> 除本授权所明示的方式外，您不得对本程序加以复制、修改、再授权或发布。任何试图以其他方式进行复制、修改、再授权或者发布本程序的行为均为无效，并且将自动终止您基于本授权所得享有的权利。然而，依本授权规定自您手中收受复制物或权利之人，只要遵守本授权规定，他们所获得的授权并不会因此终止。"
 
 #. Tag: para
 #: gpl.xml:292
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">5.</emphasis> You are not required to accept this "
 "License, since you have not signed it. However, nothing else grants you "
@@ -523,18 +393,11 @@ msgid ""
 "the Program), you indicate your acceptance of this License to do so, and all "
 "its terms and conditions for copying, distributing or modifying the Program "
 "or works based on it."
-msgstr ""
-"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 "
-"Program or its derivative works. These actions are prohibited by law if you "
-"do not accept this License. Therefore, by modifying or distributing the "
-"Program (or any work based on the Program), you indicate your acceptance of "
-"this License to do so, and all its terms and conditions for copying, "
-"distributing or modifying the Program or works based on it."
+msgstr "<emphasis role=\"bold\">5.</emphasis> 因为您并未在本授权上签名，所以您无须接受本授权。然而，除此之外您別无其他修改或发布本程序或其衍生著作的授权许可。若您不接受本授权，则这些行为在法律上都是被禁止的。因此，藉由对本程序（或任何基于本程序所生的著作）的修改或发布行为，您表示了对于本授权的接受，以及接受所有关于复制、发布或修改本程序或基于本程序所生著作的条款与条件。"
 
 #. Tag: para
 #: gpl.xml:304
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">6.</emphasis> Each time you redistribute the Program "
 "(or any work based on the Program), the recipient automatically receives a "
@@ -543,17 +406,11 @@ msgid ""
 "restrictions on the recipients' exercise of the rights granted herein. You "
 "are not responsible for enforcing compliance by third parties to this "
 "License."
-msgstr ""
-"Each time you redistribute the Program (or any work based on the Program), "
-"the recipient automatically receives a license from the original licensor to "
-"copy, distribute or modify the Program subject to these terms and "
-"conditions. You may not impose any further restrictions on the recipients' "
-"exercise of the rights granted herein. You are not responsible for enforcing "
-"compliance by third parties to this License."
+msgstr "<emphasis role=\"bold\">6.</emphasis> 每当您再发布本程序（或任何基于本程序所生的著作）时，收受者即自动获得原授权人所授予依本授权条款与条件复制、发布或修改本程序的权利。您不得就本授权所赋予收受者行使的权利附加任何进一步的限制。您对于第三人是否履行本授权一事，无须负责。"
 
 #. Tag: para
 #: gpl.xml:315
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">7.</emphasis> If, as a consequence of a court "
 "judgment or allegation of patent infringement or for any other reason (not "
@@ -567,19 +424,7 @@ msgid ""
 "receive copies directly or indirectly through you, then the only way you "
 "could satisfy both it and this License would be to refrain entirely from "
 "distribution of the Program."
-msgstr ""
-"If, as a consequence of a court judgment or allegation of patent "
-"infringement or for any other reason (not limited to patent issues), "
-"conditions are imposed on you (whether by court order, agreement or "
-"otherwise) that contradict the conditions of this License, they do not "
-"excuse you from the conditions of this License. If you cannot distribute so "
-"as to satisfy simultaneously your obligations under this License and any "
-"other pertinent obligations, then as a consequence you may not distribute "
-"the Program at all. For example, if a patent license would not permit "
-"royalty-free redistribution of the Program by all those who receive copies "
-"directly or indirectly through you, then the only way you could satisfy both "
-"it and this License would be to refrain entirely from distribution of the "
-"Program."
+msgstr "<emphasis role=\"bold\">7.</emphasis> 若法院判决、专利侵权主张或者其他任何理由（不限于专利争议）的结果，使得加诸于您的条件（无论是由法院命令、协议书或其他方式造成）与本授权规定有所冲突，他们并不免除您对于本授权规定的遵守。若您无法同时符合依本授权所生义务及其他相关义务而进行发布，那么其结果便是您不得发布该程序。例如，若专利授权不允许其他人直接或间接取得复制物，通过您以免付权利金的方式再发布该程序，您唯一能同时滿足该义务及本授权的方式就是徹底避免进行该程序的发布。"
 
 #. Tag: para
 #: gpl.xml:332
@@ -588,10 +433,7 @@ 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 "
 "the section as a whole is intended to apply in other circumstances."
-msgstr ""
-"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 "
-"the section as a whole is intended to apply in other circumstances."
+msgstr "若本条任一部份在特殊情况下被认定无效或无法执行时，本条其余部分仍应适用，且本条全部于其他情况下仍应适用。"
 
 #. Tag: para
 #: gpl.xml:339
@@ -606,16 +448,7 @@ msgid ""
 "application of that system; it is up to the author/donor to decide if he or "
 "she is willing to distribute software through any other system and a "
 "licensee cannot impose that choice."
-msgstr ""
-"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; "
-"this section has the sole purpose of protecting the integrity of the free "
-"software distribution system, which is implemented by public license "
-"practices. Many people have made generous contributions to the wide range of "
-"software distributed through that system in reliance on consistent "
-"application of that system; it is up to the author/donor to decide if he or "
-"she is willing to distribute software through any other system and a "
-"licensee cannot impose that choice."
+msgstr "本条的目的并不在诱使您侵害专利或其他財产权的权利主张，或就此类主张的有效性加以争执；本条的唯一目的，是在保障藉由公共授权惯例所执行自由软件发布系统的完整性。许多人信赖该系统一贯使用的应用程序，而对经由此系统发布的大量软件有相当多的贡献；作者／贡献者有权决定他或她是否希望经由其他的系统发布软件，而被授权人则无该种选择权。"
 
 #. Tag: para
 #: gpl.xml:352
@@ -623,13 +456,11 @@ msgstr ""
 msgid ""
 "This section is intended to make thoroughly clear what is believed to be a "
 "consequence of the rest of this License."
-msgstr ""
-"This section is intended to make thoroughly clear what is believed to be a "
-"consequence of the rest of this License."
+msgstr "本条的用意在于将本授权其他不确定的部分徹底解释清楚。"
 
 #. Tag: para
 #: gpl.xml:357
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">8.</emphasis> If the distribution and/or use of the "
 "Program is restricted in certain countries either by patents or by "
@@ -638,18 +469,11 @@ msgid ""
 "excluding those countries, so that distribution is permitted only in or "
 "among countries not thus excluded. In such case, this License incorporates "
 "the limitation as if written in the body of this License."
-msgstr ""
-"If the distribution and/or use of the Program is restricted in certain "
-"countries either by patents or by copyrighted interfaces, the original "
-"copyright holder who places the Program under this License may add an "
-"explicit geographical distribution limitation excluding those countries, so "
-"that distribution is permitted only in or among countries not thus excluded. "
-"In such case, this License incorporates the limitation as if written in the "
-"body of this License."
+msgstr "<emphasis role=\"bold\">8.</emphasis> 若因为专利或享有著作权保护的介面问题，而使得本程序的发布与／或使用局限于某些国家时，则将本程序置于本授权规范之下的原著作权人得增列明确的发布地区限制条款，将这些国家排除在外，而使发布的许可只限在未受排除的国家之內或之中。在该等情况下，该限制条款如同以书面方式订定于本授权內容中，而成为本授权的条款。"
 
 #. Tag: para
 #: gpl.xml:368
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">9.</emphasis> The Free Software Foundation may "
 "publish revised and/or new versions of the General Public License from time "
@@ -661,21 +485,11 @@ msgid ""
 "or of any later version published by the Free Software Foundation. If the "
 "Program does not specify a version number of this License, you may choose "
 "any version ever published by the Free Software Foundation."
-msgstr ""
-"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. Each version is given a distinguishing version number. "
-"If the Program specifies a version number of this License which applies to "
-"it and \"any later version\", you have the option of following the terms and "
-"conditions either of that version or of any later version published by the "
-"Free Software Foundation. If the Program does not specify a version number "
-"of this License, you may choose any version ever published by the Free "
-"Software Foundation."
+msgstr "<emphasis role=\"bold\">9.</emphasis> 自由软件基金会得随时发表通用公共授权的修正版与／或新版本。新版本在精神上将近似于目前的版本，然而在细节上或所不同以因应新的问题或状况。每一个版本都有个別的版本号码。若本程序指定有授权版本号码，表示其适用该版本或是\"任何新版本\"时，您可以选择遵循该版本或任何由自由软件基金会日后所发表新版本的条款与条件。若本程序并未指定授权版本号码时，您可以选择任一自由软件基金会所发表的版本。"
 
 #. Tag: para
 #: gpl.xml:383
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<emphasis role=\"bold\">10.</emphasis> If you wish to incorporate parts of "
 "the Program into other free programs whose distribution conditions are "
@@ -685,20 +499,13 @@ msgid ""
 "guided by the two goals of preserving the free status of all derivatives of "
 "our free software and of promoting the sharing and reuse of software "
 "generally."
-msgstr ""
-"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 "
-"permission. For software which is copyrighted by the Free Software "
-"Foundation, write to the Free Software Foundation; we sometimes make "
-"exceptions for this. Our decision will be guided by the two goals of "
-"preserving the free status of all derivatives of our free software and of "
-"promoting the sharing and reuse of software generally."
+msgstr "<emphasis role=\"bold\">10.</emphasis> 若您想将部分本程序纳入其他自由程序，而其发布的条件有所不同时，请写信取得作者的许可。若为自由软件基金会享有著作权的软件，请写信至自由软件基金会；我们有时会以例外方式予以处理。我们的决定取决于两项目标：确保我们自由软件的所有衍生著作均维持在自由的状态，并广泛地促进软件的分享与再利用。"
 
 #. Tag: emphasis
 #: gpl.xml:397
 #, no-c-format
 msgid "NO WARRANTY"
-msgstr "NO WARRANTY"
+msgstr "无担保声明"
 
 #. Tag: para
 #: gpl.xml:399
@@ -713,7 +520,7 @@ msgid ""
 "THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH "
 "YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL "
 "NECESSARY SERVICING, REPAIR OR CORRECTION."
-msgstr ""
+msgstr "<emphasis role=\"bold\">11.</emphasis> 由于本程序是无偿授权，因此在法律许可范围內，本授权对本程序并不负担保责任。非经书面声明，著作权人与／或其他提供程序之人，无论明示或默许，均是依「现况」提供本程序而并无任何形式的担保责任，其包括但不限于，就适售性以及特定目的的适用性为默示性担保。有关本程序品质与效能的全部风险均由您承担。如本程序被证明有瑕疵，您应承担所有服务、修复或改正的费用。"
 
 #. Tag: para
 #: gpl.xml:412
@@ -728,19 +535,19 @@ msgid ""
 "RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
 "OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
 "OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
+msgstr "<emphasis role=\"bold\">12.</emphasis> 非经法律要求或书面同意，任何著作权人或任何可能依前述方式修改与／或发布本程序者，对于您因为使用或不能使用本程序所造成的一般性、特殊性、意外性或间接性损失，不负任何责任（包括但不限于，资料损失，资料执行不精确，或应由您或第三人承担的损失，或本程序无法与其他程序运作等），即便前述的著作权人或其他人已被告知该等损失的可能性时，也是一样。"
 
 #. Tag: emphasis
 #: gpl.xml:428
 #, no-c-format
 msgid "END OF TERMS AND CONDITIONS"
-msgstr "END OF TERMS AND CONDITIONS"
+msgstr "条文结束"
 
 #. Tag: title
 #: gpl.xml:433
 #, no-c-format
 msgid "How to Apply These Terms to Your New Programs"
-msgstr "How to Apply These Terms to Your New Programs"
+msgstr "您的新程序该如何采用这些条款"
 
 #. Tag: para
 #: gpl.xml:434
@@ -749,10 +556,7 @@ msgid ""
 "If you develop a new program, and you want it to be of the greatest possible "
 "use to the public, the best way to achieve this is to make it free software "
 "which everyone can redistribute and change under these terms."
-msgstr ""
-"If you develop a new program, and you want it to be of the greatest possible "
-"use to the public, the best way to achieve this is to make it free software "
-"which everyone can redistribute and change under these terms."
+msgstr "如果您开发了一个新程序，并且希望能够让它尽可能地被大众使用，达成此目的的最好方式就是让它成为自由软件，任何人依这些条款规定都能就该软件再为发布及修改。"
 
 #. Tag: para
 #: gpl.xml:441
@@ -762,11 +566,7 @@ msgid ""
 "attach them to the start of each source file to most effectively convey the "
 "exclusion of warranty; and each file should have at least the \"copyright\" "
 "line and a pointer to where the full notice is found."
-msgstr ""
-"To do so, attach the following notices to the program. It is safest to "
-"attach them to the start of each source file to most effectively convey the "
-"exclusion of warranty; and each file should have at least the \"copyright\" "
-"line and a pointer to where the full notice is found."
+msgstr "为了做到这一点，请将以下声明附加到程序上。最安全的作法，是将声明放在每份源码挡案的起始处，以有效传达无担保责任的讯息；且每份挡案至少应有「著作权」列以及本份声明全文位置的提示。"
 
 #. Tag: screen
 #: gpl.xml:448
@@ -791,14 +591,21 @@ msgid ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
 "USA."
 msgstr ""
+"<replaceable>用一行描述程序的名称与其用途简述。</replaceable>\n"
+"著作权所有(C) <replaceable>年份  作者姓名</replaceable>\n"
+"\n"
+"本程序为自由软件；您可依据自由软件基金会所发表的 GNU 通用公共授权条款规定，就本程序再为发布与／或修改；无论您依据的是本授权的第二版或（您自行选择的）任一日后发行的版本。\n"
+"\n"
+"本程序是基于使用目的而加以发布，然而不负任何担保责任；亦无对适售性或特定目的适用性所为的默示性担保。详情请参照 GNU 通用公共授权。\n"
+"\n"
+"您应已收到附随于本程序的 GNU 通用公共授权的副本；如果没有，请写信至自由软件基金会：51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA。"
 
 #. Tag: para
 #: gpl.xml:450
 #, no-c-format
 msgid ""
 "Also add information on how to contact you by electronic and paper mail."
-msgstr ""
-"Also add information on how to contact you by electronic and paper mail."
+msgstr "同时附上如何以电子及书面信件与您联系的资料。"
 
 #. Tag: para
 #: gpl.xml:455
@@ -806,9 +613,7 @@ msgstr ""
 msgid ""
 "If the program is interactive, make it output a short notice like this when "
 "it starts in an interactive mode:"
-msgstr ""
-"If the program is interactive, make it output a short notice like this when "
-"it starts in an interactive mode:"
+msgstr "若程序是以交互方式运作时，请在交互式模式开始时，输出简短提示如下："
 
 #. Tag: screen
 #: gpl.xml:460
@@ -821,6 +626,8 @@ msgid ""
 "to redistribute it under certain conditions; type `show c'\n"
 "for details."
 msgstr ""
+"Gnomovision 第69版，著作权所有 (C) <replaceable>年份 作者姓名</replaceable>\n"
+"Gnomovision不负担保责任，欲知详情请键入'show w'。这是一个自由软件，欢迎您在特定条件下再发布本程序；欲知详情请键入'show c'。"
 
 #. Tag: para
 #: gpl.xml:462
@@ -830,11 +637,7 @@ msgid ""
 "parts of the General Public License. Of course, the commands you use may be "
 "called something other than `show w' and `show c'; they could even be mouse-"
 "clicks or menu items &mdash; whatever suits your program."
-msgstr ""
-"The hypothetical commands `show w' and `show c' should show the appropriate "
-"parts of the General Public License. Of course, the commands you use may be "
-"called something other than `show w' and `show c'; they could even be mouse-"
-"clicks or menu items &mdash; whatever suits your program."
+msgstr "所假设的指令'show w'与'show c'应显示通用公共授权的相对应条款。当然，您可以使用'show w'与'show c'以外的指令名称；甚至以鼠标键击或选菜单方式进行-只要是合于您程序需要的方式都可以。"
 
 #. Tag: para
 #: gpl.xml:470
@@ -843,14 +646,11 @@ msgid ""
 "You should also get your employer (if you work as a programmer) or your "
 "school, if any, to sign a \"copyright disclaimer\" for the program, if "
 "necessary. Here is a sample; alter the names:"
-msgstr ""
-"You should also get your employer (if you work as a programmer) or your "
-"school, if any, to sign a \"copyright disclaimer\" for the program, if "
-"necessary. Here is a sample; alter the names:"
+msgstr "如有需要，您亦应取得您的雇主（若您的工作为程序设计師）或学校就本程序所签署的「著作权放弃承諾书」。其范例如下，您只要修改姓名即可："
 
 #. Tag: screen
 #: gpl.xml:476
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Yoyodyne, Inc., hereby disclaims all copyright interest in the\n"
 "program `Gnomovision' (which makes passes at compilers) written\n"
@@ -859,130 +659,18 @@ msgid ""
 "<replaceable>signature of Ty Coon</replaceable>, 1 April 1989\n"
 "Ty Coon, President of Vice"
 msgstr ""
-"Yoyodyne, Inc., hereby disclaims all copyright interest in the program "
-"`Gnomovision' (which makes passes at compilers) written by James Hacker."
+"Yoyodyne 公司，茲此放弃 James Hacker 所写之'Gnomovision'程序（该程序产出编译器所需资讯）所有的著作权利益。\n"
+"\n"
+"<replaceable>Ty Coon 公司签章</replaceable>, 1989 年四月一日\n"
+"Ty Coon 公司，副总裁"
 
 #. Tag: para
 #: gpl.xml:478
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "This General Public License does not permit incorporating your program into "
 "proprietary programs. If your program is a subroutine library, you may "
 "consider it more useful to permit linking proprietary applications with the "
 "library. If this is what you want to do, use the GNU Lesser General Public "
 "License instead of this License."
-msgstr ""
-"This General Public License does not permit incorporating your program into "
-"proprietary programs. If your program is a subroutine library, you may "
-"consider it more useful to permit linking proprietary applications with the "
-"library. If this is what you want to do, use the gnu Library General Public "
-"License instead of this License."
-
-#~ msgid ""
-#~ "Copyright (C) 1989, 1991 Free Software Foundation, Inc. &mdash; 51 "
-#~ "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
-#~ msgstr ""
-#~ "Copyright (C) 1989, 1991 Free Software Foundation, Inc. &mdash; 51 "
-#~ "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid ""
-#~ "one line to give the program's name and a brief idea of what it does."
-#~ msgstr ""
-#~ "one line to give the program's name and a brief idea of what it does."
-
-#~ msgid "Copyright (C) year name of author"
-#~ msgstr "Copyright (C) year name of author"
-
-#~ msgid ""
-#~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the gnu General Public License as published by the "
-#~ "Free Software Foundation; either version 2 of the License, or (at your "
-#~ "option) any later version."
-#~ msgstr ""
-#~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the gnu General Public License as published by the "
-#~ "Free Software Foundation; either version 2 of the License, or (at your "
-#~ "option) any later version."
-
-#~ msgid ""
-#~ "This program is distributed in the hope that it will be useful, but "
-#~ "without any warranty; without even the implied warranty of "
-#~ "merchantability or fitness for a particular purpose. See the gnu General "
-#~ "Public License for more details."
-#~ msgstr ""
-#~ "This program is distributed in the hope that it will be useful, but "
-#~ "without any warranty; without even the implied warranty of "
-#~ "merchantability or fitness for a particular purpose. See the gnu General "
-#~ "Public License for more details."
-
-#~ msgid ""
-#~ "You should have received a copy of the gnu General Public License along "
-#~ "with this program; if not, write to the Free Software Foundation, Inc., "
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-#~ msgstr ""
-#~ "You should have received a copy of the gnu General Public License along "
-#~ "with this program; if not, write to the Free Software Foundation, Inc., "
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#~ msgid "Gnomovision version 69, Copyright (C) year name of author"
-#~ msgstr "Gnomovision version 69, Copyright (C) year name of author"
-
-#~ msgid ""
-#~ "Gnomovision comes with absolutely no warranty; for details type `show w'."
-#~ msgstr ""
-#~ "Gnomovision comes with absolutely no warranty; for details type `show w'."
-
-#~ msgid ""
-#~ "This is free software, and you are welcome to redistribute it under "
-#~ "certain conditions; type `show c' for details."
-#~ msgstr ""
-#~ "This is free software, and you are welcome to redistribute it under "
-#~ "certain conditions; type `show c' for details."
-
-#~ msgid "signature of Ty Coon, 1 April 1989"
-#~ msgstr "signature of Ty Coon, 1 April 1989"
-
-#~ msgid "Ty Coon, President of Vice"
-#~ msgstr "Ty Coon, President of Vice"
-
-#~ 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 stated in writing the copyright holders and/or other parties "
-#~ "provide the program \"as is\" without warranty of any kind, either "
-#~ "expressed or implied, including, but not limited to, the implied "
-#~ "warranties of merchantability and fitness for a particular purpose. the "
-#~ "entire risk as to the quality and performance of the program is with you. "
-#~ "should the program prove defective, you assume the cost of all necessary "
-#~ "servicing, repair or correction."
-#~ msgstr ""
-#~ "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 stated in writing the copyright holders and/or other parties "
-#~ "provide the program \"as is\" without warranty of any kind, either "
-#~ "expressed or implied, including, but not limited to, the implied "
-#~ "warranties of merchantability and fitness for a particular purpose. the "
-#~ "entire risk as to the quality and performance of the program is with you. "
-#~ "should the program prove defective, you assume the cost of all necessary "
-#~ "servicing, repair or correction."
-
-#~ 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 the program as permitted above, be liable to you for "
-#~ "damages, including any general, special, incidental or consequential "
-#~ "damages arising out of the use or inability to use the program (including "
-#~ "but not limited to loss of data or data being rendered inaccurate or "
-#~ "losses sustained by you or third parties or a failure of the program to "
-#~ "operate with any other programs), even if such holder or other party has "
-#~ "been advised of the possibility of such damages."
-#~ msgstr ""
-#~ "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 the program as permitted above, be liable to you for "
-#~ "damages, including any general, special, incidental or consequential "
-#~ "damages arising out of the use or inability to use the program (including "
-#~ "but not limited to loss of data or data being rendered inaccurate or "
-#~ "losses sustained by you or third parties or a failure of the program to "
-#~ "operate with any other programs), even if such holder or other party has "
-#~ "been advised of the possibility of such damages."
+msgstr "本通用公共授权并不允许您将本程序并入专有程序中。若您的程序是一子程序函数库时，您可能认为允许专有应用程序与该函式库相连结会更有帮助。若这是您所想做的，请使用 GNU 函式库通用公共授权代替本授权。"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 506d8795b..b806632cb 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-05-04 19:49+0000\n"
-"PO-Revision-Date: 2006-04-10 18:45+0800\n"
+"PO-Revision-Date: 2006-05-13 11:55+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -277,9 +277,9 @@ msgstr "nslu2"
 
 #. Tag: entry
 #: hardware.xml:117
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "<entry>RiscPC</entry>"
-msgstr "<entry>APS</entry>"
+msgstr "<entry>RiscPC</entry>"
 
 #. Tag: entry
 #: hardware.xml:118
@@ -1835,9 +1835,9 @@ msgstr ""
 
 #. Tag: term
 #: hardware.xml:743
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "<term>RiscPC</term>"
-msgstr "<term>apus</term>"
+msgstr "<term>RiscPC</term>"
 
 #. Tag: para
 #: hardware.xml:744
@@ -1954,7 +1954,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:846
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "There are four major supported <emphasis>&architecture;</emphasis> flavors: "
 "Amiga, Atari, Macintosh and VME machines. Amiga and Atari were the first two "
@@ -1966,14 +1966,7 @@ msgid ""
 "recent addition to the list of machines supported by Debian. Ports to other "
 "&architecture; architectures, such as the Sun3 architecture and NeXT black "
 "box, are underway but not yet supported by Debian."
-msgstr ""
-"有四个主要的 <emphasis>&architecture;</emphasis> 变种获得支持： Amiga, "
-"Atari, Macintosh 和 VME 机器。Amiga 与 Atari 是首批被移植 Linux 的两个系统； "
-"并且，它们也是被 Debian 移植得最好的两个。Debian 与 Linux 内核对 Macintosh 系"
-"列的 支持都是不完整的，请参考 <ulink url=\"&url-m68k-mac;\">Linux m68k for "
-"Macintosh</ulink> 以了解项目的状态和支持的硬件。BVM 和 Motorola VMEbus 单板电"
-"脑最近才加入 Debian 支持行列。移植到其它的 &architecture; 体系的工作，比如 "
-"Sun3 体系与 NeXT black box，还在进行中，且没有被 Debian 支持。"
+msgstr "一共有四个主要的 <emphasis>&architecture;</emphasis> 变种获得支持：Amiga、Atari、Macintosh 和 VME 机器。Amiga 与 Atari 是首批移植 Linux 的两个系统；并且，它们也是被 Debian 移植得最好的两个。Debian 与 Linux 内核对 Macintosh 系列的支持都是不完整的，请参考 <ulink url=\"&url-m68k-mac;\">Linux m68k for Macintosh</ulink> 以了解项目的状态和支持的硬件。BVM 和 Motorola VMEbus 单板电脑最近才加入 Debian 支持行列。移植到其它的 &architecture; 体系的工作，比如 Sun3 体系与 NeXT black box，还在进行中，且没有被 Debian 支持。"
 
 #. Tag: para
 #: hardware.xml:873
@@ -2231,7 +2224,7 @@ msgstr "支持的控制台选项"
 
 #. Tag: para
 #: hardware.xml:1057
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A serial console is available on all supported DECstations (9600 bps, 8N1). "
 "To use the serial console, you have to boot the installer image with the "
@@ -2241,13 +2234,7 @@ msgid ""
 "<literal>0</literal> for the Personal DECstations). On 3MIN and 3MAX+ "
 "(DECstation 5000/1xx, 5000/240 and 5000/260) a local console is available "
 "with the PMAG-BA and the PMAGB-B graphics options."
-msgstr ""
-"串行控制台可在所有支持的 DECstations (9600 bps, 8N1) 上使用。为了使用串行控制"
-"台，您必须在启动安装程序映象时加上 <literal>console=ttySx</literal> 内核参数"
-"(<replaceable>x</replaceable> 是终端连接的串口号 &mdash; 通常为 <literal>2</"
-"literal>，但 Personal DECstations 是 <literal>0</literal>)。在 3MIN 和 3MAX+ "
-"(DECstation 5000/1xx, 5000/240 和 5000/260) 上，本地控制台可使用 PMAG-BA 和 "
-"PMAGB-B 图形选项。"
+msgstr "串行控制台可在所有支持的 DECstations (9600 bps, 8N1)上使用。为了使用串行控制台，您必须在启动安装程序映象时加上 <literal>console=ttyS</literal><replaceable>x</replaceable> 内核参数(<replaceable>x</replaceable> 是终端连接的串口号 &mdash; 通常为 <literal>2</literal>，但 Personal DECstations 是 <literal>0</literal>)。在 3MIN 和 3MAX+ (DECstation 5000/1xx, 5000/240 和 5000/260) 上，本地控制台可使用 PMAG-BA 和 PMAGB-B 图形选项。"
 
 #. Tag: para
 #: hardware.xml:1068
@@ -3100,18 +3087,14 @@ msgstr "多处理器"
 
 #. Tag: para
 #: hardware.xml:1640
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Multi-processor support &mdash; also called <quote>symmetric multi-"
 "processing</quote> or SMP &mdash; is available for this architecture. The "
 "standard Debian &release; kernel image was compiled with SMP support. This "
 "should not prevent installation, since the SMP kernel should boot on non-SMP "
 "systems; the kernel will simply cause a bit more overhead."
-msgstr ""
-"多处理器支持 &mdash; (又称<quote>symmetric multi-processing</quote>或 SMP "
-"&mdash;) 在本体系架构下是受到支持的。标准的 Debian &release; 内核在编译时已经"
-"加入了 SMP 功能。因为 SMP 的内核也能在非 SMP 的系统下启动，只不过多些系统开"
-"销，所以这并不会影响安装。"
+msgstr "多处理器支持 &mdash; 又称<quote>symmetric multi-processing</quote>或 SMP &mdash; 在本体系架构下可以使用。标准的 Debian &release; 内核在编译时已经加入了 SMP 功能。因为 SMP 的内核也能在非 SMP 的系统下启动，只不过多些系统开销，所以这并不会影响安装。"
 
 #. Tag: para
 #: hardware.xml:1648
@@ -3131,18 +3114,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1664
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Multi-processor support &mdash; also called <quote>symmetric multi-"
 "processing</quote> or SMP &mdash; is available for this architecture. "
 "However, the standard Debian &release; kernel image does not support SMP. "
 "This should not prevent installation, since the standard, non-SMP kernel "
 "should boot on SMP systems; the kernel will simply use the first CPU."
-msgstr ""
-"多处理器支持 &mdash; (又称<quote>symmetric multi-processing</quote>或 SMP "
-"&mdash;) 在本体系架构下是受到支持的。但是，标准的 Debian &release; 内核并不支"
-"持 SMP。这不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核"
-"只使用第一个 CPU。"
+msgstr "多处理器支持 &mdash; 又称<quote>symmetric multi-processing</quote>或 SMP &mdash; 在本体系架构下可以使用。但是，标准的 Debian &release; 内核并不支持 SMP。这不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
 
 #. Tag: para
 #: hardware.xml:1673
@@ -3162,7 +3141,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1687
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Multi-processor support &mdash; also called <quote>symmetric multi-"
 "processing</quote> or SMP &mdash; is available for this architecture, and is "
@@ -3170,11 +3149,7 @@ msgid ""
 "media, this SMP-capable kernel may or may not be installed by default. This "
 "should not prevent installation, since the standard, non-SMP kernel should "
 "boot on SMP systems; the kernel will simply use the first CPU."
-msgstr ""
-"多处理器支持 &mdash; (又称<quote>symmetric multi-processing</quote>或 SMP "
-"&mdash;) 在本体系架构下是受到支持的，并且有一个预编译的 Debian 内核映象已经开"
-"启这项功能。支持 SMP 的内核默认是否被安装，取决于您的安装介质。这并不会影响安"
-"装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
+msgstr "多处理器支持 &mdash; 又称<quote>symmetric multi-processing</quote>或 SMP &mdash; 在本体系架构下可以使用，并且有一个预编译的 Debian 内核映象已经开启这项功能。支持 SMP 的内核默认是否被安装，取决于您的安装介质。这并不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
 
 #. Tag: para
 #: hardware.xml:1697
@@ -3331,7 +3306,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1795
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
 "working with a logical blocksize of 512 bytes. Many of the SCSI CD-ROM "
@@ -3344,31 +3319,18 @@ msgid ""
 "provided because the firmware doesn't recognize CD drives. In order to "
 "install Debian on an Broadcom BCM91480B evaluation board, you need an PCI "
 "IDE, SATA or SCSI card."
-msgstr ""
-"在 SGI 的机器上，从 CD-ROM 启动需要一台能使用 512 字节逻辑块的 SCSI CD-ROM 驱"
-"动器。很多面向 PC 市场的 SCSI CD-ROM 驱动器并不具有这个能力。如果您的 CD-ROM "
-"驱动器上有标注为 <quote>Unix/PC</quote> 或 <quote>512/2048</quote> 的跳线，请"
-"将其置于 <quote>Unix</quote> 或 <quote>512</quote> 的位置上。要开始安装，请从"
-"固件上选择 <quote>System installation</quote> 项。Broadcom BCM91250A 支持标准"
-"的 IDE 设备，包括 CD-ROM 驱动器。但由于其固件不能识别 CD 驱动器，所以在此并不"
-"提供针对此平台的光盘映象。要将 Debian 安装到 Broadcom BCM91480B 开发板上，您"
-"需要一个 PCI IDE、SATA 或 SCSI 卡。"
+msgstr "在 SGI 的机器上，从 CD-ROM 启动需要一台能使用 512 字节逻辑块的 SCSI CD-ROM 驱动器。很多面向 PC 市场的 SCSI CD-ROM 驱动器并不具有这个能力。如果您的 CD-ROM 驱动器上有标注为 <quote>Unix/PC</quote> 或 <quote>512/2048</quote> 的跳线，请将其置于 <quote>Unix</quote> 或 <quote>512</quote> 的位置上。要开始安装，请从固件上选择 <quote>System installation</quote> 项。Broadcom BCM91250A 支持标准的 IDE 设备，包括 CD-ROM 驱动器。但由于其固件不能识别 CD 驱动器，所以当前并不提供针对此平台的光盘映象。要将 Debian 安装到 Broadcom BCM91480B 开发板上，您需要一个 PCI IDE、SATA 或 SCSI 卡。"
 
 #. Tag: para
 #: hardware.xml:1810
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "On DECstations, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
 "working with a logical blocksize of 512 bytes. Many of the SCSI CD-ROM "
 "drives sold on the PC market do not have this capability. If your CD-ROM "
 "drive has a jumper labeled <quote>Unix/PC</quote> or <quote>512/2048</"
 "quote>, place it in the <quote>Unix</quote> or <quote>512</quote> position."
-msgstr ""
-"在 DEC 工作站(DECstations)上，从 CD-ROM 启动需要一台能使用 512 字节逻辑块的 "
-"SCSI CD-ROM 驱动器。很多面向 PC 市场的 SCSI CD-ROM 驱动器并不具有这个能力。如"
-"果您的 CD-ROM 驱动器上有标注为 <quote>Unix/PC</quote> 或 <quote>512/2048</"
-"quote> 的跳线，请将其置于 <quote>Unix</quote> 或 <quote>512</quote> 的位置"
-"上。"
+msgstr "在 DECstations 上，从 CD-ROM 启动需要一台能使用 512 字节逻辑块的 SCSI CD-ROM 驱动器。很多面向 PC 市场的 SCSI CD-ROM 驱动器并不具有这个能力。如果您的 CD-ROM 驱动器上有标注为 <quote>Unix/PC</quote> 或 <quote>512/2048</quote> 的跳线，请将其置于 <quote>Unix</quote> 或 <quote>512</quote> 的位置上。"
 
 #. Tag: para
 #: hardware.xml:1819
@@ -3550,20 +3512,17 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1930
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Generally, the Debian installation system includes support for floppies, IDE "
 "drives, IDE floppies, parallel port IDE devices, SCSI controllers and "
 "drives, USB, and FireWire. The supported file systems include FAT, Win-32 "
 "FAT extensions (VFAT) and NTFS."
-msgstr ""
-"一般说来，Debian 安装系统支持软盘、IDE 驱动器、IDE 软盘、并口 IDE 驱动器、"
-"SCSI 控制器和驱动器、USB 以及 FireWire。文件系统支持 FAT、Win-32 FAT 扩展"
-"(VFAT)、NTFS、以及其他一些格式。"
+msgstr "通常，Debian 安装系统支持软盘、IDE 驱动器、IDE 软盘、并口 IDE 驱动器、SCSI 控制器和驱动器、USB 和火线。文件系统支持 FAT、Win-32 FAT 扩展(VFAT)、NTFS。"
 
 #. Tag: para
 #: hardware.xml:1937
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
 "&mdash; often called MFM, RLL, IDE, or ATA &mdash; are supported. Very old "
@@ -3571,11 +3530,7 @@ msgid ""
 "only as a module. SCSI disk controllers from many different manufacturers "
 "are supported. See the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
 "Compatibility HOWTO</ulink> for more details."
-msgstr ""
-"模拟 <quote>AT</quote> 硬盘接口的磁盘接口 MFM、RLL、IDE 或 ATA 是受支持的。用"
-"于 IBM XT 计算机的非常陈旧的 8 位硬盘控制器只在一个模块里来支持。大部分厂商生"
-"产的 SCSI 磁盘控制器都能获得支持。请参考 <ulink url=\"&url-hardware-howto;"
-"\">Linux Hardware Compatibility HOWTO</ulink> 以获得更详细信息。"
+msgstr "模拟 <quote>AT</quote> 硬盘接口的磁盘接口 &mdash; 称为 MFM、RLL、IDE 或 ATA &mdash; 是受支持的。用于 IBM XT 计算机的非常陈旧的 8 &ndash; 位硬盘控制器只在一个模块里来支持。大部分厂商生产的 SCSI 磁盘控制器都能获得支持。请参考 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink> 以获得更详细信息。"
 
 #. Tag: para
 #: hardware.xml:1947
@@ -3910,7 +3865,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:2174
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
 "release the documentation and other resources necessary for us to program "
@@ -4159,16 +4114,13 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:2393
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Any network interface card (NIC) supported by the Linux kernel is also be "
 "supported by the boot disks. All network drivers are compiled as modules so "
 "you need to load one first during the initial network setup. The list of "
 "supported network devices is:"
-msgstr ""
-"任何受 Linux 内核支持的网络接口卡(NIC)也全都被引导盘所支持。所有的网络驱动程"
-"序都被编译成了模块，因此您需要在最初的网络设置过程中加载其中一个。被支持的网"
-"络设备是："
+msgstr "任何受 Linux 内核支持的网卡(NIC)也全都被引导盘所支持。所有的网络驱动程序都被编译成了模块，因此您需要在最初的网络设置过程中加载其中一个。支持的网络设备列表为："
 
 #. Tag: para
 #: hardware.xml:2401
@@ -4262,22 +4214,3 @@ msgid ""
 msgstr ""
 "任何受 Linux 内核支持的网络接口卡(NIC)也全都被引导盘所支持。您可能需要将网络"
 "驱动作为模块挂载。这意味着您不得不使用其他介质来安装操作系统内核。"
-
-#~ msgid "RiscPC and Riscstation"
-#~ msgstr "RiscPC 与 Riscstation"
-
-#~ msgid "RiscPC"
-#~ msgstr "RiscPC"
-
-#~ msgid "Riscstation"
-#~ msgstr "Riscstation"
-
-#~ msgid ""
-#~ "This is an inexpensive 56MHz 7500FE based machine with integrated video, "
-#~ "IDE, PS/2 keyboard and mouse and two serial ports. Its lack of processing "
-#~ "power was made up for by its price. It may be found in two configurations "
-#~ "one with RISC OS and one with a simple bootloader."
-#~ msgstr ""
-#~ "这是一款廉价的 56MHz 7500FE 机器，它集成有视频、IDE、PS/2 键盘和鼠标，以及"
-#~ "两个串口。由于价格的原由，处理器的能力显得不足。它有两种配置，一个是带有 "
-#~ "RISC OS，另一个具有简单的 bootloader。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index f3924e1dd..270c86e0a 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-04-30 23:58+0000\n"
-"PO-Revision-Date: 2006-03-22 22:14+0800\n"
+"PO-Revision-Date: 2006-05-13 13:22+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -311,7 +311,7 @@ msgstr "创建一个 IPL 磁带"
 
 #. Tag: para
 #: install-methods.xml:263
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
 "create an IPL tape first. This is described in section 3.4.3 in the <ulink "
@@ -321,14 +321,7 @@ msgid ""
 "filename>, <filename>parmfile.debian</filename> and <filename>initrd.debian</"
 "filename>. The files can be downloaded from the <filename>tape</filename> "
 "sub-directory, see <xref linkend=\"where-files\"/>."
-msgstr ""
-"如果您不能从光盘引导(IPL)并且没有使用 VM，您首先就需要创建一个 IPL 磁带。这"
-"在 <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf"
-"\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> Redbook 的"
-"第 3.4.3 节中有描述。您需要写到磁带上的文件是(按以下顺序): <filename>kernel."
-"debian</filename>、<filename>parmfile.debian</filename> 和 <filename>initrd."
-"debian</filename>。这些文件可以从 <filename>tape</filename>子目录下载，请参"
-"见 <xref linkend=\"where-files\"/>,"
+msgstr "如果不能从光盘引导(IPL)并且没有使用 VM，您首先就需要创建一个 IPL 磁带。在 <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> Redbook 的第 3.4.3 节中有描述。您需要写到磁带上的文件是(按顺序): <filename>kernel.debian</filename>、<filename>parmfile.debian</filename> 和 <filename>initrd.debian</filename>。这些文件可以从 <filename>tape</filename> 子目录下载，请参见 <xref linkend=\"where-files\"/>,"
 
 #. Tag: title
 #: install-methods.xml:287
@@ -348,19 +341,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:293
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Booting the installer from floppy disk reportedly fails on Mac USB floppy "
 "drives."
-msgstr "有报告说 Mac USB 软盘驱动器不支持引导软盘。"
+msgstr "有报告说 Mac 上的 USB 软盘驱动器安装程序软盘引导失败。"
 
 #. Tag: para
 #: install-methods.xml:298
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Booting the installer from floppy disk is not supported on Amigas or 68k "
 "Macs."
-msgstr "Amigas 或者 68k Macs 的软盘引导方法也不被支持。"
+msgstr "Amigas 或者 68k Macs 的安装程序软盘引导也不被支持。"
 
 #. Tag: para
 #: install-methods.xml:303
@@ -382,14 +375,12 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:314
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "There are different techniques for creating floppies from disk images. This "
 "section describes how to create floppies from disk images on different "
 "platforms."
-msgstr ""
-"根据平台的不同，有各种不同的方法来从软盘映像创建引导软盘。这一节将描述如何在"
-"不同平台上从软盘映像创建引导软盘。"
+msgstr "有各种不同的技术从软盘映像创建引导软盘。这一节将描述如何在不同平台上用软盘映像创建引导软盘。"
 
 #. Tag: para
 #: install-methods.xml:320
@@ -758,7 +749,7 @@ msgstr "为从 USB 闪盘引导准备文件"
 
 #. Tag: para
 #: install-methods.xml:587
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "To prepare the USB stick, you will need a system where GNU/Linux is already "
 "running and where USB is supported. You should ensure that the usb-storage "
@@ -766,21 +757,15 @@ msgid ""
 "try to find out which SCSI device the USB stick has been mapped to (in this "
 "example <filename>/dev/sda</filename> is used). To write to your stick, you "
 "may have to turn off its write protection switch."
-msgstr ""
-"您需要一台运行支持 USB 的 GNU/Linux 系统来为 USB 闪盘引导准备文件。您应该确"
-"定 usb-storage 内核模块已经被加载(<userinput>modprobe usb-storage</"
-"userinput>) 然后尝试找出 USB 闪盘被映射到的哪个 SCSI 设备(在此以 <filename>/"
-"dev/sda</filename> 为例)。为了写入您的闪盘，您可能需要关闭它的写保护开关。"
+msgstr "为了准备 USB 闪盘，您需要一台支持 USB 的运行的 GNU/Linux 系统。应确定 usb-storage 内核模块已经被加载(<userinput>modprobe usb-storage</userinput>)，然后找出 USB 闪盘被映射到的哪个 SCSI 设备(此处以 <filename>/dev/sda</filename> 为例)。为了写入闪盘，您可能需要关闭它的写保护开关。"
 
 #. Tag: para
 #: install-methods.xml:597
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Note that the USB stick should be at least 128 MB in size (smaller setups "
 "are possible if you follow <xref linkend=\"usb-copy-flexible\"/>)."
-msgstr ""
-"注意，准备的 USB 闪盘应该至少有 128MB 的容量(在更小的尺寸安装也是可能的，请参"
-"考 <xref linkend=\"usb-copy-flexible\"/>)。"
+msgstr "注意，USB 闪盘至少要有 128MB 的容量(更小的尺寸安装也是可能的，请参阅 <xref linkend=\"usb-copy-flexible\"/>)。"
 
 #. Tag: title
 #: install-methods.xml:605
@@ -891,7 +876,7 @@ msgstr "我们将展示如何使用闪盘的第一个分区，而不是整个设
 
 #. Tag: para
 #: install-methods.xml:668
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
@@ -903,12 +888,9 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> Debian package."
 msgstr ""
-"由于大多数 USB 闪盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者"
-"格式化 USB 闪盘。如果您必须这么做，请使用 <command>cfdisk</command> 或者其他"
-"的分区工具来创建一个 FAT16 分区并且输入: <informalexample><screen>\n"
+"由于大多数 USB 闪盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式化 USB 闪盘。如果必须这么做，请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区，建立文件系统使用：<informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sda1</replaceable>\n"
-"</screen></informalexample> 注意使用正确的 USB 盘设备名称。<command>mkdosfs</"
-"command> 命令包含在 <classname>dosfstools</classname> Debian 包中。"
+"</screen></informalexample> 注意使用正确的 USB 盘设备名称。<command>mkdosfs</command> 命令包含在 <classname>dosfstools</classname> Debian 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:682
@@ -1150,17 +1132,14 @@ msgstr "添加 ISO 映像"
 
 #. Tag: para
 #: install-methods.xml:846
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The installer will look for a Debian ISO image on the stick as its source "
 "for additional data needed for the installation. So your next step is to "
 "copy a Debian ISO image (businesscard, netinst or even a full CD image) onto "
 "your stick (be sure to select one that fits). The file name of the image "
 "must end in <filename>.iso</filename>."
-msgstr ""
-"现在您需要把任意一个 Debian ISO 映像(businesscard、netinst 或者甚至是完全版)"
-"放入您的 USB 闪盘内(如果它装得下的话)。这样的一个映像文件的后缀名必须是 "
-"<filename>.iso</filename>。"
+msgstr "安装程序将在盘上寻找一个 Debian ISO 映像作为安装其他数据的源。因此您下一步是复制一个 Debian ISO 映像(businesscard、netinst 或者甚至是完全版)到您的 USB 闪盘内(确定选择适合的那个)。映像文件的后缀名必须是 <filename>.iso</filename>。"
 
 #. Tag: para
 #: install-methods.xml:854
@@ -1455,17 +1434,14 @@ msgstr "yaboot.conf"
 
 #. Tag: para
 #: install-methods.xml:1049
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Make a note of the partition number of the MacOS partition where you place "
 "these files. If you have the MacOS <command>pdisk</command> program, you can "
 "use the <command>L</command> command to check for the partition number. You "
 "will need this partition number for the command you type at the Open "
 "Firmware prompt when you boot the installer."
-msgstr ""
-"记下您存放这些文件的 MacOS 分区号。如果您有 MacOS 的 <command>pdisk</"
-"command> 程序，您可以使用 L 命令检查分区号。当引导安装程序的时候，您需要这个"
-"分区号码用于在 Open Firmware 提示符下面输入命令。"
+msgstr "记下您存放这些文件的 MacOS 分区号。如果您有 MacOS 的 <command>pdisk</command> 程序，您可以使用 <command>L</command> 命令检查分区号。当引导安装程序的时候，您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
 
 #. Tag: para
 #: install-methods.xml:1057
@@ -1695,22 +1671,18 @@ msgstr "设置 BOOTP 服务器"
 
 #. Tag: para
 #: install-methods.xml:1213
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
 "<command>bootpd</command>. The other is actually a DHCP server: ISC "
 "<command>dhcpd</command>. In &debian; these are contained in the "
 "<classname>bootp</classname> and <classname>dhcp</classname> packages "
 "respectively."
-msgstr ""
-"在 GNU/Linux 下面有两种 BOOTP 服务器。他们是 CMU <command>bootpd</command>和"
-"另外一种实际上是 DHCP 服务器的程序 ISC <command>dhcpd</command>，他们被包含"
-"在 &debian; 的 <classname>bootp</classname> 和 <classname>dhcp</classname> 软"
-"件包中。"
+msgstr "在 GNU/Linux 下面可以使用两种 BOOTP 服务器。首先是 CMU <command>bootpd</command>，另外一种实际上是 DHCP 服务器：ISC <command>dhcpd</command>。&debian; 下它们被包含在 <classname>bootp</classname> 和 <classname>dhcp</classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:1221
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
 "relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
@@ -1742,19 +1714,9 @@ msgid ""
 "<userinput>printenv</userinput>. The value of the <userinput>eaddr</"
 "userinput> variable is the machine's MAC address. </phrase>"
 msgstr ""
-"为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd."
-"conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian; 里，您可"
-"以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 "
-"<userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。在其它系统中，"
-"这个行应该看起来像这样： <informalexample><screen>\n"
+"为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd.conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian; 里，您可以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 <userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP 服务器不是运行在 Debian 上，这行看起来应该像这样： <informalexample><screen>\n"
 "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-"</screen></informalexample> 现在，您必须创建一个 <filename>/etc/bootptab</"
-"filename> 文件。它具有和一些经典的 BSD 文件很相似，并使用相同的加密格式。这些"
-"文件包括 <filename>printcap</filename>、<filename>termcap</filename> 和 "
-"<filename>disktab</filename>。参见 <filename>bootptab</filename> 的手册页以获"
-"得更多的信息。对于 CMU <command>bootpd</command>，您将需要知道客户机硬件的"
-"(MAC)地址。这里有一个示例 <filename>/etc/bootptab</filename>： "
-"<informalexample><screen>\n"
+"</screen></informalexample> 现在，您必须创建一个 <filename>/etc/bootptab</filename> 文件。它具有和一些经典的 BSD 文件很相似，并使用相同的加密格式。这些文件包括 <filename>printcap</filename>、<filename>termcap</filename> 和 <filename>disktab</filename>。参见 <filename>bootptab</filename> 的手册页以获得更多的信息。对于 CMU <command>bootpd</command>，您将需要知道客户机硬件(MAC)地址。这里有一个示例 <filename>/etc/bootptab</filename>： <informalexample><screen>\n"
 "client:\\\n"
 "  hd=/tftpboot:\\\n"
 "  bf=tftpboot.img:\\\n"
@@ -1762,12 +1724,7 @@ msgstr ""
 "  sm=255.255.255.0:\\\n"
 "  sa=192.168.1.1:\\\n"
 "  ha=0123456789AB:\n"
-"</screen></informalexample> 您至少需要修改 <quote>ha</quote> 选项，它指定了客"
-"户机的硬件地址。<quote>bf</quote> 选项则指定了一个客户机应该通过 TFTP 取得的"
-"文件名称。请从 <xref linkend=\"tftp-images\"/> 处获得更多的信息。<phrase "
-"arch=\"mips\"> 在 SGI 机器上，您可以仅在进入命令监视器后输入 "
-"<userinput>printenv</userinput>。<userinput>eaddr</userinput> 的值就是机器的 "
-"MAC 地址。</phrase>"
+"</screen></informalexample> 您至少需要修改 <quote>ha</quote> 选项，它指定了客户机的硬件地址。<quote>bf</quote> 选项则指定了一个客户机应该通过 TFTP 取得的文件名称。请从 <xref linkend=\"tftp-images\"/> 处获得更多的信息。<phrase arch=\"mips\"> 在 SGI 机器上，您可以仅在进入命令监视器后输入 <userinput>printenv</userinput>。<userinput>eaddr</userinput> 的值就是机器的 MAC 地址。</phrase>"
 
 #. Tag: para
 #: install-methods.xml:1254
@@ -2109,7 +2066,7 @@ msgstr "DECstation TFTP 映像文件"
 
 #. Tag: para
 #: install-methods.xml:1412
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "For DECstations, there are tftpimage files for each subarchitecture, which "
 "contain both kernel and installer in one file. The naming convention is "
@@ -2117,12 +2074,7 @@ msgid ""
 "filename>. Copy the tftpimage file you would like to use to <userinput>/"
 "tftpboot/tftpboot.img</userinput> if you work with the example BOOTP/DHCP "
 "setups described above."
-msgstr ""
-"对于 DECstation 来说，对于每个子体系都有相应的 tftpimage 映像文件。这些单一文"
-"件包含了内核和安装程序。命名规则是 <replaceable>subarchitecture</"
-"replaceable>/netboot-boot.img。如果您是按照上述 BOOTP/DHCP 设置范例进行操作，"
-"请将想要使用的 tftpimage 文件拷贝至 <userinput>/tftpboot/tftpboot.img</"
-"userinput>。"
+msgstr "对于 DECstation 来说，每个子体系都有相应的 tftpimage 映像文件。这些单一文件包含了内核和安装程序。命名规则是 <filename><replaceable>subarchitecture</replaceable>/netboot-boot.img</filename>。如果您是按照上述 BOOTP/DHCP 设置范例进行操作，请将想要使用的 tftpimage 文件拷贝至 <userinput>/tftpboot/tftpboot.img</userinput>。"
 
 #. Tag: para
 #: install-methods.xml:1422
@@ -2216,7 +2168,7 @@ msgstr "SPARC TFTP 引导"
 
 #. Tag: para
 #: install-methods.xml:1491
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
 "<quote>SUN4M</quote> or <quote>SUN4C</quote>, to the filename. Thus, if your "
@@ -2232,15 +2184,9 @@ msgid ""
 "change all letters to uppercase and if necessary append the subarchitecture "
 "name."
 msgstr ""
-"SPARC 体系通常使用子体系名称，比如<quote>SUN4M</quote>或者<quote>SUN4C</"
-"quote>。在某些情况下，体系名字也被留为空白，这时客户端所需要的文件仅仅是 "
-"<filename>client-ip-in-hex</filename>。因此，如果您的系统子体系是 SUN4C，其 "
-"IP 是 192.168.1.3，则文件名为 <filename>C0A80103.SUN4C</filename>。一个简易的"
-"确认方法是在 shell 中输入下列命令(假设机器的 IP 为 10.0.0.4)。"
-"<informalexample><screen>\n"
+"一些 SPARC 体系通常使用子体系名称，比如 <quote>SUN4M</quote> 或者 <quote>SUN4C</quote>。因此，如果您的系统子体系是 SUN4C，其 IP 是 192.168.1.3，则文件名为 <filename>C0A80103.SUN4C</filename>。然而，有些子体系客户端所需要的文件仅仅是 <filename>client-ip-in-hex</filename>。一个简易的确定 16 进制 IP 地址的方法是在 shell 中输入下列命令(假设机器的 IP 为 10.0.0.4)。<informalexample><screen>\n"
 "$ printf '%.2x%.2x%.2x%.2x\\n' 10 0 0 4\n"
-"</screen></informalexample> 它将 IP 写成十六进制。要得到正确的文件名，您应该"
-"将所有的子母改成大写，并在必要时加上子体系名。"
+"</screen></informalexample>。要得到正确的文件名，您应该将所有的字母改成大写，并在必要时加上子体系名。"
 
 #. Tag: para
 #: install-methods.xml:1507
@@ -2314,12 +2260,11 @@ msgstr "Broadcom BCM91250A 与 BCM91480B TFTP 引导"
 
 #. Tag: para
 #: install-methods.xml:1550
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You don't have to configure DHCP in a special way because you'll pass the "
 "full path of the file to be loaded to CFE."
-msgstr ""
-"您不需要通过特殊方法配置 DHCP，因为您将传递文件的完全路径至装载的 CFE 。"
+msgstr "您不需要通过特殊方法设置 DHCP，因为您将传递文件的完全路径至装载的 CFE 。"
 
 #. Tag: title
 #: install-methods.xml:1655
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index acc80ab8e..1fafb2768 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-05-01 18:59+0000\n"
-"PO-Revision-Date: 2006-01-05 18:22+0800\n"
+"PO-Revision-Date: 2006-05-13 12:08+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -266,18 +266,13 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:155
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Some BIOSes can boot USB storage directly, and some cannot. You may need to "
 "configure your BIOS to boot from a <quote>removable drive</quote> or even a "
 "<quote>USB-ZIP</quote> to get it to boot from the USB device. For helpful "
 "hints and details, see <xref linkend=\"usb-boot\"/>."
-msgstr ""
-"有些 BIOS 支持直接从 USB 的存储设备启动，但也有的 BIOS 不支持这种特性。您或许"
-"需要设置一下 BIOS 让您的机器从 <quote>removable drive</quote> 或是 "
-"<quote>USB-ZIP</quote> 启动，以使电脑能从 USB 设备启动。如果这样不奏效，您可"
-"以借助一张软盘启动，然后再用 U 盘完成后面的安装。您还可以发现一些有用的提示和"
-"具体的细节说明，参阅 <xref linkend=\"usb-boot\"/>。"
+msgstr "有些 BIOS 支持直接从 USB 的存储设备启动，有些不行。您或许需要设置一下 BIOS 让您的机器从 <quote>removable drive</quote> 或是 <quote>USB-ZIP</quote> 启动，以使电脑能从 USB 设备引导。参阅 <xref linkend=\"usb-boot\"/>，查看一些有用的提示和具体的细节说明。"
 
 #. Tag: para
 #: installation-howto.xml:162
@@ -450,7 +445,7 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:265
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "On the next screen you will see your partition table, how the partitions "
 "will be formatted, and where they will be mounted. Select a partition to "
@@ -460,13 +455,7 @@ msgid ""
 "least one partition for swap space and to mount a partition on <filename>/</"
 "filename>. <xref linkend=\"partitioning\"/> has more information about "
 "partitioning."
-msgstr ""
-"在接下来的界面里，您可以看到自己有关分区的一张表，上面标出了各分区将以何种方"
-"式格式化，以及它们将来的挂载点在何处。要修改分区的设置或是删除分区，可以先选"
-"中它，再进行操作。如果您先前选择的是自动分区，那么您现在只要选<guimenuitem>分"
-"区结束</guimenuitem>, 使用自动分区的设置即可。有一点，请不要忘记至少要分配一"
-"个分区作为交换空间，还有必须把一个分区挂载到 <filename>/</filename>上。<xref "
-"linkend=\"partitioning\"/> 有更多关于分区方面的信息。"
+msgstr "在接下来的屏幕上，您可以看到自己的分区表，各分区将以何种方式格式化，以及它们将来的挂载点在何处。选择一个分区进行修改或删除。如果您先前选择的是自动分区，那么现在只需从菜单选择 <guimenuitem>Finish partitioning and write changes to disk</guimenuitem>，使用其设置即可。请不要忘记至少需要分配一个分区作为交换空间，以及把一个分区挂载到 <filename>/</filename>上。<xref linkend=\"partitioning\"/> 有更多关于分区方面的信息。"
 
 #. Tag: para
 #: installation-howto.xml:275
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index c67bb83d4..10599dbcb 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-04-28 19:34+0000\n"
-"PO-Revision-Date: 2006-03-22 22:24+0800\n"
+"PO-Revision-Date: 2006-05-13 12:15+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -960,11 +960,11 @@ msgid ""
 "<guimenuitem>Partition disks</guimenuitem> (or similar). It may be possible "
 "to use a different partitioning tool from the command line on VT2, but this "
 "is not recommended."
-msgstr ""
+msgstr "如果您选择了 <guimenuitem>Partition disks</guimenuitem> (或类似的)，默认会执行其中的一个程序。在 VT2 命令行上也可以使用其他的分区工具，但不推荐这种方式。"
 
 #. Tag: para
 #: partitioning.xml:579
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you will be working with more than 20 partitions on your ide disk, you "
 "will need to create devices for partitions 21 and beyond. The next step of "
@@ -986,22 +986,17 @@ msgid ""
 "</screen></informalexample> <phrase arch=\"i386\">Remember to mark your boot "
 "partition as <quote>Bootable</quote>.</phrase>"
 msgstr ""
-"如果您的 ide 磁盘上会超过多过 20 个分区，您将需要为 21 以上的分区创建设备。除"
-"非有正确的设备存在，否则下一步初始化分区将失败。作为一个例子，这里列举了相关"
-"的命令，让您可以在 <userinput>tty2</userinput> 中使用或者在运行一个 Shell 下"
-"加入一个设备文件，令第 21 个的分区能够被初始化。<informalexample><screen>\n"
+"如果您的 ide 磁盘上超过 20 个分区，您将需要为 21 以上的分区创建设备。除非有正确的设备存在，否则下一步初始化分区将失败。作为一个例子，这里列举了相关的命令，让您可以在 <userinput>tty2</userinput> 中使用或者在运行一个 Shell 下加入一个设备文件，令第 21 个的分区能够被初始化。<informalexample><screen>\n"
 "# cd /dev\n"
 "# mknod hda21 b 3 21 \n"
 "# chgrp disk hda21\n"
 "# chmod 660 hda21\n"
-"</screen></informalexample> 除非在目标系统上有合适的设备名称，否则引导一个新"
-"的系统将会失败。在安装完内核和模块以后，执行： <informalexample><screen>\n"
+"</screen></informalexample> 除非在目标系统上有合适的设备名称，否则引导一个新的系统将会失败。在安装完内核和模块以后，执行： <informalexample><screen>\n"
 "# cd /target/dev\n"
 "# mknod hda21 b 3 21 \n"
 "# chgrp disk hda21\n"
 "# chmod 660 hda21\n"
-"</screen></informalexample> <phrase arch=\"i386\">记住标记您的引导分区为 "
-"<quote>Bootable</quote>。</phrase>"
+"</screen></informalexample> <phrase arch=\"i386\">记住标记您的引导分区为 <quote>Bootable</quote>。</phrase>"
 
 #. Tag: para
 #: partitioning.xml:598
@@ -1614,20 +1609,3 @@ msgstr ""
 "这里建议第三个分区应该是 <quote>Whole disk</quote>(type 5)，并且包含整个磁盘 "
 "(从第一个柱面至最后一个)，这是 Sun 磁盘格式的惯例，并且确保 <command>SILO</"
 "command> 启动引导器工作良好。"
-
-#~ msgid ""
-#~ "One of these programs will be run by default when you select "
-#~ "<guimenuitem>Partition a Hard Disk</guimenuitem>. If the one which is run "
-#~ "by default isn't the one you want, quit the partitioner, go to the shell "
-#~ "(<userinput>tty2</userinput>) by pressing <keycap>Alt</keycap> and "
-#~ "<keycap>F2</keycap> keys together, and manually type in the name of the "
-#~ "program you want to use (and arguments, if any). Then skip the "
-#~ "<guimenuitem>Partition a Hard Disk</guimenuitem> step in <command>debian-"
-#~ "installer</command> and continue to the next step."
-#~ msgstr ""
-#~ "当您选择 <guimenuitem>对硬盘进行分区</guimenuitem> 时，程序之一将会运行。"
-#~ "如果缺省运行的那个非您所希望，退出分区程序，在 shell (<userinput>tty2</"
-#~ "userinput>) 下按下 <keycap>Alt</keycap> 以及 <keycap>F2</keycap>，并且手工"
-#~ "输入您想使用的程序名称(以及可能的参数)。然后跳过 <guimenuitem>对硬盘进行分"
-#~ "区</guimenuitem> 步骤至 <command>debian-installer</command> 并继续进行下一"
-#~ "步。"
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index e9277497d..42a36839e 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-04-28 19:34+0000\n"
-"PO-Revision-Date: 2006-01-05 18:23+0800\n"
+"PO-Revision-Date: 2006-05-13 15:18+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -592,7 +592,7 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:409
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Now, compile the kernel: <userinput>fakeroot make-kpkg --initrd --"
 "revision=custom.1.0 kernel_image</userinput>. The version number of "
@@ -600,16 +600,11 @@ msgid ""
 "that you will use to track your kernel builds. Likewise, you can put any "
 "word you like in place of <quote>custom</quote> (e.g., a host name). Kernel "
 "compilation may take quite a while, depending on the power of your machine."
-msgstr ""
-"现在，开始编译内核： <userinput>fakeroot make-kpkg --revision=custom.1.0 "
-"kernel_image</userinput>。其中版本号 <quote>1.0</quote> 可以随便您修改；它仅"
-"是一个用来跟踪您的内核编译的版本号。同样地，您也可以用任何您喜欢的单词替换 "
-"<quote>custom</quote> (例如，您的主机名称)。编译内核可能要花费较长的时间，这"
-"取决于您的机器的性能。"
+msgstr "现在，开始编译内核： <userinput>fakeroot make-kpkg --initrd --revision=custom.1.0 kernel_image</userinput>。其中版本号 <quote>1.0</quote> 可以随便您修改；它仅是一个用来跟踪您的内核编译的版本号。同样地，您也可以用任何您喜欢的词替换 <quote>custom</quote> (例如，主机名称)。编译内核可能要花费较长的时间，这取决于您的机器的性能。"
 
 #. Tag: para
 #: post-install.xml:419
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Once the compilation is complete, you can install your custom kernel like "
 "any package. As root, do <phrase condition=\"classic-kpkg\"> <userinput>dpkg "
@@ -628,19 +623,7 @@ msgid ""
 "automatically update your boot loader to use the new kernel. If you have "
 "created a modules package, <phrase condition=\"classic-kpkg\">e.g., if you "
 "have PCMCIA,</phrase> you'll need to install that package as well."
-msgstr ""
-"一旦编译完成，您就可以像安装其它软件包一样安装您的内核。以 root 身份，执行 "
-"<userinput>dpkg -i ../kernel-image-&kernelversion;-"
-"<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</"
-"userinput>。其中 <replaceable>subarchitecture</replaceable> 部分是一个可选的"
-"子结构，<phrase arch=\"i386\"> 例如 <quote>i586</quote>, </phrase> 这取决于您"
-"所设置的内核选项。<userinput>dpkg -i kernel-image...</userinput> 将安装内核以"
-"及其它的一些支持文件。例如 <filename>System.map</filename> 可能会被安装 (用来"
-"辅助调试内核问题)，<filename>/boot/config-&kernelversion;</filename> 也将被安"
-"装，它包含了您当前的配置。新的 <classname>kernel-image-&kernelversion;</"
-"classname> 软件包将会自动地使用您的系统上的启动引导器来更新引导区，因此您不必"
-"重新运行启动引导器即可引导系统。如果您创建了一个模块软件包，例如 PCMCIA，您也"
-"必须同时安装该软件包。"
+msgstr "一旦编译完成，您就可以像安装其它软件包一样安装您的内核。以 root 身份，执行 <phrase condition=\"classic-kpkg\"> <userinput>dpkg -i ../kernel-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>。</phrase> <phrase condition=\"common-kpkg\"> <userinput>dpkg -i ../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>。</phrase> 其中 <replaceable>subarchitecture</replaceable> 部分是一个可选的子结构，<phrase arch=\"i386\"> 例如 <quote>i586</quote>，</phrase> 这取决于您所设置的内核选项。 <userinput>dpkg -i</userinput> 将安装内核以及其它的一些支持文件。例如，<filename>System.map</filename> 可能会被安装 (用来辅助调试内核问题)，<filename>/boot/config-&kernelversion;</filename> 也将被安装，它包含了您当前的配置。新的内核软件包将会自动地更新您的系统上的启动引导器，让它使用新内核。如果您创建了一个模块软件包，<phrase condition=\"classic-kpkg\">例如 PCMCIA，</phrase> 您也要同时安装该软件包。"
 
 #. Tag: para
 #: post-install.xml:446
@@ -779,17 +762,3 @@ msgstr ""
 "最后，要注意修复一个损坏的系统可能非常困难，在这份手册里面不会列举所有的情况"
 "和修复方法。\n"
 "如果您遇到困难，请咨询专家。"
-
-#~ msgid ""
-#~ "If you require PCMCIA support, you'll also need to install the "
-#~ "<classname>pcmcia-source</classname> package. Unpack the gzipped tar file "
-#~ "as root in the directory <filename>/usr/src</filename> (it's important "
-#~ "that modules are found where they are expected to be found, namely, "
-#~ "<filename>/usr/src/modules</filename>). Then, as root, do <userinput>make-"
-#~ "kpkg modules_image</userinput>."
-#~ msgstr ""
-#~ "如果您需要支持 PCMCIA，您必须安装 <classname>pcmcia-source</classname> 软"
-#~ "件包。以 root 身份将用 gzip 压缩的 tar 文件解压到 <filename>/usr/src</"
-#~ "filename> 目录内(注意模块必须位于它们所应处的位置，即 <filename>/usr/src/"
-#~ "modules</filename>)。然后，以 root 身份执行 <userinput>make-kpkg "
-#~ "modules_image</userinput>。"
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index d77c2c24e..224e25242 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-04-28 19:34+0000\n"
-"PO-Revision-Date: 2006-03-03 20:13+0800\n"
+"PO-Revision-Date: 2006-05-13 15:42+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1773,15 +1773,13 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1169
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
 "good idea to fill the first few sectors with zeros. You should do this prior "
 "to running DOS's <command>format</command> command by executing the "
 "following command from Linux:"
-msgstr ""
-"显然，当您为 DOS 新建分区或者改动分区大小时，最好总是把第一个扇区全部清零。在"
-"运行 DOS 的 <command>format</command> 命令之前，在 Linux 系统中，像这样做："
+msgstr "显然，当您为 DOS 新建分区或者改动分区大小时，最好把前面机构扇区全部清零。您应该在运行 DOS 的 <command>format</command> 命令之前，到 Linux 系统中，像这样做："
 
 #. Tag: screen
 #: preparing.xml:1176
@@ -2324,18 +2322,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1548
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
 "USB memory stick or USB key). Some BIOSes can boot directly from a USB "
 "storage device, but some cannot. You may need to configure your BIOS to boot "
 "from a <quote>Removable drive</quote> or even from <quote>USB-ZIP</quote> to "
 "get it to boot from the USB device."
-msgstr ""
-"另外一个常见的选项是从 USB 存储器(也叫 USB 记忆棒或者 U 盘)引导。有些 BIOS 支"
-"持从 USB 存储器直接引导，而有的 BIOS 不行。如果要从 USB 设备引导系统的话，您"
-"可能需要在 BIOS 设置中，让系统从 <quote>Removable drive</quote> 或者 "
-"<quote>USB-ZIP</quote> 引导。"
+msgstr "另外一个常见的选项是从 USB 存储设备(也叫 USB 记忆棒或者 U 盘)引导。有些 BIOS 支持从 USB 存储器直接引导，而有的 BIOS 不行。如果要从 USB 设备引导系统的话，您需要在 BIOS 设置中，让系统从 <quote>Removable drive</quote> 或者 <quote>USB-ZIP</quote> 引导。"
 
 #. Tag: para
 #: preparing.xml:1556
@@ -2708,7 +2702,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1819
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
 "is broken. These machines will most likely not be able to boot from the hard "
@@ -2718,12 +2712,7 @@ msgid ""
 "SystemDisk2.3.1.smi.bin\"></ulink>. After unpacking the utility in MacOS, "
 "and launching it, select the <guibutton>Save button</guibutton> to have the "
 "firmware patches installed to nvram."
-msgstr ""
-"运行在 OldWorld Beige G3 机器上的 OF 版本 2.0f1 和 2.4 的 OpenFirmware 是坏"
-"的。这些机器如果没有打固件补丁，就不能够从硬盘启动。固件的补丁包括 "
-"<application>System Disk 2.3.1</application> 工具，位于 Apple 的 <ulink url="
-"\"ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi."
-"bin\"></ulink>。在 MacOS 上解包并运行它，选择保存按钮使固件补丁安装到 nvram。"
+msgstr "运行在 OldWorld Beige G3 机器上的 OF 版本 2.0f1 和 2.4 的 OpenFirmware 是坏的。这些机器如果没有打固件补丁，就不能够从硬盘启动。固件的补丁包含在 <application>System Disk 2.3.1</application> 工具里面，位于 Apple 的 <ulink url=\"ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi.bin\"></ulink>。在 MacOS 上解包并运行它，选择保存按钮使固件补丁安装到 nvram。"
 
 #. Tag: title
 #: preparing.xml:1839
@@ -2733,17 +2722,14 @@ msgstr "使用 OpenBoot"
 
 #. Tag: para
 #: preparing.xml:1841
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
 "architecture. This is rather similar in function to the BIOS in the x86 "
 "architecture, although much nicer. The Sun boot PROMs have a built-in forth "
 "interpreter which lets you do quite a number of things with your machine, "
 "such as diagnostics and simple scripts."
-msgstr ""
-"OpenBoot 提供了启动 &arch-title; 所需的基本功能。虽然做得比 x86 体系 BIOS 更"
-"好一些，但功能是非常接近的。Sun 的启动 PROM 内置了 forth 解释器，可以让您对计"
-"算机做很多事情，如诊断，简单脚本，等等。"
+msgstr "OpenBoot 提供了启动 &arch-title; 体系所需的基本功能。功能与 x86 体系的 BIOS 非常接近，但做得更好一些。Sun 的启动 PROM 内置了 forth 解释器，可以让您对计算机做很多事情，如诊断和简单脚本。"
 
 #. Tag: para
 #: preparing.xml:1849
@@ -2780,7 +2766,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1874
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
 "default boot device. However, you need to know some details about how "
@@ -2789,16 +2775,11 @@ msgid ""
 "will vary a bit, depending on what version of OpenBoot you have. More "
 "information about OpenBoot can be found in the <ulink url=\"&url-openboot;"
 "\">Sun OpenBoot Reference</ulink>."
-msgstr ""
-"您可以使用 OpenBoot 从指定设备启动，也可以能改变默认启动设备。但您需要了解 "
-"OpenBoot 如何命名设备的细节，它与 Linux 命名方法有很大差别，说明在 <xref "
-"linkend=\"device-names\"/>。另外，该命令会依 OpenBoot 的版本不同而略有区别。"
-"更多关于 OpenBoot 的信息请参考 <ulink url=\"&url-openboot;\">Sun OpenBoot "
-"Reference</ulink>。"
+msgstr "您可以使用 OpenBoot 从指定设备启动，也可以能改变默认启动设备。但您需要了解 OpenBoot 如何命名设备的细节，它与 Linux 命名方法有很大差别，说明见 <xref linkend=\"device-names\"/>。另外，该命令会依 OpenBoot 的版本不同而略有区别。更多关于 OpenBoot 的信息请参考 <ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>。"
 
 #. Tag: para
 #: preparing.xml:1884
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
 "<quote>floppy</quote>, <quote>cdrom</quote>, <quote>net</quote>, "
@@ -2819,21 +2800,11 @@ msgid ""
 "devices. For full information, whatever your revision, see the <ulink url="
 "\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 msgstr ""
-"一般来说，在较新的修订版中，您可以使用 OpenBoot 设备，如<quote>floppy</"
-"quote>、<quote>cdrom</quote>、<quote>net</quote>、<quote>disk</quote>或"
-"<quote>disk2</quote>。这些是显而易见的含义，<quote>net</quote>即指设备是从网"
-"络启动。另外，设备名可以明确指定磁盘分区，如<quote>disk2:a</quote>将启动磁盘 "
-"disk2 的第一个分区。完整的 OpenBoot 设备命名形式为 <informalexample> "
-"<screen>\n"
+"一般来说，在较新的修订版中，您可以使用 OpenBoot 设备，如<quote>floppy</quote>、<quote>cdrom</quote>、<quote>net</quote>、<quote>disk</quote> 或 <quote>disk2</quote>。这些含义很直观，<quote>net</quote> 即指设备是从网络启动。另外，设备名可以明确指定磁盘分区，如 <quote>disk2:a</quote> 是启动磁盘 disk2 的第一个分区。完整的 OpenBoot 设备命名形式为 <informalexample> <screen>\n"
 "<replaceable>driver-name</replaceable>@\n"
 "<replaceable>unit-address</replaceable>:\n"
 "<replaceable>device-arguments</replaceable>\n"
-"</screen></informalexample>。在旧版的 OpenBoot 中，设备命名有些不同：软盘设备"
-"称为<quote>/fd</quote>，SCSI 磁盘形式是<quote>sd(<replaceable>controller</"
-"replaceable>, <replaceable>disk-target-id</replaceable>, <replaceable>disk-"
-"lun</replaceable>)</quote>。<userinput>show-devs</userinput> 命令在新版的 "
-"OpenBoot 中用于查看当前的配置设备。对于完整的信息，和您使用的版本，请参考 "
-"<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>。"
+"</screen></informalexample>。在旧版的 OpenBoot 中，设备命名有些不同：软盘设备称为 <quote>/fd</quote>，SCSI 磁盘形式是 <quote>sd(<replaceable>controller</replaceable>, <replaceable>disk-target-id</replaceable>, <replaceable>disk-lun</replaceable>)</quote>。<userinput>show-devs</userinput> 命令在新版的 OpenBoot 中用于查看当前的配置设备。完整的信息，和您使用的版本，请参考 <ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>。"
 
 #. Tag: para
 #: preparing.xml:1907
@@ -3011,7 +2982,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:2025
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
 "&debian; mirror, but only the s390 and architecture-independent files are "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index a87e73924..2770f4317 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-04-28 19:33+0000\n"
-"PO-Revision-Date: 2006-04-13 12:00+0800\n"
+"PO-Revision-Date: 2006-05-13 15:47+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -526,7 +526,7 @@ msgid ""
 "bootloader configuration (if supported by the installer for the bootloader). "
 "Note that the <quote>&ndash;&ndash;</quote> may already be present in the "
 "default boot parameters."
-msgstr ""
+msgstr "<quote>&ndash;&ndash;</quote> 在启动选项中有特殊含义。之后的内核参数将复制到已安装的引导器配置(假如安装程序支持引导器)。注意 <quote>&ndash;&ndash;</quote> 也可能已经存在于默认的引导参数中。"
 
 #. Tag: para
 #: preseed.xml:371
@@ -1434,84 +1434,82 @@ msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有
 
 #. Tag: userinput
 #: preseed.xml:720
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "standard"
-msgstr "标准系统"
+msgstr "标准"
 
 #. Tag: userinput
 #: preseed.xml:723
 #, no-c-format
 msgid "desktop"
-msgstr ""
+msgstr "桌面"
 
 #. Tag: userinput
 #: preseed.xml:726
 #, no-c-format
 msgid "gnome-desktop"
-msgstr ""
+msgstr "gnome 桌面"
 
 #. Tag: userinput
 #: preseed.xml:729
 #, no-c-format
 msgid "kde-desktop"
-msgstr ""
+msgstr "kde 桌面"
 
 #. Tag: userinput
 #: preseed.xml:732
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "web-server"
 msgstr "web 服务器"
 
 #. Tag: userinput
 #: preseed.xml:735
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "print-server"
 msgstr "打印服务器"
 
 #. Tag: userinput
 #: preseed.xml:738
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "dns-server"
-msgstr "打印服务器"
+msgstr "dns 服务器"
 
 #. Tag: userinput
 #: preseed.xml:741
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "file-server"
 msgstr "文件服务器"
 
 #. Tag: userinput
 #: preseed.xml:744
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "mail-server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
 #: preseed.xml:747
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "sql-database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
 #: preseed.xml:750
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "laptop"
 msgstr "便携机"
 
 #. Tag: para
 #: preseed.xml:754
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
 "of packages in some other way. We recommend always including the "
 "<userinput>standard</userinput> task."
-msgstr ""
-"您可以不选任务，并用其他方法安装一系列软件包。我们推荐选上 <userinput>基本系"
-"统</userinput> 任务。"
+msgstr "您可以不选任务，并用其他方法安装一系列软件包。我们推荐选上 <userinput>标准</userinput> 任务。"
 
 #. Tag: screen
 #: preseed.xml:762
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "tasksel tasksel/first multiselect standard, desktop\n"
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -1523,11 +1521,12 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"tasksel tasksel/first multiselect Standard system, Desktop environment\n"
-"#tasksel tasksel/first multiselect Standard system, Web server\n"
+"tasksel tasksel/first multiselect standard, desktop\n"
+"#tasksel tasksel/first multiselect standard, web-server\n"
+"#tasksel tasksel/first multiselect standard, kde-desktop\n"
 "\n"
 "# Some versions of the installer can report back on what software you have\n"
-"# installed, and what software you ue. The default is not to report back,\n"
+"# installed, and what software you use. The default is not to report back,\n"
 "# but sending reports helps the project determine what software is most\n"
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
@@ -1783,9 +1782,3 @@ msgstr ""
 "# preconfiguration files, includes those files. \n"
 "#d-i preseed/include_command \\\n"
 "#      string echo if [ \"`hostname`\" = bob ]; then echo bob.cfg; fi"
-
-#~ msgid "Desktop environment"
-#~ msgstr "桌面环境"
-
-#~ msgid "DNS server"
-#~ msgstr "DNS 服务器"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 4d68a1673..870788d94 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2006-04-28 19:33+0000\n"
-"PO-Revision-Date: 2006-02-08 18:06+0800\n"
+"PO-Revision-Date: 2006-05-13 16:02+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1096,7 +1096,7 @@ msgstr "网络的配置"
 
 #. Tag: para
 #: random-bits.xml:526
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
 "<filename>/etc/resolv.conf</filename>, <filename>/etc/hostname</filename> "
@@ -1145,12 +1145,9 @@ msgid ""
 "file into the desired order. Then during boot, each card will be associated "
 "with the interface name (eth0, eth1, etc.) that you expect."
 msgstr ""
-"要配置网络，请修改 <filename>/etc/network/interfaces</filename>, <filename>/"
-"etc/resolv.conf</filename> 和 <filename>/etc/hostname</filename>。"
-"<informalexample><screen>\n"
+"要配置网络，请修改 <filename>/etc/network/interfaces</filename>, <filename>/etc/resolv.conf</filename>, <filename>/etc/hostname</filename> 和 <filename>/etc/hosts</filename>。<informalexample><screen>\n"
 "# editor /etc/network/interfaces\n"
-"</screen></informalexample> 这里有些简单的例子，来自 <filename>/usr/share/"
-"doc/ifupdown/examples</filename>: <informalexample><screen>\n"
+"</screen></informalexample> 这里有些简单的例子，来自 <filename>/usr/share/doc/ifupdown/examples</filename>: <informalexample><screen>\n"
 "######################################################################\n"
 "# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)\n"
 "# See the interfaces(5) manpage for information on what options are\n"
@@ -1176,20 +1173,15 @@ msgstr ""
 "#     netmask 255.255.255.0\n"
 "#     broadcast 192.168.0.255\n"
 "#     gateway 192.168.0.1\n"
-"</screen></informalexample> 填入您的 nameserver(s) 和搜索指令到 <filename>/"
-"etc/resolv.conf</filename>: <informalexample><screen>\n"
+"</screen></informalexample> 填入您的域名服务器和搜索指令到 <filename>/etc/resolv.conf</filename>: <informalexample><screen>\n"
 "# editor /etc/resolv.conf\n"
-"</screen></informalexample> 这里有个简单的 <filename>/etc/resolv.conf</"
-"filename>: <informalexample><screen>\n"
+"</screen></informalexample> 这里有个简单的 <filename>/etc/resolv.conf</filename>: <informalexample><screen>\n"
 "search hqdom.local\\000\n"
 "nameserver 10.1.1.36\n"
 "nameserver 192.168.9.100\n"
-"</screen></informalexample> 输入您的系统的主机名 (2 到 63 个字符): "
-"<informalexample><screen>\n"
+"</screen></informalexample> 输入您的系统的主机名 (2 到 63 个字符)：<informalexample><screen>\n"
 "# echo DebianHostName &gt; /etc/hostname\n"
-"</screen></informalexample> 如果您有多块网卡，在您修改 <filename>/etc/"
-"modules</filename> 文件时，一定要按照期望的顺序排列驱动模块的名字。这样的话，"
-"在系统启动时，每块网卡就能获得您所预期的 interface 名称了 (eth0、eth1 等等)。"
+"</screen></informalexample> 如果您有多块网卡，在您修改 <filename>/etc/modules</filename> 文件时，一定要按照期望的顺序排列驱动模块的名字。这样，在系统启动时，每块网卡就能获得您所预期的 interface 名称了 (eth0、eth1 等等)。"
 
 #. Tag: title
 #: random-bits.xml:563
@@ -1227,7 +1219,7 @@ msgstr "内核的安装"
 
 #. Tag: para
 #: random-bits.xml:582
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a Linux kernel and a "
 "boot loader. Identify available pre-packaged kernels with "
@@ -1236,11 +1228,9 @@ msgid ""
 "condition=\"common-kpkg\">linux</phrase>-image\n"
 "</screen></informalexample> Then install your choice using its package name."
 msgstr ""
-"您若想启动这个系统，您很可能还需要一个 Linux 内核和一个 boot loader。可以用下"
-"面指令找到那些目前可用的被打好包的内核 <informalexample><screen>\n"
-"# apt-cache search kernel-image\n"
-"</screen></informalexample> 接下来把您所选中的内核的软件包名作为命令行的参数"
-"来安装它。"
+"若想启动这个系统，您很可能还需要一个 Linux 内核和一个 boot loader。可以用下面指令找到那些预先打包的内核 <informalexample><screen>\n"
+"# apt-cache search <phrase condition=\"classic-kpkg\">kernel</phrase><phrase condition=\"common-kpkg\">linux</phrase>-image\n"
+"</screen></informalexample> 接下来使用所选包名来安装。"
 
 #. Tag: screen
 #: random-bits.xml:591
@@ -1249,7 +1239,7 @@ msgid ""
 "# apt-get install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
 "condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
 "arch-etc</replaceable>"
-msgstr ""
+msgstr "# apt-get install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>"
 
 #. Tag: title
 #: random-bits.xml:597
@@ -1643,8 +1633,3 @@ msgid ""
 msgstr ""
 "Name server addresses: 您可以使用与源计算机相同的地址 (参阅 <filename>/etc/"
 "resolv.conf</filename>)"
-
-#~ msgid ""
-#~ "# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>"
-#~ msgstr ""
-#~ "# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>"