Updated Traditional Chinese translation(Taiwan). Updated Traditional

2006-01-27  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>

	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).

1 files changed, 276 insertions, 241 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7b178675..42a518ce 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,4 +1,4 @@
-# traditional Chinese translation for gdm2.
+# Chinese(Taiwan) translation for gdm2.
 # Copyright (C) 2000-06 Free Software Foundation, Inc.
 # GNOME 1.x:
 # Jing-Jong Shyue <shyue@sonoma.com.tw>, 2000
@@ -6,17 +6,17 @@
 # GNOME 2.x
 # Abel Cheung <abel@oaka.org>, 2001-2003
 # Kevin Kee <kevin@oaka.org>, 2004
-# Woodman Tuen <wmtuen@gmail.com>, 2006
+# Woodman Tuen <wmtuen@gmail.com>, 2005-2006
 # 
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: gdm2 2.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-10 22:40+0100\n"
-"PO-Revision-Date: 2006-01-11 11:14+0800\n"
+"POT-Creation-Date: 2006-01-24 06:41+0100\n"
+"PO-Revision-Date: 2006-01-19 14:10+0800\n"
 "Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
-"Language-Team: Chinese/Traditional <community@linuxhall.org>\n"
+"Language-Team: Chinese(Taiwan) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -124,55 +124,55 @@ msgstr "GNOME"
 msgid "This session logs you into GNOME"
 msgstr "本作業階段會登入 GNOME 桌面環境"
 
-#: ../daemon/auth.c:56
+#: ../daemon/auth.c:57
 #, c-format
 msgid "%s: Could not write new authorization entry: %s"
 msgstr "%s：無法寫入新的授權紀錄：%s"
 
-#: ../daemon/auth.c:59
+#: ../daemon/auth.c:60
 #, c-format
 msgid "%s: Could not write new authorization entry.  Possibly out of diskspace"
 msgstr "%s：無法寫入新的授權紀錄。可能是磁碟空間不足"
 
-#: ../daemon/auth.c:64
+#: ../daemon/auth.c:65
 #, c-format
 msgid ""
 "GDM could not write a new authorization entry to disk.  Possibly out of "
 "diskspace.%s%s"
 msgstr "GDM 無法將新的授權紀錄寫入磁碟。可能是磁碟空間不足。%s%s"
 
-#: ../daemon/auth.c:194
+#: ../daemon/auth.c:195
 #, c-format
 msgid "%s: Could not make new cookie file in %s"
 msgstr "%s：無法在 %s 建立新的 cookie 檔"
 
-#: ../daemon/auth.c:218 ../daemon/auth.c:235 ../daemon/auth.c:875
+#: ../daemon/auth.c:219 ../daemon/auth.c:236 ../daemon/auth.c:876
 #, c-format
 msgid "%s: Cannot safely open %s"
 msgstr "%s：無法安全地開啟 %s"
 
 #. Really no need to clean up here - this process is a goner anyway
-#: ../daemon/auth.c:674 ../daemon/auth.c:716
+#: ../daemon/auth.c:675 ../daemon/auth.c:717
 #, c-format
 msgid "%s: Could not open cookie file %s"
 msgstr "%s：無法開啟 cookie 檔 %s"
 
-#: ../daemon/auth.c:695
+#: ../daemon/auth.c:696
 #, c-format
 msgid "%s: Could not lock cookie file %s"
 msgstr "%s：無法鎖定 cookie 檔 %s"
 
-#: ../daemon/auth.c:745 ../daemon/auth.c:767
+#: ../daemon/auth.c:746 ../daemon/auth.c:768
 #, c-format
 msgid "%s: Could not write cookie"
 msgstr "%s：無法寫入 cookie"
 
-#: ../daemon/auth.c:851
+#: ../daemon/auth.c:852
 #, c-format
 msgid "%s: Ignoring suspiciously looking cookie file %s"
 msgstr "%s：忽略可疑的 cookie 檔案 %s"
 
-#: ../daemon/auth.c:894 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
+#: ../daemon/auth.c:895 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
 #, c-format
 msgid "Can't write to %s: %s"
 msgstr "無法寫至 %s：%s"
@@ -187,7 +187,7 @@ msgstr "無法寫至 %s：%s"
 #. * that should give people ample time to stop gdm if needed,
 #. * or just wait for the stupid malicious user to get bored
 #. * and go away
-#: ../daemon/display.c:110
+#: ../daemon/display.c:111
 #, c-format
 msgid ""
 "The display server has been shut down about 6 times in the last 90 seconds. "
@@ -197,22 +197,22 @@ msgstr ""
 "畫面伺服器在 90 秒內被關閉了 6 次之多。這應該是有一些問題。2 分鐘後會在畫面 %"
 "s 再嘗試。"
 
-#: ../daemon/display.c:254
+#: ../daemon/display.c:255
 #, c-format
 msgid "%s: Cannot create pipe"
 msgstr "%s：無法建立 pipe"
 
-#: ../daemon/display.c:330
+#: ../daemon/display.c:331
 #, c-format
 msgid "%s: Failed forking GDM slave process for %s"
 msgstr "%s：無法衍生 %s 的 GDM 副進程"
 
-#: ../daemon/errorgui.c:346
+#: ../daemon/errorgui.c:348
 #, c-format
 msgid "%s not a regular file!\n"
 msgstr "%s 不是正規的檔案！\n"
 
-#: ../daemon/errorgui.c:363
+#: ../daemon/errorgui.c:365
 msgid ""
 "\n"
 "... File too long to display ...\n"
@@ -220,54 +220,54 @@ msgstr ""
 "\n"
 "... 檔案名稱過長 ...\n"
 
-#: ../daemon/errorgui.c:372
+#: ../daemon/errorgui.c:374
 #, c-format
 msgid "%s could not be opened"
 msgstr "%s 無法被開啟"
 
-#: ../daemon/errorgui.c:484 ../daemon/errorgui.c:625 ../daemon/errorgui.c:733
-#: ../daemon/errorgui.c:851
+#: ../daemon/errorgui.c:488 ../daemon/errorgui.c:632 ../daemon/errorgui.c:743
+#: ../daemon/errorgui.c:864
 #, c-format
 msgid "%s: Cannot fork to display error/info box"
 msgstr "%s：無法衍生進程，來顯示錯誤或訊息視窗"
 
-#: ../daemon/filecheck.c:60
+#: ../daemon/filecheck.c:61
 #, c-format
 msgid "%s: Directory %s does not exist."
 msgstr "%s：目錄 %s 不存在。"
 
-#: ../daemon/filecheck.c:72 ../daemon/filecheck.c:114
-#: ../daemon/filecheck.c:177
+#: ../daemon/filecheck.c:73 ../daemon/filecheck.c:115
+#: ../daemon/filecheck.c:178
 #, c-format
 msgid "%s: %s is not owned by uid %d."
 msgstr "%s：%s 不是由 uid %d 所擁有。"
 
-#: ../daemon/filecheck.c:78 ../daemon/filecheck.c:121
+#: ../daemon/filecheck.c:79 ../daemon/filecheck.c:122
 #, c-format
 msgid "%s: %s is writable by group."
 msgstr "%s： %s 可以被相同群組的使用者寫入。"
 
-#: ../daemon/filecheck.c:84
+#: ../daemon/filecheck.c:85
 #, c-format
 msgid "%s: %s is writable by other."
 msgstr "%s： %s 可以被其它使用者寫入。"
 
-#: ../daemon/filecheck.c:99 ../daemon/filecheck.c:165
+#: ../daemon/filecheck.c:100 ../daemon/filecheck.c:166
 #, c-format
 msgid "%s: %s does not exist but must exist."
 msgstr "%s：%s 不存在，但必須存在。"
 
-#: ../daemon/filecheck.c:107 ../daemon/filecheck.c:171
+#: ../daemon/filecheck.c:108 ../daemon/filecheck.c:172
 #, c-format
 msgid "%s: %s is not a regular file."
 msgstr "%s：%s 不是一個正規的檔案。"
 
-#: ../daemon/filecheck.c:128
+#: ../daemon/filecheck.c:129
 #, c-format
 msgid "%s: %s is writable by group/other."
 msgstr "%s：%s 可以被相同群組/其它使用者寫入。"
 
