Philip Blundell wrote:

>On Mon, 2002-03-18 at 15:53, Claus Hindsgaul wrote:
>
>>Apparently your patch introduced an error on line 715 (possibly on its
>>way to CVS?).
>>
>>bash-2.05a$ make check-zh_CN
>>zh_CN.po: zh_CN.po:715: invalid multibyte sequence
>>found 1 fatal error
>>make: *** [check-zh_CN] Error 1
>>
>
>Gah, I should have tested the changes before checking them in.  That was
>careless of me, my apologies.
>
>I've reverted the patch now.  Malix, can you have a look and see if you
>can figure out what went wrong?  Please send me a new patch once the
>problem is corrected.
>
>p.
>
Hi, I am so sorry, I have made a chinese char half deleted.
It was because I don't know much about the project.after i translated, I 
have not run
  make check-zh_CN
so now I send the patch again.
please forgive me.


malix
shanghai china

Index: zh_CN.po
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/po/zh_CN.po,v
retrieving revision 1.46
diff -u -r1.46 zh_CN.po
--- zh_CN.po    2002/03/14 22:39:43     1.46
+++ zh_CN.po    2002/03/19 13:23:27
@@ -34,7 +34,7 @@
 #: baseconfig.c:177
 #, fuzzy
 msgid "Error writing /target/etc/inittab"
-msgstr "不能写入 /target/etc/fstab"
+msgstr "写入 /target/etc/inittab 时出错"
 
 #: baseconfig.c:177 baseconfig.c:191 baseconfig.c:203 baseconfig.c:231
 #: baseconfig.c:261 baseconfig.c:274 baseconfig.c:288 baseconfig.c:304
@@ -45,32 +45,32 @@
 #: baseconfig.c:191 baseconfig.c:231
 #, fuzzy
 msgid "Error writing /target/etc/inittab.real"
-msgstr "不能写入 /target/etc/fstab"
+msgstr "写入 /target/etc/inittab.real 时出错"
 
 #: baseconfig.c:203 baseconfig.c:288
 #, fuzzy
 msgid "Error writing /target/etc/securetty"
-msgstr "不能写入 /target/etc/fstab"
+msgstr "写入 /target/etc/securetty 时出错"
 
 #: baseconfig.c:261
 #, fuzzy
 msgid "Error writing /target/root/.profile"
-msgstr "不能写入 /target/etc/fstab"
+msgstr "写入 /target/root/.profile 时出错"
 
 #: baseconfig.c:274
 #, fuzzy
 msgid "Error writing /target/etc/pam.d/passwd"
-msgstr "不能写入 /target/etc/fstab"
+msgstr "写入 /target/etc/pam.d/passwd 时出错"
 
 #: baseconfig.c:304
-#, fuzzy
+#, fuzzy ?? not so?
 msgid "Can't open /target/etc/fstab"
 msgstr "不能打开 /target/etc/fstab "
 
 #: baseconfig.c:337
 #, fuzzy
 msgid "Could not determine filesystem type of /"
-msgstr "选择 NFS 文件系统"
+msgstr "无法决定 / 文件系统类型"
 
 #: baseconfig.c:337 baseconfig.c:541 bootconfig.c:347 bootconfig.c:352
 #: bootconfig.c:357 bootconfig.c:365 bootconfig.c:370 bootconfig.c:375
@@ -99,7 +99,7 @@
 "#\n"
 "# <file system>\t<mount point>\t<type>\t<options>\t\t\t<dump>\t<pass>\n"
 msgstr ""
-"# /etc/fstab: 静态文件系统资料。\n"
+"# /etc/fstab: 静态文件系统信息。\n"
 "#\n"
 "# <文件系统>\t<挂载点>\t<分区格式>\t<选项>\t\t\t<dump>\t<pass>\n"
 
@@ -108,7 +108,7 @@
 msgstr ""
 
 #: baseconfig.c:404
-#, fuzzy
+#, fuzzy ?? not so
 msgid "Can't open /target/etc/console-tools/config"
 msgstr "不能打开 /target/etc/console-tools/config "
 
@@ -126,7 +126,7 @@
 "No modules were found in /target/lib/modules/%s that could be configured. "
 "Please install the kernel modules first, by running the \"Configure Device "
 "Driver Modules\" step"
-msgstr "在 /target/lib/modules/%s 没有找到能够被设定的模块。请先安装模块。"
+msgstr "在 /target/lib/modules/%s 
+没有找到能够被设定的模块。请先运行\"配置设备驱动程序模块\",安装模块。"
 
 #: bootconfig.c:131 bootconfig.c:243 bootconfig.c:2709
 msgid "Copying the operating system kernel..."
