usync with code

1 files changed, 232 insertions, 227 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 64879fe62..7006aff2f 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-08-18 18:01+0200\n"
+"POT-Creation-Date: 2008-08-29 18:51+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"
@@ -15,20 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: any.pm:245 diskdrake/interactive.pm:554 diskdrake/interactive.pm:741
-#: diskdrake/interactive.pm:785 diskdrake/interactive.pm:843
-#: diskdrake/interactive.pm:1133 do_pkgs.pm:221 do_pkgs.pm:267
-#: harddrake/sound.pm:285 interactive.pm:580
+#: any.pm:252 any.pm:848 diskdrake/interactive.pm:554
+#: diskdrake/interactive.pm:741 diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:843 diskdrake/interactive.pm:1133 do_pkgs.pm:221
+#: do_pkgs.pm:267 harddrake/sound.pm:285 interactive.pm:583
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: any.pm:245
+#: any.pm:252
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "启动引导程序安装中"
 
-#: any.pm:256
+#: any.pm:263
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -44,12 +44,12 @@ msgstr ""
 "\n"
 "要指定新卷 ID 吗?"
 
-#: any.pm:267
+#: any.pm:274
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "安装系统引导程序失败。出现下列错误:"
 
-#: any.pm:273
+#: any.pm:280
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -65,7 +65,7 @@ msgstr ""
 " 然后输入: shut-down\n"
 "您将在下次开机时看到引导程序提示。"
 
-#: any.pm:313
+#: any.pm:320
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -80,274 +80,274 @@ msgstr ""
 "\n"
 "您要用哪个硬盘启动?"
 
-#: any.pm:339
+#: any.pm:346
 #, fuzzy, c-format
 msgid "First sector (MBR) of drive %s"
 msgstr "驱动器的第一扇区(MBR)"
 
-#: any.pm:341
+#: any.pm:348
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "驱动器的第一扇区(MBR)"
 
-#: any.pm:343
+#: any.pm:350
 #, c-format
 msgid "First sector of the root partition"
 msgstr "根分区的第一扇区"
 
-#: any.pm:345
+#: any.pm:352
 #, c-format
 msgid "On Floppy"
 msgstr "在软盘上"
 
-#: any.pm:347
+#: any.pm:354
 #, c-format
 msgid "Skip"
 msgstr "跳过"
 
-#: any.pm:351
+#: any.pm:358
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/grub 安装"
 
-#: any.pm:352
+#: any.pm:359
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "您希望启动引导程序安装到哪里?"
 
-#: any.pm:379
+#: any.pm:386
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: any.pm:389 any.pm:420 any.pm:421
+#: any.pm:396 any.pm:427 any.pm:428
 #, c-format
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
-#: any.pm:393
+#: any.pm:400
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: any.pm:394 any.pm:424
+#: any.pm:401 any.pm:431
 #, c-format
 msgid "Bootloader to use"
 msgstr "要使用的引导程序"
 
-#: any.pm:396 any.pm:426
+#: any.pm:403 any.pm:433
 #, c-format
 msgid "Boot device"
 msgstr "启动设备"
 
-#: any.pm:398
+#: any.pm:405
 #, c-format
 msgid "Main options"
 msgstr "主选项"
 
-#: any.pm:399
+#: any.pm:406
 #, c-format
 msgid "Delay before booting default image"
 msgstr "启动默认映像前的延迟"
 
-#: any.pm:400
+#: any.pm:407
 #, c-format
 msgid "Enable ACPI"
 msgstr "启用 ACPI"
 
-#: any.pm:401
+#: any.pm:408
 #, c-format
 msgid "Enable APIC"
 msgstr "启用 APIC"
 
-#: any.pm:402
+#: any.pm:409
 #, c-format
 msgid "Enable Local APIC"
 msgstr "启用本地 APIC"
 
-#: any.pm:404 any.pm:790 any.pm:799 authentication.pm:239
+#: any.pm:411 any.pm:797 any.pm:812 authentication.pm:239
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "密码"
 
-#: any.pm:406 authentication.pm:250
+#: any.pm:413 authentication.pm:250
 #, c-format
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:406 authentication.pm:250 diskdrake/interactive.pm:1300
+#: any.pm:413 authentication.pm:250 diskdrake/interactive.pm:1300
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
 