-#: ../daemon/filecheck.c:135 ../daemon/filecheck.c:190
+#: ../daemon/filecheck.c:136 ../daemon/filecheck.c:191
 #, c-format
 msgid "%s: %s is bigger than sysadmin specified maximum file size."
 msgstr "%s：%s 比系統管理者指定的檔案大小上限還要大。"
@@ -311,7 +311,7 @@ msgid "%s: fork () failed!"
 msgstr "%s：fork () 失敗！"
 
 #. should never happen
-#: ../daemon/gdm.c:221 ../daemon/slave.c:3325
+#: ../daemon/gdm.c:221 ../daemon/slave.c:3332
 #, c-format
 msgid "%s: setsid () failed: %s!"
 msgstr "%s：setsid () 失敗：%s！"
@@ -353,8 +353,8 @@ msgstr "正在暫停主電腦..."
 
 #: ../daemon/gdm.c:622
 #, c-format
-msgid "System is rebooting, please wait ..."
-msgstr "系統正在重新啟動，請稍等..."
+msgid "System is restarting, please wait ..."
+msgstr "系統正在重新啟動，請稍候..."
 
 #: ../daemon/gdm.c:624
 #, c-format
@@ -371,23 +371,30 @@ msgid "%s: Halt failed: %s"
 msgstr "%s：關機失敗：%s"
 
 #: ../daemon/gdm.c:657
-msgid "Master rebooting..."
-msgstr "正在重新啟動主電腦..."
+msgid "Restarting computer..."
+msgstr "正在重新啟動電腦..."
 
 #: ../daemon/gdm.c:670
 #, c-format
-msgid "%s: Reboot failed: %s"
+msgid "%s: Restart failed: %s"
 msgstr "%s：重新啟動失敗：%s"
 
 #: ../daemon/gdm.c:771
 #, c-format
-msgid "Reboot or Halt request when there is no system menu from display %s"
-msgstr "當顯示畫面 %s 沒有系統選單時接收到重新啟動電腦或停機的要求"
+msgid ""
+"Restart GDM, Restart machine, Suspend, or Halt request when there is no "
+"system menu from display %s"
+msgstr ""
+"當顯示畫面 %s 沒有系統選單時接收到重新啟動·GDM、重新啟動電腦、暫停或關機的要"
+"求"
 
 #: ../daemon/gdm.c:780
 #, c-format
-msgid "Restart, Reboot or Halt request from a non-static display %s"
-msgstr "在非本地固定的顯示畫面 %s 送出重新啟動程式、重新啟動電腦或停機的要求"
+msgid ""
+"Restart GDM, Restart machine, Suspend or Halt request from a non-static "
+"display %s"
+msgstr ""
+"在非本地固定的顯示畫面 %s 送出重新啟動 GDM、重新啟動電腦、暫停或關機的要求"
 
 #. Bury this display for good
 #: ../daemon/gdm.c:846
@@ -460,7 +467,7 @@ msgstr "只有 root 可以執行 GDM\n"
 #: ../daemon/gdm.c:1555 ../daemon/gdm.c:1561 ../daemon/gdm.c:1572
 #: ../daemon/misc.c:1771 ../daemon/misc.c:1775 ../daemon/misc.c:1779
 #: ../daemon/misc.c:1786 ../daemon/misc.c:1790 ../daemon/misc.c:1794
-#: ../daemon/server.c:521 ../daemon/server.c:534 ../daemon/slave.c:780
+#: ../daemon/server.c:522 ../daemon/server.c:535 ../daemon/slave.c:780
 #: ../daemon/slave.c:794 ../daemon/slave.c:804 ../daemon/slave.c:814
 #: ../daemon/slave.c:826 ../gui/gdmchooser.c:1841 ../gui/gdmchooser.c:1844
 #: ../gui/gdmchooser.c:1847 ../gui/gdmlogin.c:3388 ../gui/gdmlogin.c:3398
@@ -754,11 +761,11 @@ msgstr ""
 "上次登入:\n"
 "%s"
 
-#: ../daemon/server.c:150
+#: ../daemon/server.c:151
 msgid "Can not start fallback console"
 msgstr "無法啟動後備的文字模式視窗"
 
-#: ../daemon/server.c:340
+#: ../daemon/server.c:341
 #, c-format
 msgid ""
 "There already appears to be an X server running on display %s.  Should "
@@ -768,7 +775,7 @@ msgstr ""
 "似乎顯示畫面 %s 已有 X 伺服器正在執行。要嘗試其它顯示畫面？如果您回答「否」，"
 "會再次嘗試在 %s 啟動伺服器。%s"
 
-#: ../daemon/server.c:348
+#: ../daemon/server.c:349
 msgid ""
 "  (You can change consoles by pressing Ctrl-Alt plus a function key, such as "
 "Ctrl-Alt-F7 to go to console 7.  X servers usually run on consoles 7 and "
@@ -777,98 +784,98 @@ msgstr ""
 "（請按 Ctrl-Alt 加一個功能鍵來切換 console，例如 Ctrl-Alt-F7 會切換至第 7 個 "
 "console。X 伺服器通常會在第 7 個或更後的 console 中執行。）"
 
-#: ../daemon/server.c:394
+#: ../daemon/server.c:395
 #, c-format
 msgid "Display '%s' cannot be opened by Xnest"
 msgstr "Xnest 無法開啟顯示畫面‘%s’"
 
-#: ../daemon/server.c:425
+#: ../daemon/server.c:426
 #, c-format
 msgid "Display %s is busy. There is another X server running already."
 msgstr "顯示畫面 %s 正在使用中。已經另有 X 伺服器正在執行。"
 
-#: ../daemon/server.c:509
+#: ../daemon/server.c:510
 #, c-format
 msgid "%s: Error opening a pipe: %s"
 msgstr "%s：開啟管道時出現錯誤：%s"
 
-#: ../daemon/server.c:697
+#: ../daemon/server.c:698
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%s：無法連接主顯示畫面‘%s’"
 
 #. Send X too busy
-#: ../daemon/server.c:837
+#: ../daemon/server.c:838
 #, c-format
 msgid "%s: Cannot find a free display number"
 msgstr "%s：無法找出空置的顯示畫面號碼"
 
-#: ../daemon/server.c:864
+#: ../daemon/server.c:865
 #, c-format
 msgid "%s: Display %s busy.  Trying another display number."
 msgstr "%s：顯示畫面 %s 在使用中。會嘗試其它顯示畫面號碼。"
 
-#: ../daemon/server.c:975
+#: ../daemon/server.c:976
 #, c-format
 msgid "Invalid server command '%s'"
 msgstr "無效的伺服器指令‘%s’"
 
-#: ../daemon/server.c:980
+#: ../daemon/server.c:981
 #, c-format
 msgid "Server name '%s' not found; using standard server"
 msgstr "找不到名為‘%s’的伺服器，改用標準的伺服器"
 
-#: ../daemon/server.c:1159
+#: ../daemon/server.c:1160
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%s：無法開啟顯示畫面 %s 的紀錄檔！"
 
-#: ../daemon/server.c:1171 ../daemon/server.c:1177 ../daemon/server.c:1182
+#: ../daemon/server.c:1172 ../daemon/server.c:1178 ../daemon/server.c:1183
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s：將 %s 設定為 %s 時發生錯誤"
 
-#: ../daemon/server.c:1228
+#: ../daemon/server.c:1229
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s：顯示畫面 %s 的伺服器指令是空白的"
 
-#: ../daemon/server.c:1238
+#: ../daemon/server.c:1239
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%s：伺服器優先等級無法設定為 %d：%s"
 
-#: ../daemon/server.c:1250
+#: ../daemon/server.c:1251
 #, c-format
 msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
 msgstr "%s：伺服器應以使用者 uid %d 的身分衍生，但該使用者不存在"
 
-#: ../daemon/server.c:1265 ../daemon/slave.c:2450 ../daemon/slave.c:2921
+#: ../daemon/server.c:1266 ../daemon/slave.c:2450 ../daemon/slave.c:2921
 #, c-format
 msgid "%s: Couldn't set groupid to %d"
 msgstr "%s：無法設定 groupid 為 %d"
 
