diff options
Diffstat (limited to 'po/zh_CN')
| -rw-r--r-- | po/zh_CN/bookinfo.po | 8 | ||||
| -rw-r--r-- | po/zh_CN/boot-installer.po | 4 | ||||
| -rw-r--r-- | po/zh_CN/boot-new.po | 16 | ||||
| -rw-r--r-- | po/zh_CN/hardware.po | 44 | ||||
| -rw-r--r-- | po/zh_CN/install-methods.po | 32 | ||||
| -rw-r--r-- | po/zh_CN/installation-howto.po | 4 | ||||
| -rw-r--r-- | po/zh_CN/partitioning.po | 12 | ||||
| -rw-r--r-- | po/zh_CN/post-install.po | 12 | ||||
| -rw-r--r-- | po/zh_CN/preface.po | 8 | ||||
| -rw-r--r-- | po/zh_CN/preparing.po | 52 | ||||
| -rw-r--r-- | po/zh_CN/random-bits.po | 36 | ||||
| -rw-r--r-- | po/zh_CN/using-d-i.po | 20 | ||||
| -rw-r--r-- | po/zh_CN/welcome.po | 24 |
13 files changed, 136 insertions, 136 deletions
diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po index c111ef6cd..43794762e 100644 --- a/po/zh_CN/bookinfo.po +++ b/po/zh_CN/bookinfo.po @@ -14,20 +14,20 @@ msgstr "" #. Tag: title #: bookinfo.xml:5 #, no-c-format -msgid "&debian; Installation Guide" -msgstr "&debian; 安装手册" +msgid "&debian-gnu; Installation Guide" +msgstr "&debian-gnu; 安装手册" #. Tag: para #: bookinfo.xml:8 #, no-c-format msgid "" -"This document contains installation instructions for the &debian; &release; " +"This document contains installation instructions for the &debian-gnu; &release; " "system (codename <quote>&releasename;</quote>), for the &arch-title; " "(<quote>&architecture;</quote>) architecture. It also contains pointers to " "more information and information on how to make the most of your new Debian " "system." msgstr "" -"本文是 &debian; &release; 系统(代号 <quote>&releasename;</quote>)在 &arch-" +"本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quote>)在 &arch-" "title; (<quote>&architecture;</quote>) 硬件架构下的安装教程。还包括关于如何构" "建您的新 Debian 系统，以及指向更多信息的链接。" diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po index cab747403..5cafc3e03 100644 --- a/po/zh_CN/boot-installer.po +++ b/po/zh_CN/boot-installer.po @@ -509,9 +509,9 @@ msgstr "" #, no-c-format msgid "" "After the program has been started, a few preliminary questions will be " -"asked and the system will be prepared to start the &debian; installer." +"asked and the system will be prepared to start the &debian-gnu; installer." msgstr "" -"程序运行后，会先询问一些预备问题，接着系统就准备开始启动 &debian; 安装程序" +"程序运行后，会先询问一些预备问题，接着系统就准备开始启动 &debian-gnu; 安装程序" "了。" #. Tag: title diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po index 2c2428812..a15d4d181 100644 --- a/po/zh_CN/boot-new.po +++ b/po/zh_CN/boot-new.po @@ -175,11 +175,11 @@ msgstr "NewWorld PowerMacs" #, no-c-format msgid "" "On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key " -"and get a graphical screen with a button for each bootable OS, &debian; will " +"and get a graphical screen with a button for each bootable OS, &debian-gnu; will " "be a button with a small penguin icon." msgstr "" "在 G4 机器和 iBooks 上，您可以按住 <keycap>option</keycap> 键，得到一个图形界" -"面，每个可以启动的系统对应一个按钮，&debian; 将是一个企鹅图标的按钮。" +"面，每个可以启动的系统对应一个按钮，&debian-gnu; 将是一个企鹅图标的按钮。" #. Tag: para #: boot-new.xml:104 @@ -210,15 +210,15 @@ msgstr "" #: boot-new.xml:118 #, no-c-format msgid "" -"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; " +"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-gnu; " "by default (if you correctly partitioned and placed the Apple_Bootstrap " -"partition first). If you have &debian; on a SCSI disk and MacOS on an IDE " +"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an IDE " "disk this may not work and you will have to enter OpenFirmware and set the " "<envar>boot-device</envar> variable, <command>ybin</command> normally does " "this automatically." msgstr "" -"重置 G3 或 G4 硬件上的 OpenFirmware 将导致默认启动 &debian;(假设您正确分区，" -"并将 Apple_Bootstrap 分区放在首位)。如果您将 &debian; 放在 SCSI 磁盘，而 " +"重置 G3 或 G4 硬件上的 OpenFirmware 将导致默认启动 &debian-gnu;(假设您正确分区，" +"并将 Apple_Bootstrap 分区放在首位)。如果您将 &debian-gnu; 放在 SCSI 磁盘，而 " "MacOS 位于 IDE 磁盘，这也许不工作，而您不得不进入 OpenFirmware 并设置 " "<envar>boot-device</envar> 变量，<command>ybin</command> 通常会自动完成。" @@ -226,13 +226,13 @@ msgstr "" #: boot-new.xml:127 #, no-c-format msgid "" -"After you boot &debian; for the first time you can add any additional " +"After you boot &debian-gnu; for the first time you can add any additional " "options you desire (such as dual boot options) to <filename>/etc/yaboot." "conf</filename> and run <command>ybin</command> to update your boot " "partition with the changed configuration. Please read the <ulink url=\"&url-" "powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information." msgstr "" -"在首次启动 &debian; 之后，您可以添加您希望的额外选项(如双启动选项)到 " +"在首次启动 &debian-gnu; 之后，您可以添加您希望的额外选项(如双启动选项)到 " "<filename>/etc/yaboot.conf</filename> 并运行 <command>ybin</command> 以更新修" "改过的设置。请参阅 <ulink url=\"&url-powerpc-yaboot-faq;\">yaboot HOWTO</" "ulink> 了解更多信息。" diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po index b9977c279..fd7a3d2ee 100644 --- a/po/zh_CN/hardware.po +++ b/po/zh_CN/hardware.po @@ -43,12 +43,12 @@ msgid "" "to which the Linux kernel, libc, <command>gcc</command>, etc. have been " "ported, and for which a Debian port exists, can run Debian. Please refer to " "the Ports pages at <ulink url=\"&url-ports;\"></ulink> for more details on " -"&arch-title; architecture systems which have been tested with &debian;." +"&arch-title; architecture systems which have been tested with &debian-gnu;." msgstr "" "Debian 不会超出 Linux 内核与 GNU 工具集所支持的硬件范围之外。因此，任何被移植" "了 Linux 内核、libc、<command>gcc</command> 等，并拥有对应的 Debian 移植版的" "硬件体系或平台都可以运行 Debian。请参考移植页面 <ulink url=\"&url-ports;\"></" -"ulink> 以了解更多已被 &debian; 测试过的 &arch-title; 体系。" +"ulink> 以了解更多已被 &debian-gnu; 测试过的 &arch-title; 体系。" #. Tag: para #: hardware.xml:32 @@ -463,7 +463,7 @@ msgstr "" #: hardware.xml:188 #, no-c-format msgid "" -"This is the first official release of &debian; for the &arch-title; " +"This is the first official release of &debian-gnu; for the &arch-title; " "architecture. We feel that it has proven itself sufficiently to be released. " "However, because it has not had the exposure (and hence testing by users) " "that some other architectures have had, you may encounter a few bugs. Use " @@ -472,7 +472,7 @@ msgid "" "platform. It can be necessary to use the <ulink url=\"&url-list-subscribe;" "\">debian-&arch-listname; mailing list</ulink> as well." msgstr "" -"此为第一个 &arch-title; 体系的 &debian; 官方发布版。我们认为它已经达到了可发" +"此为第一个 &arch-title; 体系的 &debian-gnu; 官方发布版。我们认为它已经达到了可发" "布的质量要求。但是，由于它没有像其他体系那样得到足够的曝光(经过用户测试)，您" "可能会遇到一些 bug。请使用我们的 <ulink url=\"&url-bts;\">Bug 跟踪系统</" "ulink> 来报告问题，并注明该 bug 是在 &arch-title; 平台上产生的。当然，您也可" @@ -860,10 +860,10 @@ msgstr "使用 115200 bps 的 Cobalt 机器。" #: hardware.xml:566 #, no-c-format msgid "" -"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP " +"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and PreP " "subarchitectures are supported." msgstr "" -"对于 &debian; &release; 来说，只有 PMac (Power-Macintosh 或 PowerMac) 和 " +"对于 &debian-gnu; &release; 来说，只有 PMac (Power-Macintosh 或 PowerMac) 和 " "PreP 子体系获得支持。" #. Tag: title @@ -1944,10 +1944,10 @@ msgstr "" #, no-c-format msgid "" "Wireless NICs that are not supported by the official &arch-kernel; kernel can " -"generally be made to work under &debian;, but are not supported during the " +"generally be made to work under &debian-gnu;, but are not supported during the " "installation." msgstr "" -"有些无线网卡不被正式的 &arch-kernel; 内核支持，虽然可以在 &debian; 下工作，但是却不能" +"有些无线网卡不被正式的 &arch-kernel; 内核支持，虽然可以在 &debian-gnu; 下工作，但是却不能" "在安装过程中使用。" #. Tag: para @@ -1966,14 +1966,14 @@ msgstr "" #, no-c-format msgid "" "If there is a problem with wireless and there is no other NIC you can use " -"during the installation, it is still possible to install &debian; using a " +"during the installation, it is still possible to install &debian-gnu; using a " "full CD-ROM or DVD image. Select the option to not configure a network and " "install using only the packages available from the CD/DVD. You can then " "install the driver and firmware you need after the installation is completed " "(after the reboot) and configure your network manually." msgstr "" "如果您在安装过程中使用无线网络遇到问题，并且手头也没有其他的网卡可以使用，仍" -"然可以使用完整的 CD-ROM 或 DVD 映像来安装 &debian;。选择不配置网络选项，然后" +"然可以使用完整的 CD-ROM 或 DVD 映像来安装 &debian-gnu;。选择不配置网络选项，然后" "只安装存在于 CD/DVD 上的软件包。在安装完成(重新启动之后)安装驱动程序和固件，" "并手动配置网络。" @@ -2088,13 +2088,13 @@ msgid "" "in <classname>brltty</classname>. Most displays work under " "<classname>brltty</classname>, connected via either a serial port, USB or " "bluetooth. Details on supported braille devices can be found on the <ulink " -"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian; " +"url=\"&url-brltty;\"><classname>brltty</classname> website</ulink>. &debian-gnu; " "&release; ships with <classname>brltty</classname> version &brlttyver;." msgstr "" "对于盲文点触设备的支持取决于 <classname>brltty</classname> 的支持。大多数设备" "可以在 <classname>brltty</classname> 下面工作，它们通过串口、USB 或蓝牙连接。" "支持盲文设备的详细情况可以查阅 <ulink url=\"&url-brltty;" -"\"><classname>brltty</classname> website</ulink>。&debian; &release; 使用的 " +"\"><classname>brltty</classname> website</ulink>。&debian-gnu; &release; 使用的 " "<classname>brltty</classname> 版本是 &brlttyver; 。" #. Tag: title @@ -2113,13 +2113,13 @@ msgid "" "devices connected to a serial port (no USB or serial-to-USB adapters are " "supported). Details on supported hardware speech synthesis devices can be " "found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> " -"website</ulink>. &debian; &release; ships with <classname>speakup</" +"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</" "classname> version &speakupver;." msgstr "" "对于硬件语音合成设备的支持取决于 <classname>speakup</classname> 的支持。" "<classname>speakup</classname> 只支持板卡集成和外部串口设备(支持非 USB 或 " "serial-to-USB 适配器)。支持硬件语音合成设备的详细情况可以查阅 <ulink url=" -"\"&url-speakup;\"><classname>speakup</classname> website</ulink>。&debian; " +"\"&url-speakup;\"><classname>speakup</classname> website</ulink>。&debian-gnu; " "&release; 使用的 <classname>speakup</classname> 版本是 &speakupver;。" #. Tag: title @@ -2202,14 +2202,14 @@ msgstr "除了需要设备驱动程序，有些硬件还要在使用之前加载 #, no-c-format msgid "" "In most cases firmware is non-free according to the criteria used by the " -"&debian; project and thus cannot be included in the main distribution or in " +"&debian-gnu; project and thus cannot be included in the main distribution or in " "the installation system. If the device driver itself is included in the " -"distribution and if &debian; legally can distribute the firmware, it will " +"distribution and if &debian-gnu; legally can distribute the firmware, it will " "often be available as a separate package from the non-free section of the " "archive." msgstr "" -"根据 &debian; 项目的标准，大多数情况下这些固件属于 non-free，不能被包含在主发" -"行版或安装系统里面。如果设备驱动程序被包含到发行版里面，并且 &debian; 可以合" +"根据 &debian-gnu; 项目的标准，大多数情况下这些固件属于 non-free，不能被包含在主发" +"行版或安装系统里面。如果设备驱动程序被包含到发行版里面，并且 &debian-gnu; 可以合" "法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。" #. Tag: para @@ -2217,13 +2217,13 @@ msgstr "" #, no-c-format msgid "" "However, this does not mean that such hardware cannot be used during an " -"installation. Starting with &debian; 5.0, &d-i; supports loading firmware " +"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading firmware " "files or packages containing firmware from a removable medium, such as a " "floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for " "detailed information on how to load firmware files or packages during the " "installation." msgstr "" -"然而，这并不意味着该硬件不能在安装时使用。从 &debian; 5.0 开始，&d-i; 支持从" +"然而，这并不意味着该硬件不能在安装时使用。从 &debian-gnu; 5.0 开始，&d-i; 支持从" "可移动的介质，比如软盘或 USB 盘，加载固件或包含固件的软件包。参阅 <xref " "linkend=\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信" "息。" @@ -2609,12 +2609,12 @@ msgstr "Un*x 或 GNU 系统" #, no-c-format msgid "" "If you are running another Unix-like system, you could use it to install " -"&debian; without using the &d-i; described in the rest of this manual. This " +"&debian-gnu; without using the &d-i; described in the rest of this manual. This " "kind of install may be useful for users with otherwise unsupported hardware " "or on hosts which can't afford downtime. If you are interested in this " "technique, skip to the <xref linkend=\"linux-upgrade\"/>." msgstr "" -"如果您正在运行其它的类 Unix 系统，也可以用它来安装 &debian; 而无须本手册剩余" +"如果您正在运行其它的类 Unix 系统，也可以用它来安装 &debian-gnu; 而无须本手册剩余" "部分讲述的 &d-i; 使用方法。这类安装方法可能对那些因为硬件不支持或机器停产的用" "户有用。如果您对此技术感兴趣，请直接跳到 <xref linkend=\"linux-upgrade\"/>。" diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po index c425f1f03..6ecf4e634 100644 --- a/po/zh_CN/install-methods.po +++ b/po/zh_CN/install-methods.po @@ -20,14 +20,14 @@ msgstr "获取系统安装介质" #. Tag: title #: install-methods.xml:12 #, no-c-format -msgid "Official &debian; CD-ROM Sets" -msgstr "官方的 &debian; 光盘套装" +msgid "Official &debian-gnu; CD-ROM Sets" +msgstr "官方的 &debian-gnu; 光盘套装" #. Tag: para #: install-methods.xml:13 #, no-c-format msgid "" -"By far the easiest way to install &debian; is from an Official Debian CD-ROM " +"By far the easiest way to install &debian-gnu; is from an Official Debian CD-ROM " "Set. You can buy a set from a vendor (see the <ulink url=\"&url-debian-cd-" "vendors;\">CD vendors page</ulink>). You may also download the CD-ROM images " "from a Debian mirror and make your own set, if you have a fast network " @@ -40,7 +40,7 @@ msgid "" "above. You may also consider using the DVD version, which saves a lot of " "space on your shelf and you avoid the CD shuffling marathon." msgstr "" -"目前安装 &debian; 最容易的方法是使用官方的 Debian CD-ROM 套件。您可以从一个销" +"目前安装 &debian-gnu; 最容易的方法是使用官方的 Debian CD-ROM 套件。您可以从一个销" "售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</ulink>)。如" "果您有快速的网络连接和光盘刻录机的话，也可以从 Debian 镜像站点下载 CD-ROM 映" "像然后自行刻录光盘(具体参见 <ulink url=\"&url-debian-cd;\">Debian CD 页</" @@ -561,11 +561,11 @@ msgstr "写磁盘映像：使用<command>Disk Copy</command>" #, no-c-format msgid "" "If you are creating the floppy image from files which were originally on the " -"official &debian; CD, then the Type and Creator are already set correctly. " +"official &debian-gnu; CD, then the Type and Creator are already set correctly. " "The following <command>Creator-Changer</command> steps are only necessary if " "you downloaded the image files from a Debian mirror." msgstr "" -"假如您是使用官方 &debian; 光盘上的软盘映像文件，那么 Type 和 Creator 已经设置" +"假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经设置" "正确。以下 <command>Creator-Changer</command> 步骤只针对从 Debian 镜像下载映" "像文件的情况。" @@ -1577,12 +1577,12 @@ msgstr "" #: install-methods.xml:1124 #, no-c-format msgid "" -"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's " +"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. It's " "written by the same author as the <classname>syslinux</classname> bootloader " "and is therefore least likely to cause issues. A good alternative is " "<classname>atftpd</classname>." msgstr "" -"对于 &debian; 服务器，我们推荐使用 <classname>tftpd-hpa</classname>。它由 " +"对于 &debian-gnu; 服务器，我们推荐使用 <classname>tftpd-hpa</classname>。它由 " "<classname>syslinux</classname> bootloader 的同一作者开发，因此不会导致很多问" "题。另一个好的选择是 <classname>atftpd</classname>。" @@ -1643,12 +1643,12 @@ msgstr "设置 DHCP 服务器" #: install-methods.xml:1175 #, no-c-format msgid "" -"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, " +"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-gnu;, " "the <classname>dhcp3-server</classname> package is recommended. Here is a " "sample configuration file for it (see <filename>/etc/dhcp3/dhcpd.conf</" "filename>):" msgstr "" -"一个 DHCP 服务器自由软件是 ISC <command>dhcpd</command>。对于 &debian;，推荐" +"一个 DHCP 服务器自由软件是 ISC <command>dhcpd</command>。对于 &debian-gnu;，推荐" "使用 <classname>dhcp3-server</classname> 软件包。这里是它的一个简单的配置示例" "文件(参阅 <filename>/etc/dhcp3/dhcpd.conf</filename>)：" @@ -1810,13 +1810,13 @@ msgstr "架设 BOOTP 服务器" 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 " +"<command>dhcpd</command>. In &debian-gnu; these are contained in the " "<classname>bootp</classname> and <classname>dhcp3-server</classname> " "packages respectively." msgstr "" "在 GNU/Linux 下面可以使用两种 BOOTP 服务器。首先是 CMU <command>bootpd</" "command>，另外一种实际上是 DHCP 服务器：ISC <command>dhcpd</command>。" -"&debian; 中它们分别被包含在 <classname>bootp</classname> 和 <classname>dhcp3-" +"&debian-gnu; 中它们分别被包含在 <classname>bootp</classname> 和 <classname>dhcp3-" "server</classname> 软件包。" #. Tag: para @@ -1824,7 +1824,7 @@ msgstr "" #, 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 " +"relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you can " "run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/" "etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server " "does not run Debian, the line in question should look like: " @@ -1854,7 +1854,7 @@ msgid "" "userinput> variable is the machine's MAC address. </phrase>" msgstr "" "为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd." -"conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian; 里，您可" +"conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian-gnu; 里，您可" "以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 " "<userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP " "服务器不是运行在 Debian 上，这行看起来应该像这样： " @@ -1937,14 +1937,14 @@ msgstr "" #, no-c-format msgid "" "Historically, TFTP servers used <filename>/tftpboot</filename> as directory " -"to serve images from. However, &debian; packages may use other directories " +"to serve images from. However, &debian-gnu; packages may use other directories " "to comply with the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy " "Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default " "uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the " "configuration examples in this section accordingly." msgstr "" "因为历史原因，TFTP 服务器使用 <filename>/tftpboot</filename> 作为映像文件目" -"录。然而，&debian; 软件包遵守 <ulink url=\"&url-fhs-home;\">Filesystem " +"录。然而，&debian-gnu; 软件包遵守 <ulink url=\"&url-fhs-home;\">Filesystem " "Hierarchy Standard</ulink> 使用其他的目录。例如，<classname>tftpd-hpa</" "classname> 默认使用 <filename>/var/lib/tftpboot</filename>。您或许要适当地调" "整一下配置文件示例。" diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po index 78d8554cb..36dcf1824 100644 --- a/po/zh_CN/installation-howto.po +++ b/po/zh_CN/installation-howto.po @@ -21,7 +21,7 @@ msgstr "安装指南" #: installation-howto.xml:7 #, no-c-format msgid "" -"This document describes how to install &debian; &releasename; for the &arch-" +"This document describes how to install &debian-gnu; &releasename; for the &arch-" "title; (<quote>&architecture;</quote>) with the new &d-i;. It is a quick " "walkthrough of the installation process which should contain all the " "information you will need for most installs. When more information can be " @@ -29,7 +29,7 @@ msgid "" "document." msgstr "" "本文介绍了如何在 &arch-title; (<quote>&architecture;</quote>) 架构的计算机" -"上，使用新版的 &d-i; 安装 &debian; &releasename;。这是一次对安装过程走马观花" +"上，使用新版的 &d-i; 安装 &debian-gnu; &releasename;。这是一次对安装过程走马观花" "式的简介，它应该囊括了大多数情况下您所需的信息。当需要更多信息时，我们会链接" "到更详尽的本文其他部分的说明文档。" diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po index cd409f9e6..63a0bb3df 100644 --- a/po/zh_CN/partitioning.po +++ b/po/zh_CN/partitioning.po @@ -108,13 +108,13 @@ msgstr "目录树" #: partitioning.xml:68 #, no-c-format msgid "" -"&debian; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy " +"&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy " "Standard</ulink> for directory and file naming. This standard allows users " "and software programs to predict the location of files and directories. The " "root level directory is represented simply by the slash <filename>/</" "filename>. At the root level, all Debian systems include these directories:" msgstr "" -"&debian; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem " +"&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem " "Hierarchy Standard)</ulink> 安排文件以及文件命名。该标准让用户和软件程序预知" "文件以及目录的位置。根目录只是简单表现为 <filename>/</filename>。在根层次，所" "有的 Debian 系统包括这些目录：" @@ -1042,13 +1042,13 @@ msgid "" "Linux limits the partitions per drive to 15 partitions for SCSI disks (3 " "usable primary partitions, 12 logical partitions), and 63 partitions on an " "IDE drive (3 usable primary partitions, 60 logical partitions). However the " -"normal &debian; system provides only 20 devices for partitions, so you may " +"normal &debian-gnu; system provides only 20 devices for partitions, so you may " "not install on partitions higher than 20 unless you first manually create " "devices for those partitions." msgstr "" "对于 SCSI 来说，Linux 限制每个驱动器最多有 15 个分区(3 个可用的主分区，12 个" "逻辑分区)。对于 IDE 来说可以有 63 个分区(3 个可用的主分区，60 个逻辑分区)。但" -"是对于普通的 &debian; 版本，系统只支持 20 个分区设备，因此您不能安装超过 20 " +"是对于普通的 &debian-gnu; 版本，系统只支持 20 个分区设备，因此您不能安装超过 20 " "个的分区，除非您首先为这些分区手工创建了设备文件。" #. Tag: para @@ -1379,7 +1379,7 @@ msgstr "" #: partitioning.xml:850 #, no-c-format msgid "" -"In order for OpenFirmware to automatically boot &debian; the bootstrap " +"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap " "partition should appear before other boot partitions on the disk, especially " "MacOS boot partitions. The bootstrap partition should be the first one you " "create. However, if you add a bootstrap partition later, you can use " @@ -1388,7 +1388,7 @@ msgid "" "(which is always partition 1). It's the logical map order, not the physical " "address order, that counts." msgstr "" -"为了确保 OpenFirmware 能够自动引导 &debian; 启动分区应该先于其它磁盘上的引导" +"为了确保 OpenFirmware 能够自动引导 &debian-gnu; 启动分区应该先于其它磁盘上的引导" "分区，特别是 MacOS 引导分区。启动分区应该是您第一个创建的分区。但是，如果您在" "其它情况下后加入启动分区，您可以使用 <command>mac-fdisk</command> 的 " "<userinput>r</userinput> 命令来重新调整分区布局。这样启动分区就可以在随后时间" diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po index f207d7b0f..a48de17fa 100644 --- a/po/zh_CN/post-install.po +++ b/po/zh_CN/post-install.po @@ -27,15 +27,15 @@ msgstr "关闭系统" #: post-install.xml:15 #, no-c-format msgid "" -"To shut down a running &debian; system, you must not reboot with the reset " +"To shut down a running &debian-gnu; system, you must not reboot with the reset " "switch on the front or back of your computer, or just turn off the computer. " -"&debian; should be shut down in a controlled manner, otherwise files might get " +"&debian-gnu; should be shut down in a controlled manner, otherwise files might get " "lost and/or disk damage might occur. If you run a desktop environment, there " "is usually an option to <quote>log out</quote> available from the " "application menu that allows you to shutdown (or reboot) the system." msgstr "" -"关闭一个运行着的 &debian; 系统，不要使用计算机前面或后面的 reset 开关重启，或者" -"直接关闭计算机。&debian; 应该使用可控的过程关闭，否则会造成文件丢失或/和磁盘损" +"关闭一个运行着的 &debian-gnu; 系统，不要使用计算机前面或后面的 reset 开关重启，或者" +"直接关闭计算机。&debian-gnu; 应该使用可控的过程关闭，否则会造成文件丢失或/和磁盘损" "坏。假如您运行了桌面环境，通常会有一个 <quote>log out</quote> 选项位于应用程" "序菜单让您关闭(或者重启)系统。" @@ -415,13 +415,13 @@ msgstr "默认的 E-Mail 配置" msgid "" "Even if you are planning to use a graphical mail program, it is important " "that a traditional MTA/MDA is also installed and correctly set up on your " -"&debian; system. Reason is that various utilities running on the " +"&debian-gnu; system. Reason is that various utilities running on the " "system<footnote> <para> Examples are: <command>cron</command>, " "<command>quota</command>, <command>logcheck</command>, <command>aide</" "command>, … </para> </footnote> can send important notices by e-mail " "to inform the system administrator of (potential) problems or changes." msgstr "" -"即使您打算使用图形界面的邮件程序，安装传统的 MTA/MDA 并正确架设在您的 &debian; " +"即使您打算使用图形界面的邮件程序，安装传统的 MTA/MDA 并正确架设在您的 &debian-gnu; " "系统上也是很重要的。其原因是很多运行在系统中的工具<footnote> <para> 例如：" "<command>cron</command>、<command>quota</command>、<command>logcheck</" "command>、<command>aide</command>，… </para> </footnote> 会通过邮件发" diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po index 29907b799..a09402ff3 100644 --- a/po/zh_CN/preface.po +++ b/po/zh_CN/preface.po @@ -14,21 +14,21 @@ msgstr "" #. Tag: title #: preface.xml:5 #, no-c-format -msgid "Installing &debian; &release; For &architecture;" -msgstr "在 &architecture; 上安装 &debian; &release;" +msgid "Installing &debian-gnu; &release; For &architecture;" +msgstr "在 &architecture; 上安装 &debian-gnu; &release;" #. Tag: para #: preface.xml:6 #, no-c-format msgid "" "We are delighted that you have decided to try Debian, and are sure that you " -"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian; brings " +"will find that Debian's GNU/&arch-kernel; distribution is unique. &debian-gnu; brings " "together high-quality free software from around the world, integrating it " "into a coherent whole. We believe that you will find that the result is " "truly more than the sum of the parts." msgstr "" "我们非常高兴地看到您决定试用 Debian，并确信您将发现 Debian 的 GNU/&arch-kernel; 发行" -"版是独一无二的。&debian; 将带给您来自世界各地的高质量的自由软件，并将它们整合" +"版是独一无二的。&debian-gnu; 将带给您来自世界各地的高质量的自由软件，并将它们整合" "成一个紧密的整体。您会发现整合后的结果一定会大于将各部分简单地相加。" #. Tag: para diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po index 93e8649c0..18ef26bae 100644 --- a/po/zh_CN/preparing.po +++ b/po/zh_CN/preparing.po @@ -14,8 +14,8 @@ msgstr "" #. Tag: title #: preparing.xml:5 #, no-c-format -msgid "Before Installing &debian;" -msgstr "开始安装 &debian; 之前" +msgid "Before Installing &debian-gnu;" +msgstr "开始安装 &debian-gnu; 之前" #. Tag: para #: preparing.xml:6 @@ -62,7 +62,7 @@ msgstr "" #: preparing.xml:35 #, no-c-format msgid "" -"Under &debian;, it is much more likely that your OS can be repaired rather " +"Under &debian-gnu;, it is much more likely that your OS can be repaired rather " "than replaced if things go wrong. Upgrades never require a wholesale " "installation; you can always upgrade in-place. And the programs are almost " "always compatible with successive OS releases. If a new program version " @@ -72,7 +72,7 @@ msgid "" "installation, so think of it as your very last option. The installer is " "<emphasis>not</emphasis> designed to re-install over an existing system." msgstr "" -"在 &debian; 里，如果操作系统遇到出错的情况，您大多时候都能把它修复而不用重新" +"在 &debian-gnu; 里，如果操作系统遇到出错的情况，您大多时候都能把它修复而不用重新" "安装。升级不再需要进行大规模的安装操作，您可以就地升级它，而这些程序也总能和" "新版的操作系统和平共处。如果一个程序的新版本需要其他程序的更新版本来支持它，" "Debian 软件包管理系统会自动帮您确定所有必须的软件，并把它们安装上。关键是，" @@ -184,10 +184,10 @@ msgstr "等待自动下载、安装和设置<firstterm>基本系统</firstterm> #: preparing.xml:128 #, no-c-format msgid "" -"Install a <firstterm>boot loader</firstterm> which can start up &debian; and/" +"Install a <firstterm>boot loader</firstterm> which can start up &debian-gnu; and/" "or your existing system." msgstr "" -"安装 <firstterm>boot loader</firstterm>，它负责启动 &debian; 和(或)已有的其他" +"安装 <firstterm>boot loader</firstterm>，它负责启动 &debian-gnu; 和(或)已有的其他" "系统。" #. Tag: para @@ -261,13 +261,13 @@ msgid "" "the <quote>Desktop environment</quote> task, you will only have a relatively " "basic, command line driven system. Installing the Desktop environment task " "is optional because it requires a fairly large amount of disk space, and " -"because many &debian; systems are servers which don't really have any need " +"because many &debian-gnu; systems are servers which don't really have any need " "for a graphical user interface to do their job." msgstr "" "安装过程中一个重要的选项是要不要安装图形桌面环境，它由 X Window System 和一个" "图形桌面环境组成。如果没有选择<quote>桌面环境</quote>任务，就只有一个相对基本" "的、命令行驱动的系统。把安装桌面环境任务作为选项，是因为它需要大量的磁盘空" -"间，而且由于许多 &debian; 系统是作为服务器，并不需要图形用户界面来完成它们的" +"间，而且由于许多 &debian-gnu; 系统是作为服务器，并不需要图形用户界面来完成它们的" "工作。" #. Tag: para @@ -296,7 +296,7 @@ msgid "" "Before you start, make sure to back up every file that is now on your " "system. If this is the first time a non-native operating system has been " "installed on your computer, it's quite likely you will need to re-partition " -"your disk to make room for &debian;. Anytime you partition your disk, you " +"your disk to make room for &debian-gnu;. Anytime you partition your disk, you " "run a risk of losing everything on the disk, no matter what program you use " "to do it. The programs used in installation are quite reliable and most have " "seen years of use; but they are also quite powerful and a false move can " @@ -1083,7 +1083,7 @@ msgstr "" #: preparing.xml:721 #, no-c-format msgid "" -"Disk space required for the smooth operation of the &debian; system itself " +"Disk space required for the smooth operation of the &debian-gnu; system itself " "is taken into account in these recommended system requirements. Notably, the " "<filename>/var</filename> partition contains a lot of state information " "specific to Debian in addition to its regular contents, like logfiles. The " @@ -1093,7 +1093,7 @@ msgid "" "least 200MB for <filename>/var</filename>, and a lot more if you install a " "graphical desktop environment." msgstr "" -"在推荐的系统需求中已经包含流畅运行 &debian; 所需的磁盘空间。尤其是 " +"在推荐的系统需求中已经包含流畅运行 &debian-gnu; 所需的磁盘空间。尤其是 " "<filename>/var</filename> 分区里装有许多 Debian 的特定状态信息和类似日志文件" "这样的常规内容。<command>dpkg</command> 所用的文件(含有所有已安装软件包的信" "息)很容易就会消耗掉 40MB。另外，<command>apt-get</command> 会在安装前将下载的" @@ -1206,7 +1206,7 @@ msgstr "" #, no-c-format msgid "" "If your machine has only one hard disk, and you would like to completely " -"replace the current operating system with &debian;, you also can wait to " +"replace the current operating system with &debian-gnu;, you also can wait to " "partition as part of the installation process (<xref linkend=\"di-partition" "\"/>), after you have booted the installation system. However this only " "works if you plan to boot the installer system from tapes, CD-ROM or files " @@ -1217,7 +1217,7 @@ msgid "" "some alternate means of reviving your machine like the original system's " "installation tapes or CDs." msgstr "" -"若是您的机器只有一块硬盘，而且您愿意把原来的操作系统全盘替换成 &debian;，那么" +"若是您的机器只有一块硬盘，而且您愿意把原来的操作系统全盘替换成 &debian-gnu;，那么" "可以在启动安装系统后，待到安装时再进行分区(<xref linkend=\"di-partition\"/" ">)。但是，只有当您使用存储于磁带、CD-ROM 或者联网的机器上的安装系统，并从它们" "启动安装程序时，上面的话才适用于您的情形。试想一下：假如您用放在硬盘上的文件" @@ -1261,7 +1261,7 @@ msgid "" "of the partitions will be owned by other operating systems, you should " "create those partitions using native operating system partitioning programs. " "We recommend that you do <emphasis>not</emphasis> attempt to create " -"partitions for &debian; using another operating system's tools. Instead, you " +"partitions for &debian-gnu; using another operating system's tools. Instead, you " "should just create the native operating system's partitions you will want to " "retain." msgstr "" @@ -1298,7 +1298,7 @@ msgstr "" #: preparing.xml:862 #, no-c-format msgid "" -"In order for OpenFirmware to automatically boot &debian; the Linux " +"In order for OpenFirmware to automatically boot &debian-gnu; the Linux " "partitions should appear before all other partitions on the disk, especially " "MacOS boot partitions. This should be kept in mind when pre-partitioning; " "you should create a Linux placeholder partition to come <emphasis>before</" @@ -1307,7 +1307,7 @@ msgid "" "placeholder with the Linux partition tools later during the actual install, " "and replace it with Linux partitions." msgstr "" -"为了能让 OpemFirmware 自动启动 &debian; Linux 分区必须被安置在其它分区之前，" +"为了能让 OpemFirmware 自动启动 &debian-gnu; Linux 分区必须被安置在其它分区之前，" "特别是 MacOS 的启动分区。在事先分区时，这一点您必须牢记在心。即，您必须在其" "它 可引导分区 <emphasis>之前</emphasis> 为 Linux 预留一个分区。(专门留给 " "Apple 的硬盘驱动程序的那些小分区并不是可引导的。) 您可以在真正安装时，用 " @@ -1348,9 +1348,9 @@ msgstr "" #, no-c-format msgid "" "Use the native partitioning tools to create native system partition(s). " -"Leave either a place holder partition or free space for &debian;." +"Leave either a place holder partition or free space for &debian-gnu;." msgstr "" -"使用原有系统里的分区工具来新建属于原来系统的分区。为 &debian; 或者预留一个分" +"使用原有系统里的分区工具来新建属于原来系统的分区。为 &debian-gnu; 或者预留一个分" "区，或者腾出一块空闲空间。" #. Tag: para @@ -1663,10 +1663,10 @@ msgstr "" msgid "" "Remember to create a placeholder partition for GNU/Linux, preferably " "positioned first in the disk layout. it doesn't matter what type it is, it " -"will be deleted and replaced later inside the &debian; installer." +"will be deleted and replaced later inside the &debian-gnu; installer." msgstr "" "记住要为 GNU/Linux 创建一个占位用的是分区，最好是磁盘布局中的第一个。它的类型" -"无关紧要，在后面的 &debian; 安装程序中，它会被删除并替换。" +"无关紧要，在后面的 &debian-gnu; 安装程序中，它会被删除并替换。" #. Tag: para #: preparing.xml:1107 @@ -1723,14 +1723,14 @@ msgid "" "involves checking and possibly changing firmware settings for your system. " "The <quote>firmware</quote> is the core software used by the hardware; it is " "most critically invoked during the bootstrap process (after power-up). Known " -"hardware issues affecting the reliability of &debian; on your system are " +"hardware issues affecting the reliability of &debian-gnu; on your system are " "also highlighted." msgstr "" "在本节中，我们将讨论安装之前有关硬件设置的一些问题。如果这些问题的确存在的" "话，您就需要在安装 Debian 前先做一些准备工作了。一般来说，准备工作包括：检查" "或者修改为您的系统中固件(firmware)的设定。所谓<quote>固件</quote>就是硬件运行" "所需的核心软件。它在系统引导过程(即开机之后)中起到了至关重要的作用。我们同时" -"也会着重提出一些硬件问题，您系统上这些硬件问题在将会影响到 &debian; 的可靠" +"也会着重提出一些硬件问题，您系统上这些硬件问题在将会影响到 &debian-gnu; 的可靠" "性。" #. Tag: title @@ -2439,7 +2439,7 @@ msgstr "BIOS 设置" #: preparing.xml:1646 #, no-c-format msgid "" -"In order to install &debian; on a &arch-title; or zSeries machine you have " +"In order to install &debian-gnu; on a &arch-title; or zSeries machine you have " "first boot a kernel into the system. The boot mechanism of this platform is " "inherently different to other ones, especially from PC-like systems: there " "are no floppy devices available at all. You will notice another big " @@ -2448,7 +2448,7 @@ msgid "" "telnet, or a browser. This is due to that special system architecture where " "the 3215/3270 console is line-based instead of character-based." msgstr "" -"为了安装 &debian; 到 &arch-title; 或者 zSeries 机器上，您首先要将内核引导进系" +"为了安装 &debian-gnu; 到 &arch-title; 或者 zSeries 机器上，您首先要将内核引导进系" "统。在此平台上的启动机制与其他类型，特别是类 PC 的系统，有着本质上的不同：它" "根本就没有软盘驱动器。您还会注意到此平台上的另外一个显著差异：大多数(如果不是" "全部)的时间，您将借助于其他客户机上的 telnet 这样的软件或者一个浏览器，通过远" @@ -2573,11 +2573,11 @@ msgstr "" #, 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 " +"&debian-gnu; mirror, but only the s390 and architecture-independent files are " "required. You can also copy the contents of all installation CDs into such a " "directory tree." msgstr "" -"安装服务器需要从任意 &debian; 镜像复制精确的目录结构，当然只需 s390 和一些独" +"安装服务器需要从任意 &debian-gnu; 镜像复制精确的目录结构，当然只需 s390 和一些独" "立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。" #. Tag: emphasis diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po index 44ea98156..40f274110 100644 --- a/po/zh_CN/random-bits.po +++ b/po/zh_CN/random-bits.po @@ -815,26 +815,26 @@ msgstr "" #. Tag: title #: random-bits.xml:358 #, no-c-format -msgid "Installing &debian; from a Unix/Linux System" -msgstr "通过 Unix/Linux 系统来安装 &debian;" +msgid "Installing &debian-gnu; from a Unix/Linux System" +msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;" #. Tag: para #: random-bits.xml:360 #, no-c-format msgid "" -"This section explains how to install &debian; from an existing Unix or Linux " +"This section explains how to install &debian-gnu; from an existing Unix or Linux " "system, without using the menu-driven installer as explained in the rest of " "the manual. This <quote>cross-install</quote> HOWTO has been requested by " -"users switching to &debian; from Red Hat, Mandrake, and SUSE. In this " +"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this " "section some familiarity with entering *nix commands and navigating the file " "system is assumed. In this section, <prompt>$</prompt> symbolizes a command " "to be entered in the user's current system, while <prompt>#</prompt> refers " "to a command entered in the Debian chroot." msgstr "" -"本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian;，而非使用本手册后面" +"本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册后面" "要谈到的由菜单驱动的安装软件。这篇<quote>交叉安装(cross-install)</quote> " "HOWTO 是应用户的要求而撰写的。他们原来是 Redhat、Mandrake 和 SUSE 的用户，现" -"转而使用 &debian;。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中穿梭" +"转而使用 &debian-gnu;。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中穿梭" "移动并不生疏。同时，在本节中，<prompt>$</prompt> 标志着这个命令是在用户当前使" "用的系统中输入的，而 <prompt>#</prompt> 则表示这个命令是在 Debian chroot 环境" "中输入的。" @@ -845,13 +845,13 @@ msgstr "" msgid "" "Once you've got the new Debian system configured to your preference, you can " "migrate your existing user data (if any) to it, and keep on rolling. This is " -"therefore a <quote>zero downtime</quote> &debian; install. It's also a " +"therefore a <quote>zero downtime</quote> &debian-gnu; install. It's also a " "clever way for dealing with hardware that otherwise doesn't play friendly " "with various boot or installation media." msgstr "" "一旦您根据自己的要求配置好了新的 Debian 系统，就可以将您原来系统中的用户数据" "(如果有的话)悉数迁移到 Debian 里去。然后就能继续爽了。一言以蔽之，这是一次" -"<quote>不停机</quote>的 &debian; 安装。同时，这也是处理那些因为硬件原因不能通" +"<quote>不停机</quote>的 &debian-gnu; 安装。同时，这也是处理那些因为硬件原因不能通" "过任何引导或者安装介质完成安装的权宜之计。" #. Tag: para @@ -1045,11 +1045,11 @@ msgstr "" #: random-bits.xml:503 #, no-c-format msgid "" -"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</" +"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</" "filename>, you could substitute a file URL instead of the http URL: " "<userinput>file:/cdrom/debian/</userinput>" msgstr "" -"如果您已经把一张 &releasename; 版本的 &debian; CD 挂载到 <filename>/cdrom</" +"如果您已经把一张 &releasename; 版本的 &debian-gnu; CD 挂载到 <filename>/cdrom</" "filename>，那么也可以把 http URL 替换成 file URL，即：<userinput>file:/cdrom/" "debian/</userinput>" @@ -1607,12 +1607,12 @@ msgstr "Boot Loader 的设置" #: random-bits.xml:765 #, no-c-format msgid "" -"To make your &debian; system bootable, set up your boot loader to load the " +"To make your &debian-gnu; system bootable, set up your boot loader to load the " "installed kernel with your new root partition. Note that " "<command>debootstrap</command> does not install a boot loader, though you " "can use <command>aptitude</command> inside your Debian chroot to do so." msgstr "" -"要让您的 &debian; 系统能够启动，还要创建 boot loader，好让它能加载安装的内核" +"要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的内核" "并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot loader，" "因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。" @@ -1825,20 +1825,20 @@ msgstr "# aptitude clean" #. Tag: title #: random-bits.xml:875 #, no-c-format -msgid "Installing &debian; over Parallel Line IP (PLIP)" -msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian;" +msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)" +msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;" #. Tag: para #: random-bits.xml:877 #, no-c-format msgid "" -"This section explains how to install &debian; on a computer without an " +"This section explains how to install &debian-gnu; on a computer without an " "Ethernet card, but with just a remote gateway computer attached via a Null-" "Modem cable (also called Null-Printer cable). The gateway computer should be " "connected to a network that has a Debian mirror on it (e.g. to the Internet)." msgstr "" "本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-" -"Printer 线)，连接到远端网关计算机来安装 &debian;。充当网关的计算机应该连接到" +"Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连接到" "具有 Debian 镜像的网络(例如，互联网)。" #. Tag: para @@ -2095,8 +2095,8 @@ msgstr "" #. Tag: title #: random-bits.xml:1046 #, no-c-format -msgid "Installing &debian; using PPP over Ethernet (PPPoE)" -msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian;" +msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)" +msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;" #. Tag: para #: random-bits.xml:1048 diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po index fc4f3f6ee..de30a54ab 100644 --- a/po/zh_CN/using-d-i.po +++ b/po/zh_CN/using-d-i.po @@ -519,8 +519,8 @@ msgstr "base-installer" #, no-c-format msgid "" "Installs the most basic set of packages which would allow the computer to " -"operate under &debian; when rebooted." -msgstr "安装一些基本的包，让计算机重启后能在 &debian; 下运行。" +"operate under &debian-gnu; when rebooted." +msgstr "安装一些基本的包，让计算机重启后能在 &debian-gnu; 下运行。" #. Tag: term #: using-d-i.xml:324 @@ -718,11 +718,11 @@ msgstr "检测可用内存/小内存模式" msgid "" "One of the first things &d-i; does, is to check available memory. If the " "available memory is limited, this component will make some changes in the " -"installation process which hopefully will allow you to install &debian; on " +"installation process which hopefully will allow you to install &debian-gnu; on " "your system." msgstr "" "&d-i; 首先要做的一件事是检测有效的内存。如果内存有限，该组件将修改后续的安装" -"进程，使您可以将 &debian; 安装到您的系统上。" +"进程，使您可以将 &debian-gnu; 安装到您的系统上。" #. Tag: para #: using-d-i.xml:458 @@ -3291,7 +3291,7 @@ msgstr "配置 apt" #: using-d-i.xml:2236 #, no-c-format msgid "" -"One of the tools used to install packages on a &debian; system is a program " +"One of the tools used to install packages on a &debian-gnu; system is a program " "called <command>apt-get</command>, from the <classname>apt</classname> " "package<footnote> <para> Note that the program which actually installs the " "packages is called <command>dpkg</command>. However, this program is more of " @@ -3307,7 +3307,7 @@ msgid "" "<command>aptitude</command> is now the recommended utility for package " "management." msgstr "" -"在 &debian; 系统上，<command>apt-get</command> 是一个人们用来安装软件包的程" +"在 &debian-gnu; 系统上，<command>apt-get</command> 是一个人们用来安装软件包的程" "序，它被包含在 <classname>apt</classname> 软件包中<footnote> <para> 其实，真" "正用来安装软件包的程序是 <command>dpkg</command>。但这是一个比较底层的工具。" "<command>apt-get</command> 是一个高级工具，它可以在适当的时候调用 " @@ -4335,13 +4335,13 @@ msgid "" "<quote>bootstrap</quote> with type <emphasis>Apple_Bootstrap</emphasis> " "created back in the partitioning component. If this step completes " "successfully then your disk should now be bootable and OpenFirmware will be " -"set to boot &debian;." +"set to boot &debian-gnu;." msgstr "" "新的(1998 年以后)的 PowerMacs 使用 <command>yaboot</command> 作为它们的 boot " "loader。安装程序自动配置 <command>yaboot</command>，您只需一个 820k 的小分" "区，命名为 <quote>bootstrap</quote>，类型为 <emphasis>Apple_Bootstrap</" "emphasis> 这由分区组件创建。如果这步完全成功，硬盘就可以启动，OpenFireware 将" -"设为启动 &debian;。" +"设为启动 &debian-gnu;。" #. Tag: title #: using-d-i.xml:2964 @@ -4536,12 +4536,12 @@ msgstr "" #, no-c-format msgid "" "After a final prompt the system will be halted because rebooting is not " -"supported on &arch-title;. You then need to IPL &debian; from the DASD which " +"supported on &arch-title;. You then need to IPL &debian-gnu; from the DASD which " "you selected for the root filesystem during the first steps of the " "installation." msgstr "" "最后一个提示信息后，由于重启不被 &arch-title; 支持，系统将关机。您需要 DASD " -"上的 IPL &debian;，它在安装步骤第一步里被选做根文件系统。" +"上的 IPL &debian-gnu;，它在安装步骤第一步里被选做根文件系统。" #. Tag: title #: using-d-i.xml:3122 diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po index 727cf6ca8..e0cd96fe3 100644 --- a/po/zh_CN/welcome.po +++ b/po/zh_CN/welcome.po @@ -21,12 +21,12 @@ msgstr "欢迎使用 Debian" #: welcome.xml:5 #, no-c-format msgid "" -"This chapter provides an overview of the Debian Project and &debian;. If you " -"already know about the Debian Project's history and the &debian; " +"This chapter provides an overview of the Debian Project and &debian-gnu;. If you " +"already know about the Debian Project's history and the &debian-gnu; " "distribution, feel free to skip to the next chapter." msgstr "" -"本章将简要介绍 Debian 计划和 &debian;。如果您已经对 Debian 计划的历史和 " -"&debian; 发行版有一定的了解，请略过本章。" +"本章将简要介绍 Debian 计划和 &debian-gnu;。如果您已经对 Debian 计划的历史和 " +"&debian-gnu; 发行版有一定的了解，请略过本章。" #. Tag: title #: welcome.xml:19 @@ -510,13 +510,13 @@ msgstr "获得 Debian" #: welcome.xml:348 #, no-c-format msgid "" -"For information on how to download &debian; from the Internet or from whom " +"For information on how to download &debian-gnu; from the Internet or from whom " "official Debian CDs can be purchased, see the <ulink url=\"&url-debian-" "distrib;\">distribution web page</ulink>. The <ulink url=\"&url-debian-" "mirrors;\">list of Debian mirrors</ulink> contains a full set of official " "Debian mirrors, so you can easily find the nearest one." msgstr "" -"关于如何从因特网上下载 &debian; 或者购买官方 Debian 光盘的信息，请参阅 " +"关于如何从因特网上下载 &debian-gnu; 或者购买官方 Debian 光盘的信息，请参阅 " "<ulink url=\"&url-debian-distrib;\">发行网页</ulink>。<ulink url=\"&url-" "debian-mirrors;\">Debian 镜像列表</ulink> 包含完整的 Debian 官方镜像，您可以" "很容易找到最近的一个。" @@ -544,12 +544,12 @@ msgstr "获得本文档最新版本" msgid "" "This document is constantly being revised. Be sure to check the <ulink url=" "\"&url-release-area;\"> Debian &release; pages</ulink> for any last-minute " -"information about the &release; release of the &debian; system. Updated " +"information about the &release; release of the &debian-gnu; system. Updated " "versions of this installation manual are also available from the <ulink url=" "\"&url-install-manual;\">official Install Manual pages</ulink>." msgstr "" "本文档会不断地修订。请查阅 <ulink url=\"&url-release-area;\"> Debian " -"&release; 页面</ulink> 以了解最近的关于 &release; 版 &debian; 系统的的信息。" +"&release; 页面</ulink> 以了解最近的关于 &release; 版 &debian-gnu; 系统的的信息。" "更新的安装手册也可以从 <ulink url=\"&url-install-manual;\">官方安装手册页</" "ulink>得到。" @@ -589,11 +589,11 @@ msgstr "" msgid "" "In general, this manual is arranged in a linear fashion, walking you through " "the installation process from start to finish. Here are the steps in " -"installing &debian;, and the sections of this document which correlate with " +"installing &debian-gnu;, and the sections of this document which correlate with " "each step:" msgstr "" "基本上，本手册是以单线方式组织，文章内容将沿着安装进程由始至终进行。以下是安" -"装 &debian; 的步骤，以及每步相关的章节：" +"装 &debian-gnu; 的步骤，以及每步相关的章节：" #. Tag: para #: welcome.xml:416 @@ -728,7 +728,7 @@ msgid "" "We're sure that you've read some of the licenses that come with most " "commercial software — they usually say that you can only use one copy " "of the software on a single computer. This system's license isn't like that " -"at all. We encourage you to put a copy of &debian; on every computer in your " +"at all. We encourage you to put a copy of &debian-gnu; on every computer in your " "school or place of business. Lend your installation media to your friends " "and help them install it on their computers! You can even make thousands of " "copies and <emphasis>sell</emphasis> them — albeit with a few " @@ -736,7 +736,7 @@ msgid "" "Debian being based on <emphasis>free software</emphasis>." msgstr "" "我们相信您曾经阅读过许多商业软件的许可证 — 它们通常要求您只能在一台计算" -"机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian; 拷贝用到您" +"机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian-gnu; 拷贝用到您" "的学校或商业机构的每台计算机上。将安装介质借给朋友，并帮助他们安装到他们的计" "算机上！您甚至可以制作上千份拷贝，然后 <emphasis>出售</emphasis> 它们 " "— 尽管有一些限制。您安装和使用系统的自由权利因为 Debian 是基于 " |