-#: any.pm:407
+#: any.pm:414
 #, c-format
 msgid "You can not use a password with %s"
 msgstr "您在 %s 时不能使用密码"
 
-#: any.pm:410 any.pm:792 any.pm:801 authentication.pm:240
+#: any.pm:417 any.pm:799 any.pm:814 authentication.pm:240
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: any.pm:411
+#: any.pm:418
 #, c-format
 msgid "Restrict command line options"
 msgstr "限制命令行选项"
 
-#: any.pm:411
+#: any.pm:418
 #, c-format
 msgid "restrict"
 msgstr "限制"
 
-#: any.pm:412
+#: any.pm:419
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "没有密码不能使用“限定命令行选项”"
 
-#: any.pm:414
+#: any.pm:421
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "每次启动时清除 /tmp"
 
-#: any.pm:415
+#: any.pm:422
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "精确的内存大小(找到 %d MB)"
 
-#: any.pm:416
+#: any.pm:423
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "以兆为单位给出内存大小"
 
-#: any.pm:425
+#: any.pm:432
 #, c-format
 msgid "Init Message"
 msgstr "初始信息"
 
-#: any.pm:427
+#: any.pm:434
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "开放固件延迟"
 
-#: any.pm:428
+#: any.pm:435
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "核心启动超时"
 
-#: any.pm:429
+#: any.pm:436
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "允许 CD 启动?"
 
-#: any.pm:430
+#: any.pm:437
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "启用 OF 启动?"
 
-#: any.pm:431
+#: any.pm:438
 #, c-format
 msgid "Default OS?"
 msgstr "默认操作系统?"
 
-#: any.pm:498
+#: any.pm:505
 #, c-format
 msgid "Image"
 msgstr "映像"
 
-#: any.pm:499 any.pm:512
+#: any.pm:506 any.pm:519
 #, c-format
 msgid "Root"
 msgstr "根目录"
 
-#: any.pm:500 any.pm:525
+#: any.pm:507 any.pm:532
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:502
+#: any.pm:509
 #, c-format
 msgid "Xen append"
 msgstr "追加 Xen"
 
-#: any.pm:505
+#: any.pm:512
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: any.pm:507
+#: any.pm:514
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:508
+#: any.pm:515
 #, c-format
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:517 any.pm:522 any.pm:524 diskdrake/interactive.pm:376
+#: any.pm:524 any.pm:529 any.pm:531 diskdrake/interactive.pm:376
 #, c-format
 msgid "Label"
 msgstr "标签"
 
-#: any.pm:519 any.pm:527 harddrake/v4l.pm:438
+#: any.pm:526 any.pm:534 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: any.pm:526
+#: any.pm:533
 #, c-format
 msgid "NoVideo"
 msgstr "无视频"
 
-#: any.pm:537
+#: any.pm:544
 #, c-format
 msgid "Empty label not allowed"
 msgstr "标签不能为空"
 
-#: any.pm:538
+#: any.pm:545
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您必须指定一个内核映像"
 
-#: any.pm:538
+#: any.pm:545
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您必须指定根目录所在分区"
 
-#: any.pm:539
+#: any.pm:546
 #, c-format
 msgid "This label is already used"
 msgstr "这个名字已经被使用"
 
-#: any.pm:557
+#: any.pm:564
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "要添加的条目是什么类型?"
 
-#: any.pm:558
+#: any.pm:565
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:558
+#: any.pm:565
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其它操作系统(SunOS...)"
 
-#: any.pm:559
+#: any.pm:566
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其它操作系统(MacOS...)"
 
-#: any.pm:559
+#: any.pm:566
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其它操作系统(Windows...)"
 
-#: any.pm:587
+#: any.pm:594
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -356,183 +356,188 @@ msgstr ""
 "引导菜单中现有下列条目。\n"
 "您可以创建额外的条目或是更改已存在的条目。"
 
-#: any.pm:751
+#: any.pm:758
 #, c-format
 msgid "access to X programs"
 msgstr "允许使用 X 应用程序"
 