-#: ../daemon/server.c:1271 ../daemon/slave.c:2456 ../daemon/slave.c:2927
+#: ../daemon/server.c:1272 ../daemon/slave.c:2456 ../daemon/slave.c:2927
 #, c-format
 msgid "%s: initgroups () failed for %s"
 msgstr "%s：%s 的 initgroups () 失敗。"
 
-#: ../daemon/server.c:1277 ../daemon/slave.c:2461 ../daemon/slave.c:2932
+#: ../daemon/server.c:1278 ../daemon/slave.c:2461 ../daemon/slave.c:2932
 #, c-format
 msgid "%s: Couldn't set userid to %d"
 msgstr "%s：無法設定 userid 為 %d"
 
-#: ../daemon/server.c:1284
+#: ../daemon/server.c:1285
 #, c-format
 msgid "%s: Couldn't set groupid to 0"
 msgstr "%s：無法設定 groupid 為 0"
 
-#: ../daemon/server.c:1311
+#: ../daemon/server.c:1312
 #, c-format
 msgid "%s: Xserver not found: %s"
 msgstr "%s：找不到 X 伺服器：%s"
 
-#: ../daemon/server.c:1319
+#: ../daemon/server.c:1320
 #, c-format
 msgid "%s: Can't fork Xserver process!"
 msgstr "%s: 無法衍生 X 伺服器進程！"
@@ -1057,73 +1064,73 @@ msgstr "%s: 無法衍生 gdmchooser 進程"
 msgid "%s: Could not open ~/.xsession-errors"
 msgstr "%s：無法開啟 ~/.xsession-errors"
 
-#: ../daemon/slave.c:3378
+#: ../daemon/slave.c:3385
 #, c-format
 msgid "%s: Execution of PreSession script returned > 0. Aborting."
 msgstr "%s：執行 PreSession 命令稿的傳回值大於 0。必須放棄。"
 
-#: ../daemon/slave.c:3422
+#: ../daemon/slave.c:3429
 #, c-format
 msgid "Language %s does not exist; using %s"
 msgstr "語言 %s 不存在；改用 %s"
 
-#: ../daemon/slave.c:3423
+#: ../daemon/slave.c:3430
 msgid "System default"
 msgstr "系統預設值"
 
-#: ../daemon/slave.c:3440
+#: ../daemon/slave.c:3447
 #, c-format
 msgid "%s: Could not setup environment for %s. Aborting."
 msgstr "%s：無法設定 %s 的環境變數。必須放棄。"
 
-#: ../daemon/slave.c:3487
+#: ../daemon/slave.c:3494
 #, c-format
 msgid "%s: setusercontext () failed for %s. Aborting."
 msgstr "%s：%s 的 setusercontext () 失敗。必須放棄。"
 
-#: ../daemon/slave.c:3493
+#: ../daemon/slave.c:3500
 #, c-format
 msgid "%s: Could not become %s. Aborting."
 msgstr "%s：無法成為 %s。必須放棄。"
 
-#: ../daemon/slave.c:3529
+#: ../daemon/slave.c:3536
 #, c-format
 msgid ""
 "No Exec line in the session file: %s.  Running the GNOME failsafe session "
 "instead"
 msgstr "作業階段檔案：%s，沒有Exec 行，改用「GNOME 安全模式」。"
 
-#: ../daemon/slave.c:3532
+#: ../daemon/slave.c:3539
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/slave.c:3552
+#: ../daemon/slave.c:3559
 #, c-format
 msgid ""
 "%s: Cannot find or run the base Xsession script.  Running the GNOME failsafe "
 "session instead."
 msgstr "%s：找不到或無法執行基本的 Xsession 命令稿，改用「GNOME 安全模式」。"
 
-#: ../daemon/slave.c:3558
+#: ../daemon/slave.c:3565
 msgid ""
 "Cannot find or run the base session script.  Running the GNOME failsafe "
 "session instead."
 msgstr "找不到或無法執行基本的作業階段命令稿，改用 「GNOME 安全模式」。"
 
 #. yaikes
-#: ../daemon/slave.c:3573
+#: ../daemon/slave.c:3580
 #, c-format
 msgid "%s: gnome-session not found for a failsafe GNOME session; trying xterm"
 msgstr "%s：執行 「GNOME 安全模式」時找不到 gnome-session，改用 xterm"
 
-#: ../daemon/slave.c:3578
+#: ../daemon/slave.c:3585
 msgid ""
 "Could not find the GNOME installation.  Running the \"Failsafe xterm\" "
 "session instead."
 msgstr "系統裡找不到 GNOME。改用「xterm 安全模式」作業階段。"
 
-#: ../daemon/slave.c:3586
+#: ../daemon/slave.c:3593
 msgid ""
 "This is the Failsafe GNOME session.  You will be logged into the 'Default' "
 "session of GNOME without the startup scripts being run.  This should be used "
@@ -1132,11 +1139,11 @@ msgstr ""
 "這是「GNOME 安全模式」作業階段。您將會進入 GNOME 的「預設」作業階段，任何正常"
 "啟動系統時應該執行的命令稿都不會執行。這只是為修正安裝時出現的問題而設。"
 
-#: ../daemon/slave.c:3601
+#: ../daemon/slave.c:3608
 msgid "Cannot find \"xterm\" to start a failsafe session."
 msgstr "找不到“xterm”，無法啟動安全模式的作業階段。"
 
-#: ../daemon/slave.c:3614
+#: ../daemon/slave.c:3621
 msgid ""
 "This is the Failsafe xterm session.  You will be logged into a terminal "
 "console so that you may fix your system if you cannot log in any other way.  "
@@ -1145,41 +1152,41 @@ msgstr ""
 "這是「xterm 安全模式」作業階段。如果無法以其它方式登入，可以登入終端機來修正"
 "系統設定。如果要離開終端機，可以在視窗中輸入‘exit’及按下 enter 鍵。"
 
-#: ../daemon/slave.c:3641
+#: ../daemon/slave.c:3648
 #, c-format
 msgid "%s: User not allowed to log in"
 msgstr "%s：不允許使用者登入"
 
-#: ../daemon/slave.c:3644
+#: ../daemon/slave.c:3651
 msgid "The system administrator has disabled your account."
 msgstr "系統管理員已暫時封閉您的帳號。"
 
-#: ../daemon/slave.c:3675
+#: ../daemon/slave.c:3682
 msgid "Error! Unable to set executable context."
 msgstr "錯誤！無法設定可執行的 context。"
 
 #. will go to .xsession-errors
-#: ../daemon/slave.c:3683 ../daemon/slave.c:3688
+#: ../daemon/slave.c:3690 ../daemon/slave.c:3695
 #, c-format
 msgid "%s: Could not exec %s %s %s"
 msgstr "%s：無法執行 %s %s %s"
 
 #. we can't really be any more specific
-#: ../daemon/slave.c:3699
+#: ../daemon/slave.c:3706
 msgid "Cannot start the session due to some internal error."
 msgstr "因為內部錯誤而無法執行作業階段。"
 
-#: ../daemon/slave.c:3753
+#: ../daemon/slave.c:3760
 #, c-format
 msgid "%s: User passed auth but getpwnam (%s) failed!"
 msgstr "%s：使用者通過認證，但 getpwnam (%s) 失敗！"
 
-#: ../daemon/slave.c:3766
+#: ../daemon/slave.c:3773
 #, c-format
 msgid "%s: Execution of PostLogin script returned > 0. Aborting."
 msgstr "%s：執行 PreSession 命令稿的傳回值大於 0。必須放棄。"
 
-#: ../daemon/slave.c:3788
+#: ../daemon/slave.c:3795
 #, c-format
 msgid ""
 "Your home directory is listed as:\n"
@@ -1195,12 +1202,12 @@ msgstr ""
 "\n"
 "除非使用安全模式的作業階段，否則很可能無法正常運作。"
 
-#: ../daemon/slave.c:3800
+#: ../daemon/slave.c:3807
 #, c-format
 msgid "%s: Home directory for %s: '%s' does not exist!"
 msgstr "%s：%s 的個人目錄：‘%s’不存在！"
 
-#: ../daemon/slave.c:3849
+#: ../daemon/slave.c:3856
 msgid ""
 "User's $HOME/.dmrc file is being ignored.  This prevents the default session "
 "and language from being saved.  File should be owned by user and have 644 "
