sync with code

1 files changed, 254 insertions, 195 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index e71be2e9f..71f85e474 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-12-14 15:17+0100\n"
+"POT-Creation-Date: 2013-04-06 03:21+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,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: any.pm:261 any.pm:971 diskdrake/interactive.pm:645
+#: any.pm:255 any.pm:964 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:242 do_pkgs.pm:287
@@ -25,12 +25,12 @@ msgstr ""
 msgid "Please wait"
 msgstr "请稍候"
 
-#: any.pm:261
+#: any.pm:255
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "启动引导程序安装中"
 
-#: any.pm:272
+#: any.pm:266
 #, 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:283
+#: any.pm:277
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "安装系统引导程序失败。出现下列错误:"
 
-#: any.pm:289
+#: any.pm:283
 #, 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:329
+#: any.pm:323
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -82,268 +82,268 @@ msgstr ""
 "\n"
 "您要用哪个硬盘启动?"
 
-#: any.pm:340
+#: any.pm:334
 #, c-format
 msgid "Bootloader Installation"
 msgstr "引导程序安装"
 
-#: any.pm:344
+#: any.pm:338
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "您希望启动引导程序安装到哪里?"
 
-#: any.pm:368
+#: any.pm:362
 #, c-format
 msgid "First sector (MBR) of drive %s"
 msgstr "驱动器 %s 的第一扇区(MBR)"
 
-#: any.pm:370
+#: any.pm:364
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "驱动器的第一扇区(MBR)"
 
-#: any.pm:372
+#: any.pm:366
 #, c-format
 msgid "First sector of the root partition"
 msgstr "根分区的第一扇区"
 
-#: any.pm:374
+#: any.pm:368
 #, c-format
 msgid "On Floppy"
 msgstr "在软盘上"
 
-#: any.pm:376 pkgs.pm:283 ugtk2.pm:526
+#: any.pm:370 pkgs.pm:283 ugtk2.pm:526
 #, c-format
 msgid "Skip"
 msgstr "跳过"
 
-#: any.pm:411
+#: any.pm:405
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "启动风格配置"
 
-#: any.pm:427 any.pm:460 any.pm:461
+#: any.pm:420 any.pm:453 any.pm:454
 #, c-format
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
-#: any.pm:431
+#: any.pm:424
 #, c-format
 msgid "Bootloader"
 msgstr "引导程序"
 
-#: any.pm:432 any.pm:464
+#: any.pm:425 any.pm:457
 #, c-format
 msgid "Bootloader to use"
 msgstr "要使用的引导程序"
 
-#: any.pm:435 any.pm:467
+#: any.pm:428 any.pm:460
 #, c-format
 msgid "Boot device"
 msgstr "启动设备"
 
-#: any.pm:438
+#: any.pm:431
 #, c-format
 msgid "Main options"
 msgstr "主选项"
 
-#: any.pm:439
+#: any.pm:432
 #, c-format
 msgid "Delay before booting default image"
 msgstr "启动默认映像前的延迟"
 
-#: any.pm:440
+#: any.pm:433
 #, c-format
 msgid "Enable ACPI"
 msgstr "启用 ACPI"
 
-#: any.pm:441
+#: any.pm:434
 #, c-format
 msgid "Enable SMP"
 msgstr "启用 SMP"
 
-#: any.pm:442
+#: any.pm:435
 #, c-format
 msgid "Enable APIC"
 msgstr "启用 APIC"
 
-#: any.pm:444
+#: any.pm:437
 #, c-format
 msgid "Enable Local APIC"
 msgstr "启用本地 APIC"
 
-#: any.pm:445 security/level.pm:63
+#: any.pm:438 security/level.pm:63
 #, c-format
 msgid "Security"
 msgstr "安全"
 
-#: any.pm:446 any.pm:906 any.pm:925 authentication.pm:249
+#: any.pm:439 any.pm:899 any.pm:918 authentication.pm:249
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "密码"
 