-#: any.pm:752
+#: any.pm:759
 #, c-format
 msgid "access to rpm tools"
 msgstr "允许使用 rpm 工具"
 
-#: any.pm:753
+#: any.pm:760
 #, c-format
 msgid "allow \"su\""
 msgstr "允许使用“su”指令"
 
-#: any.pm:754
+#: any.pm:761
 #, c-format
 msgid "access to administrative files"
 msgstr "允许访问系统设置文件"
 
-#: any.pm:755
+#: any.pm:762
 #, c-format
 msgid "access to network tools"
 msgstr "允许使用网络工具"
 
-#: any.pm:756
+#: any.pm:763
 #, c-format
 msgid "access to compilation tools"
 msgstr "允许使用编译工具"
 
-#: any.pm:762
+#: any.pm:769
 #, c-format
 msgid "(already added %s)"
 msgstr "(已经添加了 %s)"
 
-#: any.pm:768
+#: any.pm:775
 #, c-format
 msgid "Please give a user name"
 msgstr "请给出用户名"
 
-#: any.pm:769
+#: any.pm:776
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "用户名只能包含小写字母、数字、“-”和“_”"
 
-#: any.pm:770
+#: any.pm:777
 #, c-format
 msgid "The user name is too long"
 msgstr "该用户名太长"
 
-#: any.pm:771
+#: any.pm:778
 #, c-format
 msgid "This user name has already been added"
 msgstr "该用户名已经存在"
 
-#: any.pm:777 any.pm:803
+#: any.pm:784 any.pm:816
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: any.pm:777 any.pm:804
+#: any.pm:784 any.pm:817
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: any.pm:778
+#: any.pm:785
 #, c-format
 msgid "%s must be a number"
 msgstr "%s 必须是数字"
 
-#: any.pm:779
+#: any.pm:786
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s 应该大于 500。仍然接受吗？"
 
-#: any.pm:783
+#: any.pm:790
 #, c-format
 msgid "User management"
 msgstr "用户管理"
 
-#: any.pm:789 authentication.pm:226
+#: any.pm:796 authentication.pm:226
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "设定管理员(root)密码"
 
-#: any.pm:794
+#: any.pm:801
 #, c-format
 msgid "Enter a user"
 msgstr "输入一个用户"
 
-#: any.pm:795
+#: any.pm:803
+#, c-format
+msgid "Icon"
+msgstr "图标"
+
+#: any.pm:806
 #, c-format
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:798
+#: any.pm:810
 #, c-format
 msgid "Login name"
 msgstr "登录名"
 
-#: any.pm:802
+#: any.pm:815
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:806
+#: any.pm:848
 #, c-format
-msgid "Icon"
-msgstr "图标"
+msgid "Please wait, adding media..."
+msgstr ""
 
-#: any.pm:844 security/l10n.pm:14
+#: any.pm:866 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自动登录"
 
-#: any.pm:845
+#: any.pm:867
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 
-#: any.pm:846
+#: any.pm:868
 #, c-format
 msgid "Use this feature"
 msgstr "使用此特性"
 
-#: any.pm:847
+#: any.pm:869
 #, c-format
 msgid "Choose the default user:"
 msgstr "选择默认的用户:"
 
-#: any.pm:848
+#: any.pm:870
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "选择要运行的窗口管理程序:"
 
-#: any.pm:871 any.pm:920
+#: any.pm:881 any.pm:899 any.pm:957
 #, c-format
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: any.pm:878 any.pm:1217 interactive/gtk.pm:774
+#: any.pm:906 any.pm:1250 interactive/gtk.pm:804
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:914
+#: any.pm:943
 #, c-format
 msgid "License agreement"
 msgstr "许可协议"
 
-#: any.pm:916 diskdrake/dav.pm:26
+#: any.pm:945 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: any.pm:925
+#: any.pm:952
 #, fuzzy, c-format
 msgid "Do you accept this license ?"
 msgstr "您有其它的吗?"
 
-#: any.pm:926
+#: any.pm:953
 #, c-format
 msgid "Accept"
 msgstr "接受"
 
-#: any.pm:926
+#: any.pm:953
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: any.pm:947 any.pm:1012
+#: any.pm:980 any.pm:1045
 #, c-format
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言。"
 