@@ -1211,7 +1218,7 @@ msgstr ""
 "必須由使用者所擁有及權限為 644。使用者的 $HOME 目錄必須由使用者擁有並且不允許"
 "其他使用者寫入。"
 
-#: ../daemon/slave.c:3978
+#: ../daemon/slave.c:3985
 msgid ""
 "GDM could not write to your authorization file.  This could mean that you "
 "are out of disk space or that your home directory could not be opened for "
@@ -1221,12 +1228,12 @@ msgstr ""
 "GDM 無法寫入您的認證檔案。原因可能是磁碟空間不足，或是無法進入您的家目錄。無"
 "論任何情況，目前是無法登入的。請聯絡系統管理員。"
 
-#: ../daemon/slave.c:4054
+#: ../daemon/slave.c:4061
 #, c-format
 msgid "%s: Error forking user session"
 msgstr "%s：衍生使用者的作業階段時發生錯誤"
 
-#: ../daemon/slave.c:4135
+#: ../daemon/slave.c:4142
 msgid ""
 "Your session only lasted less than 10 seconds.  If you have not logged out "
 "yourself, this could mean that there is some installation problem or that "
@@ -1236,52 +1243,52 @@ msgstr ""
 "您的作業階段維持了不足 10 秒。如果您不是自行登出，就表示安裝時出現了問題，或"
 "者磁碟空間不足。請嘗試使用其中一種安全模式登入，看看能否修正問題。"
 
-#: ../daemon/slave.c:4143
+#: ../daemon/slave.c:4150
 msgid "View details (~/.xsession-errors file)"
 msgstr "檢查詳細資料（~/.xsession-errors 檔案）"
 
-#: ../daemon/slave.c:4307
-msgid "GDM detected a shutdown or reboot in progress."
-msgstr "GDM 偵測到電腦已經準備關閉或者重新啟動。"
+#: ../daemon/slave.c:4314
+msgid "GDM detected a halt or restart in progress."
+msgstr "GDM 偵測到電腦正經準備關機或重新啟動。"
 
-#: ../daemon/slave.c:4401
+#: ../daemon/slave.c:4408
 #, c-format
 msgid "Ping to %s failed; whacking display!"
 msgstr "無法 ping %s 主機，終止此畫面！"
 
-#: ../daemon/slave.c:4680
+#: ../daemon/slave.c:4687
 #, c-format
 msgid "%s: Fatal X error - Restarting %s"
 msgstr "%s：X 發生嚴重錯誤 ─ 重新啟動 %s"
 
-#: ../daemon/slave.c:4749
+#: ../daemon/slave.c:4756
 msgid ""
 "Login sound requested on non-local display or the play software cannot be "
 "run or the sound does not exist"
 msgstr "不能執行遠端畫面的登入聲音要求或播放程式，或聲音檔根本不存在"
 
-#: ../daemon/slave.c:5106
+#: ../daemon/slave.c:5113
 #, c-format
 msgid "%s: Failed starting: %s"
 msgstr "%s：無法啟動：%s"
 
-#: ../daemon/slave.c:5113 ../daemon/slave.c:5252
+#: ../daemon/slave.c:5120 ../daemon/slave.c:5259
 #, c-format
 msgid "%s: Can't fork script process!"
 msgstr "%s: 無法衍生進程執行命令稿！"
 
-#: ../daemon/slave.c:5207
+#: ../daemon/slave.c:5214
 #, c-format
 msgid "%s: Failed creating pipe"
 msgstr "%s：無法建立 pipe"
 
-#: ../daemon/slave.c:5246
+#: ../daemon/slave.c:5253
 #, c-format
 msgid "%s: Failed executing: %s"
 msgstr "%s：執行失敗：%s"
 
-#: ../daemon/verify-crypt.c:67 ../daemon/verify-pam.c:1119
-#: ../daemon/verify-shadow.c:68
+#: ../daemon/verify-crypt.c:68 ../daemon/verify-pam.c:1119
+#: ../daemon/verify-shadow.c:69
 msgid ""
 "\n"
 "Incorrect username or password.  Letters must be typed in the correct case."
@@ -1289,58 +1296,58 @@ msgstr ""
 "\n"
 "使用者名稱或密碼不正確。必須以正確的大小寫輸入。"
 
-#: ../daemon/verify-crypt.c:72 ../daemon/verify-pam.c:1129
-#: ../daemon/verify-shadow.c:73
-msgid "Please make sure the Caps Lock key is not enabled."
-msgstr "請確定沒有按下 Caps Lock 鍵。"
+#: ../daemon/verify-crypt.c:73 ../daemon/verify-pam.c:1129
+#: ../daemon/verify-shadow.c:74 ../gui/greeter/greeter_parser.c:1101
+msgid "Caps Lock is on."
+msgstr "按下了 Caps Lock。"
 
-#: ../daemon/verify-crypt.c:119 ../daemon/verify-pam.c:525
-#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:2773
+#: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:525
+#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:2773
 msgid "Please enter your username"
 msgstr "請輸入使用者名稱"
 
 #. login: is whacked always translate to Username:
-#: ../daemon/verify-crypt.c:120 ../daemon/verify-pam.c:425
+#: ../daemon/verify-crypt.c:119 ../daemon/verify-pam.c:425
 #: ../daemon/verify-pam.c:426 ../daemon/verify-pam.c:427
 #: ../daemon/verify-pam.c:512 ../daemon/verify-pam.c:854
-#: ../daemon/verify-shadow.c:119 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
+#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
 #: ../gui/gdmlogin.c:1624 ../gui/gdmlogin.c:2104 ../gui/greeter/greeter.c:172
 #: ../gui/greeter/greeter_parser.c:1120
 msgid "Username:"
 msgstr "使用者名稱："
 
-#: ../daemon/verify-crypt.c:158 ../daemon/verify-pam.c:428
+#: ../daemon/verify-crypt.c:157 ../daemon/verify-pam.c:428
 #: ../daemon/verify-pam.c:429 ../daemon/verify-pam.c:573
-#: ../daemon/verify-shadow.c:176 ../gui/gdmlogin.c:1659
+#: ../daemon/verify-shadow.c:175 ../gui/gdmlogin.c:1659
 #: ../gui/greeter/greeter.c:190
 msgid "Password:"
 msgstr "密碼："
 
-#: ../daemon/verify-crypt.c:176 ../daemon/verify-crypt.c:190
-#: ../daemon/verify-shadow.c:194 ../daemon/verify-shadow.c:208
+#: ../daemon/verify-crypt.c:175 ../daemon/verify-crypt.c:189
+#: ../daemon/verify-shadow.c:193 ../daemon/verify-shadow.c:207
 #, c-format
 msgid "Couldn't authenticate user \"%s\""
 msgstr "無法認證使用者“%s”"
 
-#: ../daemon/verify-crypt.c:203 ../daemon/verify-pam.c:965
-#: ../daemon/verify-shadow.c:221
+#: ../daemon/verify-crypt.c:202 ../daemon/verify-pam.c:965
+#: ../daemon/verify-shadow.c:220
 #, c-format
 msgid "Root login disallowed on display '%s'"
 msgstr "不允許 root 在顯示畫面‘%s’登入"
 
-#: ../daemon/verify-crypt.c:205 ../daemon/verify-shadow.c:223
+#: ../daemon/verify-crypt.c:204 ../daemon/verify-shadow.c:222
 msgid "The system administrator is not allowed to login from this screen"
 msgstr "不允許系統管理員在本畫面登入"
 
-#: ../daemon/verify-crypt.c:221 ../daemon/verify-crypt.c:245
-#: ../daemon/verify-shadow.c:239 ../daemon/verify-shadow.c:263
+#: ../daemon/verify-crypt.c:220 ../daemon/verify-crypt.c:244
+#: ../daemon/verify-shadow.c:238 ../daemon/verify-shadow.c:262
 #, c-format
 msgid "User %s not allowed to log in"
 msgstr "不允許使用者 %s 登入"
 