@@ -168,10 +168,9 @@
 "当您在 \"boot:\" 提示号后打入命令,自动启动将停止,而这时您可以打入您指\n"
 "定的内核名称以及对应的内核选项 (格式是:option=value.)\n"
 "\n"
-"要注意的是内核必须在第一个软驱(fd0)上的启动盘之中。在这片启动盘制作的时候,\n"
-"一个名为 \"linux.bin\" 的文件会被安装到这张启动盘上,如果您想用在您的硬盘中"
-"的\n"
-"内核,请您取出启动盘然后按下机器上的<重启键>\n"
+"内核必须在第一个软驱(fd0)中的软盘上。在这片启动盘制作的时候,\n"
+"一个名为 \"linux.bin\" 的内核文件会被安装到这张启动盘上.如果您想用在您的硬盘中的\n"
+"内核,请您取出启动盘然后按下机器上的RESET<重启键>\n"
 "\n"
 
 #: bootconfig.c:335 bootconfig.c:1274 choose_medium.c:119 choose_medium.c:158
@@ -221,9 +220,9 @@
 "Use the second floppy drive to create a boot floppy?"
 msgstr ""
 "您没有使用 RAM-Disk, 所以安装时放在第一个软驱中的安装软盘不能被取出。\n"
-"如果第二个软驱上的容量跟第一个的是一样的,您可以用它来制作启动盘,若不需要,"
-"您可以跳过这一步,但您就只能用 Debian 的“急救启动盘”启动:在\"boot:\"的提示"
-"下,以\"linux root=%s\"来启动计算机;您也可以直接从硬盘启动。\n"
+"如果第二个软驱上的容量跟第一个的是一样的,您可以用它来制作启动盘,该盘在启动时"
+"应放在第一个软驱中.如果不需要,您可以跳过这一步,但您就只能用 Debian 
+的“急救启动盘”"
+"启动你的硬盘:在\"boot:\"的提示下,打入\"linux root=%s\";您也可以直接从硬盘启动。\n"
 "要用第二个软驱制作您的启动盘吗?"
 
 #: bootconfig.c:395
@@ -279,7 +278,7 @@
 #: bootconfig.c:687
 #, fuzzy
 msgid "Running PALO to make the kernel bootable from the hard disk..."
-msgstr "正在执行 SILO,让内核直接从硬盘载入而无需启动盘..."
+msgstr "正在执行 PALO,让内核可以直接从硬盘引导..."
 
 #: bootconfig.c:743
 msgid ""
@@ -300,7 +299,7 @@
 #: bootconfig.c:756
 #, fuzzy
 msgid "/boot Cannot Be a Partition"
-msgstr "卸载分区"
+msgstr "/boot 不能是个分区"
 
 #: bootconfig.c:761
 msgid ""
@@ -311,7 +310,7 @@
 #: bootconfig.c:762
 #, fuzzy
 msgid "Root filesystem must be Ext2"
-msgstr "根文件系统没有挂载"
+msgstr "根文件系统必须是Ext2类型"
 
 #: bootconfig.c:768
 #, fuzzy
@@ -323,8 +322,11 @@
 "OPT-P-R. Finally, this code has not been thoroughly tested. Are you sure "
 "that you want to do this?"
 msgstr ""
-"您选择把 aboot 启动引导程序写入 %s 的开机扇区。如果这样做,您将不能启动这个硬"
-"盘上的其它操作系统,确定要这么做吗?"
+"您选择了安装快速引导程序.你将不能从磁盘引导任何其他操作系统."
+"另外,你的机器也有可能在此之后无法用任何方式引导."
+"如果你碰到黑屏,你可能需要尝试冷启动并按下 CMD-OPT-P-R."
+"最后,本代码并未被完整地测试过."
+"你是否确定要这么做?"
 
 #: bootconfig.c:776 bootconfig.c:786 bootconfig.c:1148 partition_config.c:932
 #: partition_config.c:1020 partition_config.c:1086 partition_config.c:1232
@@ -341,13 +343,15 @@
 "this code has not been thoroughly tested. Are you sure that you want to do "
 "this?"
 msgstr ""
-"您选择把 aboot 启动引导程序写入 %s 的开机扇区。如果这样做,您将不能启动这个硬"
-"盘上的其它操作系统,确定要这么做吗?"
+"您选择了安装快速引导程序.你将不能从磁盘引导任何其他操作系统."
+"另外,你的机器也有可能在此之后无法用任何方式引导."
+"最后,本代码并未被完整地测试过."
+"你是否确定要这么做?"
 
 #: bootconfig.c:790
 #, fuzzy
 msgid "Running quik to make Debian bootable directly from the hard disk..."