-#: any.pm:976
+#: any.pm:1009
 #, c-format
 msgid ""
 "Mandriva Linux can support multiple languages. Select\n"
@@ -542,77 +547,77 @@ msgstr ""
 "Mandriva Linux 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:979
+#: any.pm:1012
 #, c-format
 msgid "Multi languages"
 msgstr "多语言"
 
-#: any.pm:990 any.pm:1021
+#: any.pm:1023 any.pm:1054
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "使用旧的编码方式(非 UTF-8)"
 
-#: any.pm:992
+#: any.pm:1025
 #, c-format
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:1013
+#: any.pm:1046
 #, c-format
 msgid "Language choice"
 msgstr "语言选择"
 
-#: any.pm:1068
+#: any.pm:1101
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:1069
+#: any.pm:1102
 #, c-format
 msgid "Please choose your country."
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:1071
+#: any.pm:1104
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:1072
+#: any.pm:1105
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:1072 interactive.pm:481
+#: any.pm:1105 interactive.pm:484 interactive/gtk.pm:426
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:1078
+#: any.pm:1111
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:1081
+#: any.pm:1114
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:1162
+#: any.pm:1195
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:1162
+#: any.pm:1195
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:1162
+#: any.pm:1195
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: any.pm:1166
+#: any.pm:1199
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -625,32 +630,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:1178
+#: any.pm:1211
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:1181
+#: any.pm:1214
 #, 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:1189
+#: any.pm:1222
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1217
+#: any.pm:1250
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1219
+#: any.pm:1252
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -659,52 +664,52 @@ msgstr ""
 "按用户设置的共享, 使用组“fileshare”。\n"
 "您可以使用“Drak 用户管理”将用户添加到此组中。"
 
-#: any.pm:1311
+#: any.pm:1344
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "请注销, 然后同时按 Ctrl-Alt-BackSpace"
 
-#: any.pm:1315
+#: any.pm:1348
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: any.pm:1350
+#: any.pm:1383
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: any.pm:1350
+#: any.pm:1383
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: any.pm:1373 any.pm:1375
+#: any.pm:1406 any.pm:1408
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: any.pm:1376
+#: any.pm:1409
 #, c-format
 msgid "What is the best time?"
 msgstr "最适合的时间是几点?"
 
-#: any.pm:1380
+#: any.pm:1413
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (硬件时钟设定为 GMT)"
 
-#: any.pm:1381
+#: any.pm:1414
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (硬件时钟设定为本地时间)"
 
-#: any.pm:1383
+#: any.pm:1416
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: any.pm:1384
+#: any.pm:1417
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
@@ -801,7 +806,7 @@ msgstr "使用 Kerboros 和 LDAP 在活动目录服务器中进行身份验证"
 
 #: authentication.pm:96 authentication.pm:130 authentication.pm:149
 #: authentication.pm:150 authentication.pm:176 authentication.pm:200
-#: authentication.pm:871
+#: authentication.pm:878
 #, c-format
 msgid " "
 msgstr ""
@@ -994,27 +999,27 @@ msgstr "无密码"
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "这个密码太简单了(至少要有 %d 个字符)"
 
-#: authentication.pm:353
+#: authentication.pm:358
 #, c-format
 msgid "Can not use broadcast with no NIS domain"
 msgstr "没有 NIS 域无法广播"
 
-#: authentication.pm:866
+#: authentication.pm:873
 #, c-format
 msgid "Select file"
 msgstr ""
 
-#: authentication.pm:872
+#: authentication.pm:879
 #, fuzzy, c-format
 msgid "Domain Windows for authentication : "
 msgstr "需要域认证"
 
-#: authentication.pm:874
+#: authentication.pm:881
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "域管理员用户名"
 
-#: authentication.pm:875
+#: authentication.pm:882
 #, c-format
 msgid "Domain Admin Password"
 msgstr "域管理员密码"
@@ -1181,13 +1186,13 @@ msgstr "挂载点"
 msgid "Options"
 msgstr "选项"
 
