sync with code

1 files changed, 167 insertions, 164 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 6afad2607..e9ac33e63 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: 2012-07-29 11:51+0300\n"
+"POT-Creation-Date: 2012-09-14 13:51+0200\n"
 "PO-Revision-Date: 2009-04-09 11:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -16,21 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: any.pm:262 any.pm:972 diskdrake/interactive.pm:645
+#: any.pm:261 any.pm:971 diskdrake/interactive.pm:645
 #: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931
 #: diskdrake/interactive.pm:1036 diskdrake/interactive.pm:1266
-#: diskdrake/interactive.pm:1324 do_pkgs.pm:241 do_pkgs.pm:286
+#: diskdrake/interactive.pm:1324 do_pkgs.pm:242 do_pkgs.pm:287
 #: harddrake/sound.pm:270 interactive.pm:587 pkgs.pm:285
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: any.pm:262
+#: any.pm:261
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "启动引导程序安装中"
 
-#: any.pm:273
+#: any.pm:272
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -46,12 +46,12 @@ msgstr ""
 "\n"
 "要指定新卷 ID 吗?"
 
-#: any.pm:284
+#: any.pm:283
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "安装系统引导程序失败。出现下列错误:"
 
-#: any.pm:290
+#: any.pm:289
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -67,7 +67,7 @@ msgstr ""
 " 然后输入: shut-down\n"
 "您将在下次开机时看到引导程序提示。"
 
-#: any.pm:330
+#: any.pm:329
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -82,268 +82,268 @@ msgstr ""
 "\n"
 "您要用哪个硬盘启动?"
 
-#: any.pm:341
+#: any.pm:340
 #, c-format
 msgid "Bootloader Installation"
 msgstr "引导程序安装"
 
-#: any.pm:345
+#: any.pm:344
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "您希望启动引导程序安装到哪里?"
 
-#: any.pm:369
+#: any.pm:368
 #, c-format
 msgid "First sector (MBR) of drive %s"
 msgstr "驱动器 %s 的第一扇区(MBR)"
 
-#: any.pm:371
+#: any.pm:370
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "驱动器的第一扇区(MBR)"
 
-#: any.pm:373
+#: any.pm:372
 #, c-format
 msgid "First sector of the root partition"
 msgstr "根分区的第一扇区"
 
-#: any.pm:375
+#: any.pm:374
 #, c-format
 msgid "On Floppy"
 msgstr "在软盘上"
 
-#: any.pm:377 pkgs.pm:281 ugtk2.pm:526
+#: any.pm:376 pkgs.pm:281 ugtk2.pm:526
 #, c-format
 msgid "Skip"
 msgstr "跳过"
 
-#: any.pm:412
+#: any.pm:411
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: any.pm:428 any.pm:461 any.pm:462
+#: any.pm:427 any.pm:460 any.pm:461
 #, c-format
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
-#: any.pm:432
+#: any.pm:431
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: any.pm:433 any.pm:465
+#: any.pm:432 any.pm:464
 #, c-format
 msgid "Bootloader to use"
 msgstr "要使用的引导程序"
 
-#: any.pm:436 any.pm:468
+#: any.pm:435 any.pm:467
 #, c-format
 msgid "Boot device"
 msgstr "启动设备"
 
-#: any.pm:439
+#: any.pm:438
 #, c-format
 msgid "Main options"
 msgstr "主选项"
 
-#: any.pm:440
+#: any.pm:439
 #, c-format
 msgid "Delay before booting default image"
 msgstr "启动默认映像前的延迟"
 
-#: any.pm:441
+#: any.pm:440
 #, c-format
 msgid "Enable ACPI"
 msgstr "启用 ACPI"
 
-#: any.pm:442
+#: any.pm:441
 #, c-format
 msgid "Enable SMP"
 msgstr "启用 SMP"
 
-#: any.pm:443
+#: any.pm:442
 #, c-format
 msgid "Enable APIC"
 msgstr "启用 APIC"
 
