From edd6900a4865a5dae5d44df8793238ff9addca46 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 17 Apr 2015 01:41:39 +0000 Subject: propagate trivial changes to non-english languages --- po/zh_CN/boot-installer.po | 10 +--- po/zh_CN/boot-new.po | 9 +-- po/zh_CN/partitioning.po | 36 ++---------- po/zh_CN/random-bits.po | 134 +++++++-------------------------------------- po/zh_CN/using-d-i.po | 54 ++++-------------- 5 files changed, 38 insertions(+), 205 deletions(-) (limited to 'po/zh_CN') diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po index efbb018ba..48cd8f39d 100644 --- a/po/zh_CN/boot-installer.po +++ b/po/zh_CN/boot-installer.po @@ -520,20 +520,14 @@ msgstr "从 CD-ROM 启动" #. Tag: para #: boot-installer.xml:469 boot-installer.xml:982 boot-installer.xml:1638 #: boot-installer.xml:2056 -#, fuzzy, no-c-format -#| msgid "" -#| "The easiest route for most people will be to use a set of &debian; CDs. " -#| "If you have a CD set, and if your machine supports booting directly off " -#| "the CD, great! Simply configure your system for " -#| "booting off a CD as described in , insert your CD, reboot, and proceed to the next chapter." +#, no-c-format msgid "" "If you have a CD set, and if your machine supports booting directly off the " "CD, great! Simply configure your system for booting " "off a CD as described in , " "insert your CD, reboot, and proceed to the next chapter." msgstr "" -"对于大多数人来说，最快的途径是使用一套 &debian; CD 光盘套件。如果您有此套件，" +"如果您有此套件，" "并且如果您的机器支持直接 CD 引导，太棒了！只需要配置您的" "系统可以用 CD 启动，参见 , 插入您" "的 CD，重启，然后继续下一章。" diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po index fcad5fae9..b7c9897ae 100644 --- a/po/zh_CN/boot-new.po +++ b/po/zh_CN/boot-new.po @@ -155,12 +155,7 @@ msgstr "" #. Tag: para #: boot-new.xml:84 -#, fuzzy, no-c-format -#| msgid "" -#| "If you use BootX to boot into the installed system, " -#| "just select your desired kernel in the Linux Kernels " -#| "folder, un-choose the ramdisk option, and add a root device corresponding " -#| "to your installation; e.g. /dev/hda8." +#, no-c-format msgid "" "If you use BootX to boot into the installed system, just " "select your desired kernel in the Linux Kernels folder, " @@ -169,7 +164,7 @@ msgid "" msgstr "" "假如您使用 BootX 启动到安装的系统，只需选择需要的内核，位" "于 Linux Kernels 目录，去掉 ramdisk 选项，并添加与您安装" -"对应的根设备；如 /dev/hda8。" +"对应的根设备；如 /dev/sda8。" #. Tag: title #: boot-new.xml:96 diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po index 00a589574..c354519f3 100644 --- a/po/zh_CN/partitioning.po +++ b/po/zh_CN/partitioning.po @@ -567,13 +567,7 @@ msgstr "" #. Tag: para #: partitioning.xml:291 -#, fuzzy, no-c-format -#| msgid "" -#| "As an example, an older home machine might have 32MB of RAM and a 1.7GB " -#| "IDE drive on /dev/hda. There might be a 500MB " -#| "partition for another operating system on /dev/hda1, " -#| "a 32MB swap partition on /dev/hda3 and about 1.2GB " -#| "on /dev/hda2 as the Linux partition." +#, no-c-format msgid "" "As an example, an older home machine might have 32MB of RAM and a 1.7GB IDE " "drive on /dev/sda. There might be a 500MB partition for " @@ -581,10 +575,10 @@ msgid "" "partition on /dev/sda3 and about 1.2GB on /" "dev/sda2 as the Linux partition." msgstr "" -"举一个例子，一个较老的家用机器上，可能有 32MB 内存和一个 /dev/hda 上的 1.7GB IDE 驱动器。/dev/hda1 上有一个 " -"500MB 的分区用于其它操作系统，一个 32MB 交换分区位于 /dev/hda3，以及一个 1.2GB 空间 /dev/hda2 用于 Linux 分" +"举一个例子，一个较老的家用机器上，可能有 32MB 内存和一个 /dev/sda 上的 1.7GB IDE 驱动器。/dev/sda1 上有一个 " +"500MB 的分区用于其它操作系统，一个 32MB 交换分区位于 /dev/sda3，以及一个 1.2GB 空间 /dev/sda2 用于 Linux 分" "区。" #. Tag: para @@ -1428,26 +1422,6 @@ msgstr "" #~ "第二个 SCSI 驱动器(address-wise)被命名为 /dev/sdb，等" #~ "等。" -#~ msgid "" -#~ "The master disk on IDE primary controller is named /dev/hda." -#~ msgstr "主 IDE 控制器下的主磁盘被命名为 /dev/hda。" - -#~ msgid "" -#~ "The slave disk on IDE primary controller is named /dev/hdb." -#~ msgstr "主 IDE 控制器的从盘命名为 /dev/hdb。" - -#~ msgid "" -#~ "The master and slave disks of the secondary controller can be called " -#~ "/dev/hdc and /dev/hdd, " -#~ "respectively. Newer IDE controllers can actually have two channels, " -#~ "effectively acting like two controllers." -#~ msgstr "" -#~ "第二个控制器的主磁盘和从磁盘会分别被叫做 /dev/hdc 和 " -#~ "/dev/hdd，较新的 IDE 控制器实际上有两个通道，扮演着两" -#~ "个控制器的角色。" - #~ msgid "Virtual directory for system information (2.4 and 2.6 kernels)" #~ msgstr "系统信息的虚拟目录(2.4 和 2.6 内核)" diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po index 253dbd138..007f9ccda 100644 --- a/po/zh_CN/random-bits.po +++ b/po/zh_CN/random-bits.po @@ -793,14 +793,7 @@ msgstr "" #. Tag: para #: random-bits.xml:364 -#, fuzzy, no-c-format -#| msgid "" -#| "Next, create file systems on the partitions. For example, to create an " -#| "ext3 file system on partition /dev/hda6 (that's our " -#| "example root partition): \n" -#| "# mke2fs -j /dev/hda6\n" -#| " To create an ext2 file system instead, omit " -#| "-j." +#, no-c-format msgid "" "Next, create file systems on the partitions. For example, to create an ext3 " "file system on partition /dev/sda6 (that's our example " @@ -809,26 +802,16 @@ msgid "" " To create an ext2 file system instead, omit " "-j." msgstr "" -"下一步，在分区上创建文件系统。例如，在 /dev/hda6 分区(以" +"下一步，在分区上创建文件系统。例如，在 /dev/sda6 分区(以" "后的例子中，将把它作为 root 分区)建立一个 ext3 格式的文件系统： " "\n" -"# mke2fs -j /dev/hda6\n" +"# mke2fs -j /dev/sda6\n" " 建立 ext2 格式的文件系统，要去掉 -j。" #. Tag: para #: random-bits.xml:374 -#, fuzzy, no-c-format -#| msgid "" -#| "Initialize and activate swap (substitute the partition number for your " -#| "intended &debian; swap partition): \n" -#| "# mkswap /dev/hda5\n" -#| "# sync\n" -#| "# swapon /dev/hda5\n" -#| " Mount one partition as /mnt/" -#| "debinst (the installation point, to be the root (/) filesystem on your new system). The mount point name is " -#| "strictly arbitrary, it is referenced later below." +#, no-c-format msgid "" "Initialize and activate swap (substitute the partition number for your " "intended &debian; swap partition): \n" @@ -842,25 +825,22 @@ msgid "" msgstr "" "初始化并激活交换分区(请把分区号替换成您希望用作 &debian; 交换分区的分区号): " "\n" -"# mkswap /dev/hda5\n" +"# mkswap /dev/sda5\n" "# sync\n" -"# swapon /dev/hda5\n" +"# swapon /dev/sda5\n" " 把一个分区挂载到 /mnt/debinst(这是安装的位置，将来作为您新系统的根(/)文件系" "统)。挂载点的名称是任意的，后面的步骤将会用到。" #. Tag: screen #: random-bits.xml:386 -#, fuzzy, no-c-format -#| msgid "" -#| "# mkdir /mnt/debinst\n" -#| "# mount /dev/hda6 /mnt/debinst" +#, no-c-format msgid "" "# mkdir /mnt/debinst\n" "# mount /dev/sda6 /mnt/debinst" msgstr "" "# mkdir /mnt/debinst\n" -"# mount /dev/hda6 /mnt/debinst" +"# mount /dev/sda6 /mnt/debinst" #. Tag: para #: random-bits.xml:389 @@ -1533,17 +1513,7 @@ msgstr "" #. Tag: para #: random-bits.xml:731 -#, fuzzy, no-c-format -#| msgid "" -#| "Installing and setting up grub2 is as easy as: " -#| "\n" -#| "# aptitude install grub-pc\n" -#| "# grub-install /dev/hda\n" -#| "# update-grub\n" -#| " The second command will install " -#| "grub2 (in this case in the MBR of hda). The last command will create a sane and working /" -#| "boot/grub/grub.cfg." +#, no-c-format msgid "" "Installing and setting up grub2 is as easy as: " "\n" @@ -1557,26 +1527,21 @@ msgid "" msgstr "" "安装和建立 grub2 非常容易：\n" "# aptitude install grub-pc\n" -"# grub-install /dev/hda\n" +"# grub-install /dev/sda\n" "# update-grub\n" " 第二个命令将安装 grub2 (本例中" -"是 hda 的 MBR)。最后的命令是创建一个可用的 /" +"是 sda 的 MBR)。最后的命令是创建一个可用的 /" "boot/grub/grub.cfg。" #. Tag: para #: random-bits.xml:741 -#, fuzzy, no-c-format -#| msgid "" -#| "Note that this assumes that a /dev/hda device file " -#| "has been created. There are alternative methods to install " -#| "grub2, but those are outside the scope of this " -#| "appendix." +#, no-c-format msgid "" "Note that this assumes that a /dev/sda device file has " "been created. There are alternative methods to install grub2, but those are outside the scope of this appendix." msgstr "" -"注意，这里假设已经创建了 /dev/hda 设备文件。另外一种方法" +"注意，这里假设已经创建了 /dev/sda 设备文件。另外一种方法" "是安装 grub2，但它不属于本附录讨论范围。" #. Tag: para @@ -1587,16 +1552,7 @@ msgstr "下面有一个简单的/etc/lilo.conf 作为例子 #. Tag: screen #: random-bits.xml:751 -#, fuzzy, no-c-format -#| msgid "" -#| "boot=/dev/hda6\n" -#| "root=/dev/hda6\n" -#| "install=menu\n" -#| "delay=20\n" -#| "lba32\n" -#| "image=/vmlinuz\n" -#| "initrd=/initrd.img\n" -#| "label=Debian" +#, no-c-format msgid "" "boot=/dev/sda6\n" "root=/dev/sda6\n" @@ -1607,8 +1563,8 @@ msgid "" "initrd=/initrd.img\n" "label=Debian" msgstr "" -"boot=/dev/hda6\n" -"root=/dev/hda6\n" +"boot=/dev/sda6\n" +"root=/dev/sda6\n" "install=menu\n" "delay=20\n" "lba32\n" @@ -1635,20 +1591,7 @@ msgstr "" #. Tag: para #: random-bits.xml:763 -#, fuzzy, no-c-format -#| msgid "" -#| "Here is a basic /etc/yaboot.conf as an example: " -#| "\n" -#| "boot=/dev/hda2\n" -#| "device=hd:\n" -#| "partition=6\n" -#| "root=/dev/hda6\n" -#| "magicboot=/usr/lib/yaboot/ofboot\n" -#| "timeout=50\n" -#| "image=/vmlinux\n" -#| "label=Debian\n" -#| " On some machines, you may need to use " -#| "ide0: instead of hd:." +#, no-c-format msgid "" "Here is a basic /etc/yaboot.conf as an example: " "\n" @@ -1665,10 +1608,10 @@ msgid "" msgstr "" "下面有一个简单的/etc/yaboot.conf 作为例子： " "\n" -"boot=/dev/hda2\n" +"boot=/dev/sda2\n" "device=hd:\n" "partition=6\n" -"root=/dev/hda6\n" +"root=/dev/sda6\n" "magicboot=/usr/lib/yaboot/ofboot\n" "timeout=50\n" "image=/vmlinux\n" @@ -2173,57 +2116,18 @@ msgstr "" "信息不正确或有错误出现，安装程序将停止，但可以选择 Configure " "and start PPPoE connection 菜单项重新配置。" -#~ msgid "hda" -#~ msgstr "hda" - -#~ msgid "IDE Hard disk / CD-ROM on the first IDE port (Master)" -#~ msgstr "在第一个 IDE 口(Master)的 IDE 硬盘/光驱" - -#~ msgid "hdb" -#~ msgstr "hdb" - -#~ msgid "IDE Hard disk / CD-ROM on the first IDE port (Slave)" -#~ msgstr "在第一个 IDE 口(Slave)的 IDE 硬盘/光驱" - -#~ msgid "hdc" -#~ msgstr "hdc" - -#~ msgid "IDE Hard disk / CD-ROM on the second IDE port (Master)" -#~ msgstr "在第二个 IDE 口(Master)的 IDE 硬盘/光驱" - -#~ msgid "hdd" -#~ msgstr "hdd" - -#~ msgid "IDE Hard disk / CD-ROM on the second IDE port (Slave)" -#~ msgstr "在第二个 IDE 口(Slave)的 IDE 硬盘/光驱" - -#~ msgid "hda1" -#~ msgstr "hda1" - -#~ msgid "hdd15" -#~ msgstr "hdd15" - -#~ msgid "Fifteenth partition of the fourth IDE hard disk" -#~ msgstr "在第四块 IDE 硬盘上的第十五个分区" - #~ msgid "SCSI Hard disk with lowest SCSI ID (e.g. 0)" #~ msgstr "SCSI ID (比如 0)最小的 SCSI 硬盘" #~ msgid "SCSI Hard disk with next higher SCSI ID (e.g. 1)" #~ msgstr "下一个 SCSI ID (比如 1)的 SCSI 硬盘" -#~ msgid "sdc" -#~ msgstr "sdc" - #~ msgid "SCSI Hard disk with next higher SCSI ID (e.g. 2)" #~ msgstr "下一个 SCSI ID (比如 2)的 SCSI 硬盘" #~ msgid "First partition of the first SCSI hard disk" #~ msgstr "在第一块 SCSI 硬盘上的第一个分区" -#~ msgid "sdd10" -#~ msgstr "sdd10" - #~ msgid "SCSI CD-ROM with the lowest SCSI ID" #~ msgstr "SCSI ID 最小的 SCSI 光驱" diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po index c63408f68..c8f7823d6 100644 --- a/po/zh_CN/using-d-i.po +++ b/po/zh_CN/using-d-i.po @@ -1544,16 +1544,7 @@ msgstr "" #. Tag: para #: using-d-i.xml:1083 -#, fuzzy, no-c-format -#| msgid "" -#| "If a hard disk has previously used under Solaris, the partitioner may not " -#| "detect the size of the drive correctly. Creating a new partition table " -#| "does not fix this issue. What does help, is to zero the " -#| "first few sectors of the drive: \n" -#| "# dd if=/dev/zero of=/dev/hdX bs=512 count=2; " -#| "sync\n" -#| " Note that this will make any existing data on " -#| "that disk inaccessible." +#, no-c-format msgid "" "If a hard disk has previously used under Solaris, the partitioner may not " "detect the size of the drive correctly. Creating a new partition table does " @@ -1567,7 +1558,7 @@ msgstr "" "如果以前是在 Solaris 下使用硬盘，分区工具可能无法正确检测到磁盘大小。建立一个" "新的分区表也无法解决该问题。有效的方法是给磁盘的前面的一些扇区清零：\n" -"# dd if=/dev/zero of=/dev/hdX bs=512 count=2; " +"# dd if=/dev/zero of=/dev/sdX bs=512 count=2; " "sync\n" " 注意，这会是磁盘上已有的数据无法访问。" @@ -2111,30 +2102,7 @@ msgstr "" #. Tag: para #: using-d-i.xml:1381 -#, fuzzy, no-c-format -#| msgid "" -#| "The list of partitions might look like this: \n" -#| " IDE1 master (hda) - 6.4 GB WDC AC36400L\n" -#| " #1 primary 16.4 MB B f ext2 /boot\n" -#| " #2 primary 551.0 MB swap swap\n" -#| " #3 primary 5.8 GB ntfs\n" -#| " pri/log 8.2 MB FREE SPACE\n" -#| "\n" -#| " IDE1 slave (hdb) - 80.0 GB ST380021A\n" -#| " #1 primary 15.9 MB ext3\n" -#| " #2 primary 996.0 MB fat16\n" -#| " #3 primary 3.9 GB xfs /home\n" -#| " #5 logical 6.0 GB f ext3 /\n" -#| " #6 logical 1.0 GB f ext3 /var\n" -#| " #7 logical 498.8 MB ext3\n" -#| " #8 logical 551.5 MB swap swap\n" -#| " #9 logical 65.8 GB ext2\n" -#| " This example shows two IDE harddrives divided " -#| "into several partitions; the first disk has some free space. Each " -#| "partition line consists of the partition number, its type, size, optional " -#| "flags, file system, and mountpoint (if any). Note: this particular setup " -#| "cannot be created using guided partitioning but it does show possible " -#| "variation that can be achieved using manual partitioning." +#, no-c-format msgid "" "The list of partitions might look like this: \n" " SCSI1 (0,0,0) (sda) - 6.4 GB WDC AC36400L\n" @@ -2158,22 +2126,20 @@ msgid "" "can be achieved using manual partitioning." msgstr "" "分区表格的格式如下：\n" -" IDE1 master (hda) - 6.4 GB WDC AC36400L\n" +" SCSI1 (0,0,0) (sda) - 6.4 GB WDC AC36400L\n" " #1 primary 16.4 MB B f ext2 /boot\n" " #2 primary 551.0 MB swap swap\n" " #3 primary 5.8 GB ntfs\n" " pri/log 8.2 MB FREE SPACE\n" "\n" -" IDE1 slave (hdb) - 80.0 GB ST380021A\n" +" SCSI2 (1,0,0) (sdb) - 80.0 GB ST380021A\n" " #1 primary 15.9 MB ext3\n" " #2 primary 996.0 MB fat16\n" " #3 primary 3.9 GB xfs /home\n" -" #5 logical 6.0 GB f ext3 /\n" +" #5 logical 6.0 GB f ext4 /\n" " #6 logical 1.0 GB f ext3 /var\n" " #7 logical 498.8 MB ext3\n" -" #8 logical 551.5 MB swap swap\n" -" #9 logical 65.8 GB ext2\n" -" 本例中有两块 IDE 硬盘，它们分别被分割成了几个分" +" 本例中有两块 硬盘，它们分别被分割成了几个分" "区。第一块硬盘上还有些空闲空间。表中每行列出了分区编号、类型、大小、选项标" "志、文件系统和挂载点(如果有的话)。注意：导引式分区方式不能创建这些特殊的设" "置，但使用手动方式分区的结果会有所不同。" @@ -3858,7 +3824,7 @@ msgstr "" #, fuzzy, no-c-format #| msgid "" #| "Another option when choosing to specify the mirror manually is to use " -#| "http.debian.net as your mirror. http.debian.nethttpredir.debian.org as your mirror. httpredir.debian.org is not a physical mirror but a mirror redirection service, i.e. it " #| "automatically refers your system to a real mirror near you in terms of " #| "network topology. It takes into account by which protocol you connect to " @@ -3872,8 +3838,8 @@ msgid "" "network topology. It takes into account by which protocol you connect to it, " "i.e. if you use IPv6, it will refer you to an IPv6-capable mirror near you." msgstr "" -"另一种选择是手动选取镜像，指定 http.debian.net 作为您的镜像服" -"务器。 http.debian.net 并不是一个物理镜像，而是一个重定向服" +"另一种选择是手动选取镜像，指定 httpredir.debian.org 作为您的镜像服" +"务器。 httpredir.debian.org 并不是一个物理镜像，而是一个重定向服" "务，也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考虑到您" "连接所采用的协议，比如使用 IPv6，它将自动将您引到最近的 IPv6 镜像服务器。" -- cgit v1.2.3