sync with code

1 files changed, 228 insertions, 297 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d065cc2..b12dfc1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: draklive-install 2006\n"
-"POT-Creation-Date: 2006-02-23 13:25+0100\n"
+"POT-Creation-Date: 2008-03-20 13:17+0100\n"
 "PO-Revision-Date: 2006-03-03 08:14+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -26,81 +26,54 @@ msgstr "Mandriva Live"
 msgid "This wizard will help you to install the live distribution."
 msgstr "此向导将帮助您安装 Live 发行版。"
 
-#: ../draklive-install:83
+#: ../draklive-install:107 ../draklive-install:147 ../draklive-install:197
 #, c-format
-msgid "Computing total size"
-msgstr "正计算总计大小"
-
-#: ../draklive-install:95
-#, c-format
-msgid "Copying in progress"
-msgstr "复制进行中"
+msgid "Please wait"
+msgstr ""
 
-#: ../draklive-install:163
+#: ../draklive-install:120 ../draklive-install:190
 #, c-format
-msgid "Congratulations"
-msgstr "恭喜"
+msgid "Error"
+msgstr ""
 
-#: ../draklive-install:163
+#: ../draklive-install:120
 #, c-format
-msgid ""
-"Please halt your computer, remove your live system, and restart your "
-"computer."
-msgstr "请关闭您的计算机，取出 Live 系统，然后重新启动您的计算机。"
+msgid "An error occured: %s"
+msgstr ""
 
-#: ../draklive-install:179 ../draklive-install:404
+#: ../draklive-install:137
 #, c-format
-msgid "You need to reboot for the partition table modifications to take place"
-msgstr "对分区表的更改要等到重新启动后才能生效"
+msgid "Not enough space available (%s available while %s are needed)"
+msgstr ""
 
-#: ../draklive-install:230
+#: ../draklive-install:165
 #, c-format
-msgid "Choose the partitions you want to format"
-msgstr "选择您要格式化的分区"
+msgid "Computing total size"
+msgstr "正计算总计大小"
 
-#: ../draklive-install:232
+#: ../draklive-install:173 ../draklive-install:314
 #, c-format
-msgid "Check bad blocks?"
-msgstr "是否检查坏磁块?"
+msgid "Copying in progress"
+msgstr "复制进行中"
 
-#: ../draklive-install:261
+#: ../draklive-install:190
 #, c-format
-msgid ""
-"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
-"you can lose data)"
-msgstr "检查文件系统 %s 失败。您想修复错误吗?(注意, 有可能丢失数据)"
+msgid "Unable to copy files to new root"
+msgstr ""
 
 #: ../draklive-install:264
 #, c-format
-msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "交换空间太少, 无法完成安装, 请扩大交换分区。"
-
-#: ../draklive-install:314
-#, c-format
-msgid "No partition available"
-msgstr "没有可用的硬盘分区"
-
-#: ../draklive-install:317
-#, c-format
-msgid "Scanning partitions to find mount points"
-msgstr "正在扫描各个分区以查找挂载点"
-
-#: ../draklive-install:324
-#, c-format
-msgid "Choose the mount points"
-msgstr "选择挂载点"
-
-#: ../draklive-install:325
-#, c-format
-msgid "Partitioning"
-msgstr "分区"
+msgid "Congratulations"
+msgstr "恭喜"
 
-#: ../draklive-install:360
+#: ../draklive-install:264
 #, c-format
-msgid "Duplicate mount point %s"
-msgstr "重复的挂载点 %s"
+msgid ""
+"Please halt your computer, remove your live system, and restart your "
+"computer."
+msgstr "请关闭您的计算机，取出 Live 系统，然后重新启动您的计算机。"
 
-#: ../draklive-install:386
+#: ../draklive-install:279
 #, c-format
 msgid "Continue anyway?"
 msgstr "仍然继续吗?"
@@ -120,7 +93,12 @@ msgstr "退出而不保存分区表吗?"
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "您想要保存 /etc/fstab 修改吗?"
 
-#: ../draklive-install:409
+#: ../draklive-install:297
+#, c-format
+msgid "You need to reboot for the partition table modifications to take place"
+msgstr "对分区表的更改要等到重新启动后才能生效"
+
+#: ../draklive-install:302
 #, c-format
 msgid ""
 "You should format partition %s.\n"
