diff --git a/po/ChangeLog b/po/ChangeLog
index 5cd58bfaf..7cceef6f3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-17  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_TW.po: Updated Traditional Chinese translation.
+
 2005-08-16  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5ba82079a..51251d6ce 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,4 +1,4 @@
-# traditional Chinese translation of gnome-control-center.
+# Traditional Chinese translation of gnome-control-center.
 # Copyright (C) 1999, 2001, 02, 03, 04, 05 Free Software Foundation, Inc.
 # GNOME 1.x:
 # S.J. Luo <crystal@mickey.ee.nctu.edu.tw>, 1999.
@@ -10,10 +10,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 2.11.5\n"
+"Project-Id-Version: gnome-control-center 2.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-01 19:13+0800\n"
-"PO-Revision-Date: 2005-07-01 19:19+0800\n"
+"POT-Creation-Date: 2005-08-17 06:42+0800\n"
+"PO-Revision-Date: 2005-08-15 15:39+0800\n"
 "Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
 "Language-Team: Chinese/Traditional <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,39 +23,339 @@ msgstr ""
 
 #: ../capplets/about-me/eel-alert-dialog.c:114
 msgid "Image/label border"
-msgstr ""
+msgstr "圖像/標籤邊框"
 
 #: ../capplets/about-me/eel-alert-dialog.c:115
 msgid "Width of border around the label and image in the alert dialog"
-msgstr ""
+msgstr "在警告對話方塊中圍繞標籤與圖像的邊框的寬度"
 
 #: ../capplets/about-me/eel-alert-dialog.c:124
 msgid "Alert Type"
-msgstr ""
+msgstr "警告類型"
 
 #: ../capplets/about-me/eel-alert-dialog.c:125
 msgid "The type of alert"
-msgstr ""
+msgstr "警告的類型"
 
 #: ../capplets/about-me/eel-alert-dialog.c:133
 msgid "Alert Buttons"
-msgstr ""
+msgstr "警告按鈕"
 
 #: ../capplets/about-me/eel-alert-dialog.c:134
 msgid "The buttons shown in the alert dialog"
-msgstr ""
+msgstr "在警告對話方塊中顯示的按鈕"
 
 #: ../capplets/about-me/eel-alert-dialog.c:198
 msgid "Show more _details"
 msgstr "顯示更多詳細資料(_D)"
 
 #: ../capplets/about-me/gnome-about-me.desktop.in.in.h:1
-msgid "About-me"
+#: ../capplets/about-me/gnome-about-me.glade.h:14
+msgid "About Me"
 msgstr "關於自己"
 
 #: ../capplets/about-me/gnome-about-me.desktop.in.in.h:2
 msgid "Set your personal information"
-msgstr "設定有關自己的資訊"
+msgstr "設定您的個人資訊"
+
+#: ../capplets/about-me/gnome-about-me.c:554
+msgid "Select Image"
+msgstr "選擇圖像"
+
+#: ../capplets/about-me/gnome-about-me.c:556
+msgid "No Image"
+msgstr "沒有圖像"
+
+#: ../capplets/about-me/gnome-about-me.c:706
+msgid ""
+"There was an error while trying to get the addressbook information\n"
+"Evolution Data Server can't handle the protocol"
+msgstr ""
+"嘗試取得地址薄資訊時發生錯誤\n"
+"Evolution 資料伺服器無法處理該通訊協定"
+
+#: ../capplets/about-me/gnome-about-me.c:727
+msgid "Unable to open address book"
+msgstr "無法開啟地址薄"
+
+#: ../capplets/about-me/gnome-about-me.c:739
+msgid "Unknown login ID, the user database might be corrupted"
+msgstr "不明的登入 ID，使用者資料庫可能已經受損"
+
+#: ../capplets/about-me/gnome-about-me.c:770
+#: ../capplets/about-me/gnome-about-me.c:772
+#, c-format
+msgid "About %s"
+msgstr "關於 %s"
+
+#: ../capplets/about-me/gnome-about-me-password.c:101
+#: ../capplets/about-me/gnome-about-me-password.c:479
+msgid "Old password is incorrect, please retype it"
+msgstr "舊的密碼不正確，請重新輸入"
+
+#: ../capplets/about-me/gnome-about-me-password.c:112
+msgid "System error has occurred"
+msgstr "發生了系統錯誤"
+
+#: ../capplets/about-me/gnome-about-me-password.c:113
+msgid "Could not run /usr/bin/passwd"
+msgstr "無法執行 /usr/bin/passwd"
+
+#: ../capplets/about-me/gnome-about-me-password.c:114
+msgid "Unable to launch backend"
+msgstr "無法執行後端程式"
+
+#: ../capplets/about-me/gnome-about-me-password.c:116
+#: ../capplets/about-me/gnome-about-me-password.c:117
+msgid "Unexpected error has occurred"
+msgstr "發生了無法預期的錯誤"
+
+#: ../capplets/about-me/gnome-about-me-password.c:315
+msgid "Password is too short"
+msgstr "密碼過短"
+
+#: ../capplets/about-me/gnome-about-me-password.c:318
+#: ../capplets/about-me/gnome-about-me-password.c:321
+msgid "Password is too simple"
+msgstr "密碼過份簡單"
+
+#: ../capplets/about-me/gnome-about-me-password.c:324
+msgid "Old and new passwords are too similar"
+msgstr "舊的密碼與新的密碼太相似了"
+
+#: ../capplets/about-me/gnome-about-me-password.c:328
+msgid "Old and new password are the same"
+msgstr "舊的密碼與新的密碼是相同的"
+
+#: ../capplets/about-me/gnome-about-me-password.c:406
+msgid "Please type the passwords."
+msgstr "請輸入密碼。"
+
+#: ../capplets/about-me/gnome-about-me-password.c:414
+msgid "Please type the password again, it is wrong."
+msgstr "請再次輸入密碼，剛才的密碼是錯的。"
+
+#: ../capplets/about-me/gnome-about-me-password.c:417
+msgid "Click on Change Password to change the password."
+msgstr "按下「變更密碼」來更改密碼。"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:1
+#: ../vfs-methods/themus/apply-font.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../capplets/about-me/gnome-about-me.glade.h:2
+#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
+#: ../capplets/font/font-properties.glade.h:1
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:1
+#: ../capplets/ui-properties/gnome-ui-properties.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../capplets/about-me/gnome-about-me.glade.h:3
+msgid "<b>Email</b>"
+msgstr "<b>電子郵件</b>"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:4
+msgid "<b>Home</b>"
+msgstr "<b>住家</b>"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:5
+msgid "<b>Instant Messaging</b>"
+msgstr "<b>即時通訊</b>"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:6
+msgid "<b>Job</b>"
+msgstr "<b>職業</b>"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:7
+msgid "<b>Please type the passwords.</b>"
+msgstr "<b>請輸入密碼。</b>"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:8
+msgid "<b>Telephone</b>"
+msgstr "<b>電話</b>"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:9
+msgid "<b>Web</b>"
+msgstr "<b>Web</b>"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:10
+msgid "<b>Work</b>"
+msgstr "<b>工作</b>"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:11
+msgid "A_IM/iChat:"
+msgstr "A_IM/iChat:"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:12
+msgid "A_ddress:"
+msgstr "地址(_A)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:13
+msgid "A_ssistant:"
+msgstr "助理(_S)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:15
+msgid "Address"
+msgstr "地址"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:16
+msgid "C_ity:"
+msgstr "城市(_I)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:17
+msgid "C_ompany:"
+msgstr "公司(_O)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:18
+msgid "Cale_ndar:"
+msgstr "行事曆(_N)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:19
+msgid "Change Passwo_rd..."
+msgstr "更改密碼(_R)..."
+
+#: ../capplets/about-me/gnome-about-me.glade.h:20
+msgid "Change Password"
+msgstr "更改密碼"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:21
+msgid "Ci_ty:"
+msgstr "城市(_T)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:22
+msgid "Co_untry:"
+msgstr "國家/地區(_U)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:23
+msgid "Contact"
+msgstr "聯絡"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:24
+msgid "Cou_ntry:"
+msgstr "國家/地區(_N)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:25
+msgid "Full Name"
+msgstr "全名"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:26
+msgid "Hom_e:"
+msgstr "住家(_E)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:27
+msgid "IC_Q:"
+msgstr "IC_Q:"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:28
+msgid "M_SN:"
+msgstr "M_SN:"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:29
+msgid "Old pa_ssword:"
+msgstr "舊密碼(_S)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:30
+msgid "P.O. _box:"
+msgstr "郵政信箱(_B)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:31
+msgid "P._O. box:"
+msgstr "郵政信箱(_O)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:32
+msgid "Personal Info"
+msgstr "個人資訊"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:33
+msgid "State/Pro_vince:"
+msgstr "州/省(_V)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:34
+msgid "User name:"
+msgstr "使用者名稱："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:35
+msgid "Web _log:"
+msgstr "網路日誌(_L)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:36
+msgid "Wor_k:"
+msgstr "工作(_W)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:37
+msgid "Work _fax:"
+msgstr "工作傳真(_F)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:38
+msgid "Zip/_Postal code:"
+msgstr "郵遞區號(_P)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:39
+msgid "_Address:"
+msgstr "地址(_A)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:40
+msgid "_Department:"
+msgstr "部門(_D)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:41
+msgid "_Groupwise:"
+msgstr "_Groupwise:"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:42
+msgid "_Home page:"
+msgstr "首頁(_H)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:43
+msgid "_Home:"
+msgstr "住家(_H)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:44
+msgid "_Jabber:"
+msgstr "_Jabber:"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:45
+msgid "_Manager:"
+msgstr "總管(_M)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:46
+msgid "_Mobile:"
+msgstr "手機(_M)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:47
+msgid "_New password:"
+msgstr "新密碼(_N)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:48
+msgid "_Profession:"
+msgstr "職業(_P)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:49
+msgid "_Retype new password:"
+msgstr "再輸入新的密碼(_R)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:50
+msgid "_State/Province:"
+msgstr "州/省(_S)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:51
+msgid "_Title:"
+msgstr "職稱(_T)："
+
+#: ../capplets/about-me/gnome-about-me.glade.h:52
+msgid "_Work:"
+msgstr "工作(_W)"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:53
+msgid "_Yahoo:"
+msgstr "_Yahoo:"
+
+#: ../capplets/about-me/gnome-about-me.glade.h:54
+msgid "_Zip/Postal code:"
+msgstr "郵遞區號(_Z)："
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:1
 msgid "<b>Applications</b>"