-#: any.pm:449 authentication.pm:260
+#: any.pm:442 authentication.pm:260
 #, c-format
 msgid "The passwords do not match"
 msgstr "两次密码不符"
 
-#: any.pm:449 authentication.pm:260 diskdrake/interactive.pm:1499
+#: any.pm:442 authentication.pm:260 diskdrake/interactive.pm:1499
 #, c-format
 msgid "Please try again"
 msgstr "请再试一次"
 
-#: any.pm:451
+#: any.pm:444
 #, c-format
 msgid "You cannot use a password with %s"
 msgstr "您在 %s 时不能使用密码"
 
-#: any.pm:455 any.pm:909 any.pm:927 authentication.pm:250
+#: any.pm:448 any.pm:902 any.pm:920 authentication.pm:250
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: any.pm:456
+#: any.pm:449
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "每次启动时清除 /tmp"
 
-#: any.pm:466
+#: any.pm:459
 #, c-format
 msgid "Init Message"
 msgstr "初始信息"
 
-#: any.pm:468
+#: any.pm:461
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "开放固件延迟"
 
-#: any.pm:469
+#: any.pm:462
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "核心启动超时"
 
-#: any.pm:470
+#: any.pm:463
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "允许 CD 启动?"
 
-#: any.pm:471
+#: any.pm:464
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "启用 OF 启动?"
 
-#: any.pm:472
+#: any.pm:465
 #, c-format
 msgid "Default OS?"
 msgstr "默认操作系统?"
 
-#: any.pm:546
+#: any.pm:539
 #, c-format
 msgid "Image"
 msgstr "映像"
 
-#: any.pm:547 any.pm:561
+#: any.pm:540 any.pm:554
 #, c-format
 msgid "Root"
 msgstr "根目录"
 
-#: any.pm:548 any.pm:574
+#: any.pm:541 any.pm:567
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:550
+#: any.pm:543
 #, c-format
 msgid "Xen append"
 msgstr "追加 Xen"
 
-#: any.pm:552
+#: any.pm:545
 #, c-format
 msgid "Requires password to boot"
 msgstr ""
 
-#: any.pm:554
+#: any.pm:547
 #, c-format
 msgid "Video mode"
 msgstr "显示模式"
 
-#: any.pm:556
+#: any.pm:549
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:557
+#: any.pm:550
 #, c-format
 msgid "Network profile"
 msgstr "网络配置文件"
 
-#: any.pm:566 any.pm:571 any.pm:573 diskdrake/interactive.pm:411
+#: any.pm:559 any.pm:564 any.pm:566 diskdrake/interactive.pm:411
 #, c-format
 msgid "Label"
 msgstr "标签"
 
-#: any.pm:568 any.pm:576 harddrake/v4l.pm:438
+#: any.pm:561 any.pm:569 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: any.pm:575
+#: any.pm:568
 #, c-format
 msgid "NoVideo"
 msgstr "无视频"
 
-#: any.pm:586
+#: any.pm:579
 #, c-format
 msgid "Empty label not allowed"
 msgstr "标签不能为空"
 
-#: any.pm:587
+#: any.pm:580
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "您必须指定一个内核映像"
 
-#: any.pm:587
+#: any.pm:580
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您必须指定根目录所在分区"
 
-#: any.pm:588
+#: any.pm:581
 #, c-format
 msgid "This label is already used"
 msgstr "这个名字已经被使用"
 
-#: any.pm:606
+#: any.pm:599
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "要添加的条目是什么类型?"
 
-#: any.pm:607
+#: any.pm:600
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:607
+#: any.pm:600
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其它操作系统(SunOS...)"
 
-#: any.pm:608
+#: any.pm:601
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其它操作系统(MacOS...)"
 
-#: any.pm:608
+#: any.pm:601
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其它操作系统(Windows...)"
 
-#: any.pm:655
+#: any.pm:648
 #, c-format
 msgid "Bootloader Configuration"
 msgstr "引导程序配置"
 
