sync with code

1 files changed, 169 insertions, 164 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index f19e65097..300f6961d 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
-"POT-Creation-Date: 2008-07-20 04:41+0200\n"
+"POT-Creation-Date: 2008-08-12 17:53+0200\n"
 "PO-Revision-Date: 2008-03-29 21:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -110,244 +110,244 @@ msgstr "跳过"
 msgid "LILO/grub Installation"
 msgstr "LILO/grub 安装"
 
-#: any.pm:353
+#: any.pm:352
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "您希望启动引导程序安装到哪里?"
 
-#: any.pm:380
+#: any.pm:379
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: any.pm:390 any.pm:422 any.pm:423
+#: any.pm:389 any.pm:420 any.pm:421
 #, c-format
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
-#: any.pm:395
+#: any.pm:393
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: any.pm:396 any.pm:427
+#: any.pm:394 any.pm:424
 #, c-format
 msgid "Bootloader to use"
 msgstr "要使用的引导程序"
 
-#: any.pm:398 any.pm:429
+#: any.pm:396 any.pm:426
 #, c-format
 msgid "Boot device"
 msgstr "启动设备"
 
-#: any.pm:400
+#: any.pm:398
 #, c-format
 msgid "Main options"
 msgstr "主选项"
 
-#: any.pm:401
+#: any.pm:399
 #, c-format
 msgid "Delay before booting default image"
 msgstr "启动默认映像前的延迟"
 
-#: any.pm:402
+#: any.pm:400
 #, c-format
 msgid "Enable ACPI"
 msgstr "启用 ACPI"
 
-#: any.pm:403
+#: any.pm:401
 #, c-format
 msgid "Enable APIC"
 msgstr "启用 APIC"
 
-#: any.pm:404
+#: any.pm:402
 #, c-format
 msgid "Enable Local APIC"
 msgstr "启用本地 APIC"
 
-#: any.pm:406 any.pm:794 any.pm:803 authentication.pm:240
+#: any.pm:404 any.pm:790 any.pm:799 authentication.pm:239
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "密码"
 
-#: any.pm:408 authentication.pm:251
+#: any.pm:406 authentication.pm:250
 #, c-format
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:408 authentication.pm:251 diskdrake/interactive.pm:1300
+#: any.pm:406 authentication.pm:250 diskdrake/interactive.pm:1300
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
 
-#: any.pm:409
+#: any.pm:407
 #, c-format
 msgid "You can not use a password with %s"
 msgstr "您在 %s 时不能使用密码"
 
-#: any.pm:412 any.pm:796 any.pm:805 authentication.pm:241
+#: any.pm:410 any.pm:792 any.pm:801 authentication.pm:240
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: any.pm:413
+#: any.pm:411
 #, c-format
 msgid "Restrict command line options"
 msgstr "限制命令行选项"
 
-#: any.pm:413
+#: any.pm:411
 #, c-format
 msgid "restrict"
 msgstr "限制"
 
-#: any.pm:414
+#: any.pm:412
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "没有密码不能使用“限定命令行选项”"
 
-#: any.pm:416
+#: any.pm:414
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "每次启动时清除 /tmp"
 
-#: any.pm:417
+#: any.pm:415
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "精确的内存大小(找到 %d MB)"
 
-#: any.pm:418
+#: any.pm:416
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "以兆为单位给出内存大小"
 
-#: any.pm:428
+#: any.pm:425
 #, c-format
 msgid "Init Message"
 msgstr "初始信息"
 
-#: any.pm:430
+#: any.pm:427
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "开放固件延迟"
 
-#: any.pm:431
+#: any.pm:428
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "核心启动超时"
 
-#: any.pm:432
+#: any.pm:429
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "允许 CD 启动?"
 
-#: any.pm:433
+#: any.pm:430
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "启用 OF 启动?"
 
-#: any.pm:434
+#: any.pm:431
 #, c-format
 msgid "Default OS?"
 msgstr "默认操作系统?"
 