@@ -147,7 +447,7 @@ msgstr "無法從‘%s’檔案匯入 AccessX 設定"
 
 #: ../capplets/accessibility/keyboard/accessibility-keyboard.c:435
 msgid "Import Feature Settings File"
-msgstr "匯入無障礙環境組態"
+msgstr "匯入無障礙環境設定檔"
 
 #: ../capplets/accessibility/keyboard/accessibility-keyboard.c:439
 msgid "_Import"
@@ -169,18 +469,9 @@ msgid ""
 "accessibility features will not operate without it."
 msgstr "本系統似乎沒有 XKB 擴展功能。沒有了該功能，無障礙鍵盤功能將無法使用。"
 
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-#: ../capplets/font/font-properties.glade.h:1
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:1
-#: ../capplets/ui-properties/gnome-ui-properties.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:1
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:2
-#: ../capplets/network/gnome-network-preferences.glade.h:2
 #: ../capplets/theme-switcher/theme-install.glade.h:1
 #: ../capplets/theme-switcher/theme-properties.glade.h:1
 msgid "*"
@@ -295,7 +586,7 @@ msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
-"順序按下個別的特殊按鍵 (例如 Alt、Ctrl) 的效果等於同時按下多個特殊按鍵。"
+"順序按下個別的特殊按鍵（例如 Alt、Ctrl）的效果等於同時按下多個特殊按鍵。"
 
 #: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:29
@@ -353,12 +644,12 @@ msgstr "毫秒"
 
 #: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "pixels/second"
-msgstr "像素(每秒)"
+msgstr "像素/秒"
 
 #. set the timeout value  label with correct value of timeout
 #: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:43
 #: ../capplets/mouse/gnome-mouse-properties.c:131
-#: ../capplets/mouse/gnome-mouse-properties.c:584
+#: ../capplets/mouse/gnome-mouse-properties.c:863
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:27
 #: ../capplets/windows/gnome-window-properties.glade.h:10
 msgid "seconds"
@@ -385,8 +676,8 @@ msgid "Desktop Background Preferences"
 msgstr "桌面背景偏好設定"
 
 #: ../capplets/background/gnome-background-properties.glade.h:4
-msgid "Pick a color"
-msgstr "請選取顏色"
+msgid "Open a dialog to specify the color"
+msgstr "開啟對話方塊來指定顏色"
 
 #: ../capplets/background/gnome-background-properties.glade.h:5
 msgid "_Add Wallpaper"
@@ -396,59 +687,59 @@ msgstr "加入桌布(_A)"
 msgid "_Style:"
 msgstr "風格(_S)："
 
-#: ../capplets/background/gnome-wp-capplet.c:72
+#: ../capplets/background/gnome-wp-capplet.c:74
 #: ../capplets/common/capplet-util.c:340
 #: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:333
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "顯示說明文件時發生錯誤：%s"
 
-#: ../capplets/background/gnome-wp-capplet.c:1064
-#: ../capplets/background/gnome-wp-capplet.c:1080
+#: ../capplets/background/gnome-wp-capplet.c:1041
+#: ../capplets/background/gnome-wp-capplet.c:1059
 msgid "Centered"
 msgstr "中央"
 
-#: ../capplets/background/gnome-wp-capplet.c:1088
-#: ../capplets/background/gnome-wp-capplet.c:1103
+#: ../capplets/background/gnome-wp-capplet.c:1067
+#: ../capplets/background/gnome-wp-capplet.c:1084
 msgid "Fill Screen"
 msgstr "放大至全螢幕"
 
-#: ../capplets/background/gnome-wp-capplet.c:1111
-#: ../capplets/background/gnome-wp-capplet.c:1126
+#: ../capplets/background/gnome-wp-capplet.c:1092
+#: ../capplets/background/gnome-wp-capplet.c:1109
 msgid "Scaled"
 msgstr "依比例縮放"
 