@@ -131,248 +109,201 @@ msgstr ""
 "否则, 将无法在 fstab 中写入挂载点 %s 的任何信息。\n"
 "仍然退出吗?"
 
-#: ../install_interactive.pm:22
-#, c-format
-msgid ""
-"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
-"You can find some information about them at: %s"
-msgstr ""
-"您系统中的部分硬件需要“私有”的驱动程序才能工作。\n"
-"有关它们的情况, 请您查看: %s"
-
-#: ../install_interactive.pm:62
-#, c-format
-msgid ""
-"You must have a root partition.\n"
-"For this, create a partition (or click on an existing one).\n"
-"Then choose action ``Mount point'' and set it to `/'"
-msgstr ""
-"必须指定一个根分区。\n"
-"请先创建一个 Linux 分区(或在图中单击现有的一个)。\n"
-"然后在列表里选择“挂载点”, 设为“/”。"
-
-#: ../install_interactive.pm:67
-#, c-format
-msgid ""
-"You do not have a swap partition.\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-"您还没有交换分区。\n"
-"\n"
-"要继续吗?"
-
-#: ../install_interactive.pm:70
-#, c-format
-msgid "You must have a FAT partition mounted in /boot/efi"
-msgstr "您必须有一个FAT分区载入 /boot/efi"
-
-#: ../install_interactive.pm:95
-#, c-format
-msgid "Use free space"
-msgstr "使用空闲空间"
-
-#: ../install_interactive.pm:97
-#, c-format
-msgid "Not enough free space to allocate new partitions"
-msgstr "没有足够空闲空间分配给新分区"
+#~ msgid "Choose the partitions you want to format"
+#~ msgstr "选择您要格式化的分区"
 
-#: ../install_interactive.pm:105
-#, c-format
-msgid "Use existing partitions"
-msgstr "使用现存的分区"
+#~ msgid "Check bad blocks?"
+#~ msgstr "是否检查坏磁块?"
 
-#: ../install_interactive.pm:107
-#, c-format
-msgid "There is no existing partition to use"
-msgstr "没有可使用的现存分区"
+#~ msgid ""
+#~ "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
+#~ "you can lose data)"
+#~ msgstr "检查文件系统 %s 失败。您想修复错误吗?(注意, 有可能丢失数据)"
 
-#: ../install_interactive.pm:114
-#, c-format
-msgid "Use the Windows partition for loopback"
-msgstr "利用 Windows 分区进行回环"
+#~ msgid "Not enough swap space to fulfill installation, please add some"
+#~ msgstr "交换空间太少, 无法完成安装, 请扩大交换分区。"
 
-#: ../install_interactive.pm:117
-#, c-format
-msgid "Which partition do you want to use for Linux4Win?"
-msgstr "请问您要在哪一个分区里放 Linux4Win?"
+#~ msgid "No partition available"
+#~ msgstr "没有可用的硬盘分区"
 
-#: ../install_interactive.pm:119
-#, c-format
-msgid "Choose the sizes"
-msgstr "选择大小"
+#~ msgid "Scanning partitions to find mount points"
+#~ msgstr "正在扫描各个分区以查找挂载点"
 