-#: any.pm:501
+#: any.pm:498
 #, c-format
 msgid "Image"
 msgstr "映像"
 
-#: any.pm:502 any.pm:515
+#: any.pm:499 any.pm:512
 #, c-format
 msgid "Root"
 msgstr "根目录"
 
-#: any.pm:503 any.pm:528
+#: any.pm:500 any.pm:525
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:505
+#: any.pm:502
 #, c-format
 msgid "Xen append"
 msgstr "追加 Xen"
 
-#: any.pm:508
+#: any.pm:505
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: any.pm:510
+#: any.pm:507
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:511
+#: any.pm:508
 #, c-format
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:520 any.pm:525 any.pm:527 diskdrake/interactive.pm:376
+#: any.pm:517 any.pm:522 any.pm:524 diskdrake/interactive.pm:376
 #, c-format
 msgid "Label"
 msgstr "标签"
 
-#: any.pm:522 any.pm:530 harddrake/v4l.pm:438
+#: any.pm:519 any.pm:527 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: any.pm:529
+#: any.pm:526
 #, c-format
 msgid "NoVideo"
 msgstr "无视频"
 
-#: any.pm:540
+#: any.pm:537
 #, c-format
 msgid "Empty label not allowed"
 msgstr "标签不能为空"
 
-#: any.pm:541
+#: any.pm:538
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您必须指定一个内核映像"
 
-#: any.pm:541
+#: any.pm:538
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您必须指定根目录所在分区"
 
-#: any.pm:542
+#: any.pm:539
 #, c-format
 msgid "This label is already used"
 msgstr "这个名字已经被使用"
 
-#: any.pm:560
+#: any.pm:557
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "要添加的条目是什么类型?"
 
-#: any.pm:561
+#: any.pm:558
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:561
+#: any.pm:558
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其它操作系统(SunOS...)"
 
-#: any.pm:562
+#: any.pm:559
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其它操作系统(MacOS...)"
 
-#: any.pm:562
+#: any.pm:559
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其它操作系统(Windows...)"
 
-#: any.pm:590
+#: any.pm:587
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -356,183 +356,183 @@ msgstr ""
 "引导菜单中现有下列条目。\n"
 "您可以创建额外的条目或是更改已存在的条目。"
 
-#: any.pm:754
+#: any.pm:751
 #, c-format
 msgid "access to X programs"
 msgstr "允许使用 X 应用程序"
 
-#: any.pm:755
+#: any.pm:752
 #, c-format
 msgid "access to rpm tools"
 msgstr "允许使用 rpm 工具"
 
-#: any.pm:756
+#: any.pm:753
 #, c-format
 msgid "allow \"su\""
 msgstr "允许使用“su”指令"
 
-#: any.pm:757
+#: any.pm:754
 #, c-format
 msgid "access to administrative files"
 msgstr "允许访问系统设置文件"
 
-#: any.pm:758
+#: any.pm:755
 #, c-format
 msgid "access to network tools"
 msgstr "允许使用网络工具"
 
-#: any.pm:759
+#: any.pm:756
 #, c-format
 msgid "access to compilation tools"
 msgstr "允许使用编译工具"
 
-#: any.pm:765
+#: any.pm:762
 #, c-format
 msgid "(already added %s)"
 msgstr "(已经添加了 %s)"
 
-#: any.pm:771
+#: any.pm:768
 #, c-format
 msgid "Please give a user name"
 msgstr "请给出用户名"
 
-#: any.pm:772
+#: any.pm:769
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "用户名只能包含小写字母、数字、“-”和“_”"
 
-#: any.pm:773
+#: any.pm:770
 #, c-format
 msgid "The user name is too long"
 msgstr "该用户名太长"
 
-#: any.pm:774
+#: any.pm:771
 #, c-format
 msgid "This user name has already been added"
 msgstr "该用户名已经存在"
 
-#: any.pm:780 any.pm:807
+#: any.pm:777 any.pm:803
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: any.pm:780 any.pm:808
+#: any.pm:777 any.pm:804
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: any.pm:781
+#: any.pm:778
 #, c-format
 msgid "%s must be a number"
 msgstr "%s 必须是数字"
 