+#: ../capplets/background/gnome-wp-capplet.c:1117
 #: ../capplets/background/gnome-wp-capplet.c:1134
-#: ../capplets/background/gnome-wp-capplet.c:1149
 msgid "Tiled"
 msgstr "鋪排"
 
-#: ../capplets/background/gnome-wp-capplet.c:1173
-#: ../capplets/background/gnome-wp-capplet.c:1182
+#: ../capplets/background/gnome-wp-capplet.c:1158
+#: ../capplets/background/gnome-wp-capplet.c:1167
 msgid "Solid Color"
 msgstr "純色"
 
-#: ../capplets/background/gnome-wp-capplet.c:1190
-#: ../capplets/background/gnome-wp-capplet.c:1199
+#: ../capplets/background/gnome-wp-capplet.c:1175
+#: ../capplets/background/gnome-wp-capplet.c:1184
 msgid "Horizontal Gradient"
 msgstr "水平漸層"
 
-#: ../capplets/background/gnome-wp-capplet.c:1207
-#: ../capplets/background/gnome-wp-capplet.c:1216
+#: ../capplets/background/gnome-wp-capplet.c:1192
+#: ../capplets/background/gnome-wp-capplet.c:1201
 msgid "Vertical Gradient"
 msgstr "垂直漸層"
 
 #. Create the file chooser dialog stuff here
-#: ../capplets/background/gnome-wp-capplet.c:1263
+#: ../capplets/background/gnome-wp-capplet.c:1250
 msgid "Add Wallpaper"
 msgstr "加入桌布"
 
-#: ../capplets/background/gnome-wp-info.c:49
+#: ../capplets/background/gnome-wp-info.c:57
 msgid "No Wallpaper"
 msgstr "沒有桌布"
 
-#: ../capplets/background/gnome-wp-item.c:289
-#: ../capplets/background/gnome-wp-item.c:291
+#: ../capplets/background/gnome-wp-item.c:292
+#: ../capplets/background/gnome-wp-item.c:294
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "像素"
@@ -463,7 +754,7 @@ msgid ""
 msgstr ""
 "無法啟動設定總管‘gnome-settings-daemon’。\n"
 "如果 GNOME 設定總管沒有執行，某部份偏好設定可能不會生效。這可能表示 Bonobo 出"
-"了問題；或是另一個 GNOME 以外 (例如 KDE) 的設定總管正在執行，和 GNOME 設定總"
+"了問題；或是另一個 GNOME 以外（例如 KDE）的設定總管正在執行，和 GNOME 設定總"
 "管出現衝突。"
 
 #: ../capplets/common/capplet-stock-icons.c:94
@@ -478,81 +769,78 @@ msgstr "套用設定並離開"
 #: ../capplets/common/capplet-util.c:243
 #: ../capplets/default-applications/gnome-default-applications-properties.c:765
 #: ../capplets/keyboard/gnome-keyboard-properties.c:225
-#: ../capplets/mouse/gnome-mouse-properties.c:819
+#: ../capplets/mouse/gnome-mouse-properties.c:999
 #: ../capplets/sound/sound-properties-capplet.c:244
 msgid "Retrieve and store legacy settings"
 msgstr "讀入舊版本的設定"
 
-#: ../capplets/common/file-transfer-dialog.c:95
+#: ../capplets/common/file-transfer-dialog.c:94
 #, c-format
-msgid "%i of %i"
-msgstr "%2$i 之 %1$i"
+msgid "Copying file: %i of %i"
+msgstr "複製檔案：%i 之 %i"
 
-#: ../capplets/common/file-transfer-dialog.c:119
+#: ../capplets/common/file-transfer-dialog.c:122
 #, c-format
-msgid "Transferring: %s"
-msgstr "正在傳送：%s"
+msgid "Copying '%s'"
+msgstr "正在複製‘%s’"
 
-#: ../capplets/common/file-transfer-dialog.c:126
-#, c-format
-msgid "From: %s"
-msgstr "從：%s"
-
-#: ../capplets/common/file-transfer-dialog.c:134
-#, c-format
-msgid "To: %s"
-msgstr "至：%s"
-
-#: ../capplets/common/file-transfer-dialog.c:185
+#: ../capplets/common/file-transfer-dialog.c:193
 msgid "From URI"
 msgstr "URI 來源地"
 
-#: ../capplets/common/file-transfer-dialog.c:186
+#: ../capplets/common/file-transfer-dialog.c:194
 msgid "URI currently transferring from"
 msgstr "檔案傳送程序的來源地 URI"
 
-#: ../capplets/common/file-transfer-dialog.c:193
+#: ../capplets/common/file-transfer-dialog.c:201
 msgid "To URI"
 msgstr "URI 目的地"
 
-#: ../capplets/common/file-transfer-dialog.c:194
+#: ../capplets/common/file-transfer-dialog.c:202
 msgid "URI currently transferring to"
 msgstr "檔案傳送程序的目的地 URI"
 
-#: ../capplets/common/file-transfer-dialog.c:201
+#: ../capplets/common/file-transfer-dialog.c:209
 msgid "Fraction completed"
 msgstr "完成比例"
 
-#: ../capplets/common/file-transfer-dialog.c:202
+#: ../capplets/common/file-transfer-dialog.c:210
 msgid "Fraction of transfer currently completed"
 msgstr "檔案傳送程序的完成比例"
 
-#: ../capplets/common/file-transfer-dialog.c:209
+#: ../capplets/common/file-transfer-dialog.c:217
 msgid "Current URI index"
 msgstr "目前的 URI 編號"
 
-#: ../capplets/common/file-transfer-dialog.c:210
+#: ../capplets/common/file-transfer-dialog.c:218
 msgid "Current URI index - starts from 1"
 msgstr "目前的 URI 編號 ─ 由 1 開始"
 
-#: ../capplets/common/file-transfer-dialog.c:217
+#: ../capplets/common/file-transfer-dialog.c:225
 msgid "Total URIs"
 msgstr "URI 總數"
 
-#: ../capplets/common/file-transfer-dialog.c:218
+#: ../capplets/common/file-transfer-dialog.c:226
 msgid "Total number of URIs"
 msgstr "URI 的總數"
 
-#: ../capplets/common/file-transfer-dialog.c:372
-#: ../capplets/common/file-transfer-dialog.c:374
+#: ../capplets/common/file-transfer-dialog.c:327
+#: ../capplets/common/file-transfer-dialog.c:369
+msgid "Copying files"
+msgstr "正在複製檔案"
+
+#: ../capplets/common/file-transfer-dialog.c:345
+msgid "From:"
+msgstr "從："
+
+#: ../capplets/common/file-transfer-dialog.c:349
+msgid "To:"
+msgstr "至："
+
+#: ../capplets/common/file-transfer-dialog.c:448
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: ../capplets/common/file-transfer-dialog.c:379
-#: ../capplets/common/file-transfer-dialog.c:381
-msgid "Downloading..."
-msgstr "下載中..."
-
 #: ../capplets/common/gconf-property-editor.c:170
 msgid "Key"
 msgstr "設定鍵"