-#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:167 diskdrake/removable.pm:26
+#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:174 diskdrake/removable.pm:26
 #: diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151
 #, c-format
 msgid "Done"
 msgstr "完成"
 
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/hd_gtk.pm:265
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:120 diskdrake/hd_gtk.pm:272
 #: diskdrake/interactive.pm:233 diskdrake/interactive.pm:246
 #: diskdrake/interactive.pm:480 diskdrake/interactive.pm:485
 #: diskdrake/interactive.pm:603 diskdrake/interactive.pm:861
@@ -1228,7 +1233,7 @@ msgstr "挂载点: "
 msgid "Options: %s"
 msgstr "选项: %s"
 
-#: diskdrake/hd_gtk.pm:53 diskdrake/interactive.pm:284
+#: diskdrake/hd_gtk.pm:54 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:211 fs/partitioning_wizard.pm:250
@@ -1237,49 +1242,39 @@ msgstr "选项: %s"
 msgid "Partitioning"
 msgstr "分区"
 
-#: diskdrake/hd_gtk.pm:66
+#: diskdrake/hd_gtk.pm:68
 #, c-format
 msgid "Click on a partition, choose a filesystem type then choose an action"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1010
+#: diskdrake/hd_gtk.pm:102 diskdrake/interactive.pm:1010
 #: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1073
 #, c-format
 msgid "Read carefully!"
 msgstr "请仔细阅读！"
 
-#: diskdrake/hd_gtk.pm:93
+#: diskdrake/hd_gtk.pm:102
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "请事先备份您的数据"
 
-#: diskdrake/hd_gtk.pm:94 diskdrake/interactive.pm:226
+#: diskdrake/hd_gtk.pm:103 diskdrake/interactive.pm:226
 #, c-format
 msgid "Exit"
 msgstr "退出"
 
-#: diskdrake/hd_gtk.pm:94
+#: diskdrake/hd_gtk.pm:103
 #, c-format
 msgid "Continue"
 msgstr "继续"
 
-#: diskdrake/hd_gtk.pm:97
-#, c-format
-msgid ""
-"If you plan to use aboot, be careful to leave a free space (2048 sectors is "
-"enough)\n"
-"at the beginning of the disk"
-msgstr ""
-"如果您计划采用 aboot, 请注意在磁盘的开头位置留下一段自由空间\n"
-"(2048 扇区就足够了)"
-
-#: diskdrake/hd_gtk.pm:163 interactive.pm:644 interactive/gtk.pm:752
-#: interactive/gtk.pm:767 interactive/gtk.pm:787 ugtk2.pm:942 ugtk2.pm:943
+#: diskdrake/hd_gtk.pm:170 interactive.pm:649 interactive/gtk.pm:781
+#: interactive/gtk.pm:797 interactive/gtk.pm:815 ugtk2.pm:933 ugtk2.pm:934
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: diskdrake/hd_gtk.pm:201
+#: diskdrake/hd_gtk.pm:208
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1290,72 +1285,72 @@ msgstr ""
 "我建议您先重新设置这个分区的大小\n"
 "(点中它, 然后按“改变大小”)"
 
-#: diskdrake/hd_gtk.pm:203
+#: diskdrake/hd_gtk.pm:210
 #, c-format
 msgid "Please click on a partition"
 msgstr "请单击一个分区"
 
-#: diskdrake/hd_gtk.pm:217 diskdrake/smbnfs_gtk.pm:63
+#: diskdrake/hd_gtk.pm:224 diskdrake/smbnfs_gtk.pm:63
 #, c-format
 msgid "Details"
 msgstr "细节"
 
-#: diskdrake/hd_gtk.pm:265
+#: diskdrake/hd_gtk.pm:272
 #, c-format
 msgid "No hard drives found"
 msgstr "没有发现硬盘"
 
-#: diskdrake/hd_gtk.pm:292
+#: diskdrake/hd_gtk.pm:299
 #, c-format
 msgid "Unknown"
 msgstr "未知"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "Ext3"
 msgstr "Ext3"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "XFS"
 msgstr "XFS"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "Swap"
 msgstr "交换"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:355 services.pm:158
+#: diskdrake/hd_gtk.pm:362 services.pm:158
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: diskdrake/hd_gtk.pm:355 diskdrake/interactive.pm:1195
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:1195
 #, c-format
 msgid "Empty"
 msgstr "空"
 
