Rename debian entity to debian-gnu.

1 files changed, 26 insertions, 26 deletions

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