@@ -602,7 +890,7 @@ msgstr "界面控制"
 
 #: ../capplets/common/gconf-property-editor.c:202
 msgid "Object that controls the property (normally a widget)"
-msgstr "控制該屬性的物件 (通常是視窗元件)"
+msgstr "控制該屬性的物件（通常是視窗元件）"
 
 #: ../capplets/common/gconf-property-editor.c:217
 msgid "Property editor object data"
@@ -722,7 +1010,7 @@ msgstr "Links 文字模式網頁瀏覽器"
 #: ../capplets/default-applications/gnome-default-applications-properties-structs.c:40
 #: ../capplets/default-applications/gnome-default-applications-properties-structs.c:41
 msgid "Evolution Mail Reader"
-msgstr "Evolution 郵件處理程式"
+msgstr "Evolution 電子郵件讀信軟體"
 
 #: ../capplets/default-applications/gnome-default-applications-properties-structs.c:42
 msgid "Balsa"
@@ -779,7 +1067,7 @@ msgstr "請指定該編輯器的名稱及執行時的指令。"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Add..."
-msgstr "新增..."
+msgstr "加入..."
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:3
 msgid "C_ustom"
@@ -787,7 +1075,7 @@ msgstr "自訂(_U)"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:4
 msgid "C_ustom:"
-msgstr "自選(_U)："
+msgstr "自訂(_U)："
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:5
 msgid "Can open _URIs"
@@ -839,7 +1127,7 @@ msgstr "修改..."
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:17
 msgid "Mail Reader"
-msgstr "電子郵件處理程式"
+msgstr "電子郵件讀信軟體"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:19
 msgid "Run in a _terminal"
@@ -878,7 +1166,7 @@ msgstr "網頁瀏覽器"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
-msgstr "視窗總管"
+msgstr "視窗管理員"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:28
 msgid "_Command:"
@@ -904,42 +1192,42 @@ msgstr "更改螢幕解析度"
 msgid "Screen Resolution"
 msgstr "螢幕解析度"
 
-#: ../capplets/display/main.c:333
+#: ../capplets/display/main.c:345
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../capplets/display/main.c:436
+#: ../capplets/display/main.c:448
 msgid "_Resolution:"
 msgstr "解析度(_R)："
 
-#: ../capplets/display/main.c:455
+#: ../capplets/display/main.c:467
 msgid "Re_fresh rate:"
 msgstr "更新頻率(_F)："
 
-#: ../capplets/display/main.c:476
+#: ../capplets/display/main.c:488
 msgid "Default Settings"
 msgstr "預設設定"
 
-#: ../capplets/display/main.c:478
+#: ../capplets/display/main.c:490
 #, c-format
 msgid "Screen %d Settings\n"
 msgstr "第 %d 個畫面的設定\n"
 
-#: ../capplets/display/main.c:504
+#: ../capplets/display/main.c:516
 msgid "Screen Resolution Preferences"
 msgstr "畫面解析度偏好設定"
 
-#: ../capplets/display/main.c:541
+#: ../capplets/display/main.c:553
 #, c-format
 msgid "_Make default for this computer (%s) only"
 msgstr "只在這部電腦 (%s) 中成為預設值(_M)"
 
-#: ../capplets/display/main.c:559
+#: ../capplets/display/main.c:571
 msgid "Options"
 msgstr "選項"
 
-#: ../capplets/display/main.c:580
+#: ../capplets/display/main.c:592
 #, c-format
 msgid ""
 "Testing the new settings. If you don't respond in %d second the previous "
@@ -949,29 +1237,29 @@ msgid_plural ""
 "settings will be restored."
 msgstr[0] "正在測試新的設定。如果在 %d 秒內沒有回應，則會回復舊的設定。"
 
-#: ../capplets/display/main.c:626
+#: ../capplets/display/main.c:638
 msgid "Keep Resolution"
 msgstr "保留解析度"
 
-#: ../capplets/display/main.c:630
+#: ../capplets/display/main.c:642
 msgid "Do you want to keep this resolution?"
 msgstr "是否保留這個解析度？"
 
-#: ../capplets/display/main.c:655
+#: ../capplets/display/main.c:667
 msgid "Use _previous resolution"
 msgstr "使用以前的解析度(_P)"
 
-#: ../capplets/display/main.c:655
+#: ../capplets/display/main.c:667
 msgid "_Keep resolution"
 msgstr "保留解析度(_K)"
 
-#: ../capplets/display/main.c:806
+#: ../capplets/display/main.c:818
 msgid ""
 "The X Server does not support the XRandR extension.  Runtime resolution "
 "changes to the display size are not available."
 msgstr "這個 X 伺服器不支援 XRandR 擴展功能，因此無法即時更改畫面的大小。"
 
-#: ../capplets/display/main.c:814
+#: ../capplets/display/main.c:826
 msgid ""
 "The version of the XRandR extension is incompatible with this program. "
 "Runtime changes to the display size are not available."
@@ -1066,7 +1354,6 @@ msgid "_Full"
 msgstr "完整(_F)"
 
 #: ../capplets/font/font-properties.glade.h:22
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:22
 msgid "_Medium"
 msgstr "中(_M)"
 
@@ -1145,7 +1432,7 @@ msgstr "捷徑鍵"
 #: ../capplets/keybindings/eggcellrendererkeys.c:173
 #: ../capplets/keybindings/eggcellrendererkeys.c:174
 msgid "Accelerator modifiers"
-msgstr "捷徑鍵的特殊按鍵 (例如 Alt、Ctrl)"
+msgstr "捷徑鍵的特殊按鍵（例如 Alt、Ctrl）"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:182
 #: ../capplets/keybindings/eggcellrendererkeys.c:183
@@ -1213,7 +1500,7 @@ msgstr "捷徑鍵"
 #: ../capplets/keybindings/gnome-keybinding-properties.glade.h:1
 #: ../capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
-msgstr "捷徑鍵"
+msgstr "鍵盤捷徑鍵"
 
 #: ../capplets/keybindings/gnome-keybinding-properties.glade.h:2
 msgid ""
@@ -1225,12 +1512,11 @@ msgstr "要編輯捷徑鍵，在相應的行中按下新設的捷徑鍵，或以
 msgid "Assign shortcut keys to commands"
 msgstr "為不同的指令分配捷徑鍵"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: ../capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#: ../capplets/keyboard/gnome-keyboard-properties-xkb.c:84
 msgid "Unknown"
 msgstr "不明"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:251
+#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:273
 msgid "Layout"
 msgstr "配置"
 
@@ -1238,8 +1524,8 @@ msgstr "配置"
 #. the below options are to be included in the selected list.
 #. This is a HIG-compliant alternative to allowing no
 #. selection in the group.
-#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:255
-#: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:206
+#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:277
+#: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:228
 msgid "Default"
 msgstr "預設"
 
@@ -1384,7 +1670,7 @@ msgstr "無障礙環境(_A)..."
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:33
 msgid "_Add..."
-msgstr "新增(_A)..."
+msgstr "加入(_A)..."
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:34
 msgid "_Break interval lasts:"
@@ -1418,67 +1704,59 @@ msgstr "分鐘"
 msgid "Set your keyboard preferences"
 msgstr "修改鍵盤偏好設定"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:498