-#: ../daemon/verify-crypt.c:223 ../daemon/verify-crypt.c:247
-#: ../daemon/verify-pam.c:1011 ../daemon/verify-pam.c:1294
-#: ../daemon/verify-shadow.c:241 ../daemon/verify-shadow.c:265
+#: ../daemon/verify-crypt.c:222 ../daemon/verify-crypt.c:246
+#: ../daemon/verify-pam.c:1011 ../daemon/verify-pam.c:1292
+#: ../daemon/verify-shadow.c:240 ../daemon/verify-shadow.c:264
 msgid ""
 "\n"
 "The system administrator has disabled your account."
@@ -1348,16 +1355,16 @@ msgstr ""
 "\n"
 "系統管理員已暫時停止您的帳號。"
 
-#: ../daemon/verify-crypt.c:270 ../daemon/verify-crypt.c:408
-#: ../daemon/verify-pam.c:1029 ../daemon/verify-pam.c:1311
-#: ../daemon/verify-shadow.c:288 ../daemon/verify-shadow.c:426
+#: ../daemon/verify-crypt.c:269 ../daemon/verify-crypt.c:407
+#: ../daemon/verify-pam.c:1029 ../daemon/verify-pam.c:1309
+#: ../daemon/verify-shadow.c:287 ../daemon/verify-shadow.c:425
 #, c-format
 msgid "Cannot set user group for %s"
 msgstr "無法指定使用者 %s 的群組"
 
-#: ../daemon/verify-crypt.c:272 ../daemon/verify-crypt.c:411
-#: ../daemon/verify-pam.c:1031 ../daemon/verify-pam.c:1314
-#: ../daemon/verify-shadow.c:290 ../daemon/verify-shadow.c:429
+#: ../daemon/verify-crypt.c:271 ../daemon/verify-crypt.c:410
+#: ../daemon/verify-pam.c:1031 ../daemon/verify-pam.c:1312
+#: ../daemon/verify-shadow.c:289 ../daemon/verify-shadow.c:428
 msgid ""
 "\n"
 "Cannot set your user group; you will not be able to log in. Please contact "
@@ -1366,13 +1373,13 @@ msgstr ""
 "\n"
 "無法設定您的使用者群組，您將會無法登入。請聯絡您的系統管理員。"
 
-#: ../daemon/verify-crypt.c:283 ../daemon/verify-crypt.c:356
-#: ../daemon/verify-shadow.c:301 ../daemon/verify-shadow.c:375
+#: ../daemon/verify-crypt.c:282 ../daemon/verify-crypt.c:355
+#: ../daemon/verify-shadow.c:300 ../daemon/verify-shadow.c:374
 #, c-format
 msgid "Password of %s has expired"
 msgstr "%s 的密碼已經過期"
 
-#: ../daemon/verify-crypt.c:285 ../daemon/verify-shadow.c:303
+#: ../daemon/verify-crypt.c:284 ../daemon/verify-shadow.c:302
 msgid ""
 "You are required to change your password.\n"
 "Please choose a new one."
@@ -1380,7 +1387,7 @@ msgstr ""
 "您需要立刻更新密碼。\n"
 "請輸入新的密碼。"
 
-#: ../daemon/verify-crypt.c:296 ../daemon/verify-shadow.c:314
+#: ../daemon/verify-crypt.c:295 ../daemon/verify-shadow.c:313
 msgid ""
 "\n"
 "Cannot change your password; you will not be able to log in. Please try "
@@ -1389,15 +1396,15 @@ msgstr ""
 "\n"
 "無法更改密碼，您也不能登入。請稍後再試，或是聯絡您的系統管理員。"
 
-#: ../daemon/verify-crypt.c:339 ../daemon/verify-crypt.c:347
-#: ../daemon/verify-shadow.c:358 ../daemon/verify-shadow.c:366
+#: ../daemon/verify-crypt.c:338 ../daemon/verify-crypt.c:346
+#: ../daemon/verify-shadow.c:357 ../daemon/verify-shadow.c:365
 msgid ""
 "Your password has been changed but you may have to change it again. Please "
 "try again later or contact your system administrator."
 msgstr ""
 "您的密碼已被更改，但有可能要再次更改。請稍後再試，或是聯絡您的系統管理員。"
 
-#: ../daemon/verify-crypt.c:358 ../daemon/verify-shadow.c:377
+#: ../daemon/verify-crypt.c:357 ../daemon/verify-shadow.c:376
 msgid ""
 "Your password has expired.\n"
 "Only a system administrator can now change it"
@@ -1405,11 +1412,11 @@ msgstr ""
 "您的密碼已經過期。\n"
 "只有系統管理員才可以為您更新。"
 
-#: ../daemon/verify-crypt.c:365 ../daemon/verify-shadow.c:384
+#: ../daemon/verify-crypt.c:364 ../daemon/verify-shadow.c:383
 msgid "Internal error on passwdexpired"
 msgstr "passwdexpired 導致內部錯誤"
 
-#: ../daemon/verify-crypt.c:367 ../daemon/verify-shadow.c:386
+#: ../daemon/verify-crypt.c:366 ../daemon/verify-shadow.c:385
 msgid ""
 "An internal error occurred. You will not be able to log in.\n"
 "Please try again later or contact your system administrator."
@@ -1417,7 +1424,7 @@ msgstr ""
 "發生內部錯誤，您將無法登入。\n"
 "請稍後再試，或是聯絡您的系統管理員。"
 
-#: ../daemon/verify-crypt.c:403 ../daemon/verify-shadow.c:421
+#: ../daemon/verify-crypt.c:402 ../daemon/verify-shadow.c:420
 #, c-format
 msgid "Cannot get passwd structure for %s"
 msgstr "無法獲取 %s 的密碼結構"
@@ -1504,7 +1511,7 @@ msgstr "無法設定 PAM_RHOST=%s"
 #. pretty much look as such, it shouldn't really
 #. happen
 #: ../daemon/verify-pam.c:915 ../daemon/verify-pam.c:933
-#: ../daemon/verify-pam.c:1233 ../daemon/verify-pam.c:1245
+#: ../daemon/verify-pam.c:1231 ../daemon/verify-pam.c:1243
 msgid "Couldn't authenticate user"
 msgstr "無法認證使用者"
 
@@ -1516,12 +1523,12 @@ msgstr ""
 "\n"
 "不允許系統管理員在本畫面登入"
 
-#: ../daemon/verify-pam.c:992 ../daemon/verify-pam.c:1275
+#: ../daemon/verify-pam.c:992 ../daemon/verify-pam.c:1273
 #, c-format
 msgid "Authentication token change failed for user %s"
 msgstr "使用者 %s 的認證 token 更改要求已經失敗"
 
-#: ../daemon/verify-pam.c:994 ../daemon/verify-pam.c:1278
+#: ../daemon/verify-pam.c:994 ../daemon/verify-pam.c:1276
 msgid ""
 "\n"
 "The change of the authentication token failed. Please try again later or "
@@ -1530,12 +1537,12 @@ msgstr ""
 "\n"
 "更改認證 token 失敗。請稍後再嘗試，或是聯絡系統管理員。"
 
-#: ../daemon/verify-pam.c:1009 ../daemon/verify-pam.c:1291
+#: ../daemon/verify-pam.c:1009 ../daemon/verify-pam.c:1289
 #, c-format
 msgid "User %s no longer permitted to access the system"
 msgstr "使用者 %s 不再允許進入系統"
 
-#: ../daemon/verify-pam.c:1015 ../daemon/verify-pam.c:1297
+#: ../daemon/verify-pam.c:1015 ../daemon/verify-pam.c:1295
 #, c-format
 msgid "User %s not permitted to gain access at this time"
 msgstr "今次不允許使用者 %s 進入系統"
@@ -1548,17 +1555,17 @@ msgstr ""
 "\n"
 "系統管理員暫時禁止使用者進入系統。"
 
-#: ../daemon/verify-pam.c:1022 ../daemon/verify-pam.c:1304
+#: ../daemon/verify-pam.c:1022 ../daemon/verify-pam.c:1302
 #, c-format
 msgid "Couldn't set acct. mgmt for %s"
 msgstr "無法設定 %s 的帳號管理"
 