-#: any.pm:445
+#: any.pm:444
 #, c-format
 msgid "Enable Local APIC"
 msgstr "启用本地 APIC"
 
-#: any.pm:446 security/level.pm:63
+#: any.pm:445 security/level.pm:63
 #, c-format
 msgid "Security"
 msgstr "安全"
 
-#: any.pm:447 any.pm:907 any.pm:926 authentication.pm:249
+#: any.pm:446 any.pm:906 any.pm:925 authentication.pm:249
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "密码"
 
-#: any.pm:450 authentication.pm:260
+#: any.pm:449 authentication.pm:260
 #, c-format
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:450 authentication.pm:260 diskdrake/interactive.pm:1499
+#: any.pm:449 authentication.pm:260 diskdrake/interactive.pm:1499
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
 
-#: any.pm:452
+#: any.pm:451
 #, c-format
 msgid "You cannot use a password with %s"
 msgstr "您在 %s 时不能使用密码"
 
-#: any.pm:456 any.pm:910 any.pm:928 authentication.pm:250
+#: any.pm:455 any.pm:909 any.pm:927 authentication.pm:250
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: any.pm:457
+#: any.pm:456
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "每次启动时清除 /tmp"
 
-#: any.pm:467
+#: any.pm:466
 #, c-format
 msgid "Init Message"
 msgstr "初始信息"
 
-#: any.pm:469
+#: any.pm:468
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "开放固件延迟"
 
-#: any.pm:470
+#: any.pm:469
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "核心启动超时"
 
-#: any.pm:471
+#: any.pm:470
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "允许 CD 启动?"
 
-#: any.pm:472
+#: any.pm:471
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "启用 OF 启动?"
 
-#: any.pm:473
+#: any.pm:472
 #, c-format
 msgid "Default OS?"
 msgstr "默认操作系统?"
 
-#: any.pm:547
+#: any.pm:546
 #, c-format
 msgid "Image"
 msgstr "映像"
 
-#: any.pm:548 any.pm:562
+#: any.pm:547 any.pm:561
 #, c-format
 msgid "Root"
 msgstr "根目录"
 
-#: any.pm:549 any.pm:575
+#: any.pm:548 any.pm:574
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:551
+#: any.pm:550
 #, c-format
 msgid "Xen append"
 msgstr "追加 Xen"
 
-#: any.pm:553
+#: any.pm:552
 #, c-format
 msgid "Requires password to boot"
 msgstr ""
 
-#: any.pm:555
+#: any.pm:554
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: any.pm:557
+#: any.pm:556
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:558
+#: any.pm:557
 #, c-format
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:567 any.pm:572 any.pm:574 diskdrake/interactive.pm:411
+#: any.pm:566 any.pm:571 any.pm:573 diskdrake/interactive.pm:411
 #, c-format
 msgid "Label"
 msgstr "标签"
 
-#: any.pm:569 any.pm:577 harddrake/v4l.pm:438
+#: any.pm:568 any.pm:576 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: any.pm:576
+#: any.pm:575
 #, c-format
 msgid "NoVideo"
 msgstr "无视频"
 
-#: any.pm:587
+#: any.pm:586
 #, c-format
 msgid "Empty label not allowed"
 msgstr "标签不能为空"
 
-#: any.pm:588
+#: any.pm:587
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您必须指定一个内核映像"
 
-#: any.pm:588
+#: any.pm:587
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您必须指定根目录所在分区"
 
-#: any.pm:589
+#: any.pm:588
 #, c-format
 msgid "This label is already used"
 msgstr "这个名字已经被使用"
 
-#: any.pm:607
+#: any.pm:606
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "要添加的条目是什么类型?"
 
-#: any.pm:608
+#: any.pm:607
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:608
+#: any.pm:607
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其它操作系统(SunOS...)"
 
-#: any.pm:609
+#: any.pm:608
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其它操作系统(MacOS...)"
 
-#: any.pm:609
+#: any.pm:608
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其它操作系统(Windows...)"
 
