summaryrefslogtreecommitdiff
path: root/po/zh_CN/preparing.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN/preparing.po')
-rw-r--r--po/zh_CN/preparing.po12
1 files changed, 6 insertions, 6 deletions
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index e9e01c16b..973844181 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -1169,7 +1169,7 @@ msgstr ""
#, no-c-format
#| msgid ""
#| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, "
+#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
#| "&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
#| "phrase> and want to stick Linux on the same disk, you will need to "
#| "repartition the disk. Debian requires its own hard disk partitions. It "
@@ -1179,14 +1179,14 @@ msgstr ""
#| "Debian root."
msgid ""
"If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, "
+"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
"&hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </"
"phrase> and want to stick &debian; on the same disk, you will need to "
"repartition the disk. &debian; requires its own hard disk partitions. It "
"cannot be installed on Windows or MacOS partitions. It may be able to share "
"some partitions with other Unix systems, but that's not covered here. At the "
"very least you will need a dedicated partition for the &debian; root."
-msgstr "如果您已经在您的机器中安装有操作系统<phrase arch=\"x86\"> (Windows 9x、Windows NT/2000/XP、OS/2、MacOS、Solaris、FreeBSD,&hellip;) </phrase> <phrase arch=\"s390\"> (VM、z/OS、OS/390,&hellip;) </phrase>,同时也希望把 Linux 装在同一块硬盘上,那么您就必须重新对硬盘分区。&debian; 需要它自己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。它可以与其它 Linux 系统共享一些分区,但是我们在这里不会对此进行说明。最起码,您要为 &debian; 的根目录准备一个专用的分区。"
+msgstr "如果您已经在您的机器中安装有操作系统<phrase arch=\"x86\"> (Windows 9x、Windows NT/2000/XP/2003/Vista/7、OS/2、MacOS、Solaris、FreeBSD,&hellip;) </phrase> <phrase arch=\"s390\"> (VM、z/OS、OS/390,&hellip;) </phrase>,同时也希望把 Linux 装在同一块硬盘上,那么您就必须重新对硬盘分区。&debian; 需要它自己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。它可以与其它 Linux 系统共享一些分区,但是我们在这里不会对此进行说明。最起码,您要为 &debian; 的根目录准备一个专用的分区。"
#. Tag: para
#: preparing.xml:778
@@ -1491,7 +1491,7 @@ msgstr "在 DOS、Win-32 或者 OS/2 上的无损分区"
#| msgid ""
#| "One of the most common installations is onto a system that already "
#| "contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, "
-#| "NT, 2000, XP), or OS/2, and it is desired to put Debian onto the same "
+#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian onto the same "
#| "disk without destroying the previous system. Note that the installer "
#| "supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
#| "Simply start the installer and when you get to the partitioning step, "
@@ -1502,14 +1502,14 @@ msgstr "在 DOS、Win-32 或者 OS/2 上的无损分区"
msgid ""
"One of the most common installations is onto a system that already contains "
"DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP), or OS/2, and it is desired to put &debian; onto the same disk without "
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
"destroying the previous system. Note that the installer supports resizing of "
"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
"installer and when you get to the partitioning step, select the option for "
"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
"select the partition to resize, and specify its new size. So in most cases "
"you should not need to use the method described below."
-msgstr "在常见的安装中,有一种是希望在已装有 DOS(含 Windows 3.1)、Win32(如 Windows 95、98、Me、NT、2000、XP) 或者 OS/2 的系统上安装 &debian; 到同一块硬盘,并保留原有系统。注意,安装程序支持改变 DOS 和 Windows 所使用的 FAT 和 NTFS 文件系统的容量。只需启动安装程序,选择 <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> 选项,并选择需要调整大小的分区,指定新的尺寸。在多数情况下您并不需要使用下面的方法。"
+msgstr "在常见的安装中,有一种是希望在已装有 DOS(含 Windows 3.1)、Win32(如 Windows 95、98、Me、NT、2000、XP、2003、Vista、7) 或者 OS/2 的系统上安装 &debian; 到同一块硬盘,并保留原有系统。注意,安装程序支持改变 DOS 和 Windows 所使用的 FAT 和 NTFS 文件系统的容量。只需启动安装程序,选择 <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> 选项,并选择需要调整大小的分区,指定新的尺寸。在多数情况下您并不需要使用下面的方法。"
#. Tag: para
#: preparing.xml:966