-#: any.pm:656
+#: any.pm:649
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -352,194 +352,194 @@ msgstr ""
 "引导菜单中现有下列条目。\n"
 "您可以创建额外的条目或是更改已存在的条目。"
 
-#: any.pm:867
+#: any.pm:860
 #, c-format
 msgid "access to X programs"
 msgstr "允许使用 X 应用程序"
 
-#: any.pm:868
+#: any.pm:861
 #, c-format
 msgid "access to rpm tools"
 msgstr "允许使用 rpm 工具"
 
-#: any.pm:869
+#: any.pm:862
 #, c-format
 msgid "allow \"su\""
 msgstr "允许使用“su”指令"
 
-#: any.pm:870
+#: any.pm:863
 #, c-format
 msgid "access to administrative files"
 msgstr "允许访问系统设置文件"
 
-#: any.pm:871
+#: any.pm:864
 #, c-format
 msgid "access to network tools"
 msgstr "允许使用网络工具"
 
-#: any.pm:872
+#: any.pm:865
 #, c-format
 msgid "access to compilation tools"
 msgstr "允许使用编译工具"
 
-#: any.pm:878
+#: any.pm:871
 #, c-format
 msgid "(already added %s)"
 msgstr "(已经添加了 %s)"
 
-#: any.pm:884
+#: any.pm:877
 #, c-format
 msgid "Please give a user name"
 msgstr "请给出用户名"
 
-#: any.pm:885
+#: any.pm:878
 #, c-format
 msgid ""
 "The user name must start with a lower case letter followed by only lower "
 "cased letters, numbers, `-' and `_'"
 msgstr "用户名只能包含小写字母、数字、“-”和“_”"
 
-#: any.pm:886
+#: any.pm:879
 #, c-format
 msgid "The user name is too long"
 msgstr "该用户名太长"
 
-#: any.pm:887
+#: any.pm:880
 #, c-format
 msgid "This user name has already been added"
 msgstr "该用户名已经存在"
 
-#: any.pm:893 any.pm:929
+#: any.pm:886 any.pm:922
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: any.pm:893 any.pm:930
+#: any.pm:886 any.pm:923
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: any.pm:894
+#: any.pm:887
 #, c-format
 msgid "%s must be a number"
 msgstr "%s 必须是数字"
 
-#: any.pm:895
+#: any.pm:888
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s 应该大于 500。仍然接受吗？"
 
-#: any.pm:899
+#: any.pm:892
 #, c-format
 msgid "User management"
 msgstr "用户管理"
 
-#: any.pm:904
+#: any.pm:897
 #, c-format
 msgid "Enable guest account"
 msgstr ""
 
-#: any.pm:905 authentication.pm:236
+#: any.pm:898 authentication.pm:236
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "设定管理员(root)密码"
 
-#: any.pm:911
+#: any.pm:904
 #, c-format
 msgid "Enter a user"
 msgstr "输入一个用户"
 
-#: any.pm:913
+#: any.pm:906
 #, c-format
 msgid "Icon"
 msgstr "图标"
 
-#: any.pm:916
+#: any.pm:909
 #, c-format
 msgid "Real name"
 msgstr "真实姓名"
 
-#: any.pm:923
+#: any.pm:916
 #, c-format
 msgid "Login name"
 msgstr "登录名"
 
-#: any.pm:928
+#: any.pm:921
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:971
+#: any.pm:964
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: any.pm:1003 security/l10n.pm:14
+#: any.pm:996 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自动登录"
 
-#: any.pm:1004
+#: any.pm:997
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
 
-#: any.pm:1005
+#: any.pm:998
 #, c-format
 msgid "Use this feature"
 msgstr "使用此特性"
 
-#: any.pm:1006
+#: any.pm:999
 #, c-format
 msgid "Choose the default user:"
 msgstr "选择默认的用户:"
 
-#: any.pm:1007
+#: any.pm:1000
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "选择要运行的窗口管理程序:"
 