-#: any.pm:656
+#: any.pm:655
 #, c-format
 msgid "Bootloader Configuration"
 msgstr "引导程序配置"
 
-#: any.pm:657
+#: any.pm:656
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -352,194 +352,194 @@ msgstr ""
 "引导菜单中现有下列条目。\n"
 "您可以创建额外的条目或是更改已存在的条目。"
 
-#: any.pm:868
+#: any.pm:867
 #, c-format
 msgid "access to X programs"
 msgstr "允许使用 X 应用程序"
 
-#: any.pm:869
+#: any.pm:868
 #, c-format
 msgid "access to rpm tools"
 msgstr "允许使用 rpm 工具"
 
-#: any.pm:870
+#: any.pm:869
 #, c-format
 msgid "allow \"su\""
 msgstr "允许使用“su”指令"
 
-#: any.pm:871
+#: any.pm:870
 #, c-format
 msgid "access to administrative files"
 msgstr "允许访问系统设置文件"
 
-#: any.pm:872
+#: any.pm:871
 #, c-format
 msgid "access to network tools"
 msgstr "允许使用网络工具"
 
-#: any.pm:873
+#: any.pm:872
 #, c-format
 msgid "access to compilation tools"
 msgstr "允许使用编译工具"
 
-#: any.pm:879
+#: any.pm:878
 #, c-format
 msgid "(already added %s)"
 msgstr "(已经添加了 %s)"
 
-#: any.pm:885
+#: any.pm:884
 #, c-format
 msgid "Please give a user name"
 msgstr "请给出用户名"
 
-#: any.pm:886
+#: any.pm:885
 #, c-format
 msgid ""
 "The user name must start with a lower case letter followed by only lower "
 "cased letters, numbers, `-' and `_'"
 msgstr "用户名只能包含小写字母、数字、“-”和“_”"
 
-#: any.pm:887
+#: any.pm:886
 #, c-format
 msgid "The user name is too long"
 msgstr "该用户名太长"
 
-#: any.pm:888
+#: any.pm:887
 #, c-format
 msgid "This user name has already been added"
 msgstr "该用户名已经存在"
 
-#: any.pm:894 any.pm:930
+#: any.pm:893 any.pm:929
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: any.pm:894 any.pm:931
+#: any.pm:893 any.pm:930
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: any.pm:895
+#: any.pm:894
 #, c-format
 msgid "%s must be a number"
 msgstr "%s 必须是数字"
 
-#: any.pm:896
+#: any.pm:895
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s 应该大于 500。仍然接受吗？"
 
-#: any.pm:900
+#: any.pm:899
 #, c-format
 msgid "User management"
 msgstr "用户管理"
 
-#: any.pm:905
+#: any.pm:904
 #, c-format
 msgid "Enable guest account"
 msgstr ""
 
-#: any.pm:906 authentication.pm:236
+#: any.pm:905 authentication.pm:236
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "设定管理员(root)密码"
 
-#: any.pm:912
+#: any.pm:911
 #, c-format
 msgid "Enter a user"
 msgstr "输入一个用户"
 
-#: any.pm:914
+#: any.pm:913
 #, c-format
 msgid "Icon"
 msgstr "图标"
 
-#: any.pm:917
+#: any.pm:916
 #, c-format
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:924
+#: any.pm:923
 #, c-format
 msgid "Login name"
 msgstr "登录名"
 
-#: any.pm:929
+#: any.pm:928
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:972
+#: any.pm:971
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: any.pm:1004 security/l10n.pm:14
+#: any.pm:1003 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自动登录"
 
-#: any.pm:1005
+#: any.pm:1004
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 
-#: any.pm:1006
+#: any.pm:1005
 #, c-format
 msgid "Use this feature"
 msgstr "使用此特性"
 
-#: any.pm:1007
+#: any.pm:1006
 #, c-format
 msgid "Choose the default user:"
 msgstr "选择默认的用户:"
 