-#: ../install_interactive.pm:120
-#, c-format
-msgid "Root partition size in MB: "
-msgstr "根分区大小(MB):"
-
-#: ../install_interactive.pm:121
-#, c-format
-msgid "Swap partition size in MB: "
-msgstr "交换分区大小(MB):"
-
-#: ../install_interactive.pm:130
-#, c-format
-msgid "There is no FAT partition to use as loopback (or not enough space left)"
-msgstr "没有 FAT 分区来用作回环(或者没有足够剩余空间)"
-
-#: ../install_interactive.pm:137
-#, c-format
-msgid "Use the free space on the Windows partition"
-msgstr "使用在 Windows 分区上的空闲空间"
-
-#: ../install_interactive.pm:139
-#, c-format
-msgid "Which partition do you want to resize?"
-msgstr "您需要改变哪个分区的大小?"
-
-#: ../install_interactive.pm:153
-#, c-format
-msgid ""
-"The FAT resizer is unable to handle your partition, \n"
-"the following error occurred: %s"
-msgstr ""
-"改变 FAT 分区大小的程序无法处理这个分区, \n"
-"发生了如下错误: %s"
-
-#: ../install_interactive.pm:156 ../install_interactive.pm:188
-#, c-format
-msgid "Resizing"
-msgstr "改变大小"
-
-#: ../install_interactive.pm:156
-#, c-format
-msgid "Computing the size of the Windows partition"
-msgstr "正在计算 Windows 分区的大小"
-
-#: ../install_interactive.pm:163
-#, c-format
-msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
-"installation."
-msgstr ""
-"您的 Windows 分区有太多碎片, 请重新启动, 进入 Windows, 运行磁盘碎片整理程序, "
-"然后重新开始安装 Mandriva Linux"
-
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: ../install_interactive.pm:166
-#, c-format
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX will now resize your Windows partition. Be careful: this\n"
-"operation is dangerous. If you have not already done so, you\n"
-"first need to exit the installation, run \"chkdsk c:\" from a\n"
-"Command Prompt under Windows (beware, running graphical program\n"
-"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
-"Command Prompt!), optionally run defrag, then restart the\n"
-"installation. You should also backup your data.\n"
-"When sure, press Ok."
-msgstr ""
-"警告!\n"
-"\n"
-"DrakX 现在要调整您的 Windows 分区的大小。请小心: 此操作十分危险。为安全起见, "
-"您应该先退出安装程序, 在 Windows 的命令提示符状态下运行“chkdsk c:”(注意, 只运"
-"行图形化程序“磁盘扫描程序”是不够的, 请确定在命令提示符状态下使用“chkdsk”。)另"
-"外, 还建议您运行磁盘碎片整理程序。然后重新启动本安装程序。您还应该备份您的数"
-"据。一切就绪后, 请按“确定”。"
-
-#: ../install_interactive.pm:178
-#, c-format
-msgid "Which size do you want to keep for Windows on"
-msgstr "您将保留多少空间给 Windows?"
-
-#: ../install_interactive.pm:179
-#, c-format
-msgid "partition %s"
-msgstr "分区 %s"
-
-#: ../install_interactive.pm:188
-#, c-format
-msgid "Resizing Windows partition"
-msgstr "改变 Windows 分区大小"
-
-#: ../install_interactive.pm:193
-#, c-format
-msgid "FAT resizing failed: %s"
-msgstr "FAT 调整大小失败: %s"
-
-#: ../install_interactive.pm:196
-#, c-format
-msgid ""
-"To ensure data integrity after resizing the partition(s), \n"
-"filesystem checks will be run on your next boot into Windows(TM)"
-msgstr ""
-"为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Windows(TM) 时可能\n"
-"会自动运行文件系统检查。"
-
-#: ../install_interactive.pm:208
-#, c-format
-msgid "There is no FAT partition to resize (or not enough space left)"
-msgstr "没有 FAT 分区用来调整大小(或者没有足够剩余空间)"
-
-#: ../install_interactive.pm:213
-#, c-format
-msgid "Remove Windows(TM)"
-msgstr "删除 Windows(TM)"
-
-#: ../install_interactive.pm:213
-#, c-format
-msgid "Erase and use entire disk"
-msgstr "清除并使用整个磁盘"
-
-#: ../install_interactive.pm:215
-#, c-format
-msgid "You have more than one hard drive, which one do you install linux on?"
-msgstr "您有不只一个硬盘, 您要在哪个上面安装 Linux?"
-
-#: ../install_interactive.pm:219
-#, c-format
-msgid "ALL existing partitions and their data will be lost on drive %s"
-msgstr "磁盘 %s 上现存的所有分区及其资料将被清除"
-
-#: ../install_interactive.pm:228
-#, c-format
-msgid "Custom disk partitioning"
-msgstr "自定义磁盘分区"
-
-#: ../install_interactive.pm:232
-#, c-format
-msgid "Use fdisk"
-msgstr "使用 fdisk"
-
-#: ../install_interactive.pm:235
-#, c-format
-msgid ""
-"You can now partition %s.\n"
-"When you are done, do not forget to save using `w'"
-msgstr ""
-"您现在可以在 %s 上分区。\n"
-"做完之后, 不要忘记用“w”命令保存您的修改"
-
-#: ../install_interactive.pm:271
-#, c-format
-msgid "I can not find any room for installing"
-msgstr "我无法找到安装需要的空间"
-
-#: ../install_interactive.pm:275
-#, c-format
-msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX 分区向导找到下列解决办法:"
-
-#: ../install_interactive.pm:281
-#, c-format
-msgid "Partitioning failed: %s"
-msgstr "分区失败: %s"
-
-#: ../install_interactive.pm:288
-#, c-format
-msgid "Bringing up the network"
-msgstr "正在启动网络"
-
-#: ../install_interactive.pm:293
-#, c-format
-msgid "Bringing down the network"
-msgstr "正在禁用网络"
+#~ msgid "Choose the mount points"
+#~ msgstr "选择挂载点"
+
+#~ msgid "Partitioning"
+#~ msgstr "分区"
+
+#~ msgid "Duplicate mount point %s"
+#~ msgstr "重复的挂载点 %s"
+
+#~ msgid ""
+#~ "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+#~ "You can find some information about them at: %s"
+#~ msgstr ""
+#~ "您系统中的部分硬件需要“私有”的驱动程序才能工作。\n"
+#~ "有关它们的情况, 请您查看: %s"
+
+#~ msgid ""
+#~ "You must have a root partition.\n"
+#~ "For this, create a partition (or click on an existing one).\n"
+#~ "Then choose action ``Mount point'' and set it to `/'"
+#~ msgstr ""
+#~ "必须指定一个根分区。\n"
+#~ "请先创建一个 Linux 分区(或在图中单击现有的一个)。\n"
+#~ "然后在列表里选择“挂载点”, 设为“/”。"
+
+#~ msgid ""
+#~ "You do not have a swap partition.\n"
+#~ "\n"
+#~ "Continue anyway?"
+#~ msgstr ""
+#~ "您还没有交换分区。\n"
+#~ "\n"
+#~ "要继续吗?"
+
+#~ msgid "You must have a FAT partition mounted in /boot/efi"
+#~ msgstr "您必须有一个FAT分区载入 /boot/efi"
+
+#~ msgid "Use free space"
+#~ msgstr "使用空闲空间"
+
+#~ msgid "Not enough free space to allocate new partitions"
+#~ msgstr "没有足够空闲空间分配给新分区"
+
+#~ msgid "Use existing partitions"
+#~ msgstr "使用现存的分区"
+
+#~ msgid "There is no existing partition to use"
+#~ msgstr "没有可使用的现存分区"
+
+#~ msgid "Use the Windows partition for loopback"
+#~ msgstr "利用 Windows 分区进行回环"
+
+#~ msgid "Which partition do you want to use for Linux4Win?"
+#~ msgstr "请问您要在哪一个分区里放 Linux4Win?"
+
+#~ msgid "Choose the sizes"
+#~ msgstr "选择大小"
+
+#~ msgid "Root partition size in MB: "
+#~ msgstr "根分区大小(MB):"
+
+#~ msgid "Swap partition size in MB: "
+#~ msgstr "交换分区大小(MB):"
+
+#~ msgid ""
+#~ "There is no FAT partition to use as loopback (or not enough space left)"
+#~ msgstr "没有 FAT 分区来用作回环(或者没有足够剩余空间)"
+
+#~ msgid "Use the free space on the Windows partition"
+#~ msgstr "使用在 Windows 分区上的空闲空间"
+
+#~ msgid "Which partition do you want to resize?"
+#~ msgstr "您需要改变哪个分区的大小?"
+
+#~ msgid ""
+#~ "The FAT resizer is unable to handle your partition, \n"
+#~ "the following error occurred: %s"
+#~ msgstr ""
+#~ "改变 FAT 分区大小的程序无法处理这个分区, \n"
+#~ "发生了如下错误: %s"
+
+#~ msgid "Resizing"
+#~ msgstr "改变大小"
+
+#~ msgid "Computing the size of the Windows partition"
+#~ msgstr "正在计算 Windows 分区的大小"
+
+#~ msgid ""
+#~ "Your Windows partition is too fragmented. Please reboot your computer "
+#~ "under Windows, run the ``defrag'' utility, then restart the Mandriva "
+#~ "Linux installation."
+#~ msgstr ""
+#~ "您的 Windows 分区有太多碎片, 请重新启动, 进入 Windows, 运行磁盘碎片整理程"
+#~ "序, 然后重新开始安装 Mandriva Linux"
+
+#~ msgid ""
+#~ "WARNING!\n"
+#~ "\n"
+#~ "DrakX will now resize your Windows partition. Be careful: this\n"
+#~ "operation is dangerous. If you have not already done so, you\n"
+#~ "first need to exit the installation, run \"chkdsk c:\" from a\n"
+#~ "Command Prompt under Windows (beware, running graphical program\n"
+#~ "\"scandisk\" is not enough, be sure to use \"chkdsk\" in a\n"
+#~ "Command Prompt!), optionally run defrag, then restart the\n"
+#~ "installation. You should also backup your data.\n"
+#~ "When sure, press Ok."
+#~ msgstr ""
+#~ "警告!\n"
+#~ "\n"
+#~ "DrakX 现在要调整您的 Windows 分区的大小。请小心: 此操作十分危险。为安全起"
+#~ "见, 您应该先退出安装程序, 在 Windows 的命令提示符状态下运行“chkdsk c:”(注"
+#~ "意, 只运行图形化程序“磁盘扫描程序”是不够的, 请确定在命令提示符状态下使"
+#~ "用“chkdsk”。)另外, 还建议您运行磁盘碎片整理程序。然后重新启动本安装程序。"
+#~ "您还应该备份您的数据。一切就绪后, 请按“确定”。"
+
+#~ msgid "Which size do you want to keep for Windows on"
+#~ msgstr "您将保留多少空间给 Windows?"
+
+#~ msgid "partition %s"
+#~ msgstr "分区 %s"
+
+#~ msgid "Resizing Windows partition"
+#~ msgstr "改变 Windows 分区大小"
+
+#~ msgid "FAT resizing failed: %s"
+#~ msgstr "FAT 调整大小失败: %s"
+
+#~ msgid ""
+#~ "To ensure data integrity after resizing the partition(s), \n"
+#~ "filesystem checks will be run on your next boot into Windows(TM)"
+#~ msgstr ""
+#~ "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Windows(TM) 时可"
+#~ "能\n"
+#~ "会自动运行文件系统检查。"
+
+#~ msgid "There is no FAT partition to resize (or not enough space left)"
+#~ msgstr "没有 FAT 分区用来调整大小(或者没有足够剩余空间)"
+
+#~ msgid "Remove Windows(TM)"
+#~ msgstr "删除 Windows(TM)"
+
+#~ msgid "Erase and use entire disk"
+#~ msgstr "清除并使用整个磁盘"
+
+#~ msgid ""
+#~ "You have more than one hard drive, which one do you install linux on?"
+#~ msgstr "您有不只一个硬盘, 您要在哪个上面安装 Linux?"
+
+#~ msgid "ALL existing partitions and their data will be lost on drive %s"
+#~ msgstr "磁盘 %s 上现存的所有分区及其资料将被清除"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "自定义磁盘分区"
+
+#~ msgid "Use fdisk"
+#~ msgstr "使用 fdisk"
+
+#~ msgid ""
+#~ "You can now partition %s.\n"
+#~ "When you are done, do not forget to save using `w'"
+#~ msgstr ""
+#~ "您现在可以在 %s 上分区。\n"
+#~ "做完之后, 不要忘记用“w”命令保存您的修改"
+
+#~ msgid "I can not find any room for installing"
+#~ msgstr "我无法找到安装需要的空间"
+
+#~ msgid "The DrakX Partitioning wizard found the following solutions:"
+#~ msgstr "DrakX 分区向导找到下列解决办法:"
+
+#~ msgid "Partitioning failed: %s"
+#~ msgstr "分区失败: %s"
+
+#~ msgid "Bringing up the network"
+#~ msgstr "正在启动网络"
+
+#~ msgid "Bringing down the network"
+#~ msgstr "正在禁用网络"