-#: any.pm:1018 any.pm:1032 any.pm:1100
+#: any.pm:1011 any.pm:1025 any.pm:1093
 #, c-format
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: any.pm:1039 any.pm:1389 interactive/gtk.pm:817
+#: any.pm:1032 any.pm:1382 interactive/gtk.pm:821
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: any.pm:1086
+#: any.pm:1079
 #, c-format
 msgid "License agreement"
 msgstr "许可协议"
 
-#: any.pm:1088 diskdrake/dav.pm:26
+#: any.pm:1081 diskdrake/dav.pm:26 mygtk2.pm:1222
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: any.pm:1095
+#: any.pm:1088
 #, c-format
 msgid "Do you accept this license ?"
 msgstr "您接受此许可协议吗?"
 
-#: any.pm:1096
+#: any.pm:1089
 #, c-format
 msgid "Accept"
 msgstr "接受"
 
-#: any.pm:1096
+#: any.pm:1089
 #, c-format
 msgid "Refuse"
 msgstr "拒绝"
 
-#: any.pm:1122 any.pm:1185
+#: any.pm:1115 any.pm:1178
 #, c-format
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言。"
 
-#: any.pm:1150
+#: any.pm:1143
 #, c-format
 msgid ""
 "%s can support multiple languages. Select\n"
@@ -549,87 +549,87 @@ msgstr ""
 "%s 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
-#: any.pm:1152 fs/partitioning_wizard.pm:174
+#: any.pm:1145 fs/partitioning_wizard.pm:174
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: any.pm:1153
+#: any.pm:1146
 #, c-format
 msgid "Multiple languages"
 msgstr "多语言"
 
-#: any.pm:1154
+#: any.pm:1147
 #, c-format
 msgid "Select Additional Languages"
 msgstr ""
 
-#: any.pm:1163 any.pm:1194
+#: any.pm:1156 any.pm:1187
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "使用旧的编码方式(非 UTF-8)"
 
-#: any.pm:1164
+#: any.pm:1157
 #, c-format
 msgid "All languages"
 msgstr "全部语言"
 
-#: any.pm:1186
+#: any.pm:1179
 #, c-format
 msgid "Language choice"
 msgstr "语言选择"
 
-#: any.pm:1240
+#: any.pm:1233
 #, c-format
 msgid "Country / Region"
 msgstr "国家/地区"
 
-#: any.pm:1241
+#: any.pm:1234
 #, c-format
 msgid "Please choose your country"
 msgstr "请选择您的国家/地区。"
 
-#: any.pm:1243
+#: any.pm:1236
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "在此列出了可用的全部国家/地区"
 
-#: any.pm:1244
+#: any.pm:1237
 #, c-format
 msgid "Other Countries"
 msgstr "其它国家"
 
-#: any.pm:1244 interactive.pm:489 interactive/gtk.pm:445
+#: any.pm:1237 interactive.pm:489 interactive/gtk.pm:445
 #, c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: any.pm:1250
+#: any.pm:1243
 #, c-format
 msgid "Input method:"
 msgstr "输入法:"
 
-#: any.pm:1253
+#: any.pm:1246
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: any.pm:1334
+#: any.pm:1327
 #, c-format
 msgid "No sharing"
 msgstr "禁止共享"
 
-#: any.pm:1334
+#: any.pm:1327
 #, c-format
 msgid "Allow all users"
 msgstr "允许所有用户使用"
 
-#: any.pm:1334
+#: any.pm:1327
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: any.pm:1338
+#: any.pm:1331
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -642,32 +642,32 @@ msgstr ""
 "选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
 "“自定义”允许按照不同用户细分设置。\n"
 
-#: any.pm:1350
+#: any.pm:1343
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
 
-#: any.pm:1353
+#: any.pm:1346
 #, 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:1361
+#: any.pm:1354
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
 
-#: any.pm:1389
+#: any.pm:1382
 #, c-format
 msgid "Launch userdrake"
 msgstr "运行“Drak 用户管理”"
 