-#: any.pm:1008
+#: any.pm:1007
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "选择要运行的窗口管理程序:"
 
-#: any.pm:1019 any.pm:1039 any.pm:1107
+#: any.pm:1018 any.pm:1038 any.pm:1106
 #, c-format
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: any.pm:1046 any.pm:1395 interactive/gtk.pm:817
+#: any.pm:1045 any.pm:1394 interactive/gtk.pm:817
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:1093
+#: any.pm:1092
 #, c-format
 msgid "License agreement"
 msgstr "许可协议"
 
-#: any.pm:1095 diskdrake/dav.pm:26
+#: any.pm:1094 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: any.pm:1102
+#: any.pm:1101
 #, c-format
 msgid "Do you accept this license ?"
 msgstr "您接受此许可协议吗?"
 
-#: any.pm:1103
+#: any.pm:1102
 #, c-format
 msgid "Accept"
 msgstr "接受"
 
-#: any.pm:1103
+#: any.pm:1102
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: any.pm:1129 any.pm:1191
+#: any.pm:1128 any.pm:1190
 #, c-format
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言。"
 
-#: any.pm:1157
+#: any.pm:1156
 #, fuzzy, c-format
 msgid ""
 "%s can support multiple languages. Select\n"
@@ -549,82 +549,82 @@ msgstr ""
 "Mageia 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:1159 fs/partitioning_wizard.pm:174
+#: any.pm:1158 fs/partitioning_wizard.pm:174
 #, c-format
 msgid "Mageia"
 msgstr ""
 
-#: any.pm:1160
+#: any.pm:1159
 #, fuzzy, c-format
 msgid "Multiple languages"
 msgstr "多语言"
 
-#: any.pm:1169 any.pm:1200
+#: any.pm:1168 any.pm:1199
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "使用旧的编码方式(非 UTF-8)"
 
-#: any.pm:1170
+#: any.pm:1169
 #, c-format
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:1192
+#: any.pm:1191
 #, c-format
 msgid "Language choice"
 msgstr "语言选择"
 
-#: any.pm:1246
+#: any.pm:1245
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:1247
+#: any.pm:1246
 #, c-format
 msgid "Please choose your country"
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:1249
+#: any.pm:1248
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:1250
+#: any.pm:1249
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:1250 interactive.pm:488 interactive/gtk.pm:445
+#: any.pm:1249 interactive.pm:488 interactive/gtk.pm:445
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:1256
+#: any.pm:1255
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:1259
+#: any.pm:1258
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:1340
+#: any.pm:1339
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:1340
+#: any.pm:1339
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:1340
+#: any.pm:1339
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: any.pm:1344
+#: any.pm:1343
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -637,32 +637,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:1356
+#: any.pm:1355
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:1359
+#: any.pm:1358
 #, 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:1367
+#: any.pm:1366
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1395
+#: any.pm:1394
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1397
+#: any.pm:1396
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -671,54 +671,54 @@ msgstr ""
 "按用户设置的共享, 使用组“fileshare”。\n"
 "您可以使用“Drak 用户管理”将用户添加到此组中。"
 
-#: any.pm:1504
+#: any.pm:1503
 #, c-format
 msgid ""
 "You need to logout and back in again for changes to take effect. Press OK to "
 "logout now."
 msgstr "您需要注销后重新登录才能让更改生效。单击确定立即注销。"
 
-#: any.pm:1508
+#: any.pm:1507
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: any.pm:1543
+#: any.pm:1542
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: any.pm:1543
+#: any.pm:1542
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: any.pm:1566 any.pm:1568
+#: any.pm:1565 any.pm:1567
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: any.pm:1569
+#: any.pm:1568
 #, c-format
 msgid "What is the best time?"
 msgstr "最适合的时间是几点?"
 
-#: any.pm:1573
+#: any.pm:1572
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (硬件时钟设定为 GMT)"
 
-#: any.pm:1574
+#: any.pm:1573
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (硬件时钟设定为本地时间)"
 
