sync with code

1 files changed, 256 insertions, 197 deletions

diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po
index 90378b56d..6f33bca3d 100644
--- a/perl-install/share/po/zh_TW.po
+++ b/perl-install/share/po/zh_TW.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx_share\n"
-"POT-Creation-Date: 2012-12-14 15:17+0100\n"
+"POT-Creation-Date: 2013-04-06 03:21+0200\n"
 "PO-Revision-Date: 2012-12-20 10:10+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.4\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"
 "要分配一個新的磁區標籤？"
 
-#: 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"
@@ -68,7 +68,7 @@ msgstr ""
 "然後再輸入：shut-down\n"
 "然後您下一次開機時應該就可以看到開機啟動程式的訊息了。"
 
-#: any.pm:329
+#: any.pm:323
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -83,268 +83,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 "Open Firmware 延遲"
 
-#: 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 "允許光碟開機？"
 
-#: any.pm:471
+#: any.pm:464
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "允許 Open Firmware 開機？"
 
-#: 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 "網路 profile"
 
-#: 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 "沒有 Video 參數"
 
-#: 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 "您需要指定一個 root 分割區"
 
-#: 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"
@@ -353,194 +353,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"
@@ -550,87 +550,87 @@ msgstr ""
 "%s 可以支援多重語言。請選擇您要安裝的語言。這些語言在安裝完成並重新啟動系統後"
 "即可使用。"
 
-#: 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"
@@ -645,32 +645,32 @@ msgstr ""
 "\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、Mac OS 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 或者是 SMB 匯出。請選擇您想要用那一個。"
 
-#: any.pm:1389
+#: any.pm:1382
 #, c-format
 msgid "Launch userdrake"
 msgstr "啟動 userdrake"
 
-#: any.pm:1391
+#: any.pm:1384
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -679,54 +679,54 @@ msgstr ""
 "每個使用者的分享都是使用 \"fileshare\" 群組。\n"
 "您可以執行 userdrake 在該群組內加入使用者。"
 
-#: 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 (硬體時鐘設定為 UTC 時間)"
 
-#: 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 服務)"
@@ -1051,7 +1051,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"
@@ -1066,61 +1066,61 @@ msgstr ""
 "或是稍候使用預設作業系統開機。\n"
 "\n"
 
-#: bootloader.pm:1190
+#: bootloader.pm:1206
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO 文字介面選單"
 
-#: bootloader.pm:1191
+#: bootloader.pm:1207
 #, c-format
 msgid "GRUB2 with graphical menu"
 msgstr "GRUB2 圖形介面選單"
 
-#: 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 "重新安裝開機載入程式"
@@ -1217,7 +1217,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 "移除"
@@ -1323,7 +1323,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"
@@ -1445,7 +1445,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 "確認"
@@ -2235,8 +2235,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 "取消"
@@ -2731,12 +2731,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 分割區，大小不能小於 16MB"
 
-#: fs/type.pm:390
+#: fs/type.pm:391
 #, c-format
 msgid "You cannot use ReiserFS for partitions smaller than 32MB"
 msgstr "使用 ReiserFS 分割區，大小不能小於 32MB"
@@ -3173,7 +3173,7 @@ msgid ""
 "sound card (%s)."
 msgstr "您可以選擇使用其他的 (OSS 或者 ALSA) 的驅動程式給您的音效卡 (%s)"
 
-#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
 #: harddrake/sound.pm:369
@@ -3220,7 +3220,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 "驅動程式："
@@ -3271,56 +3271,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 ""
-"傳統的音效除錯與測試是執行以下指令：\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"
 "\n"
+"- \"pactl list sink-inputs\" will tell you which programs are currently "
+"playing sound via PulseAudio.\n"
 "\n"
-"- \"lspcidrake -v | fgrep -i AUDIO\" 會告訴您您的音效卡預設使用何種驅動程"
-"式。\n"
 "\n"
-"- \"grep sound-slot /etc/modprobe.conf\" 將告訴您正在使用何種驅動程式。\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"
-"- \"/sbin/lsmod\" 讓您可以檢查音效模組 (驅動程式) 是否已經載入。\n"
 "\n"
-"- \"/sbin/chkconfig --list sound\" 與 \"/sbin/chkconfig --list alsa\" 將\n"
-"告訴您音效與 ALSA 服務是否被設定為在 initlevel 3 執行。\n"
+"- \"pacmd ls\" will give you a LOT of debug information about the current "
+"state of your audio.\n"
 "\n"
-"- \"aumix -q\" 會告訴您音量是否設為靜音\n"
 "\n"
-"- \"/sbin/fuser -v /dev/dsp\" 將指出哪個程式在使用音效卡。\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 "
@@ -3399,12 +3417,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 "修改"
@@ -3439,7 +3457,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)"
@@ -4725,17 +4743,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 "先移除邏輯 volume\n"
 
-#: lvm.pm:202
+#: lvm.pm:205
 #, c-format
 msgid "The bootloader can't handle /boot on multiple physical volumes"
 msgstr "開機載入器無法處理位於多個實體磁區的 /boot"
@@ -5091,12 +5109,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 "密碼似乎是安全的"
@@ -5325,8 +5343,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"
@@ -6435,7 +6453,7 @@ msgstr "遠端管理"
 msgid "Database Server"
 msgstr "資料庫軟體"
 
-#: services.pm:188 services.pm:227
+#: services.pm:188 services.pm:225
 #, c-format
 msgid "Services"
 msgstr "服務"
@@ -6450,22 +6468,22 @@ 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"
@@ -6474,27 +6492,27 @@ msgstr ""
 "抱歉 ! 這個服務項目並沒有\n"
 "額外的相關資訊。"
 
-#: 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 "停止"
@@ -6827,6 +6845,47 @@ 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 ""
+#~ "傳統的音效除錯與測試是執行以下指令：\n"
+#~ "\n"
+#~ "\n"
+#~ "- \"lspcidrake -v | fgrep -i AUDIO\" 會告訴您您的音效卡預設使用何種驅動程"
+#~ "式。\n"
+#~ "\n"
+#~ "- \"grep sound-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"
+
+#~ msgid ""
 #~ "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 #~ "up a firewall to protect your machine from network attacks."
 #~ msgstr ""