-#: any.pm:1391
+#: any.pm:1384
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -676,54 +676,54 @@ msgstr ""
 "按用户设置的共享, 使用组“fileshare”。\n"
 "您可以使用“Drak 用户管理”将用户添加到此组中。"
 
-#: any.pm:1498
+#: any.pm:1491
 #, c-format
 msgid ""
 "You need to logout and back in again for changes to take effect. Press OK to "
 "logout now."
 msgstr "您需要注销后重新登录才能让更改生效。单击确定立即注销。"
 
-#: any.pm:1502
+#: any.pm:1495
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "您需要注销后重新登录才能让更改生效"
 
-#: any.pm:1537
+#: any.pm:1530
 #, c-format
 msgid "Timezone"
 msgstr "时区"
 
-#: any.pm:1537
+#: any.pm:1530
 #, c-format
 msgid "Which is your timezone?"
 msgstr "您所在的时区?"
 
-#: any.pm:1560 any.pm:1562
+#: any.pm:1553 any.pm:1555
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、时钟和时区设置"
 
-#: any.pm:1563
+#: any.pm:1556
 #, c-format
 msgid "What is the best time?"
 msgstr "最适合的时间是几点?"
 
-#: any.pm:1567
+#: any.pm:1560
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (硬件时钟设定为 GMT)"
 
-#: any.pm:1568
+#: any.pm:1561
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (硬件时钟设定为本地时间)"
 
-#: any.pm:1570
+#: any.pm:1563
 #, c-format
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
-#: any.pm:1571
+#: any.pm:1564
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自动时间同步(使用 NTP)"
@@ -1049,7 +1049,7 @@ msgid "Domain Admin Password"
 msgstr "域管理员密码"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:998
+#: bootloader.pm:1014
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1064,61 +1064,61 @@ msgstr ""
 "wait for default boot.\n"
 "\n"
 
-#: bootloader.pm:1190
+#: bootloader.pm:1206
 #, c-format
 msgid "LILO with text menu"
 msgstr "文本菜单 LILO"
 
-#: bootloader.pm:1191
+#: bootloader.pm:1207
 #, fuzzy, c-format
 msgid "GRUB2 with graphical menu"
 msgstr "图形菜单 GRUB"
 
-#: bootloader.pm:1192
+#: bootloader.pm:1208
 #, c-format
 msgid "GRUB with graphical menu"
 msgstr "图形菜单 GRUB"
 
-#: bootloader.pm:1193
+#: bootloader.pm:1209
 #, c-format
 msgid "GRUB with text menu"
 msgstr "文本菜单 GRUB"
 
-#: bootloader.pm:1194
+#: bootloader.pm:1210
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1195
+#: bootloader.pm:1211
 #, c-format
 msgid "SILO"
 msgstr "SILO"
 
-#: bootloader.pm:1281
+#: bootloader.pm:1297
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 中没有足够空间"
 
-#: bootloader.pm:2030
+#: bootloader.pm:2079
 #, c-format
 msgid "You cannot install the bootloader on a %s partition\n"
 msgstr "%s 分区不能安装启动引导程序\n"
 
-#: bootloader.pm:2197
+#: bootloader.pm:2248
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
 
-#: bootloader.pm:2210
+#: bootloader.pm:2261
 #, c-format
 msgid ""
 "The bootloader cannot be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
 
-#: bootloader.pm:2211
+#: bootloader.pm:2262
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "重新安装启动引导程序"
@@ -1215,7 +1215,7 @@ msgstr "挂载点"
 msgid "Options"
 msgstr "选项"
 
-#: diskdrake/dav.pm:68 interactive.pm:388 interactive/gtk.pm:453
+#: diskdrake/dav.pm:68 interactive.pm:388 interactive/gtk.pm:457
 #, c-format
 msgid "Remove"
 msgstr "删除"
@@ -1321,7 +1321,7 @@ msgid "Continue"
 msgstr "继续"
 
 #: diskdrake/hd_gtk.pm:188 fs/partitioning_wizard.pm:555 interactive.pm:654