-msgstr "正在执行 SILO,让内核直接从硬盘载入而无需启动盘..."
+msgstr "正在执行quik,让Debian可以直接从硬盘引导..."
 
 #: bootconfig.c:817
 msgid ""
@@ -358,7 +362,7 @@
 #: bootconfig.c:819
 #, fuzzy
 msgid "Unable to install Quik"
-msgstr "基本系统未安装"
+msgstr "无法安装Quik"
 
 #: bootconfig.c:858
 msgid ""
@@ -398,7 +402,7 @@
 #: bootconfig.c:909
 #, fuzzy
 msgid "Root and /boot partitions must be on the same disk"
-msgstr "硬盘       : 在硬盘上的分区"
+msgstr "Root 和 /boot 分区必须在同一个磁盘上"
 
 #: bootconfig.c:917
 msgid ""
@@ -428,8 +432,8 @@
 
 #: bootconfig.c:938 bootconfig.c:945
 #, fuzzy
-msgid "Bootstrap partition must be 800K"
-msgstr "卸载分区"
+msgid "Bootstrap partition must be at least 800K"
+msgstr "引导分区必须至少800K"
 
 #: bootconfig.c:942
 msgid ""
@@ -457,7 +461,7 @@
 #, fuzzy
 msgid ""
 "Running yabootconfig to make Debian bootable directly from the hard disk..."
-msgstr "正在执行 SILO,让内核直接从硬盘载入而无需启动盘..."
+msgstr "正在执行 yabootconfig,让Debian可以直接从硬盘引导..."
 
 #: bootconfig.c:1028
 msgid ""
@@ -483,7 +487,7 @@
 "You will not be able to boot any other operating systems on this disk. Are "
 "you sure you want to do this?"
 msgstr ""
-"您选择把 aboot 启动引导程序写入 %s 的开机扇区。如果这样做,您将不能启动这个硬"
+"您选择了把 aboot 启动引导程序写入 %s 的引导扇区。如果这样做,您将不能启动这个硬"
 "盘上的其它操作系统,确定要这么做吗?"
 
 #: bootconfig.c:1151
@@ -662,8 +666,8 @@
 "such partitions.  This means you will not be able to boot directly from "
 "disk.\n"
 msgstr ""
-"MILO以及APB等启动引导程序必须装在一个FAT分区上,因为ARC/AlphaBIOS的固件只能读"
-"取FAT分区。您没有DOS的FAT分区,所以您将不能从硬盘启动 Linux。\n"
+"ELILO引导程序必须装在一个FAT(MSDOS)分区上,以使其被BIOS读取."
+"您看来还没有这样的分区.所以您将不能直接从硬盘启动 Linux。\n"
 
 #: bootconfig.c:1505 bootconfig.c:2779
 msgid "No FAT partitions detected"
@@ -686,7 +690,7 @@
 #: bootconfig.c:1518 bootconfig.c:1529
 #, fuzzy
 msgid "Running ELILO to make the kernel able to boot from the hard disk..."
-msgstr "正在执行 SILO,让内核直接从硬盘载入而无需启动盘..."
+msgstr "正在执行 ELILO,让内核直接可以从硬盘引导..."
 
 #: bootconfig.c:1526
 #, c-format
@@ -700,14 +704,14 @@
 #: bootconfig.c:1527 bootconfig.c:1539
 #, fuzzy
 msgid "ELILO install failed"
-msgstr "MILO 安装失败"
+msgstr "ELILO 安装失败"
 
 #: bootconfig.c:1537
 #, fuzzy
 msgid ""
 "Install of ELILO failed, you will not be able to boot your system from the "
 "harddisk"
-msgstr "正在执行 SILO,让内核直接从硬盘载入而无需启动盘..."
+msgstr "ELILO安装失败,你将不能从硬盘引导你的系统"
 
 #: bootconfig.c:1573
 #, c-format
@@ -719,12 +723,13 @@
 msgid ""
 "Installing /etc/delo.conf and running DELO to make the system able to boot "
 "from the hard disk..."
-msgstr "正在执行 SILO,让内核直接从硬盘载入而无需启动盘..."
+msgstr "正在安装 /etc/delo.conf 并运行DELO,让内核直接从硬盘载入而无需启动盘..."
 
 #: bootconfig.c:1595
 #, fuzzy
 msgid "DELO failed."
-msgstr "MILO 安装失败"
+msgstr "DELO 安装失败"
+#, malix 2002-03-18
 
 #: bootconfig.c:1595 bootconfig.c:1631 bootconfig.c:2044 bootconfig.c:2053
 #: bootconfig.c:2066 bootconfig.c:2075 bootconfig.c:2091 bootconfig.c:2097

Reply via email to