diff options
Diffstat (limited to 'po/zh_CN/welcome.po')
| -rw-r--r-- | po/zh_CN/welcome.po | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po index ab6c6fd53..49b8d1a6e 100644 --- a/po/zh_CN/welcome.po +++ b/po/zh_CN/welcome.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: d-i-manual\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" -"POT-Creation-Date: 2012-09-18 17:24+0000\n" +"POT-Creation-Date: 2012-06-16 09:12+0000\n" "PO-Revision-Date: 2010-10-28 00:19+0800\n" "Last-Translator: Ji YongGang <jungleji@gmail.com>\n" "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n" @@ -717,10 +717,10 @@ msgid "" "This involves choosing your language, configuring peripheral driver modules, " "configuring your network connection, so that remaining installation files " "can be obtained directly from a &debian; server (if you are not installing " -"from a CD/DVD set), partitioning your hard drives and installation of a base " -"system, then selection and installation of tasks. (Some background about " -"setting up the partitions for your &debian; system is explained in <xref " -"linkend=\"partitioning\"/>.)" +"from a CD), partitioning your hard drives and installation of a base system, " +"then selection and installation of tasks. (Some background about setting up " +"the partitions for your &debian; system is explained in <xref linkend=" +"\"partitioning\"/>.)" msgstr "" "执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边" "驱动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光" @@ -830,12 +830,12 @@ msgstr "" #| "but that they may distribute the results of their work as well." msgid "" "Calling software <emphasis>free</emphasis> doesn't mean that the software " -"isn't copyrighted, and it doesn't mean that CDs/DVDs containing that " -"software must be distributed at no charge. Free software, in part, means " -"that the licenses of individual programs do not require you to pay for the " -"privilege of distributing or using those programs. Free software also means " -"that not only may anyone extend, adapt, and modify the software, but that " -"they may distribute the results of their work as well." +"isn't copyrighted, and it doesn't mean that CDs containing that software " +"must be distributed at no charge. Free software, in part, means that the " +"licenses of individual programs do not require you to pay for the privilege " +"of distributing or using those programs. Free software also means that not " +"only may anyone extend, adapt, and modify the software, but that they may " +"distribute the results of their work as well." msgstr "" "称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权，也不是指包含该软件" "的 CD 必须免费分派。自由软件，某种程度上意味着您不须为分发和使用这些程序付" @@ -859,7 +859,7 @@ msgid "" "packages available that do not meet our criteria for being free. These " "packages are not part of the official distribution, however, and are only " "available from the <userinput>contrib</userinput> or <userinput>non-free</" -"userinput> areas of &debian; mirrors or on third-party CD/DVD-ROMs; see the " +"userinput> areas of &debian; mirrors or on third-party CD-ROMs; see the " "<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>The Debian " "FTP archives</quote>, for more information about the layout and contents of " "the archives." |