-#: diskdrake/hd_gtk.pm:362
+#: diskdrake/hd_gtk.pm:369
 #, c-format
 msgid "Filesystem types:"
 msgstr "文件系统类型: "
 
-#: diskdrake/hd_gtk.pm:383 diskdrake/interactive.pm:289
+#: diskdrake/hd_gtk.pm:390 diskdrake/interactive.pm:289
 #: diskdrake/interactive.pm:361 diskdrake/interactive.pm:510
 #: diskdrake/interactive.pm:694 diskdrake/interactive.pm:752
 #: diskdrake/interactive.pm:841 diskdrake/interactive.pm:883
@@ -1366,22 +1361,22 @@ msgstr "文件系统类型: "
 msgid "Warning"
 msgstr "警告"
 
-#: diskdrake/hd_gtk.pm:383
+#: diskdrake/hd_gtk.pm:390
 #, c-format
 msgid "This partition is already empty"
 msgstr "此分区已经为空"
 
-#: diskdrake/hd_gtk.pm:392
+#: diskdrake/hd_gtk.pm:399
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "请先“Unmount”"
 
-#: diskdrake/hd_gtk.pm:392
+#: diskdrake/hd_gtk.pm:399
 #, c-format
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr "用“%s”代替(在专家模式中)"
 
-#: diskdrake/hd_gtk.pm:392 diskdrake/interactive.pm:374
+#: diskdrake/hd_gtk.pm:399 diskdrake/interactive.pm:374
 #: diskdrake/interactive.pm:548 diskdrake/interactive.pm:1026
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
 #, c-format
@@ -2092,10 +2087,10 @@ msgstr "加密算法"
 msgid "Change type"
 msgstr "更改类型"
 
-#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:126 interactive.pm:543
+#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:129 interactive.pm:546
 #: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:411 ugtk2.pm:513
-#: ugtk2.pm:522 ugtk2.pm:807
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:415 ugtk2.pm:517
+#: ugtk2.pm:526 ugtk2.pm:813
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -2524,8 +2519,8 @@ msgstr ""
 "一切就绪后, 请按“%s”。"
 
 #. -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:515
+#: fs/partitioning_wizard.pm:165 interactive.pm:545 interactive/curses.pm:263
+#: ugtk2.pm:519
 #, c-format
 msgid "Next"
 msgstr "下一步"
@@ -2604,12 +2599,12 @@ msgstr ""
 msgid "I can not find any room for installing"
 msgstr "我无法找到安装需要的空间"
 
-#: fs/partitioning_wizard.pm:273
+#: fs/partitioning_wizard.pm:278
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX 分区向导找到下列解决办法:"
 
-#: fs/partitioning_wizard.pm:284
+#: fs/partitioning_wizard.pm:287
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "分区失败: %s"
@@ -3239,55 +3234,55 @@ msgstr "卡的型号: "
 msgid "Tuner type:"
 msgstr "调谐器类型: "
 
-#: interactive.pm:125 interactive.pm:542 interactive/curses.pm:263
+#: interactive.pm:128 interactive.pm:545 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:417 ugtk2.pm:515
-#: ugtk2.pm:807 ugtk2.pm:830
+#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:421 ugtk2.pm:519
+#: ugtk2.pm:813 ugtk2.pm:836
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:806 wizards.pm:156
+#: interactive.pm:227 modules/interactive.pm:71 ugtk2.pm:812 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:806 wizards.pm:156
+#: interactive.pm:227 modules/interactive.pm:71 ugtk2.pm:812 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: interactive.pm:258
+#: interactive.pm:261
 #, c-format
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: interactive.pm:383 interactive/gtk.pm:428
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: interactive.pm:383 interactive/gtk.pm:428
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Modify"
 msgstr "修改"
 
-#: interactive.pm:383 interactive/gtk.pm:428
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:515
+#: interactive.pm:545 interactive/curses.pm:263 ugtk2.pm:519
 #, c-format
 msgid "Finish"
 msgstr "完成"
 