+#: ../capplets/mouse/gnome-mouse-properties.c:552
 msgid "Unknown Cursor"
 msgstr "不明的鼠標"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:619
-msgid "Default Cursor - Current"
-msgstr "預設的鼠標 - 使用中"
-
-#: ../capplets/mouse/gnome-mouse-properties.c:619
-#: ../capplets/mouse/gnome-mouse-properties.c:622
-msgid "The default cursor that ships with X"
-msgstr "X Window 預設使用的鼠標"
-
-#: ../capplets/mouse/gnome-mouse-properties.c:622
+#: ../capplets/mouse/gnome-mouse-properties.c:739
 msgid "Default Cursor"
 msgstr "預設的鼠標"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:640
-msgid "White Cursor - Current"
-msgstr "白色鼠標 - 使用中"
+#: ../capplets/mouse/gnome-mouse-properties.c:740
+msgid "Default Cursor - Current"
+msgstr "預設的鼠標 - 使用中"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:640
-#: ../capplets/mouse/gnome-mouse-properties.c:643
-msgid "The default cursor inverted"
-msgstr "和預設鼠標顏色相反的鼠標"
+#: ../capplets/mouse/gnome-mouse-properties.c:741
+msgid "The default cursor that ships with X"
+msgstr "X Window 預設使用的鼠標"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:643
+#: ../capplets/mouse/gnome-mouse-properties.c:745
 msgid "White Cursor"
 msgstr "白色鼠標"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:662
-msgid "Large Cursor - Current"
-msgstr "大型鼠標 - 使用中"
+#: ../capplets/mouse/gnome-mouse-properties.c:746
+msgid "White Cursor - Current"
+msgstr "白色鼠標 - 使用中"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:662
-#: ../capplets/mouse/gnome-mouse-properties.c:665
-msgid "Large version of normal cursor"
-msgstr "普通鼠標的大型版本"
+#: ../capplets/mouse/gnome-mouse-properties.c:747
+msgid "The default cursor inverted"
+msgstr "和預設鼠標顏色相反的鼠標"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:665
+#: ../capplets/mouse/gnome-mouse-properties.c:751
 msgid "Large Cursor"
 msgstr "大型鼠標"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:684
+#: ../capplets/mouse/gnome-mouse-properties.c:752
+msgid "Large Cursor - Current"
+msgstr "大型鼠標 - 使用中"
+
+#: ../capplets/mouse/gnome-mouse-properties.c:753
+msgid "Large version of normal cursor"
+msgstr "普通鼠標的大型版本"
+
+#: ../capplets/mouse/gnome-mouse-properties.c:757
 msgid "Large White Cursor - Current"
 msgstr "大型白色鼠標 - 使用中"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:684
-#: ../capplets/mouse/gnome-mouse-properties.c:687
-msgid "Large version of white cursor"
-msgstr "白色鼠標的大型版本"
-
-#: ../capplets/mouse/gnome-mouse-properties.c:687
+#: ../capplets/mouse/gnome-mouse-properties.c:758
 msgid "Large White Cursor"
 msgstr "大型白色鼠標"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:760
-msgid "Cursor Size"
-msgstr "鼠標大小"
+#: ../capplets/mouse/gnome-mouse-properties.c:759
+msgid "Large version of white cursor"
+msgstr "白色鼠標的大型版本"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:769
+#: ../capplets/mouse/gnome-mouse-properties.c:953
 msgid "Cursor Theme"
 msgstr "鼠標主題"
 
@@ -1503,40 +1781,37 @@ msgid "<b>Speed</b>"
 msgstr "<b>速度</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:7
-msgid ""
-"<i><small><b>Note:</b> Changes to this setting will not take effect until "
-"next time you log in.</small></i>"
-msgstr ""
-"<i><small><b>注意：</b>更改本設定後，需在下次登入時方會生效。</small></i>"
-
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:8
 msgid "<i>Fast</i>"
 msgstr "<i>快</i>"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:9
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:8
 msgid "<i>High</i>"
 msgstr "<i>高</i>"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:10
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:9
 msgid "<i>Large</i>"
 msgstr "<i>大</i>"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:11
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:10
 msgid "<i>Low</i>"
 msgstr "<i>低</i>"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:12
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:11
 msgid "<i>Slow</i>"
 msgstr "<i>慢</i>"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:13
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:12
 msgid "<i>Small</i>"
 msgstr "<i>小</i>"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:14
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:13
 msgid "Buttons"
 msgstr "按鈕"
 
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:14
+msgid "Cursor Size:"
+msgstr "游標大小："
+
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:15
 msgid "Cursors"
 msgstr "鼠標"
@@ -1546,33 +1821,37 @@ msgid "Highlight the _pointer when you press Ctrl"
 msgstr "當按下 Ctrl 時加強顯示鼠標(_P)"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:17
+msgid "Large"
+msgstr "大"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:18
+msgid "Medium"
+msgstr "中"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:19
 msgid "Motion"
 msgstr "移動"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:18
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:20
 msgid "Mouse Preferences"
 msgstr "滑鼠偏好設定"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:19
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:21
+msgid "Small"
+msgstr "小"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:22
 msgid "_Acceleration:"
 msgstr "加速度(_A)："
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:20
-msgid "_Large"
-msgstr "大(_L)"
-
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:21
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:23
 msgid "_Left-handed mouse"
 msgstr "左手操作滑鼠(_L)"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:23
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:24
 msgid "_Sensitivity:"
 msgstr "敏感度(_S)："
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:24
-msgid "_Small"
-msgstr "小(_S)"
-
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:25
 msgid "_Threshold:"
 msgstr "分辨距離(_T)："
@@ -1601,6 +1880,10 @@ msgstr "設定您的代理伺服器"
 msgid "      "
 msgstr "      "
 
+#: ../capplets/network/gnome-network-preferences.glade.h:2
+msgid "<b>D_irect internet connection</b>"
+msgstr "<b>直接網路連線</b>(_I)"
+
 #: ../capplets/network/gnome-network-preferences.glade.h:3
 msgid "<b>Ignore Host List</b>"
 msgstr "<b>忽略主機列表</b>"
@@ -1610,66 +1893,62 @@ msgid "<b>_Automatic proxy configuration</b>"
 msgstr "<b>自動設定代理伺服器</b>(_A)"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:5
-msgid "<b>_Direct internet connection</b>"
-msgstr "<b>直接連線至網際網路</b>(_D)"
-
-#: ../capplets/network/gnome-network-preferences.glade.h:6
 msgid "<b>_Manual proxy configuration</b>"
 msgstr "<b>自選代理伺服器</b>(_M)"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:7
+#: ../capplets/network/gnome-network-preferences.glade.h:6
 msgid "<b>_Use authentication</b>"
 msgstr "<b>需要認證</b>(_U)"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:8
+#: ../capplets/network/gnome-network-preferences.glade.h:7
 msgid "Advanced Configuration"
 msgstr "進階設定"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:9
+#: ../capplets/network/gnome-network-preferences.glade.h:8
 msgid "Autoconfiguration _URL:"
 msgstr "自動設定所需的 _URL："
 