-#: any.pm:1576
+#: any.pm:1575
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: any.pm:1577
+#: any.pm:1576
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
@@ -1044,7 +1044,7 @@ msgid "Domain Admin Password"
 msgstr "域管理员密码"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:978
+#: bootloader.pm:991
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1059,56 +1059,56 @@ msgstr ""
 "wait for default boot.\n"
 "\n"
 
-#: bootloader.pm:1156
+#: bootloader.pm:1169
 #, c-format
 msgid "LILO with text menu"
 msgstr "文本菜单 LILO"
 
-#: bootloader.pm:1157
+#: bootloader.pm:1170
 #, c-format
 msgid "GRUB with graphical menu"
 msgstr "图形菜单 GRUB"
 
-#: bootloader.pm:1158
+#: bootloader.pm:1171
 #, c-format
 msgid "GRUB with text menu"
 msgstr "文本菜单 GRUB"
 
-#: bootloader.pm:1159
+#: bootloader.pm:1172
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1160
+#: bootloader.pm:1173
 #, c-format
 msgid "SILO"
 msgstr "SILO"
 
-#: bootloader.pm:1244
+#: bootloader.pm:1257
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 中没有足够空间"
 
-#: bootloader.pm:1970
+#: bootloader.pm:1983
 #, c-format
 msgid "You cannot install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:2091
+#: bootloader.pm:2104
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:2104
+#: bootloader.pm:2117
 #, c-format
 msgid ""
 "The bootloader cannot be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:2105
+#: bootloader.pm:2118
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
@@ -1224,7 +1224,7 @@ msgstr "完成"
 #: diskdrake/interactive.pm:1054 diskdrake/interactive.pm:1209
 #: diskdrake/interactive.pm:1222 diskdrake/interactive.pm:1225
 #: diskdrake/interactive.pm:1499 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23
-#: do_pkgs.pm:28 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:82
+#: do_pkgs.pm:28 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:83
 #: fsedit.pm:246 interactive/http.pm:117 interactive/http.pm:118
 #: modules/interactive.pm:19 scanner.pm:95 scanner.pm:106 scanner.pm:113
 #: scanner.pm:120 wizards.pm:96 wizards.pm:100 wizards.pm:122
@@ -1248,7 +1248,7 @@ msgstr "URL 应该是以 http:// 或 https:// 开头"
 #: diskdrake/interactive.pm:1034 diskdrake/interactive.pm:1076
 #: diskdrake/interactive.pm:1077 diskdrake/interactive.pm:1309
 #: diskdrake/interactive.pm:1347 diskdrake/interactive.pm:1498 do_pkgs.pm:19
-#: do_pkgs.pm:39 do_pkgs.pm:57 do_pkgs.pm:77 harddrake/sound.pm:399
+#: do_pkgs.pm:39 do_pkgs.pm:57 do_pkgs.pm:78 harddrake/sound.pm:399
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -2279,7 +2279,7 @@ msgstr "搜索新服务器"
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "需要安装软件包 %s。您同意安装吗?"
 
-#: do_pkgs.pm:23 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:82
+#: do_pkgs.pm:23 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:83
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "无法安装 %s 软件包!"
@@ -2289,17 +2289,17 @@ msgstr "无法安装 %s 软件包!"
 msgid "Mandatory package %s is missing"
 msgstr "无法找到必需的软件包 %s"
 
-#: do_pkgs.pm:39 do_pkgs.pm:77
+#: do_pkgs.pm:39 do_pkgs.pm:78
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "下列软件包需要安装: \n"
 
-#: do_pkgs.pm:241
+#: do_pkgs.pm:242
 #, c-format
 msgid "Installing packages..."
 msgstr "正在安装软件包..."
 
-#: do_pkgs.pm:286 pkgs.pm:285
+#: do_pkgs.pm:287 pkgs.pm:285
 #, c-format
 msgid "Removing packages..."
 msgstr "正在删除软件包..."