-#: any.pm:782
+#: any.pm:779
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s 应该大于 500。仍然接受吗？"
 
-#: any.pm:786
+#: any.pm:783
 #, c-format
 msgid "User management"
 msgstr "用户管理"
 
-#: any.pm:793 authentication.pm:226
+#: any.pm:789 authentication.pm:226
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "设定管理员(root)密码"
 
-#: any.pm:798
+#: any.pm:794
 #, c-format
 msgid "Enter a user"
 msgstr "输入一个用户"
 
-#: any.pm:799
+#: any.pm:795
 #, c-format
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:802
+#: any.pm:798
 #, c-format
 msgid "Login name"
 msgstr "登录名"
 
-#: any.pm:806
+#: any.pm:802
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:810
+#: any.pm:806
 #, c-format
 msgid "Icon"
 msgstr "图标"
 
-#: any.pm:848 security/l10n.pm:14
+#: any.pm:844 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自动登录"
 
-#: any.pm:849
+#: any.pm:845
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 
-#: any.pm:850
+#: any.pm:846
 #, c-format
 msgid "Use this feature"
 msgstr "使用此特性"
 
-#: any.pm:851
+#: any.pm:847
 #, c-format
 msgid "Choose the default user:"
 msgstr "选择默认的用户:"
 
-#: any.pm:852
+#: any.pm:848
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "选择要运行的窗口管理程序:"
 
-#: any.pm:875 any.pm:925
+#: any.pm:871 any.pm:920
 #, c-format
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: any.pm:882 any.pm:1221 interactive/gtk.pm:766
+#: any.pm:878 any.pm:1214 interactive/gtk.pm:766
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:918
+#: any.pm:914
 #, c-format
 msgid "License agreement"
 msgstr "许可协议"
 
-#: any.pm:921 diskdrake/dav.pm:26
+#: any.pm:916 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: any.pm:928
+#: any.pm:923
 #, c-format
 msgid "Accept"
 msgstr "接受"
 
-#: any.pm:928
+#: any.pm:923
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: any.pm:948 any.pm:1015
+#: any.pm:943 any.pm:1009
 #, c-format
 msgid "Please choose a language to use."
 msgstr "请选择要使用的语言。"
 
-#: any.pm:949 any.pm:1016
+#: any.pm:944 any.pm:1010
 #, c-format
 msgid "Language choice"
 msgstr "语言选择"
 
-#: any.pm:979
+#: any.pm:973
 #, c-format
 msgid ""
 "Mandriva Linux can support multiple languages. Select\n"
@@ -542,72 +542,72 @@ msgstr ""
 "Mandriva Linux 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:982
+#: any.pm:976
 #, c-format
 msgid "Multi languages"
 msgstr "多语言"
 
-#: any.pm:993 any.pm:1024
+#: any.pm:987 any.pm:1018
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "使用旧的编码方式(非 UTF-8)"
 
-#: any.pm:995
+#: any.pm:989
 #, c-format
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:1071
+#: any.pm:1065
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:1073
+#: any.pm:1066
 #, c-format
 msgid "Please choose your country."
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:1075
+#: any.pm:1068
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:1076
+#: any.pm:1069
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:1076 interactive.pm:481
+#: any.pm:1069 interactive.pm:481
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:1082
+#: any.pm:1075
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:1085
+#: any.pm:1078
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:1166
+#: any.pm:1159
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:1166
+#: any.pm:1159
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:1166
+#: any.pm:1159
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: any.pm:1170
+#: any.pm:1163
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -620,32 +620,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:1182
+#: any.pm:1175
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:1185
+#: any.pm:1178
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
 "systems."
 msgstr "SMB: Windows、MacOS X 和其它现代 Linux 系统所用的文件共享系统。"
 