-#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:513
+#: interactive.pm:546 interactive/curses.pm:260 ugtk2.pm:517
 #, c-format
 msgid "Previous"
 msgstr "上一步"
 
-#: interactive/gtk.pm:556
+#: interactive/gtk.pm:564
 #, c-format
 msgid "Beware, Caps Lock is enabled"
 msgstr "注意，Caps Lock 已开启"
@@ -4564,7 +4559,7 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: lang.pm:1201
+#: lang.pm:1208
 #, c-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
@@ -5801,32 +5796,37 @@ msgstr "安全"
 msgid "DrakSec Basic Options"
 msgstr "“Drak 安全管理”基本选项"
 
-#: security/level.pm:56
+#: security/level.pm:58
 #, c-format
 msgid "Please choose the desired security level"
 msgstr "请选择期望的安全级别"
 
 #: security/level.pm:60
 #, c-format
-msgid "Security level"
-msgstr "安全级别"
+msgid "%s: %s"
+msgstr ""
 
-#: security/level.pm:62
+#: security/level.pm:63
 #, c-format
 msgid "Use libsafe for servers"
 msgstr "服务器使用 libsafe"
 
-#: security/level.pm:63
+#: security/level.pm:64
 #, c-format
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
 msgstr "防止缓冲溢出和串格式攻击的库。"
 
-#: security/level.pm:64
-#, c-format
-msgid "Security Administrator (login or email)"
+#: security/level.pm:65
+#, fuzzy, c-format
+msgid "Security Administrator:"
 msgstr "安全管理员(登录或 email)"
 
+#: security/level.pm:66
+#, c-format
+msgid "Login or email:"
+msgstr ""
+
 #: services.pm:19
 #, c-format
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
@@ -6252,7 +6252,7 @@ msgid ""
 "about this service, sorry."
 msgstr "没有该服务的附加信息。"
 
-#: services.pm:221 ugtk2.pm:917
+#: services.pm:221 ugtk2.pm:923
 #, c-format
 msgid "Info"
 msgstr "信息"
@@ -6576,51 +6576,36 @@ msgstr "俄联邦"
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
-#: ugtk2.pm:807
+#: ugtk2.pm:813
 #, c-format
 msgid "Is this correct?"
 msgstr "这样正确吗?"
 
-#: ugtk2.pm:867
+#: ugtk2.pm:873
 #, c-format
 msgid "No file chosen"
 msgstr "未选择文件"
 
-#: ugtk2.pm:869
+#: ugtk2.pm:875
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr "您选择了文件，而非目录"
 
-#: ugtk2.pm:871
+#: ugtk2.pm:877
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr "您选择了目录，而非文件"
 
-#: ugtk2.pm:873
+#: ugtk2.pm:879
 #, c-format
 msgid "No such directory"
 msgstr "无此目录"
 
-#: ugtk2.pm:873
+#: ugtk2.pm:879
 #, c-format
 msgid "No such file"
 msgstr "非本地文件"
 
-#: ugtk2.pm:952
-#, c-format
-msgid "Expand Tree"
-msgstr "展开树"
-
-#: ugtk2.pm:953
-#, c-format
-msgid "Collapse Tree"
-msgstr "折叠树"
-
-#: ugtk2.pm:954
-#, c-format
-msgid "Toggle between flat and group sorted"
-msgstr "切换清单显示/分组排序"
-
 #: wizards.pm:95
 #, c-format
 msgid ""
@@ -6635,6 +6620,26 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid ""
+#~ "If you plan to use aboot, be careful to leave a free space (2048 sectors "
+#~ "is enough)\n"
+#~ "at the beginning of the disk"
+#~ msgstr ""
+#~ "如果您计划采用 aboot, 请注意在磁盘的开头位置留下一段自由空间\n"
+#~ "(2048 扇区就足够了)"
+
+#~ msgid "Security level"
+#~ msgstr "安全级别"
+
+#~ msgid "Expand Tree"
+#~ msgstr "展开树"
+
+#~ msgid "Collapse Tree"
+#~ msgstr "折叠树"
+
+#~ msgid "Toggle between flat and group sorted"
+#~ msgstr "切换清单显示/分组排序"
+
 #~ msgid "Choose action"
 #~ msgstr "选择操作"