-#: interactive/gtk.pm:809 interactive/gtk.pm:827 interactive/gtk.pm:848
+#: interactive/gtk.pm:813 interactive/gtk.pm:831 interactive/gtk.pm:862
 #: ugtk2.pm:936
 #, c-format
 msgid "Help"
@@ -1443,7 +1443,7 @@ msgid "More"
 msgstr "更多"
 
 #: diskdrake/interactive.pm:281 diskdrake/interactive.pm:294
-#: diskdrake/interactive.pm:1293
+#: diskdrake/interactive.pm:1293 mygtk2.pm:1221
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -2232,8 +2232,8 @@ msgstr "更改类型"
 
 #: diskdrake/smbnfs_gtk.pm:81 interactive.pm:130 interactive.pm:551
 #: interactive/curses.pm:267 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:846 ugtk2.pm:415
-#: ugtk2.pm:517 ugtk2.pm:526 ugtk2.pm:812
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:846
+#: mygtk2.pm:1222 ugtk2.pm:415 ugtk2.pm:517 ugtk2.pm:526 ugtk2.pm:812
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -2730,12 +2730,12 @@ msgstr "这是您硬盘驱动器的内容 "
 msgid "Partitioning failed: %s"
 msgstr "分区失败: %s"
 
-#: fs/type.pm:389
+#: fs/type.pm:390
 #, c-format
 msgid "You cannot use JFS for partitions smaller than 16MB"
 msgstr "您不能把 JFS(日志文件系统)用于小于 16 MB 的分区"
 
-#: fs/type.pm:390
+#: fs/type.pm:391
 #, c-format
 msgid "You cannot use ReiserFS for partitions smaller than 32MB"
 msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
@@ -3223,7 +3223,7 @@ msgstr ""
 "- 与旧的 OSS 兼容的 API\n"
 "- 新的 ALSA API 带来许多增强特性, 但这需要使用 ALSA 库。\n"
 
-#: harddrake/sound.pm:385 harddrake/sound.pm:468
+#: harddrake/sound.pm:385 harddrake/sound.pm:487
 #, c-format
 msgid "Driver:"
 msgstr "驱动程序: "
@@ -3276,55 +3276,74 @@ msgstr "声音疑难解决"
 #: harddrake/sound.pm:430
 #, c-format
 msgid ""
-"The classic bug sound tester is to run the following commands:\n"
+"Below are some basic tips to help debug audio problems, but for accurate and "
+"up-to-date tips and tricks, please see:\n"
 "\n"
+"https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n"
 "\n"
-"- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card "
-"uses\n"
-"by default\n"
 "\n"
-"- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n"
-"currently uses\n"
 "\n"
-"- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n"
-"loaded or not\n"
+"- General Recommendation: Enable PulseAudio. If you have opted to not to use "
+"PulseAudio, we would strongly advise you enable it. For the vast majority of "
+"desktop use cases, PulseAudio is the recommended and best supported option.\n"
 "\n"
-"- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" will\n"
-"tell you if sound and alsa services are configured to be run on\n"
-"initlevel 3\n"
 "\n"
-"- \"aumix -q\" will tell you if the sound volume is muted or not\n"
 "\n"
-"- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
-msgstr ""
-"经典 bug 声音测试程序将要运行下列命令: \n"
+"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pauvucontrol"
+"\" (generic) will launch graphical applications to allow you to view your "
+"sound devices and adjust volume levels\n"
+"\n"
+"\n"
+"- \"ps aux | grep pulseaudio\" will check that PulseAudio is running.\n"
+"\n"
 "\n"
+"- \"pactl stat\" will check that you can connect to the PulseAudio daemon "
+"correctly.\n"
 "\n"
-"-“lspcidrake -v | fgrep -i AUDIO”将会告诉您您的声卡默认使用哪种驱动程序\n"
 "\n"