-#: any.pm:1193
+#: any.pm:1186
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1221
+#: any.pm:1214
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1223
+#: any.pm:1216
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -654,52 +654,52 @@ msgstr ""
 "按用户设置的共享, 使用组“fileshare”。\n"
 "您可以使用“Drak 用户管理”将用户添加到此组中。"
 
-#: any.pm:1315
+#: any.pm:1308
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "请注销, 然后同时按 Ctrl-Alt-BackSpace"
 
-#: any.pm:1319
+#: any.pm:1312
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: any.pm:1354
+#: any.pm:1347
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: any.pm:1354
+#: any.pm:1347
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: any.pm:1377 any.pm:1379
+#: any.pm:1370 any.pm:1372
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: any.pm:1380
+#: any.pm:1373
 #, c-format
 msgid "What is the best time?"
 msgstr "最适合的时间是几点?"
 
-#: any.pm:1384
+#: any.pm:1377
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (硬件时钟设定为 GMT)"
 
-#: any.pm:1385
+#: any.pm:1378
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (硬件时钟设定为本地时间)"
 
-#: any.pm:1387
+#: any.pm:1380
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: any.pm:1388
+#: any.pm:1381
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
@@ -796,7 +796,7 @@ msgstr "使用 Kerboros 和 LDAP 在活动目录服务器中进行身份验证"
 
 #: authentication.pm:96 authentication.pm:130 authentication.pm:149
 #: authentication.pm:150 authentication.pm:176 authentication.pm:200
-#: authentication.pm:872
+#: authentication.pm:871
 #, c-format
 msgid " "
 msgstr ""
@@ -824,7 +824,7 @@ msgstr "LDAP 服务器"
 msgid "Base dn"
 msgstr "LDAP 基 DN"
 
-#: authentication.pm:103 authentication.pm:158
+#: authentication.pm:103
 #, c-format
 msgid "Fetch base Dn "
 msgstr ""
@@ -929,6 +929,11 @@ msgid ""
 "type of users information "
 msgstr ""
 
+#: authentication.pm:158
+#, c-format
+msgid "Fecth base Dn "
+msgstr ""
+
 #: authentication.pm:179
 #, c-format
 msgid ""
@@ -963,48 +968,48 @@ msgstr "域"
 msgid "Active Directory Realm "
 msgstr "活动目录域"
 
-#: authentication.pm:225 authentication.pm:242
+#: authentication.pm:225 authentication.pm:241
 #, c-format
 msgid "Authentication"
 msgstr "身份验证"
 
-#: authentication.pm:228
+#: authentication.pm:227
 #, c-format
 msgid "Authentication method"
 msgstr "身份验证方式"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: authentication.pm:233
+#: authentication.pm:232
 #, c-format
 msgid "No password"
 msgstr "无密码"
 
-#: authentication.pm:254
+#: authentication.pm:253
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "这个密码太简单了(至少要有 %d 个字符)"
 
-#: authentication.pm:354
+#: authentication.pm:353
 #, c-format
 msgid "Can not use broadcast with no NIS domain"
 msgstr "没有 NIS 域无法广播"
 
-#: authentication.pm:867
+#: authentication.pm:866
 #, c-format
 msgid "Select file"
 msgstr ""
 
-#: authentication.pm:873
+#: authentication.pm:872
 #, fuzzy, c-format
 msgid "Domain Windows for authentication : "
 msgstr "需要域认证"
 
-#: authentication.pm:875
+#: authentication.pm:874
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "域管理员用户名"
 
-#: authentication.pm:876
+#: authentication.pm:875
 #, c-format
 msgid "Domain Admin Password"
 msgstr "域管理员密码"
@@ -1119,7 +1124,7 @@ msgstr "1 分钟"
 msgid "%d seconds"
 msgstr "%d 秒钟"
 
-#: common.pm:349
+#: common.pm:358
 #, c-format
 msgid "command %s missing"
 msgstr "缺少命令 %s"
