From b9456dc9350c8a8423b63adb5f6b1e3ed235abd6 Mon Sep 17 00:00:00 2001 From: Karsten Merker Date: Tue, 18 Sep 2012 19:15:44 +0000 Subject: Ran the po update scripts for the po-based translations to get the files up to date with regard to changes in the english manual. The cron job which did that beforehand is not active anymore. M manual/po/ro/welcome.po M manual/po/pt/random-bits.po M manual/po/pt/preseed.po M manual/po/pt/preparing.po M manual/po/pt/welcome.po M manual/po/pt/using-d-i.po M manual/po/pt/hardware.po M manual/po/pt/boot-installer.po M manual/po/pt/installation-howto.po M manual/po/pt/partitioning.po M manual/po/pt/install-methods.po M manual/po/da/welcome.po M manual/po/da/boot-installer.po M manual/po/ru/preparing.po M manual/po/ru/preseed.po M manual/po/ru/welcome.po M manual/po/ru/using-d-i.po M manual/po/ru/hardware.po M manual/po/ru/boot-installer.po M manual/po/ru/installation-howto.po M manual/po/ru/partitioning.po M manual/po/ru/install-methods.po M manual/po/ru/random-bits.po M manual/po/sv/install-methods.po M manual/po/sv/partitioning.po M manual/po/sv/random-bits.po M manual/po/sv/preparing.po M manual/po/sv/preseed.po M manual/po/sv/welcome.po M manual/po/sv/hardware.po M manual/po/sv/boot-installer.po M manual/po/sv/installation-howto.po M manual/po/ja/preparing.po M manual/po/ja/welcome.po M manual/po/ja/hardware.po M manual/po/ja/boot-installer.po M manual/po/ja/install-methods.po M manual/po/ja/random-bits.po M manual/po/zh_TW/random-bits.po M manual/po/zh_TW/preparing.po M manual/po/zh_TW/welcome.po M manual/po/zh_TW/hardware.po M manual/po/zh_TW/boot-installer.po M manual/po/zh_TW/install-methods.po M manual/po/fi/install-methods.po M manual/po/fi/random-bits.po M manual/po/fi/preparing.po M manual/po/fi/welcome.po M manual/po/fi/hardware.po M manual/po/fi/boot-installer.po M manual/po/el/boot-new.po M manual/po/el/welcome.po M manual/po/el/using-d-i.po M manual/po/el/hardware.po M manual/po/el/boot-installer.po M manual/po/el/installation-howto.po M manual/po/el/partitioning.po M manual/po/el/install-methods.po M manual/po/el/random-bits.po M manual/po/el/preparing.po M manual/po/el/preseed.po M manual/po/el/post-install.po M manual/po/zh_CN/boot-installer.po M manual/po/zh_CN/installation-howto.po M manual/po/zh_CN/install-methods.po M manual/po/zh_CN/partitioning.po M manual/po/zh_CN/random-bits.po M manual/po/zh_CN/preparing.po M manual/po/zh_CN/preseed.po M manual/po/zh_CN/welcome.po M manual/po/zh_CN/using-d-i.po M manual/po/zh_CN/hardware.po M manual/po/es/random-bits.po M manual/po/es/preparing.po M manual/po/es/welcome.po M manual/po/es/hardware.po M manual/po/es/boot-installer.po M manual/po/es/install-methods.po M manual/po/ko/boot-installer.po M manual/po/ko/install-methods.po M manual/po/ko/random-bits.po M manual/po/ko/preparing.po M manual/po/ko/welcome.po M manual/po/ko/hardware.po M manual/po/nl/bookinfo.po M manual/po/hu/install-methods.po M manual/po/hu/random-bits.po M manual/po/hu/preparing.po M manual/po/hu/welcome.po M manual/po/hu/hardware.po M manual/po/hu/boot-installer.po M manual/po/vi/boot-installer.po M manual/po/vi/install-methods.po M manual/po/vi/random-bits.po M manual/po/vi/preparing.po M manual/po/vi/welcome.po M manual/po/vi/hardware.po M manual/po/tl/welcome.po --- po/zh_CN/welcome.po | 56 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 15 deletions(-) (limited to 'po/zh_CN/welcome.po') diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po index b3e2b4144..ab6c6fd53 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: 2010-10-10 12:35+0000\n" +"POT-Creation-Date: 2012-09-18 17:24+0000\n" "PO-Revision-Date: 2010-10-28 00:19+0800\n" "Last-Translator: Ji YongGang \n" "Language-Team: debian-chinese-gb \n" @@ -702,16 +702,25 @@ msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这 #. Tag: para #: welcome.xml:484 -#, no-c-format +#, fuzzy, no-c-format +#| msgid "" +#| "Perform the actual installation according to . 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), 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 .)" msgid "" "Perform the actual installation according to . " "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), 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 .)" +"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 .)" msgstr "" "执行真正的安装是在 。其中涉及选择语言、设置周边" "驱动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光" @@ -810,15 +819,23 @@ msgstr "" #. Tag: para #: welcome.xml:566 -#, no-c-format +#, fuzzy, no-c-format +#| msgid "" +#| "Calling software free doesn't mean that the software " +#| "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." msgid "" "Calling software free doesn't mean that the software " -"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." +"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." msgstr "" "称软件为自由并不意味着该软件没有版权，也不是指包含该软件" "的 CD 必须免费分派。自由软件，某种程度上意味着您不须为分发和使用这些程序付" @@ -827,13 +844,22 @@ msgstr "" #. Tag: para #: welcome.xml:577 -#, no-c-format +#, fuzzy, no-c-format +#| msgid "" +#| "The &debian; project, as a pragmatic concession to its users, does make " +#| "some 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 contrib or " +#| "non-free areas of &debian; mirrors or on third-" +#| "party CD-ROMs; see the Debian FAQ, under The Debian FTP archives, for more " +#| "information about the layout and contents of the archives." msgid "" "The &debian; project, as a pragmatic concession to its users, does make some " "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 contrib or non-free areas of &debian; mirrors or on third-party CD-ROMs; see the " +"userinput> areas of &debian; mirrors or on third-party CD/DVD-ROMs; see the " "Debian FAQ, under The Debian " "FTP archives, for more information about the layout and contents of " "the archives." -- cgit v1.2.3