-"-“grep snd-slot /etc/modprobe.conf”将会告诉您声卡目前使用的驱动程序\n"
+"- \"pactl list sink-inputs\" will tell you which programs are currently "
+"playing sound via PulseAudio.\n"
 "\n"
-"-“/sbin/lsmod”允许您检查该驱动程序是否已经装入\n"
 "\n"
-"-“/sbin/chkconfig --list sound”和“/sbin/chkconfig --list alsa”将会告诉\n"
-"您声音和 alsa 服务是否已配置为可以 initlevel 3 运行\n"
+"- \"systemctl status osspd.service\" will tell you the current state of the "
+"OSS Proxy Daemon. This is used to enable sound from legacy applications "
+"which use the OSS sound API. You should install the \"ossp\" package if you "
+"need this functionality.\n"
 "\n"
-"- “aumix -q”将告诉您音量是否为静音\n"
 "\n"
-"- “/sbin/fuser -v /dev/dsp”将会告诉您哪个程序使用声卡。\n"
+"- \"pacmd ls\" will give you a LOT of debug information about the current "
+"state of your audio.\n"
+"\n"
+"\n"
+"- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver "
+"your card uses by default.\n"
+"\n"
+"\n"
+"- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound "
+"related kernel modules (drivers) are loaded.\n"
+"\n"
+"\n"
+"- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA "
+"mixer controls for first sound card\n"
+"\n"
+"\n"
+"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are "
+"currently using the sound card directly (normally this should only show "
+"PulseAudio)\n"
+msgstr ""
 
-#: harddrake/sound.pm:457
+#: harddrake/sound.pm:476
 #, c-format
 msgid "Let me pick any driver"
 msgstr "让我挑选任意驱动"
 
-#: harddrake/sound.pm:460
+#: harddrake/sound.pm:479
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "选择其它驱动"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:463
+#: harddrake/sound.pm:482
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3403,12 +3422,12 @@ msgstr "否"
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: interactive.pm:388 interactive/gtk.pm:453
+#: interactive.pm:388 interactive/gtk.pm:457
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: interactive.pm:388 interactive/gtk.pm:453
+#: interactive.pm:388 interactive/gtk.pm:457
 #, c-format
 msgid "Modify"
 msgstr "修改"
@@ -3443,7 +3462,7 @@ msgstr "无此目录"
 msgid "No such file"
 msgstr "非本地文件"
 
-#: interactive/gtk.pm:592
+#: interactive/gtk.pm:596
 #, c-format
 msgid "Beware, Caps Lock is enabled"
 msgstr "注意，Caps Lock 已开启"
@@ -4730,17 +4749,17 @@ msgstr "欢迎使用 %s"
 msgid "Moving used physical extents to other physical volumes failed"
 msgstr "将已用的物理卷扩展分区移动到其它物理卷失败"
 
-#: lvm.pm:149
+#: lvm.pm:152
 #, c-format
 msgid "Physical volume %s is still in use"
 msgstr "物理卷 %s 仍在使用中"
 
-#: lvm.pm:159
+#: lvm.pm:162
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "请先删除逻辑卷\n"
 
-#: lvm.pm:202
+#: lvm.pm:205
 #, c-format
 msgid "The bootloader can't handle /boot on multiple physical volumes"
 msgstr "引导程序无法识别多个物理卷上的 /boot"
@@ -5127,12 +5146,12 @@ msgstr "您确定想要删除此挂载点吗?"
 msgid "Password is trivial to guess"
 msgstr "密码很容易猜到"
 
-#: mygtk2.pm:1542
+#: mygtk2.pm:1565
 #, c-format
 msgid "Password should be resistant to basic attacks"
 msgstr "密码可抵御常见攻击"
 
-#: mygtk2.pm:1543 mygtk2.pm:1544
+#: mygtk2.pm:1566 mygtk2.pm:1567
 #, c-format
 msgid "Password seems secure"
 msgstr "密码好像安全"
