summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/zh_CN/hardware.po30
-rw-r--r--po/zh_CN/install-methods.po6
-rw-r--r--po/zh_CN/preparing.po39
-rw-r--r--po/zh_CN/preseed.po32
-rw-r--r--po/zh_CN/random-bits.po18
-rw-r--r--po/zh_CN/using-d-i.po16
6 files changed, 42 insertions, 99 deletions
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index c67f8a70c..a0f601af8 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2010-10-29 05:56+0000\n"
-"PO-Revision-Date: 2010-10-27 22:10+0800\n"
+"PO-Revision-Date: 2010-11-04 16:56+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -1493,7 +1493,7 @@ msgid ""
"developerworks/linux/linux390/development_technical.html\"> Linux on "
"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
"ulink>."
-msgstr ""
+msgstr "&debian; Squeeze 已不再支持 ESA/390 模式的引导。您的机器至少要支持 z/Architecture、Architecture Level Set 2。不过 userland 仍然为 ESA/390 编译。所有的 zSeries 硬件完全获得支持。&arch-title; 支持的软件源自 2.6.32 内核开发流。有关 IBM 支持 Linux 的最新信息可以在 <ulink url=\"http://www.ibm.com/developerworks/linux/linux390/development_technical.html\"> Linux on <trademark class=\"registered\">System z</trademark> page on developerWorks</ulink> 找到。"
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
@@ -1760,7 +1760,7 @@ msgstr "图形卡支持"
#. Tag: para
#: hardware.xml:1224
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "You should be using a VGA-compatible display interface for the console "
#| "terminal. Nearly every modern display card is compatible with VGA. "
@@ -1774,10 +1774,7 @@ msgid ""
"require X11 support. Note that X11 is not used during the installation "
"process described in this document unless the graphical installer was "
"explicitly selected."
-msgstr ""
-"您应该给终端控制台使用 VGA 兼容的显示接口。几乎所有的新显卡都兼容 VGA。在不使"
-"用 X11 支持的情况下,您也可以用古老的 CGA、MDA 或 HGA 工作。注意,在本文所述"
-"的安装过程中并不会使用 X11 图形界面。"
+msgstr "您应该给终端控制台使用 VGA 兼容的显示接口。几乎所有的新显卡都兼容 VGA。在不使用 X11 支持的情况下,您也可以用古老的 CGA、MDA 或 HGA 工作。注意,除非特意选择使用图形安装程序,本文所述的安装过程中并不会使用 X11 图形界面。"
#. Tag: para
#: hardware.xml:1233
@@ -2810,22 +2807,3 @@ msgstr ""
"本界面需要更多的内存,并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
"形界面两种方式之间选择,应选择普通方式。</para> </footnote>或磁盘空间上安装系"
"统或许可行,但只针对有经验的用户。"
-
-#~ msgid ""
-#~ "Complete information regarding supported S/390 and zSeries machines can "
-#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
-#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
-#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
-#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
-#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
-#~ "supported with IEEE floating point emulation and thus degraded "
-#~ "performance."
-#~ msgstr ""
-#~ "有关 S/390 和 zSeries 机器支持的完整信息参见 IBM 的 Redbook <ulink url="
-#~ "\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux "
-#~ "for IBM eServer zSeries and S/390: Distributions</ulink> 第 2.1 章节,或"
-#~ "者 <ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/"
-#~ "index.html\">developerWorks 网站上的 zSeries 页面</ulink>。简而言之,G5、"
-#~ "Multiprise 3000、G6 以及所有的 zSeries 都可以得到完整的支持;Multiprise "
-#~ "2000、G3 和 G4 机器使用 IEEE 浮点模拟来支持,因此会降低性能。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index c1b30c3d2..b5b3fec3e 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2010-10-29 05:56+0000\n"
-"PO-Revision-Date: 2010-10-27 23:00+0800\n"
+"PO-Revision-Date: 2010-11-04 16:56+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -1410,14 +1410,14 @@ msgstr ""
#. Tag: para
#: install-methods.xml:996
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
#| "filename>."
msgid ""
"Copy the following directories from a &debian; CD image to <filename>c:\\</"
"filename>."
-msgstr "从 &debian; CD 映象复制下列文件到 <filename>c:\\</filename>。"
+msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
#. Tag: para
#: install-methods.xml:1001
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 044789ee9..ce74582c8 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2010-10-29 05:56+0000\n"
-"PO-Revision-Date: 2010-10-27 23:40+0800\n"
+"PO-Revision-Date: 2010-11-04 17:18+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -423,13 +423,13 @@ msgstr "&arch-title; Hardware References"
msgid ""
"Documentation of &arch-title;-specific boot sequence, commands and device "
"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
-msgstr ""
+msgstr "&arch-title;-规格引导次序、命令和设备驱动程序文档(如: DASD、XPRAM、Console、OSA、HiperSockets 和 z/VM interaction)"
#. Tag: ulink
#: preparing.xml:318
#, no-c-format
msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
-msgstr ""
+msgstr "设备驱动程序、特性和命令(Linux 内核 2.6.32)"
#. Tag: para
#: preparing.xml:323
@@ -1018,10 +1018,10 @@ msgstr "桌面系统"
#. Tag: entry
#: preparing.xml:681
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "512 megabytes"
msgid "128 megabytes"
-msgstr "512 MB"
+msgstr "128 MB"
#. Tag: entry
#: preparing.xml:682
@@ -1485,7 +1485,7 @@ msgstr ""
#. Tag: para
#: preparing.xml:983
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The first thing needed is a copy of <command>fips</command> which is "
#| "available in the <filename>tools/</filename> directory on your nearest "
@@ -1506,15 +1506,7 @@ msgid ""
"you may want to read. You will definitely need to read the documentation if "
"you use a disk compression driver or a disk manager. Create the disk and "
"read the documentation <emphasis>before</emphasis> you defragment the disk."
-msgstr ""
-"第一件需要的东西是一份 <command>fips</command> 的拷贝。您可以从离您最近的 "
-"&debian; 镜像里的 <filename>tools/</filename> 目录下载它。解开这个 zip 压缩文"
-"件,把 <filename>RESTORRB.EXE</filename>、<filename>FIPS.EXE</filename> 和 "
-"<filename>ERRORS.TXT</filename> 复制到一张启动软盘里。您可以在 DOS 下面用 "
-"<filename>sys a:</filename> 来制作启动盘。<command>fips</command> 带有相当不"
-"错的文档,您也许会想看看的。倘若您正在用磁盘压缩驱动程序或者磁盘管理器,那么"
-"您绝对有必要读一下那个文档。在为这块硬盘清理磁盘碎片<emphasis>之前</"
-"emphasis>,请先做一张启动盘并好好阅读那份文档。"
+msgstr "首先需要一份 <command>fips</command>。解压并复制文件 <filename>RESTORRB.EXE</filename>、<filename>FIPS.EXE</filename> 和 <filename>ERRORS.TXT</filename> 到一张引导软盘。在 DOS 下,引导软盘可以用 <filename>sys a:</filename> 命令制作。<command>fips</command> 附带有非常好的文档,您需要读一读。如果您使用了压缩磁盘或者磁盘管理器,那一定要读一下这份文档。创建磁盘,然后在整理磁盘碎片<emphasis>前</emphasis>阅读这份文档。"
#. Tag: para
#: preparing.xml:995
@@ -2569,7 +2561,7 @@ msgstr ""
#. Tag: para
#: preparing.xml:1710
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "You need to copy all the files from the <filename>generic</filename> sub-"
#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
@@ -2583,10 +2575,7 @@ msgid ""
"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
"script, which will punch the files in the proper order, is included with the "
"images."
-msgstr ""
-"您需要从 <filename>generic</filename> 子目录复制所有的文件到您的 CMS 磁盘。确"
-"保 <filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> "
-"是以固定 80 字符记录长度的二近制形式进行传输。"
+msgstr "您需要从 <filename>generic</filename> 子目录复制所有的文件到 CMS 磁盘。确保 <filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> 是以 80 字符固定记录长度的二进制模式传输。<filename>parmfile.debian</filename> 可以是 ASCII 或 EBCDIC 格式。有一个例子脚本 <filename>debian.exec</filename>,用来将文件按正确次序存放,也包含在映象里面。"
#. Tag: title
#: preparing.xml:1726
@@ -2679,13 +2668,3 @@ msgstr ""
"碰到这种问题(有时可以看到显示器上的数据,有时却什么都没有),或者引导安装程序"
"以后黑屏,而不是显示用户界面,请试着在 MacOS 下修改显示设置为 256 色,替代 "
"<quote>thousands</quote> 或 <quote>millions</quote>。"
-
-#~ msgid ""
-#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
-#~ msgstr ""
-#~ "在 &arch-title; 上 Linux 2.4 版内核的安装指引和设备驱动程序 (DASD, XPRAM, "
-#~ "Console, tape, z90 crypto, chandev, network)"
-
-#~ msgid "Device Drivers and Installation Commands"
-#~ msgstr "设备驱动程序与安装命令"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index dccc51fac..88f98171a 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2010-10-29 05:56+0000\n"
-"PO-Revision-Date: 2010-10-27 23:49+0800\n"
+"PO-Revision-Date: 2010-11-04 18:18+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
"Language: \n"
@@ -1829,7 +1829,7 @@ msgstr "使用 RAID 分区"
#. Tag: para
#: preseed.xml:892
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "You can also use preseeding to set up partitions on software RAID arrays. "
#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
@@ -1840,14 +1840,11 @@ msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
"Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
"specifying spare devices."
-msgstr ""
-"您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10,建立降级阵"
-"列(degraded arrays)和指定额外设备。如果使用了 RAID 1,您可以预置 grub 来安装"
-"阵列中的所有设备;参见 <xref linkend=\"preseed-bootloader\"/>。"
+msgstr "您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10,建立降级阵列(degraded arrays)和指定额外设备。"
#. Tag: para
#: preseed.xml:898
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "You can also use preseeding to set up partitions on software RAID arrays. "
#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
@@ -1857,10 +1854,7 @@ msgstr ""
msgid ""
"If you are using RAID 1, you can preseed grub to install to all devices used "
"in the array; see <xref linkend=\"preseed-bootloader\"/>."
-msgstr ""
-"您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10,建立降级阵"
-"列(degraded arrays)和指定额外设备。如果使用了 RAID 1,您可以预置 grub 来安装"
-"阵列中的所有设备;参见 <xref linkend=\"preseed-bootloader\"/>。"
+msgstr "如果是使用 RAID 1,您可以预置 grub 安装所有的阵列中的设备; 参见 <xref linkend=\"preseed-bootloader\"/>。"
#. Tag: para
#: preseed.xml:905
@@ -2437,7 +2431,7 @@ msgstr "安装 bootloader"
#. Tag: screen
#: preseed.xml:1087
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
#| "If you want lilo installed\n"
@@ -2534,15 +2528,13 @@ msgid ""
"# Note: options passed to the installer will be added automatically.\n"
"#d-i debian-installer/add-kernel-opts string nousb"
msgstr ""
-"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
-"you want lilo installed\n"
+"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If you want lilo installed\n"
"# instead, uncomment this:\n"
"#d-i grub-installer/skip boolean true\n"
"# To also skip installing lilo, and install no bootloader, uncomment this\n"
"# too:\n"
"#d-i lilo-installer/skip boolean true</phrase>\n"
-"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment "
-"this\n"
+"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment this\n"
"#d-i grub-installer/skip boolean true</phrase>\n"
"\n"
"# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
@@ -2550,13 +2542,11 @@ msgstr ""
"# uncomment this:\n"
"#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
"\n"
-"# This is fairly safe to set, it makes grub install automatically to the "
-"MBR\n"
+"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
"# if no other operating system is detected on the machine.\n"
"d-i grub-installer/only_debian boolean true\n"
"\n"
-"# This one makes grub-installer install to the MBR if it also finds some "
-"other\n"
+"# This one makes grub-installer install to the MBR if it also finds some other\n"
"# OS, which is less safe as it might not be able to boot that other OS.\n"
"d-i grub-installer/with_other_os boolean true\n"
"\n"
@@ -2567,6 +2557,8 @@ msgstr ""
"#d-i grub-installer/bootdev string (hd0,0)\n"
"# To install grub to multiple disks:\n"
"#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev string /dev/sda\n"
"\n"
"# Optional password for grub, either in clear text\n"
"#d-i grub-installer/password password r00tme\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 77959c612..a3f3dc7cb 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2010-10-29 05:56+0000\n"
-"PO-Revision-Date: 2010-10-26 19:11+0800\n"
+"PO-Revision-Date: 2010-11-04 18:18+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -802,31 +802,31 @@ msgstr "&task-sql-tot;"
#. Tag: entry
#: random-bits.xml:341
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "DNS server"
msgid "SSH server"
-msgstr "DNS 服务器"
+msgstr "SSH 服务器"
#. Tag: entry
#: random-bits.xml:342
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "&task-sql-inst;"
msgid "&task-ssh-inst;"
-msgstr "&task-sql-inst;"
+msgstr "&task-ssh-inst;"
#. Tag: entry
#: random-bits.xml:343
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "&task-sql-dl;"
msgid "&task-ssh-dl;"
-msgstr "&task-sql-dl;"
+msgstr "&task-ssh-dl;"
#. Tag: entry
#: random-bits.xml:344
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "&task-sql-tot;"
msgid "&task-ssh-tot;"
-msgstr "&task-sql-tot;"
+msgstr "&task-ssh-tot;"
#. Tag: para
#: random-bits.xml:350
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 36d16099d..0dc4c8332 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2010-10-29 05:56+0000\n"
-"PO-Revision-Date: 2010-10-27 23:56+0800\n"
+"PO-Revision-Date: 2010-11-04 18:24+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -1279,7 +1279,7 @@ msgstr "设置用户和密码"
#. Tag: para
#: using-d-i.xml:902
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "After the base system has been installed, the installer will allow you to "
#| "set up the <quote>root</quote> account and/or an account for the first "
@@ -1289,9 +1289,7 @@ msgid ""
"Just before configuring the clock, the installer will allow you to set up "
"the <quote>root</quote> account and/or an account for the first user. Other "
"user accounts can be created after the installation has been completed."
-msgstr ""
-"系统安装之后,安装程序要求您创建 <quote>root</quote> 帐号和/或第一个用户帐"
-"号。其他的用户帐号可以在安装完成之后创建。"
+msgstr "在设置时钟之前,安装程序允许您创建 <quote>root</quote> 帐号和/或第一个用户帐号。其他的用户帐号可以在安装完成之后创建。"
#. Tag: title
#: using-d-i.xml:916
@@ -4085,7 +4083,7 @@ msgstr "选择正确的分区!"
#. Tag: para
#: using-d-i.xml:2771
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The criteria for selecting a partition is that it is FAT format "
#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
@@ -4100,11 +4098,7 @@ msgid ""
"of the system including EFI partitions of other system disks and EFI "
"diagnostic partitions. Remember, <command>elilo</command> may format the "
"partition during the installation, erasing any previous contents!"
-msgstr ""
-"选择分区的准则是格式化为 FAT 的文件系统并有 <emphasis>boot</emphasis> 标志。"
-"&d-i; 可能会显示多个选择,这取决于被扫描的包含 EFI 分区的磁盘和 EFI 诊断分"
-"区。切记,<command>elilo</command> 可能会在安装时格式化分区,这将清除以前的所"
-"有内容!"
+msgstr "选择分区的准则是文件系统必须为 FAT 并有 <emphasis>boot</emphasis> 标志。&d-i; 可能会显示多个选择,这取决于被扫描的包含 EFI 分区的磁盘和 EFI 诊断分区。切记,<command>elilo</command> 在安装时可能会格式化分区,这将清除以前所有的内容!"
#. Tag: title
#: using-d-i.xml:2786