-#: ../daemon/verify-pam.c:1055 ../daemon/verify-pam.c:1338
+#: ../daemon/verify-pam.c:1055 ../daemon/verify-pam.c:1336
 #, c-format
 msgid "Couldn't set credentials for %s"
 msgstr "無法設定 %s 的 credential"
 
-#: ../daemon/verify-pam.c:1069 ../daemon/verify-pam.c:1354
+#: ../daemon/verify-pam.c:1069 ../daemon/verify-pam.c:1352
 #, c-format
 msgid "Couldn't open session for %s"
 msgstr "無法開啟 %s 的作業階段"
@@ -1571,16 +1578,16 @@ msgstr ""
 "\n"
 "認證失敗。必須以正確的大小寫輸入。"
 
-#: ../daemon/verify-pam.c:1139 ../daemon/verify-pam.c:1236
-#: ../daemon/verify-pam.c:1248
+#: ../daemon/verify-pam.c:1137 ../daemon/verify-pam.c:1234
+#: ../daemon/verify-pam.c:1246
 msgid "Authentication failed"
 msgstr "認證失敗"
 
-#: ../daemon/verify-pam.c:1212
+#: ../daemon/verify-pam.c:1210
 msgid "Automatic login"
 msgstr "自動登入"
 
-#: ../daemon/verify-pam.c:1300
+#: ../daemon/verify-pam.c:1298
 msgid ""
 "\n"
 "The system administrator has disabled your access to the system temporarily."
@@ -1588,7 +1595,7 @@ msgstr ""
 "\n"
 "系統管理員暫時禁止您進入系統。"
 
-#: ../daemon/verify-pam.c:1521 ../daemon/verify-pam.c:1523
+#: ../daemon/verify-pam.c:1519 ../daemon/verify-pam.c:1521
 msgid "Can't find PAM configuration for GDM."
 msgstr "找不到 GDM 的 PAM 設定。"
 
@@ -2684,11 +2691,13 @@ msgid "Are you sure you want to restart the computer?"
 msgstr "您確定要重新啟動電腦？"
 
 #: ../gui/gdmlogin.c:650 ../gui/gdmlogin.c:2494
+#: ../gui/greeter/greeter_parser.c:1086 ../gui/greeter/greeter_system.c:68
+#: ../gui/greeter/greeter_system.c:187
 msgid "_Restart"
 msgstr "重新啟動(_R)"
 
 #: ../gui/gdmlogin.c:662 ../gui/greeter/greeter_system.c:79
-msgid "Are you sure you want to shut down the computer?"
+msgid "Are you sure you want to Shut Down the computer?"
 msgstr "您確定要關閉電腦？"
 
 #: ../gui/gdmlogin.c:663 ../gui/gdmlogin.c:2504
@@ -2872,7 +2881,7 @@ msgstr ""
 msgid "Cannot start the greeter"
 msgstr "無法啟動歡迎程式"
 
-#: ../gui/gdmlogin.c:3280 ../gui/greeter/greeter.c:674
+#: ../gui/gdmlogin.c:3280
 msgid "Restart"
 msgstr "重新啟動"
 
@@ -2885,7 +2894,7 @@ msgstr ""
 "歡迎程式的版本 (%s) 和服務程式的版本 (%s) 不配合。可能是因為您剛才升級了 "
 "GDM。請重新啟動 GDM 服務程式或重新啟動電腦。"
 
-#: ../gui/gdmlogin.c:3328
+#: ../gui/gdmlogin.c:3328 ../gui/greeter/greeter.c:674
 msgid "Restart GDM"
 msgstr "重新啟動 GDM"
 
@@ -2936,13 +2945,13 @@ msgstr "無法開啟檔案"
 msgid "Select User Image"
 msgstr "選擇使用者圖片"
 
-#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5670 ../gui/gdmsetup.c:5739
-#: ../gui/gdmsetup.c:5948 ../gui/gdmsetup.c:6017
+#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5582 ../gui/gdmsetup.c:5704
+#: ../gui/gdmsetup.c:5857 ../gui/gdmsetup.c:5979
 msgid "Images"
 msgstr "圖片"
 
-#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3045 ../gui/gdmsetup.c:5675
-#: ../gui/gdmsetup.c:5744 ../gui/gdmsetup.c:5953 ../gui/gdmsetup.c:6022
+#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3046 ../gui/gdmsetup.c:5587
+#: ../gui/gdmsetup.c:5709 ../gui/gdmsetup.c:5862 ../gui/gdmsetup.c:5984
 msgid "All Files"
 msgstr "全部檔案"
 
@@ -3002,14 +3011,14 @@ msgstr "嘗糕，在作業階段目錄中甚麼都找不到。"
 msgid "No default session link found. Using Failsafe GNOME.\n"
 msgstr "找不到預設作業階段的連結。使用「GNOME 安全模式」。\n"
 
-#: ../gui/gdmsetup.c:259
+#: ../gui/gdmsetup.c:260
 msgid ""
 "An error occurred while trying to contact the login screens.  Not all "
 "updates may have taken effect."
 msgstr "嘗試連接登入畫面時出現錯誤。某部分已更新的設定可能不會生效。"
 
-#: ../gui/gdmsetup.c:801 ../gui/gdmsetup.c:819 ../gui/gdmsetup.c:979
-#: ../gui/gdmsetup.c:1223
+#: ../gui/gdmsetup.c:801 ../gui/gdmsetup.c:819 ../gui/gdmsetup.c:974
+#: ../gui/gdmsetup.c:1220
 msgid "Themed"
 msgstr "佈景主題"
 
@@ -3021,115 +3030,115 @@ msgstr "純文字"
 msgid "Plain with face browser"
 msgstr "純文字加上樣貌瀏覽程式"
 
-#: ../gui/gdmsetup.c:1574
+#: ../gui/gdmsetup.c:1571
 msgid "Autologin or timed login to the root account is not allowed."
 msgstr "不允許以自動或計時的方式登入 root 帳號。"
 
-#: ../gui/gdmsetup.c:1795
+#: ../gui/gdmsetup.c:1792
 #, c-format
 msgid "The \"%s\" user already exists in the include list."
 msgstr "「%s」使用者已經存在包含清單中。"
 
-#: ../gui/gdmsetup.c:1805 ../gui/gdmsetup.c:1835 ../gui/gdmsetup.c:1872
+#: ../gui/gdmsetup.c:1802 ../gui/gdmsetup.c:1832 ../gui/gdmsetup.c:1869
 msgid "Cannot add user"
 msgstr "無法加入使用者"
 
-#: ../gui/gdmsetup.c:1825
+#: ../gui/gdmsetup.c:1822
 #, c-format
 msgid "The \"%s\" user already exists in the exclude list."
 msgstr "「%s」使用者已經存在排除清單中。"
 
-#: ../gui/gdmsetup.c:1862
+#: ../gui/gdmsetup.c:1859
 #, c-format
 msgid "The \"%s\" user does not exist."
 msgstr "使用者「%s」不存在。"
 
-#: ../gui/gdmsetup.c:3040 ../gui/gdmsetup.glade.h:73
+#: ../gui/gdmsetup.c:3041 ../gui/gdmsetup.glade.h:73
 msgid "Sounds"
 msgstr "聲音"
 
-#: ../gui/gdmsetup.c:3247 ../gui/gdmsetup.c:3305
+#: ../gui/gdmsetup.c:3245 ../gui/gdmsetup.c:3303
 msgid "None"
 msgstr "無"
 
-#: ../gui/gdmsetup.c:3738
+#: ../gui/gdmsetup.c:3736
 msgid "Archive is not of a subdirectory"
 msgstr "檔案中沒有包含任何副目錄"
 
-#: ../gui/gdmsetup.c:3746
+#: ../gui/gdmsetup.c:3744
 msgid "Archive is not of a single subdirectory"
 msgstr "檔案中包含的副目錄不止一個"
 
-#: ../gui/gdmsetup.c:3770 ../gui/gdmsetup.c:3848
+#: ../gui/gdmsetup.c:3768 ../gui/gdmsetup.c:3846
 msgid "File not a tar.gz or tar archive"
 msgstr "檔案不是 tar.gz 或 tar 保存檔"
 
-#: ../gui/gdmsetup.c:3772
+#: ../gui/gdmsetup.c:3770
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "檔案中沒有包括 GdmGreeterTheme.info 檔案"
 