-#: ../capplets/network/gnome-network-preferences.glade.h:10
+#: ../capplets/network/gnome-network-preferences.glade.h:9
 msgid "HTTP Proxy Details"
 msgstr "HTTP 代理伺服器設定"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:11
+#: ../capplets/network/gnome-network-preferences.glade.h:10
 msgid "H_TTP proxy:"
 msgstr "H_TTP 代理伺服器："
 
-#: ../capplets/network/gnome-network-preferences.glade.h:12
+#: ../capplets/network/gnome-network-preferences.glade.h:11
 msgid "Network Proxy Preferences"
 msgstr "網路代理伺服器偏好設定"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:13
+#: ../capplets/network/gnome-network-preferences.glade.h:12
 msgid "Port:"
 msgstr "連接埠："
 
-#: ../capplets/network/gnome-network-preferences.glade.h:14
+#: ../capplets/network/gnome-network-preferences.glade.h:13
 msgid "Proxy Configuration"
 msgstr "代理伺服器設定"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:15
+#: ../capplets/network/gnome-network-preferences.glade.h:14
 msgid "S_ocks host:"
 msgstr "S_ocks 主機："
 
-#: ../capplets/network/gnome-network-preferences.glade.h:16
+#: ../capplets/network/gnome-network-preferences.glade.h:15
 msgid "U_sername:"
 msgstr "使用者名稱(_S)："
 
-#: ../capplets/network/gnome-network-preferences.glade.h:17
+#: ../capplets/network/gnome-network-preferences.glade.h:16
 msgid "_Details"
 msgstr "詳細設定(_D)"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:18
+#: ../capplets/network/gnome-network-preferences.glade.h:17
 msgid "_FTP proxy:"
 msgstr "_FTP 代理伺服器："
 
-#: ../capplets/network/gnome-network-preferences.glade.h:19
+#: ../capplets/network/gnome-network-preferences.glade.h:18
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-#: ../capplets/network/gnome-network-preferences.glade.h:20
+#: ../capplets/network/gnome-network-preferences.glade.h:19
 msgid "_Secure HTTP proxy:"
 msgstr "安全 HTTP 代理伺服器(_S)："
 
@@ -1977,7 +2256,7 @@ msgstr "佈景主題選擇樹"
 
 #: ../capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
-msgstr "自行指定應用程式中工具列及選單列的外觀"
+msgstr "自訂應用程式中工具列及選單列的外觀"
 
 #: ../capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
@@ -2179,11 +2458,11 @@ msgstr "音量"
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:396
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:397
 msgid "Slow Keys Alert"
 msgstr "遲緩按鍵警告"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:397
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:398
 msgid ""
 "You just held down the Shift key for 8 seconds.  This is the shortcut for "
 "the Slow Keys feature, which affects the way your keyboard works."
@@ -2191,19 +2470,19 @@ msgstr ""
 "您按往了 Shift 鍵達8秒。這是使用遲緩鍵功能的捷徑，那會影響您的鍵盤的操作方"
 "式。"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:399
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:400
 msgid "Do you want to activate Slow Keys?"
 msgstr "您是否要啟用遲緩按鍵？"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:400
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:401
 msgid "Do you want to deactivate Slow Keys?"
 msgstr "您是否要停用遲緩按鍵？"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:409
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:410
 msgid "Sticky Keys Alert"
 msgstr "黏性特殊鍵警告"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:410
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:411
 msgid ""
 "You just pressed the Shift key 5 times in a row.  This is the shortcut for "
 "the Sticky Keys feature, which affects the way your keyboard works."
@@ -2211,7 +2490,7 @@ msgstr ""
 "您連續按下了5次 Shift·鍵。這是使用黏性特殊鍵功能的捷徑，那會影響您的鍵盤的操"
 "作方式。"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:412
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:413
 msgid ""
 "You just pressed two keys at once, or pressed the Shift key 5 times in a "
 "row.  This turns off the Sticky Keys feature, which affects the way your "
@@ -2220,11 +2499,11 @@ msgstr ""
 "您同時按下兩個鍵，或是連續按下5次 Shift 鍵。這會停用黏性特殊鍵功能，那會影響"
 "您的鍵盤的操作方式。"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:414
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:415
 msgid "Do you want to activate Sticky Keys?"
 msgstr "您是否要啟用黏性特殊鍵？"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:415
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:416
 msgid "Do you want to deactivate Sticky Keys?"
 msgstr "您是否要停用黏性特殊鍵？"
 
@@ -2290,8 +2569,8 @@ msgid ""
 "%d\n"
 "%s\n"
 "If you report this situation as a bug, please include:\n"
-"- The result of %s\n"
-"- The result of %s"
+"- The result of <b>%s</b>\n"
+"- The result of <b>%s</b>"
 msgstr ""
 "啟用 XKB 設定時發生錯誤。\n"
 "這可以在多個場合下發生：\n"
@@ -2304,25 +2583,25 @@ msgstr ""
 "%d\n"
 "%s\n"
 "如果您將這場合回報為錯誤，請包括：\n"
-"-·%s 的結果\n"
-"-·%s 的結果"
+"-·<b>%s</b>的結果\n"
+"-·<b>%s</b>的結果"
 
 #: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:117
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
-"Try using simpler configuration or taking more fresh version of XFree "
+"Try using a simpler configuration or taking a fresher version of XFree "
 "software."
 msgstr ""
 "您正在使用 XFree 4.3.0。\n"
-"已知在 XFree 4.3.0 使用複雜的 XKB 設定時會發生問題。\n"
+"已知道在 XFree 4.3.0 使用複雜的 XKB 設定時會發生問題。\n"
 "嘗試用較簡單的設定，或是取得新版的 XFree 軟體。"
 
-#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:230
+#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:227
 msgid "Do _not show this warning again"
 msgstr "不再顯示此訊息(_N)"
 
-#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:241
+#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:238
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2342,8 +2621,8 @@ msgid ""
 "Couldn't execute command: %s\n"
 "Verify that this command exists."
 msgstr ""
-"不能執行命令 %s\n"
-"請檢查該命令是否存在。"
+"不能執行指令 %s\n"
+"請檢查該指令是否存在。"
 
 #: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:145
 msgid ""
@@ -2364,7 +2643,7 @@ msgstr ""
 "不能載入 Glade 檔案。\n"
 "請確定該守護進程已經安裝妥當。"
 
-#: ../gnome-settings-daemon/gnome-settings-screensaver.c:94
+#: ../gnome-settings-daemon/gnome-settings-screensaver.c:113
 #, c-format
 msgid ""
 "There was an error starting up the screensaver:\n"
@@ -2379,7 +2658,7 @@ msgstr ""
 "\n"
 "今次作業階段不會有螢幕保護桯式的功能。"
 
-#: ../gnome-settings-daemon/gnome-settings-screensaver.c:104
+#: ../gnome-settings-daemon/gnome-settings-screensaver.c:123
 msgid "_Do not show this message again"
 msgstr "不再顯示此訊息(_D)"
 
@@ -2391,9 +2670,9 @@ msgstr "無法載入音效檔 %s 作為音效樣本 %s"
 #: ../gnome-settings-daemon/gnome-settings-xrdb.c:214
 #: ../gnome-settings-daemon/gnome-settings-xrdb.c:262
 msgid "Cannot determine user's home directory"