@@ -4711,7 +4711,7 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: lang.pm:1227
+#: lang.pm:1191
 #, c-format
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
@@ -4737,7 +4737,7 @@ msgid "The bootloader can't handle /boot on multiple physical volumes"
 msgstr "引导程序无法识别多个物理卷上的 /boot"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:11
+#: messages.pm:12
 #, c-format
 msgid ""
 "Introduction\n"
@@ -4750,8 +4750,7 @@ msgid ""
 "to the operating \n"
 "system and the different components of the Mageia distribution, and any "
 "applications \n"
-"distributed with these products provided by Mageia's licensors or "
-"suppliers."
+"distributed with these products provided by Mageia's licensors or suppliers."
 msgstr ""
 "简介\n"
 "\n"
@@ -4759,7 +4758,8 @@ msgstr ""
 "但不限于 Mageia 许可商或供应商提供的与 Mageia 发行版的操作系统和各个部分有关"
 "的程序、方法、规则和文档。"
 
-
+#: messages.pm:21
+#, c-format
 msgid ""
 "1. License Agreement\n"
 "\n"
@@ -4790,7 +4790,8 @@ msgstr ""
 "法的, 并将导致本许可协议赋予您的各种权利立即作废, 根据许可协议的条款, 您将必"
 "须立即销毁本软件产品的任何副本。"
 
-
+#: messages.pm:35
+#, c-format
 msgid ""
 "2. Limited Warranty\n"
 "\n"
@@ -4850,7 +4851,8 @@ msgstr ""
 "费用和处罚或其他因此产生的损失)将不承担责任。这种有限责任适用但不限于本软件产"
 "品所包括的强大数据加密组件。"
 
-
+#: messages.pm:61
+#, c-format
 msgid ""
 "3. The GPL License and Related Licenses\n"
 "\n"
@@ -4871,13 +4873,14 @@ msgid ""
 msgstr ""
 "3. GPL 许可协议和其它有关协议\n"
 "\n"
-"本软件产品由不同个人或组织所创作的各部分组成。这些许可协议大多允许您使用、"
-"复制、修改或重新发表协议所覆盖的部分。使用这些软件之前, 请仔细阅读有关许可协"
-"议的条款和条件。如果对任何部分的许可协议有疑问, 应该与该部分的作者联系, "
-"Mageia 无法解答这些问题。由 Mageia 开发的各个程序受 GPL 许可协议保护。由 "
-"Mageia 创作的文档采用一个特别的许可协议。详情见有关的文档。"
-
+"本软件产品由不同个人或组织所创作的各部分组成。这些许可协议大多允许您使用、复"
+"制、修改或重新发表协议所覆盖的部分。使用这些软件之前, 请仔细阅读有关许可协议"
+"的条款和条件。如果对任何部分的许可协议有疑问, 应该与该部分的作者联系, Mageia "
+"无法解答这些问题。由 Mageia 开发的各个程序受 GPL 许可协议保护。由 Mageia 创作"
+"的文档采用一个特别的许可协议。详情见有关的文档。"
 
+#: messages.pm:73
+#, c-format
 msgid ""
 "4. Intellectual Property Rights\n"
 "\n"
@@ -4897,7 +4900,8 @@ msgstr ""
 "的权利, 不论采用任何方法, 不论出于任何目的。\n"
 "“Mageia”, “Mageia”和相关的标志是 Mageia 的商标。"
 
-
+#: messages.pm:82
+#, c-format
 msgid ""
 "5. Governing Laws \n"
 "\n"
@@ -4921,8 +4925,7 @@ msgstr ""
 "辖。有关本协议的任何争议最好在法庭外解决。作为最后的手段, 争议将被提交法国巴"
 "黎适当的法院审理。对本文档有任何疑问, 请联系 Mageia。"
 
-
-#: messages.pm:93
+#: messages.pm:95
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4939,7 +4942,7 @@ msgstr ""
 "地的法律。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:102
+#: messages.pm:104
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"