-#: ../gui/gdmsetup.c:3794
+#: ../gui/gdmsetup.c:3792
 msgid "File does not exist"
 msgstr "檔案不存在。"
 
-#: ../gui/gdmsetup.c:3914
+#: ../gui/gdmsetup.c:3912
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../gui/gdmsetup.c:3921
+#: ../gui/gdmsetup.c:3919
 msgid "Not a theme archive"
 msgstr "不是佈景主題檔"
 
 #. FIXME: if exists already perhaps we could also have an
 #. * option to change the dir name
-#: ../gui/gdmsetup.c:3943
+#: ../gui/gdmsetup.c:3941
 #, c-format
 msgid ""
 "Theme directory '%s' seems to be already installed. Install again anyway?"
 msgstr "佈景主題目錄‘%s’似乎已經安裝完成，是否再安裝一次？"
 
-#: ../gui/gdmsetup.c:4035
+#: ../gui/gdmsetup.c:4033
 msgid "Some error occurred when installing the theme"
 msgstr "安裝佈景主題時出現某些錯誤"
 
-#: ../gui/gdmsetup.c:4091
+#: ../gui/gdmsetup.c:4089
 msgid "No file selected"
 msgstr "未選取任何檔案。"
 
-#: ../gui/gdmsetup.c:4112
+#: ../gui/gdmsetup.c:4110
 msgid "Select Theme Archive"
 msgstr "選擇佈景主題檔案庫"
 
-#: ../gui/gdmsetup.c:4116 ../gui/gdmsetup.c:5105
+#: ../gui/gdmsetup.c:4114 ../gui/gdmsetup.c:5103
 msgid "_Install"
 msgstr "安裝(_I)"
 
-#: ../gui/gdmsetup.c:4207
+#: ../gui/gdmsetup.c:4205
 #, c-format
 msgid "Remove the \"%s\" theme?"
 msgstr "是否移除主題「%s」？"
 
-#: ../gui/gdmsetup.c:4216
+#: ../gui/gdmsetup.c:4214
 msgid "If you choose to remove the theme, it will be permanently lost."
 msgstr "如果您選擇移除該主題，它將被完全刪除。"
 
-#: ../gui/gdmsetup.c:4224
+#: ../gui/gdmsetup.c:4222
 msgid "_Remove Theme"
 msgstr "移除佈景主題(_R)"
 
-#: ../gui/gdmsetup.c:5094
+#: ../gui/gdmsetup.c:5092
 #, c-format
 msgid "Install the theme from '%s'?"
 msgstr "從‘%s’安裝佈景主題？"
 
-#: ../gui/gdmsetup.c:5095
+#: ../gui/gdmsetup.c:5093
 #, c-format
 msgid "Select install to add the theme from the file '%s'."
 msgstr "選取安裝來從檔案‘%s’中加入佈景主題。"
 
 #. This is the temporary help dialog
-#: ../gui/gdmsetup.c:5356
+#: ../gui/gdmsetup.c:5354
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3149,24 +3158,24 @@ msgstr ""
 "\n"
 "如果需要完整的說明文件，請啟動 GNOME 說明文字瀏覽器並閱讀「桌面」部分。"
 
-#: ../gui/gdmsetup.c:6442
+#: ../gui/gdmsetup.c:6400
 msgid "Apply the changes to users before closing?"
 msgstr "是否在關閉前套用變更至使用者？"
 
-#: ../gui/gdmsetup.c:6443
+#: ../gui/gdmsetup.c:6401
 msgid ""
 "If you don't apply, the changes made on the Users tab will be disregarded."
 msgstr "如果您不想套用，在使用者分頁所做的變更都會被廢棄。"
 
-#: ../gui/gdmsetup.c:6446
+#: ../gui/gdmsetup.c:6404
 msgid "Close _without Applying"
 msgstr "不套用而關閉(_W)"
 
-#: ../gui/gdmsetup.c:6494
+#: ../gui/gdmsetup.c:6452
 msgid "Could not access GDM configuration file.\n"
 msgstr "無法存取 GDM 設置檔。\n"
 
-#: ../gui/gdmsetup.c:6538
+#: ../gui/gdmsetup.c:6496
 msgid "You must be the root user to configure GDM."
 msgstr "您必須是以 root 的身分來設置 GDM。"
 
@@ -3603,7 +3612,7 @@ msgstr ""
 "新啟動 GDM 服務程式或啟動電腦。"
 
 #: ../gui/greeter/greeter.c:625 ../gui/greeter/greeter.c:676
-msgid "Reboot"
+msgid "Restart Machine"
 msgstr "重新啟動電腦"
 
 #: ../gui/greeter/greeter.c:1099
@@ -3690,11 +3699,6 @@ msgstr "佈景主題損壞：必須具 pam-message 標籤！"
 msgid "Sus_pend"
 msgstr "暫停(_P)"
 
-#: ../gui/greeter/greeter_parser.c:1086 ../gui/greeter/greeter_system.c:68
-#: ../gui/greeter/greeter_system.c:187
-msgid "_Reboot"
-msgstr "重新啟動電腦(_R)"
-
 #: ../gui/greeter/greeter_parser.c:1091
 msgid "_XDMCP Chooser"
 msgstr "_XDMCP 選擇程式"
@@ -3703,10 +3707,6 @@ msgstr "_XDMCP 選擇程式"
 msgid "_Configure"
 msgstr "設定(_C)"
 
-#: ../gui/greeter/greeter_parser.c:1101
-msgid "You've got capslock on!"
-msgstr "請留意不要按下 Caps Lock！"
-
 #: ../gui/greeter/greeter_parser.c:1125
 msgid "_OK"
 msgstr "確定(_O)"
@@ -3757,12 +3757,12 @@ msgid ""
 msgstr "設定 GDM（即是登入管理員）。這樣需要 root 的密碼。"
 
 #: ../gui/greeter/greeter_system.c:194 ../gui/greeter/greeter_system.c:322
-msgid "Reboot your computer"
-msgstr "重新啟動電腦"
+msgid "Restart your computer"
+msgstr "重新啟動您的電腦"
 
 #: ../gui/greeter/greeter_system.c:206
-msgid "Shut down the system so that you may safely turn off the computer."
-msgstr "關閉作業系統，以便關閉電源。"
+msgid "Shut Down the system so that you may safely turn off the computer."
+msgstr "關閉作業系統，那麼您可以安全地關閉電腦的電源。"
 
 #: ../gui/greeter/greeter_system.c:219 ../gui/greeter/greeter_system.c:339
 msgid "Suspend your computer"
@@ -3777,11 +3777,11 @@ msgid "Shut _down the computer"
 msgstr "關閉電腦(_D)"
 
 #: ../gui/greeter/greeter_system.c:304
-msgid "Shut down your computer so that you may turn it off."
-msgstr "關閉電腦以便使用者關閉電源。"
+msgid "Shut Down your computer so that you may turn it off."
+msgstr "關閉您的電腦，那麼您可以關閉它的電源。"
 
 #: ../gui/greeter/greeter_system.c:319
-msgid "_Reboot the computer"
+msgid "_Restart the computer"
 msgstr "重新啟動電腦(_R)"
 
 #: ../gui/greeter/greeter_system.c:336
@@ -3838,7 +3838,7 @@ msgstr "GNOME 版本的「圓圈」佈景主題"
 msgid "Happy GNOME"
 msgstr "Happy GNOME"
 
-#: ../gui/modules/dwellmouselistener.c:655
+#: ../gui/modules/dwellmouselistener.c:656
 #: ../gui/modules/keymouselistener.c:926
 #, c-format
 msgid ""
@@ -3853,55 +3853,55 @@ msgstr ""
 msgid "Cannot open gestures file: %s"
 msgstr "無法開啟 gestures 檔：%s"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:38
+#: ../utils/gdm-dmx-reconnect-proxy.c:37
 msgid "DMX display to migrate to"
 msgstr "DMX 顯示轉移到"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:39 ../utils/gdm-dmx-reconnect-proxy.c:44
+#: ../utils/gdm-dmx-reconnect-proxy.c:38 ../utils/gdm-dmx-reconnect-proxy.c:43
 msgid "DISPLAY"
 msgstr "畫面"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:43