-msgstr "無法決定用戶的個人目錄所在"
+msgstr "無法決定使用者的個人資料夾所在"
 
-#: ../gnome-settings-daemon/gnome-settings-xsettings.c:211
+#: ../gnome-settings-daemon/gnome-settings-xsettings.c:215
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf 設定鍵 %s 的類型目前是 %s，但應該是 %s\n"
@@ -2407,13 +2686,13 @@ msgid "Do _not show this warning again."
 msgstr "不再顯示此訊息(_N)。"
 
 #: ../gnome-settings-daemon/modmap-dialog.glade.h:3
-msgid "Do you like to load the modmap file(s)?"
-msgstr "您想要載入 modmap 檔？"
-
-#: ../gnome-settings-daemon/modmap-dialog.glade.h:4
 msgid "Load modmap files"
 msgstr "載入 modmap 檔"
 
+#: ../gnome-settings-daemon/modmap-dialog.glade.h:4
+msgid "Would you like to load the modmap file(s)?"
+msgstr "您想要載入 modmap 檔？"
+
 #: ../gnome-settings-daemon/modmap-dialog.glade.h:5
 msgid "_Load"
 msgstr "載入(_L)"
@@ -2462,7 +2741,7 @@ msgstr "畫面"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier 準備繪畫的畫面"
 
-#: ../libgswitchit/gswitchit_config.c:1016
+#: ../libgswitchit/gswitchit_config.c:1035
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "載入圖片時發生錯誤：%s"
@@ -2517,7 +2796,7 @@ msgstr "移除(_R)"
 #: ../libwindow-settings/gnome-wm-manager.c:320
 #, c-format
 msgid "Window manager \"%s\" has not registered a configuration tool\n"
-msgstr "視窗總管“%s”沒有登記任何設定工具\n"
+msgstr "視窗管理員“%s”沒有登記任何設定工具\n"
 
 #: ../libwindow-settings/metacity-window-manager.c:378
 msgid "Maximize"
@@ -2530,7 +2809,7 @@ msgstr "捲起"
 #: ../schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:1
 msgid ""
 "If true, the mime handlers for text/plain and text/* will be kept in sync"
-msgstr "如選用本選項，text/plain 及 text/* 的 mime 處理方式會保持一致"
+msgstr "如設定為‘true’，text/plain 及 text/* 的 mime 處理方式會保持一致"
 
 #: ../schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:2
 msgid "Sync text/plain and text/* handlers"
@@ -2697,20 +2976,20 @@ msgid "Volume up's shortcut."
 msgstr "調高音量的捷徑。"
 
 #: ../schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:1
-msgid "Display a dialog when there are errors running XScreenSaver"
-msgstr "如果執行 XScreenSaver 時出現錯誤則顯示對話方塊"
+msgid "Display a dialog when there are errors running the screensaver"
+msgstr "螢幕保護程式在執行時出現錯誤則顯示對話方塊"
 
 #: ../schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:2
-msgid "Run XScreenSaver at login"
-msgstr "登入時執行 XScreenSaver"
+msgid "Run screensaver at login"
+msgstr "登入時執行螢幕保護程式"
 
 #: ../schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:3
 msgid "Show Startup Errors"
 msgstr "顯示啟動時發生的錯誤"
 
 #: ../schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:4
-msgid "Start XScreenSaver"
-msgstr "啟動 XScreenSaver"
+msgid "Start screensaver"
+msgstr "啟動螢幕保護程式"
 
 #: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
@@ -2748,8 +3027,10 @@ msgid "Keyboard options"
 msgstr "鍵盤選項"
 
 #: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Keyboard settings in gconf will be overridden from the system ASAP"
-msgstr "在 gconf 中的鍵盤設定，將會立即被系統取締"
+msgid ""
+"Keyboard settings in gconf will be overridden from the system ASAP "
+"(deprecated)"
+msgstr "在 gconf 中的鍵盤設定，將會立即被系統取締（不建議再使用）"
 
 #: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
 msgid "Save/restore indicators together with layout groups"
@@ -2772,8 +3053,11 @@ msgstr "抑制「X 系統設置已改變」的警告訊息"
 #: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
 msgid ""
 "Very soon, keyboard settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "鍵盤設定將會立即被取締（由系統設定所取締）"
+"configuration) This key has been deprecated since GNOME 2.12, please unset "
+"the model, layouts and options keys to get the default system configuration."
+msgstr ""
+"很快，在 gconf 的鍵盤設定會被取締（由系統設定取締）。這設定鍵自 GNOME 2.12 後"
+"不建議再使用，請取消型號、配置及選項鍵的設定來使用系統預設設定。"
 
 #: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:15
 msgid "keyboard layout"
@@ -2864,37 +3148,37 @@ msgstr ""
 msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr "0123456789 The following is Chinese: '中文測試'"
 
-#: ../vfs-methods/fontilus/font-view.c:275
+#: ../vfs-methods/fontilus/font-view.c:276
 msgid "Name:"
 msgstr "名稱："
 
-#: ../vfs-methods/fontilus/font-view.c:278
+#: ../vfs-methods/fontilus/font-view.c:279
 msgid "Style:"
 msgstr "字款："
 
-#: ../vfs-methods/fontilus/font-view.c:287
+#: ../vfs-methods/fontilus/font-view.c:289
 msgid "Type:"
 msgstr "類型："
 
-#: ../vfs-methods/fontilus/font-view.c:294
+#: ../vfs-methods/fontilus/font-view.c:295
 msgid "Size:"
 msgstr "大小："
 
-#: ../vfs-methods/fontilus/font-view.c:338
-#: ../vfs-methods/fontilus/font-view.c:351
+#: ../vfs-methods/fontilus/font-view.c:339
+#: ../vfs-methods/fontilus/font-view.c:352
 msgid "Version:"
 msgstr "版本："
 
-#: ../vfs-methods/fontilus/font-view.c:342
-#: ../vfs-methods/fontilus/font-view.c:353
+#: ../vfs-methods/fontilus/font-view.c:343
+#: ../vfs-methods/fontilus/font-view.c:354
 msgid "Copyright:"
 msgstr "版權："
 
-#: ../vfs-methods/fontilus/font-view.c:346
+#: ../vfs-methods/fontilus/font-view.c:347
 msgid "Description:"
 msgstr "說明："
 
-#: ../vfs-methods/fontilus/font-view.c:407
+#: ../vfs-methods/fontilus/font-view.c:408
 #, c-format
 msgid "usage: %s fontfile\n"
 msgstr "用法：%s 字型檔\n"
@@ -2909,19 +3193,19 @@ msgstr "設定應用程式的預設字型"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
-msgstr "如選用本選項，則會顯示 OpenType 字型的縮圖。"
+msgstr "如設定為‘true’，則會顯示 OpenType 字型的縮圖。"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:2
 msgid "If set to true, then PCF fonts will be thumbnailed."
-msgstr "如選用本選項，則會顯示 PCF 字型的縮圖。"
+msgstr "如設定為‘true’，則會顯示 PCF 字型的縮圖。"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:3
 msgid "If set to true, then TrueType fonts will be thumbnailed."