@@ -1221,8 +1226,8 @@ msgstr "选项: %s"
 #: diskdrake/hd_gtk.pm:53 diskdrake/interactive.pm:284
 #: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:106
 #: fs/partitioning_wizard.pm:51 fs/partitioning_wizard.pm:206
-#: fs/partitioning_wizard.pm:212 fs/partitioning_wizard.pm:252
-#: fs/partitioning_wizard.pm:271 fs/partitioning_wizard.pm:276
+#: fs/partitioning_wizard.pm:211 fs/partitioning_wizard.pm:250
+#: fs/partitioning_wizard.pm:269 fs/partitioning_wizard.pm:274
 #, c-format
 msgid "Partitioning"
 msgstr "分区"
@@ -1259,7 +1264,7 @@ msgstr ""
 "(2048 扇区就足够了)"
 
 #: diskdrake/hd_gtk.pm:160 interactive.pm:644 interactive/gtk.pm:744
-#: interactive/gtk.pm:759 interactive/gtk.pm:779 ugtk2.pm:936 ugtk2.pm:937
+#: interactive/gtk.pm:759 interactive/gtk.pm:779 ugtk2.pm:938 ugtk2.pm:939
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -1424,7 +1429,7 @@ msgstr "退出而不保存分区表吗?"
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "您想要保存 /etc/fstab 修改吗?"
 
-#: diskdrake/interactive.pm:284 fs/partitioning_wizard.pm:252
+#: diskdrake/interactive.pm:284 fs/partitioning_wizard.pm:250
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "对分区表的更改要等到重新启动后才能生效"
@@ -1808,7 +1813,7 @@ msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
 
-#: diskdrake/interactive.pm:1103 fs/partitioning.pm:49
+#: diskdrake/interactive.pm:1103 fs/partitioning.pm:48
 #, c-format
 msgid "Check bad blocks?"
 msgstr "是否检查坏磁块?"
@@ -2084,8 +2089,8 @@ msgstr "更改类型"
 
 #: diskdrake/smbnfs_gtk.pm:81 interactive.pm:126 interactive.pm:543
 #: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:408 ugtk2.pm:510
-#: ugtk2.pm:519 ugtk2.pm:801
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:409 ugtk2.pm:511
+#: ugtk2.pm:520 ugtk2.pm:803
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -2362,14 +2367,14 @@ msgstr "选择挂载点"
 msgid "Choose the partitions you want to format"
 msgstr "选择您要格式化的分区"
 
-#: fs/partitioning.pm:76
+#: fs/partitioning.pm:75
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
 "you can lose data)"
 msgstr "检查文件系统 %s 失败。您想修复错误吗?(注意, 有可能丢失数据)"
 
-#: fs/partitioning.pm:79
+#: fs/partitioning.pm:78
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "交换空间太少, 无法完成安装, 请扩大交换分区。"
@@ -2515,7 +2520,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: fs/partitioning_wizard.pm:165 interactive.pm:542 interactive/curses.pm:263
-#: ugtk2.pm:512
+#: ugtk2.pm:513
 #, c-format
 msgid "Next"
 msgstr "下一步"
@@ -2565,22 +2570,22 @@ msgstr "清除并使用整个磁盘"
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "您有不只一个硬盘, 您要在哪个上面安装 Linux?"
 
-#: fs/partitioning_wizard.pm:211 fsedit.pm:570
+#: fs/partitioning_wizard.pm:210 fsedit.pm:570
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "磁盘 %s 上现存的所有分区及其资料将被清除"
 
-#: fs/partitioning_wizard.pm:222
+#: fs/partitioning_wizard.pm:220
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "自定义磁盘分区"
 
-#: fs/partitioning_wizard.pm:228
+#: fs/partitioning_wizard.pm:226
 #, c-format
 msgid "Use fdisk"
 msgstr "使用 fdisk"
 
-#: fs/partitioning_wizard.pm:231
+#: fs/partitioning_wizard.pm:229
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -2589,17 +2594,17 @@ msgstr ""
 "您现在可以在 %s 上分区。\n"
 "做完之后, 不要忘记用“w”命令保存您的修改"
 