+#: ../utils/gdm-dmx-reconnect-proxy.c:42
 msgid "Backend display name"
 msgstr "後端顯示名稱"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:48
+#: ../utils/gdm-dmx-reconnect-proxy.c:47
 msgid "Xauthority file for destination display"
 msgstr "目的地顯示的 Xauthority 檔案"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:49 ../utils/gdm-dmx-reconnect-proxy.c:54
+#: ../utils/gdm-dmx-reconnect-proxy.c:48 ../utils/gdm-dmx-reconnect-proxy.c:53
 msgid "AUTHFILE"
 msgstr "認證檔案"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:53
+#: ../utils/gdm-dmx-reconnect-proxy.c:52
 msgid "Xauthority file for backend display"
 msgstr "後端顯示的 Xauthority 檔案"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:71
+#: ../utils/gdm-dmx-reconnect-proxy.c:70
 #, c-format
 msgid "Failed to open display \"%s\"\n"
 msgstr "無法開啟畫面“%s”\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:75
+#: ../utils/gdm-dmx-reconnect-proxy.c:74
 #, c-format
 msgid "DMX extension not present on \"%s\"\n"
 msgstr "DMX 伸延不存在於“%s”\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:98
+#: ../utils/gdm-dmx-reconnect-proxy.c:97
 msgid "- migrate a backend display from one DMX display to another"
 msgstr "- 將後端顯示由一個 DMX 顯示轉移到另一個"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:104
+#: ../utils/gdm-dmx-reconnect-proxy.c:103
 #, c-format
 msgid "You must specify a destination DMX display using %s\n"
 msgstr "您必須使用 %s 來指定 DMX 顯示\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:109
+#: ../utils/gdm-dmx-reconnect-proxy.c:108
 #, c-format
 msgid "You must specify a backend display by using %s\n"
 msgstr "您必須使用 %s 來指定後端顯示\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:124
+#: ../utils/gdm-dmx-reconnect-proxy.c:123
 #, c-format
 msgid "DMXAddScreen \"%s\" failed on \"%s\"\n"
 msgstr "DMXAddScreen “%s”在“%s”上失敗\n"
@@ -3916,14 +3916,14 @@ msgstr "gdmaskpass 只能以 root 身分執行\n"
 msgid "Authentication failure!\n"
 msgstr "認證錯誤！\n"
 
-#: ../vicious-extensions/glade-helper.c:85
-#: ../vicious-extensions/glade-helper.c:117
-#: ../vicious-extensions/glade-helper.c:139
-#: ../vicious-extensions/glade-helper.c:159
+#: ../vicious-extensions/glade-helper.c:84
+#: ../vicious-extensions/glade-helper.c:116
+#: ../vicious-extensions/glade-helper.c:138
+#: ../vicious-extensions/glade-helper.c:158
 msgid "(memory buffer)"
 msgstr "（記憶緩衝區）"
 
-#: ../vicious-extensions/glade-helper.c:191
+#: ../vicious-extensions/glade-helper.c:190
 #, c-format
 msgid ""
 "An error occurred while loading user interface element %s%s from file %s.  "
@@ -3934,13 +3934,13 @@ msgstr ""
 "描述檔已經損壞。%4$s 無法繼續，而且會立刻退出。請您檢查是否已正確安裝 %5$s 或"
 "者選擇重新安裝 %6$s。"
 
-#: ../vicious-extensions/glade-helper.c:209
-#: ../vicious-extensions/glade-helper.c:277
-#: ../vicious-extensions/glade-helper.c:319
+#: ../vicious-extensions/glade-helper.c:208
+#: ../vicious-extensions/glade-helper.c:276
+#: ../vicious-extensions/glade-helper.c:318
 msgid "Cannot load user interface"
 msgstr "無法載入使用者介面"
 
-#: ../vicious-extensions/glade-helper.c:215
+#: ../vicious-extensions/glade-helper.c:214
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -3949,7 +3949,7 @@ msgstr ""
 "Glade 檔案有錯誤！請確定是否已安裝正確的檔案！\n"
 "檔案：%s  視窗元件：%s"
 
-#: ../vicious-extensions/glade-helper.c:247
+#: ../vicious-extensions/glade-helper.c:246
 #, c-format
 msgid ""
 "An error occurred while loading the user interface element %s%s from file %"
@@ -3962,11 +3962,11 @@ msgid_plural ""
 "description was corrupted. %s cannot continue and will exit now. You should "
 "check your installation of %s or reinstall %s."
 msgstr[0] ""
-"當由檔案 %3$s 載入使用者介面的視窗元件 %1$s%2$s 時發生錯誤。CList 類型的視窗"
+"當由檔案 %3$s 載入使用者介面的視窗元件 %1$s%2$s 時出現錯誤。CList 類型的視窗"
 "元件應有 %4$d 欄。可能是 glade 介面描述檔已經損壞。%5$s 無法繼續，而且會立刻"
-"退出。請您檢查是否已正確安裝 %6$s 或選擇重新安裝 %7$s。"
+"退出。請您檢查是否已正確安裝 %6$s 或者選擇重新安裝 %7$s。"
 
-#: ../vicious-extensions/glade-helper.c:283
+#: ../vicious-extensions/glade-helper.c:282
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -3975,7 +3975,7 @@ msgstr ""
 "Glade 檔案有錯誤！請確定是否已安裝正確的檔案！\n"
 "檔案：%s  視窗元件：%s  clist 欄數應該是：%d"
 
-#: ../vicious-extensions/glade-helper.c:303
+#: ../vicious-extensions/glade-helper.c:302
 #, c-format
 msgid ""
 "An error occurred while loading the user interface from file %s.  Possibly "
@@ -3985,11 +3985,46 @@ msgstr ""
 "由檔案 %s 載入使用者介面時發生錯誤。可能是找不到 glade 介面描述檔。%s 無法繼"
 "續執行，而且會立即結束。請檢查是否已正確安裝 %s，或者選擇重新安裝 %s。 "
 
-#: ../vicious-extensions/glade-helper.c:322
+#: ../vicious-extensions/glade-helper.c:321
 #, c-format
 msgid "No interface could be loaded. This is BAD! (file: %s)"
 msgstr "無法載入任何介面！這是錯誤！（檔案：%s）"
 
-#: ../vicious-extensions/ve-nongnome.c:134
+#: ../vicious-extensions/ve-nongnome.c:135
 msgid "Too many alias levels for a locale; may indicate a loop"
 msgstr "地區的別稱級別過多，可能是出現循環"
+
+#~ msgid ""
+#~ "An error occurred while loading the user interface element %s%s from file "
+#~ "%s. CList type widget should have %d column. Possibly the glade interface "
+#~ "description was corrupted. %s cannot continue and will exit now. You "
+#~ "should check your installation of %s or reinstall %s.An error occurred "
+#~ "while loading the user interface element %s%s from file %s. CList type "
+#~ "widget should have %d columns. Possibly the glade interface description "
+#~ "was corrupted. %s cannot continue and will exit now. You should check "
+#~ "your installation of %s or reinstall %s."
+#~ msgstr ""
+#~ "當由檔案 %3$s 載入使用者介面的視窗元件 %1$s%2$s 時發生錯誤。CList 類型的視"
+#~ "窗元件應有 %4$d 欄。可能是 glade 介面描述檔已經損壞。%5$s 無法繼續，而且會"
+#~ "立刻退出。請您檢查是否已正確安裝 %6$s 或選擇重新安裝 %7$s。"
+
+#~ msgid "Master rebooting..."
+#~ msgstr "正在重新啟動主電腦..."
+
+#~ msgid "Please make sure the Caps Lock key is not enabled."
+#~ msgstr "請確定沒有按下 Caps Lock 鍵。"
+
+#~ msgid "Reboot"
+#~ msgstr "重新啟動電腦"
+
+#~ msgid "_Reboot"
+#~ msgstr "重新啟動電腦(_R)"
+
+#~ msgid "You've got capslock on!"
+#~ msgstr "請留意不要按下 Caps Lock！"
+
+#~ msgid "Reboot your computer"
+#~ msgstr "重新啟動電腦"
+
+#~ msgid "_Reboot the computer"
+#~ msgstr "重新啟動電腦(_R)"