-msgstr "如選用本選項，則會顯示 TrueType 字型的縮圖。"
+msgstr "如設定為‘true’，則會顯示 TrueType 字型的縮圖。"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:4
 msgid "If set to true, then Type1 fonts will be thumbnailed."
-msgstr "如選用本選項，則會顯示 Type1 字型的縮圖。"
+msgstr "如設定為‘true’，則會顯示 Type1 字型的縮圖。"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:5
 msgid ""
@@ -2977,10 +3261,6 @@ msgstr "是否為 Type1 字型製作縮圖"
 msgid "GNOME Font Viewer"
 msgstr "GNOME 字型檢視程式"
 
-#: ../vfs-methods/themus/apply-font.glade.h:1
-msgid " "
-msgstr " "
-
 #: ../vfs-methods/themus/apply-font.glade.h:2
 msgid "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">是否套用新的字型？</span>"
@@ -3034,11 +3314,11 @@ msgstr "設定預設的佈景主題"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
-msgstr "如選用本選項，則會為已安裝的佈景主題製作縮圖。"
+msgstr "如設定為‘true’，則會為已安裝的佈景主題製作縮圖。"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:2
 msgid "If set to true, then themes will be thumbnailed."
-msgstr "如選用本選項，則會為佈景主題製作縮圖。"
+msgstr "如設定為‘true’，則會為佈景主題製作縮圖。"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:3
 msgid ""
@@ -3065,6 +3345,32 @@ msgstr "是否為已安裝的佈景主題製作縮圖"
 msgid "Whether to thumbnail themes"
 msgstr "是否為佈景主題製作縮圖"
 
+#~ msgid "Password is to simple"
+#~ msgstr "密碼過份簡單"
+
+#~ msgid "Pick a color"
+#~ msgstr "請選取顏色"
+
+#~ msgid "%i of %i"
+#~ msgstr "%2$i 之 %1$i"
+
+#~ msgid "Transferring: %s"
+#~ msgstr "正在傳送：%s"
+
+#~ msgid "Downloading..."
+#~ msgstr "下載中..."
+
+#~ msgid ""
+#~ "<i><small><b>Note:</b> Changes to this setting will not take effect until "
+#~ "next time you log in.</small></i>"
+#~ msgstr ""
+#~ "<i><small><b>注意：</b>更改本設定後，需在下次登入時方會生效。</small></i>"
+
+#~ msgid ""
+#~ "Very soon, keyboard settings in gconf will be overridden (from the system "
+#~ "configuration)"
+#~ msgstr "鍵盤設定將會立即被取締（由系統設定所取締）"
+
 #~ msgid "Information about myself"
 #~ msgstr "關於自己的資訊"
 
@@ -3097,144 +3403,12 @@ msgstr "是否為佈景主題製作縮圖"
 #~ "\"caps lock\" key"
 #~ msgstr "請檢查您所輸入的是否正確及有沒有按下了“caps lock〝鍵"
 
-#~ msgid "Could not run passwd"
-#~ msgstr "無法執行 passwd"
-
 #~ msgid "Check that you have permissions to run this command"
 #~ msgstr "請檢查您有沒有執行此命令的權限"
 
-#~ msgid "An unexpected error has ocurred"
-#~ msgstr "發生了無法預期的錯誤"
-
-#~ msgid "Select Image"
-#~ msgstr "選擇圖像"
-
-#~ msgid "No Image"
-#~ msgstr "沒有圖像"
-
-#~ msgid "<b>Email</b>"
-#~ msgstr "<b>電子郵件</b>"
-
-#~ msgid "<b>Home</b>"
-#~ msgstr "<b>住家</b>"
-
-#~ msgid "<b>Instant Messaging</b>"
-#~ msgstr "<b>即時通訊</b>"
-
-#~ msgid "<b>Job</b>"
-#~ msgstr "<b>職業</b>"
-
-#~ msgid "<b>Telephone</b>"
-#~ msgstr "<b>電話</b>"
-
-#~ msgid "<b>Web</b>"
-#~ msgstr "<b>Web</b>"
-
-#~ msgid "<b>Work</b>"
-#~ msgstr "<b>工作</b>)"
-
-#~ msgid "A_IM/iChat:"
-#~ msgstr "A_IM/iChat:"
-
-#~ msgid "A_ssistant:"
-#~ msgstr "助理(_S)："
-
-#~ msgid "C_ity:"
-#~ msgstr "城市(_I)："
-
-#~ msgid "C_ompany:"
-#~ msgstr "公司(_O)："
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "日曆(_N)："
-
-#~ msgid "Change Passwo_rd"
-#~ msgstr "更改密碼(_R)"
-
-#~ msgid "Change Password"
-#~ msgstr "更改密碼"
-
-#~ msgid "Co_untry:"
-#~ msgstr "國家/地區(_U)："
-
-#~ msgid "IC_Q:"
-#~ msgstr "IC_Q:"
-
-#~ msgid "M_SN:"
-#~ msgstr "M_SN:"
-
-#~ msgid "New Password:"
-#~ msgstr "新密碼："
-
-#~ msgid "Old Password:"
-#~ msgstr "舊密碼："
-
-#~ msgid "P_O Box:"
-#~ msgstr "郵政信箱(_O)："
-
-#~ msgid "Retype New Password:"
-#~ msgstr "再輸入新的密碼："
-
 #~ msgid "User Name:"
 #~ msgstr "使用者名稱："
 
-#~ msgid "Web _Log:"
-#~ msgstr "網路日誌(_L)："
-
-#~ msgid "Work _Fax:"
-#~ msgstr "工作傳真(_F)："
-
-#~ msgid "_Address"
-#~ msgstr "地址(_A)"
-
-#~ msgid "_Address:"
-#~ msgstr "地址(_A)："
-
-#~ msgid "_Contact"
-#~ msgstr "聯絡(_C)"
-
-#~ msgid "_Department:"
-#~ msgstr "部門(_D)："
-
-#~ msgid "_Groupwise:"
-#~ msgstr "_Groupwise:"
-
-#~ msgid "_Home Page:"
-#~ msgstr "首頁(_H)："
-
-#~ msgid "_Home:"
-#~ msgstr "住家(_H)："
-
-#~ msgid "_Jabber:"
-#~ msgstr "_Jabber:"
-
-#~ msgid "_Manager:"
-#~ msgstr "總管(_M)："
-
-#~ msgid "_Mobile:"
-#~ msgstr "手機(_M)："
-
-#~ msgid "_Personal Info"
-#~ msgstr "個人資訊(_P)："
-
-#~ msgid "_Profession:"
-#~ msgstr "職業(_P)："
-
-#~ msgid "_State/Province:"
-#~ msgstr "州/省(_S)："
-
-#~ msgid "_Title:"
-#~ msgstr "職稱(_T)："
-
-#~ msgid "_Work:"
-#~ msgstr "工作(_W)"
-
-#~ msgid "_Yahoo:"
-#~ msgstr "_Yahoo:"
-
-#~ msgid "_Zip/Postal Code:"
-#~ msgstr "郵遞區號(_Z)："
-
 #~ msgid "asdfasdfasdfasdfasdf"
 #~ msgstr "asdfasdfasdfasdfasdf"