-#: fs/partitioning_wizard.pm:271
+#: fs/partitioning_wizard.pm:269
 #, c-format
 msgid "I can not find any room for installing"
 msgstr "我无法找到安装需要的空间"
 
-#: fs/partitioning_wizard.pm:275
+#: fs/partitioning_wizard.pm:273
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX 分区向导找到下列解决办法:"
 
-#: fs/partitioning_wizard.pm:287
+#: fs/partitioning_wizard.pm:284
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "分区失败: %s"
@@ -3231,18 +3236,18 @@ msgstr "调谐器类型: "
 
 #: interactive.pm:125 interactive.pm:542 interactive/curses.pm:263
 #: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
-#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:414 ugtk2.pm:512
-#: ugtk2.pm:801 ugtk2.pm:824
+#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:415 ugtk2.pm:513
+#: ugtk2.pm:803 ugtk2.pm:826
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:800 wizards.pm:156
+#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:802 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:800 wizards.pm:156
+#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:802 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "否"
@@ -3267,12 +3272,12 @@ msgstr "修改"
 msgid "Remove"
 msgstr "删除"
 
-#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:512
+#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:513
 #, c-format
 msgid "Finish"
 msgstr "完成"
 
-#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:510
+#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:511
 #, c-format
 msgid "Previous"
 msgstr "上一步"
@@ -5791,28 +5796,28 @@ msgstr "安全"
 msgid "DrakSec Basic Options"
 msgstr "“Drak 安全管理”基本选项"
 
-#: security/level.pm:57
+#: security/level.pm:56
 #, c-format
 msgid "Please choose the desired security level"
 msgstr "请选择期望的安全级别"
 
-#: security/level.pm:61
+#: security/level.pm:60
 #, c-format
 msgid "Security level"
 msgstr "安全级别"
 
-#: security/level.pm:63
+#: security/level.pm:62
 #, c-format
 msgid "Use libsafe for servers"
 msgstr "服务器使用 libsafe"
 
-#: security/level.pm:64
+#: security/level.pm:63
 #, c-format
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
 msgstr "防止缓冲溢出和串格式攻击的库。"
 
-#: security/level.pm:65
+#: security/level.pm:64
 #, c-format
 msgid "Security Administrator (login or email)"
 msgstr "安全管理员(登录或 email)"
@@ -6242,7 +6247,7 @@ msgid ""
 "about this service, sorry."
 msgstr "没有该服务的附加信息。"
 
-#: services.pm:221 ugtk2.pm:911
+#: services.pm:221 ugtk2.pm:913
 #, c-format
 msgid "Info"
 msgstr "信息"
@@ -6566,47 +6571,47 @@ msgstr "俄联邦"
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
-#: ugtk2.pm:801
+#: ugtk2.pm:803
 #, c-format
 msgid "Is this correct?"
 msgstr "这样正确吗?"
 
-#: ugtk2.pm:861
+#: ugtk2.pm:863
 #, c-format
 msgid "No file chosen"
 msgstr "未选择文件"
 
-#: ugtk2.pm:863
+#: ugtk2.pm:865
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr "您选择了文件，而非目录"
 
-#: ugtk2.pm:865
+#: ugtk2.pm:867
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr "您选择了目录，而非文件"
 
-#: ugtk2.pm:867
+#: ugtk2.pm:869
 #, c-format
 msgid "No such directory"
 msgstr "无此目录"
 
-#: ugtk2.pm:867
+#: ugtk2.pm:869
 #, c-format
 msgid "No such file"
 msgstr "非本地文件"
 
-#: ugtk2.pm:946
+#: ugtk2.pm:948
 #, c-format
 msgid "Expand Tree"
 msgstr "展开树"
 
-#: ugtk2.pm:947
+#: ugtk2.pm:949
 #, c-format
 msgid "Collapse Tree"
 msgstr "折叠树"
 
-#: ugtk2.pm:948
+#: ugtk2.pm:950
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "切换清单显示/分组排序"