@@ -5359,8 +5378,8 @@ msgid ""
 "\n"
 "- none if set to \"None\".\n"
 "\n"
-"To authorize the services you need, use /etc/hosts.allow (see hosts.allow"
-"(5))."
+"To authorize the services you need, use /etc/hosts.allow (see hosts."
+"allow(5))."
 msgstr ""
 "认证:\n"
 "\n"
@@ -6459,7 +6478,7 @@ msgstr "远程管理"
 msgid "Database Server"
 msgstr "数据库服务器"
 
-#: services.pm:188 services.pm:227
+#: services.pm:188 services.pm:225
 #, c-format
 msgid "Services"
 msgstr "服务"
@@ -6474,49 +6493,49 @@ msgstr "选择开机时自动启动的服务"
 msgid "%d activated for %d registered"
 msgstr "%2$d 项已注册, %1$d 项已激活"
 
-#: services.pm:243
+#: services.pm:241
 #, c-format
 msgid "running"
 msgstr "运行中"
 
-#: services.pm:243
+#: services.pm:241
 #, c-format
 msgid "stopped"
 msgstr "已停止"
 
-#: services.pm:248
+#: services.pm:246
 #, c-format
 msgid "Services and daemons"
 msgstr "服务和守护程序"
 
-#: services.pm:254
+#: services.pm:252
 #, c-format
 msgid ""
 "No additional information\n"
 "about this service, sorry."
 msgstr "没有该服务的附加信息。"
 
-#: services.pm:259 ugtk2.pm:924
+#: services.pm:257 ugtk2.pm:924
 #, c-format
 msgid "Info"
 msgstr "信息"
 
-#: services.pm:262
+#: services.pm:260
 #, c-format
 msgid "Start when requested"
 msgstr "请求时启动"
 
-#: services.pm:262
+#: services.pm:260
 #, c-format
 msgid "On boot"
 msgstr "启动时"
 
-#: services.pm:280
+#: services.pm:278
 #, c-format
 msgid "Start"
 msgstr "启动"
 
-#: services.pm:280
+#: services.pm:278
 #, c-format
 msgid "Stop"
 msgstr "停止"
@@ -6841,3 +6860,43 @@ msgstr ""
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
+
+#~ msgid ""
+#~ "The classic bug sound tester is to run the following commands:\n"
+#~ "\n"
+#~ "\n"
+#~ "- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card "
+#~ "uses\n"
+#~ "by default\n"
+#~ "\n"
+#~ "- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n"
+#~ "currently uses\n"
+#~ "\n"
+#~ "- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n"
+#~ "loaded or not\n"
+#~ "\n"
+#~ "- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" "
+#~ "will\n"
+#~ "tell you if sound and alsa services are configured to be run on\n"
+#~ "initlevel 3\n"
+#~ "\n"
+#~ "- \"aumix -q\" will tell you if the sound volume is muted or not\n"
+#~ "\n"
+#~ "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound "
+#~ "card.\n"
+#~ msgstr ""
+#~ "经典 bug 声音测试程序将要运行下列命令: \n"
+#~ "\n"
+#~ "\n"
+#~ "-“lspcidrake -v | fgrep -i AUDIO”将会告诉您您的声卡默认使用哪种驱动程序\n"
+#~ "\n"
+#~ "-“grep snd-slot /etc/modprobe.conf”将会告诉您声卡目前使用的驱动程序\n"
+#~ "\n"
+#~ "-“/sbin/lsmod”允许您检查该驱动程序是否已经装入\n"
+#~ "\n"
+#~ "-“/sbin/chkconfig --list sound”和“/sbin/chkconfig --list alsa”将会告诉\n"
+#~ "您声音和 alsa 服务是否已配置为可以 initlevel 3 运行\n"
+#~ "\n"
+#~ "- “aumix -q”将告诉您音量是否为静音\n"
+#~ "\n"
+#~ "- “/sbin/fuser -v /dev/dsp”将会告诉您哪个程序使用声卡。\n"