From df131cfc67a9ce9577da2f3d7090b3fccd82958b Mon Sep 17 00:00:00 2001
From: Kwok-Koon Cheung <baddog@src.gnome.org>
Date: Sun, 21 Apr 2002 22:49:46 +0000
Subject: [PATCH] Updated traditional Chinese translation

---
 po/ChangeLog |   4 +
 po/zh_TW.po  | 890 +++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 826 insertions(+), 68 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index b6e0a84d2..caf4e4d15 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-22  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_TW.po: Updated traditional Chinese translation.
+
 2002-04-21  Changwoo Ryu  <cwryu@debian.org>
 
 	* ko.po: Updated Korean translation.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d26d30fa9..6f8e21404 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.99.6\n"
+<<<<<<< zh_TW.po
+"POT-Creation-Date: 2002-04-21 05:23+0800\n"
+=======
 "POT-Creation-Date: 2002-04-21 15:46-0500\n"
+>>>>>>> 1.19
 "PO-Revision-Date: 2002-04-05 16:36+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: traditional Chinese <zh-l10n@linux.org.tw>\n"
@@ -16,12 +20,12 @@ msgstr ""
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:262
 msgid "_Enable keyboard accessibility"
-msgstr ""
+msgstr "啟用鍵盤輔助技術(_E)"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:329
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
-msgstr ""
+msgstr "無法由檔案‘%s’匯入 AccessX 設定"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:441
 msgid "Select CDE AccessX file"
@@ -34,7 +38,7 @@ msgstr "鍵盤"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
 msgid "Keyboard Accessibility Properties"
-msgstr ""
+msgstr "鍵盤輔助技術偏好設定"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:1
 msgid "&lt;b&gt;Test&lt;/b&gt;"
@@ -45,12 +49,22 @@ msgid "B_eep when modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:3
+<<<<<<< zh_TW.po
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "當某一顆 LED 亮起時響一下，而 LED 熄滅時響兩下。"
+=======
 msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:4
+<<<<<<< zh_TW.po
+msgid "Beep when:"
+msgstr "在以下情況發出聲響："
+=======
 msgid "Beep when:"
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:5
 msgid "Enable Slo_w Keys"
@@ -79,8 +93,13 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:11
+<<<<<<< zh_TW.po
+msgid "Keyboard Accessibility Configuration (AccessX)"
+msgstr "鍵盤輔助技術設定 (AccessX)"
+=======
 msgid "Keyboard Accessibility Configuration (AccessX)"
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:12
 msgid "Ma_ximum pointer speed :"
@@ -131,10 +150,17 @@ msgstr "匯入 CDE AccessX 檔案(_I)"
 msgid "_Keyboard"
 msgstr "鍵盤(_K)"
 
+<<<<<<< zh_TW.po
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:23
+msgid "_Misc"
+msgstr "其它(_M)"
+
+=======
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:23
 msgid "_Misc"
 msgstr ""
 
+>>>>>>> 1.19
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:24
 msgid "_Only accept keypress after :"
 msgstr ""
@@ -167,7 +193,7 @@ msgstr "毫秒"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:32
 msgid "pixels/sec"
-msgstr ""
+msgstr "像素（每秒）"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:33
 msgid "seconds"
@@ -206,7 +232,7 @@ msgstr "底部顏色(_B)"
 
 #: capplets/background/background-properties-capplet.c:392
 msgid "_Wallpaper"
-msgstr "桌布(_W)"
+msgstr "桌布方式鋪排(_W)"
 
 #: capplets/background/background-properties-capplet.c:392
 msgid "C_entered"
@@ -222,11 +248,11 @@ msgstr "不依比例伸展(_H)"
 
 #: capplets/background/background-properties-capplet.c:392
 msgid "_No Picture"
-msgstr ""
+msgstr "不使用圖案(_N)"
 
 #: capplets/background/background-properties-capplet.c:427
 msgid "_Picture"
-msgstr ""
+msgstr "圖案(_P)"
 
 #: capplets/background/background-properties-capplet.c:531
 #: capplets/common/capplet-util.c:243
@@ -235,7 +261,7 @@ msgstr ""
 #: capplets/mouse/gnome-mouse-properties.c:691
 #: capplets/sound/sound-properties-capplet.c:148
 msgid "Retrieve and store legacy settings"
-msgstr ""
+msgstr "讀入舊版本的設定"
 
 #: capplets/background/background-properties-capplet.c:556
 #: capplets/background/background-properties.glade.h:1
@@ -244,7 +270,7 @@ msgstr "背景圖案偏好設定"
 
 #: capplets/background/background-properties.glade.h:2
 msgid "Bor_der the picture with a:"
-msgstr ""
+msgstr "包圍圖案用的顏色(_D)："
 
 #: capplets/background/background-properties.glade.h:3
 msgid "E-Mail"
@@ -260,19 +286,19 @@ msgstr "請選擇顏色"
 
 #: capplets/background/background-properties.glade.h:6
 msgid "Picture Options:"
-msgstr ""
+msgstr "有關圖案的選項："
 
 #: capplets/background/background-properties.glade.h:7
 msgid "Primary Color"
-msgstr ""
+msgstr "第一種顏色"
 
 #: capplets/background/background-properties.glade.h:8
 msgid "Secondary Color"
-msgstr ""
+msgstr "第二種顏色"
 
 #: capplets/background/background-properties.glade.h:9
 msgid "Solid color"
-msgstr ""
+msgstr "單色"
 
 #: capplets/background/background-properties.glade.h:10
 msgid "Vertical gradient"
@@ -284,6 +310,8 @@ msgid ""
 "into the window to set the \n"
 "background picture."
 msgstr ""
+"可以拖曳圖像至此視窗\n"
+"來設定背景圖案。"
 
 #: capplets/background/background-properties.glade.h:14
 msgid "radiobutton1"
@@ -305,6 +333,21 @@ msgstr "圓形按鈕 4"
 msgid "radiobutton5"
 msgstr "圓形按鈕 5"
 
+<<<<<<< zh_TW.po
+#: capplets/common/activate-settings-daemon.c:18
+msgid ""
+"Unable to start the settings manager 'gnome-settings-daemon'.\n"
+"Without the GNOME settings manager running, some preferences may not take "
+"effect. This could indicate a problem with Bonobo, or a non-GNOME (e.g. KDE) "
+"settings manager may already be active and conflicting with the GNOME "
+"settings manager."
+msgstr ""
+"無法啟動設定管理程式‘gnome-settings-daemon’。\n"
+"因為 GNOME 設定管理程式未有執行，某部份偏好設定可能不會生效。這可能表示 "
+"Bonobo 出了問題；或是另一個 GNOME 以外 (例如 KDE) 的設定管理程式正在執行，和 "
+"GNOME 設定管理程式出現衝突。"
+
+=======
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -314,9 +357,10 @@ msgid ""
 "settings manager."
 msgstr ""
 
+>>>>>>> 1.19
 #: capplets/common/capplet-util.c:239 capplets/common/capplet-util.c:241
 msgid "Just apply settings and quit"
-msgstr "只套用設定並離開"
+msgstr "僅套用設定及離開"
 
 #: capplets/common/gconf-property-editor.c:172
 msgid "Key"
@@ -363,11 +407,11 @@ msgstr ""
 
 #: capplets/common/gconf-property-editor.c:203
 msgid "UI Control"
-msgstr ""
+msgstr "介面控制"
 
 #: capplets/common/gconf-property-editor.c:204
 msgid "Object that controls the property (normally a widget)"
-msgstr ""
+msgstr "控制該屬性的物件 (通常是視窗元件)"
 
 #: capplets/common/gconf-property-editor.c:219
 msgid "Property editor object data"
@@ -406,7 +450,7 @@ msgid ""
 "Please select a different picture instead."
 msgstr ""
 "不知應如何開啟檔案‘%s’。\n"
-"可能這種圖案仍未有支援。\n"
+"可能仍未支援這種圖案。\n"
 "\n"
 "請選擇另一個圖案。"
 
@@ -421,7 +465,7 @@ msgstr "選擇預設使用的應用軟件"
 #: capplets/default-applications/default-applications.desktop.in.h:2
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:15
 msgid "Preferred Applications"
-msgstr ""
+msgstr "首選應用軟件"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:1
 msgid "Acce_pts URLs"
@@ -437,7 +481,7 @@ msgstr "自行指定編輯器(_U)："
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
 msgid "C_ustom Help Browser:"
-msgstr "自行指定輔助說明瀏覽器(_U)："
+msgstr "自行指定說明文件瀏覽器(_U)："
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
 msgid "C_ustom Terminal:"
@@ -453,7 +497,7 @@ msgstr "指令(_M)："
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:8
 msgid "Default Help Browser"
-msgstr "預設的輔助說明瀏覽器"
+msgstr "預設的說明文件瀏覽器"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:9
 msgid "Default Terminal"
@@ -473,11 +517,11 @@ msgstr "預設的視窗管理程式"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:13
 msgid "E_xec Flag:"
-msgstr ""
+msgstr "執行時的參數(_X)："
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:14
 msgid "He_lp Browser"
-msgstr "輔助說明瀏覽器(_L)"
+msgstr "說明文件瀏覽器(_L)"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:16
 msgid ""
@@ -516,7 +560,7 @@ msgstr "編輯(_E)..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
 msgid "_Select a Help Browser:"
-msgstr "請選擇輔助說明瀏覽器(_S)："
+msgstr "請選擇說明文件瀏覽器(_S)："
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "_Select a Terminal:"
@@ -541,11 +585,11 @@ msgstr "視窗管理程式(_W)"
 #: capplets/desktop-links/Accessibility.directory.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:7
 msgid "Accessibility"
-msgstr "可用性"
+msgstr "輔助技術"
 
 #: capplets/desktop-links/Accessibility.directory.in.in.h:2
 msgid "Accessibility Settings"
-msgstr "可用性設定"
+msgstr "輔助技術設定"
 
 #: capplets/desktop-links/Advanced.directory.in.in.h:1
 msgid "Advanced"
@@ -571,6 +615,16 @@ msgstr "舊式軟體"
 msgid "Legacy applications settings (grdb)"
 msgstr "舊式軟體設定（grdb）"
 
+<<<<<<< zh_TW.po
+#: capplets/desktop-links/panel.desktop.in.in.h:1
+msgid "Global panel properties"
+msgstr "整體的面板屬性"
+
+#: capplets/desktop-links/panel.desktop.in.in.h:2
+msgid "Panel"
+msgstr "面板"
+
+=======
 #: capplets/desktop-links/panel.desktop.in.in.h:1
 #, fuzzy
 msgid "Global panel properties"
@@ -580,6 +634,7 @@ msgstr "字型屬性"
 msgid "Panel"
 msgstr "面板"
 
+>>>>>>> 1.19
 #: capplets/desktop-links/Sawfish/appearance-properties.desktop.in.h:1
 msgid "Appearance"
 msgstr "外觀"
@@ -601,16 +656,14 @@ msgid "Configure window focusing"
 msgstr "設定視窗焦點模式"
 
 #: capplets/desktop-links/Sawfish/focus-properties.desktop.in.h:2
-#, fuzzy
 msgid "Focus behavior"
-msgstr "焦點表視"
+msgstr "焦點處理方式"
 
 #: capplets/desktop-links/Sawfish/match-properties.desktop.in.h:1
 msgid "Configure window properties"
 msgstr "設定視窗屬性"
 
 #: capplets/desktop-links/Sawfish/match-properties.desktop.in.h:2
-#, fuzzy
 msgid "Matched Windows"
 msgstr "視窗吻合條件"
 
@@ -704,7 +757,7 @@ msgstr "文書處理器"
 
 #: capplets/file-types/category-names.h:9
 msgid "Published Materials"
-msgstr ""
+msgstr "出版文件"
 
 #: capplets/file-types/category-names.h:10
 msgid "Spreadsheet"
@@ -802,21 +855,36 @@ msgstr "指定開啟或觀看每種檔案類型所用的程式"
 
 #: capplets/file-types/file-types-properties.glade.h:1
 msgid "Actions"
-msgstr ""
+msgstr "處理方式"
 
 #: capplets/file-types/file-types-properties.glade.h:2
+<<<<<<< zh_TW.po
+msgid "Add _file type..."
+msgstr "新增檔案類型(_F)..."
+=======
 #, fuzzy
 msgid "Add _file type..."
 msgstr "新增檔案類型..."
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:3
+<<<<<<< zh_TW.po
+msgid "Add _service..."
+msgstr "新增網絡服務(_S)..."
+=======
 msgid "Add _service..."
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:4
+<<<<<<< zh_TW.po
+msgid "Default action"
+msgstr "預設處理方式"
+=======
 #, fuzzy
 msgid "Default action"
 msgstr "預設行動"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:5
 #: capplets/file-types/mime-edit-dialog.c:167
@@ -824,8 +892,13 @@ msgid "Edit file type"
 msgstr "編輯檔案類型"
 
 #: capplets/file-types/file-types-properties.glade.h:6
+<<<<<<< zh_TW.po
+msgid "File types and Internet Services"
+msgstr "檔案類型及網絡服務"
+=======
 msgid "File types and Internet Services"
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:7
 msgid "Filename extensions"
@@ -836,79 +909,154 @@ msgid "Look at content"
 msgstr ""
 
 #: capplets/file-types/file-types-properties.glade.h:9
+<<<<<<< zh_TW.po
+msgid "Needs _terminal"
+msgstr "需要終端機(_T)"
+=======
 #, fuzzy
 msgid "Needs _terminal"
 msgstr "需要終端機"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:10
+<<<<<<< zh_TW.po
+msgid "Program to run"
+msgstr "執行程式"
+=======
 msgid "Program to run"
 msgstr "要執行的程式"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "Run a program"
 msgstr "執行程式"
 
 #: capplets/file-types/file-types-properties.glade.h:12
+<<<<<<< zh_TW.po
+msgid "Use category _defaults"
+msgstr "使用該分類的預設值(_D)"
+=======
 msgid "Use category _defaults"
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:13
+<<<<<<< zh_TW.po
+msgid "Use parent category _defaults"
+msgstr "使用上層分類的預設值(_D)"
+=======
 msgid "Use parent category _defaults"
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:14
+<<<<<<< zh_TW.po
+msgid "Viewing component"
+msgstr "檢視方式"
+=======
 msgid "Viewing component"
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:15
+<<<<<<< zh_TW.po
+msgid "_Add"
+msgstr "新增(_A)"
+=======
 #, fuzzy
 msgid "_Add"
 msgstr "加入"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:16
+<<<<<<< zh_TW.po
+msgid "_Category"
+msgstr "分類(_C)"
+=======
 #, fuzzy
 msgid "_Category"
 msgstr "分類"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:17
+<<<<<<< zh_TW.po
+msgid "_Choose..."
+msgstr "選擇(_C)..."
+=======
 #, fuzzy
 msgid "_Choose..."
 msgstr "選擇..."
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:18
+<<<<<<< zh_TW.po
+msgid "_Description"
+msgstr "描述(_D)"
+=======
 #, fuzzy
 msgid "_Description"
 msgstr "描述"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:20
+<<<<<<< zh_TW.po
+msgid "_MIME Type"
+msgstr "_MIME 類型"
+=======
 #, fuzzy
 msgid "_MIME Type"
 msgstr "MIME 類型"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:21
+<<<<<<< zh_TW.po
+msgid "_Name"
+msgstr "名稱(_N)"
+=======
 #, fuzzy
 msgid "_Name"
 msgstr "名稱"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:22
+<<<<<<< zh_TW.po
+msgid "_Program"
+msgstr "程式(_P)"
+=======
 #, fuzzy
 msgid "_Program"
 msgstr "程式"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:23
+<<<<<<< zh_TW.po
+msgid "_Program to execute"
+msgstr "執行的程式(_P)"
+=======
 #, fuzzy
 msgid "_Program to execute"
 msgstr "要執行的程式"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:24
+<<<<<<< zh_TW.po
+msgid "_Protocol name"
+msgstr "協定名稱(_P)"
+=======
 #, fuzzy
 msgid "_Protocol name"
 msgstr "協定名稱"
+>>>>>>> 1.19
 
 #: capplets/file-types/file-types-properties.glade.h:25
+<<<<<<< zh_TW.po
+msgid "_Remove"
+msgstr "移除(_R)"
+=======
 #, fuzzy
 msgid "_Remove"
 msgstr "移除"
+>>>>>>> 1.19
 
 #: capplets/file-types/mime-category-edit-dialog.c:137
 msgid "Edit file category"
@@ -931,7 +1079,7 @@ msgstr "MIME 類別資訊"
 
 #: capplets/file-types/mime-category-edit-dialog.c:178
 msgid "Structure containing information on the MIME category"
-msgstr ""
+msgstr "含有有關該 MIME 分類的資訊的結構"
 
 #: capplets/file-types/mime-category-edit-dialog.c:343
 #: capplets/file-types/mime-edit-dialog.c:409
@@ -976,7 +1124,7 @@ msgid ""
 "Invalid MIME type. Please enter a valid MIME type, or leave the field blank "
 "to have one generated for you."
 msgstr ""
-"無效的 MIME 類型。請輸入正確的 MIME 類型，或是留白，使之自動估計 MIME 類型。"
+"無效的 MIME 類型。請輸入正確的 MIME 類型，或是留空，使之自動估計 MIME 類型。"
 
 #: capplets/file-types/mime-edit-dialog.c:703
 msgid "There already exists a MIME type of that name."
@@ -997,7 +1145,7 @@ msgstr ""
 
 #: capplets/file-types/mime-types-model.c:421
 msgid "Internet Services"
-msgstr "互聯網服務"
+msgstr "網絡服務"
 
 #: capplets/file-types/service-edit-dialog.c:133
 msgid "Edit service information"
@@ -1009,7 +1157,7 @@ msgstr "服務資訊"
 
 #: capplets/file-types/service-edit-dialog.c:175
 msgid "Structure containing service information"
-msgstr "含有服務資訊的結構"
+msgstr "含有該服務的資訊的結構"
 
 #: capplets/file-types/service-edit-dialog.c:181
 msgid "Is add"
@@ -1075,7 +1223,7 @@ msgstr "字型屬性"
 
 #: capplets/font/font-properties.glade.h:2
 msgid "Font settings only apply to new programs."
-msgstr ""
+msgstr "已更改的字型設定只會對將來啟動的程式生效。"
 
 #: capplets/font/font-properties.glade.h:3
 msgid "Use a custom font."
@@ -1088,9 +1236,8 @@ msgstr ""
 
 #: capplets/keybindings/eggcellrendererkeys.c:161
 #: capplets/keybindings/eggcellrendererkeys.c:162
-#, fuzzy
 msgid "Accelerator key"
-msgstr "捷徑鍵"
+msgstr "快速鍵"
 
 #: capplets/keybindings/eggcellrendererkeys.c:199
 #: capplets/keybindings/gnome-keybinding-properties.c:101
@@ -1119,7 +1266,7 @@ msgstr ""
 
 #: capplets/keybindings/gnome-keybinding-properties.c:594
 msgid "_Action"
-msgstr ""
+msgstr "行動(_A)"
 
 #: capplets/keybindings/gnome-keybinding-properties.c:606
 msgid "_Shortcut"
@@ -1132,7 +1279,7 @@ msgstr "桌面捷徑鍵："
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:2
 #: capplets/keybindings/keybinding.desktop.in.h:2
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "捷徑鍵"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:3
 msgid "Keyboard _Navigation scheme for use in applications:"
@@ -1150,7 +1297,7 @@ msgstr ""
 
 #: capplets/keyboard/gnome-keyboard-properties.c:338
 msgid "_Accessibility"
-msgstr "可用性(_A)"
+msgstr "輔助技術(_A)"
 
 #: capplets/keyboard/gnome-keyboard-properties.c:355
 #: capplets/keyboard/gnome-keyboard-properties.c:357
@@ -1173,27 +1320,35 @@ msgstr "&lt;i&gt;快&lt;/i&gt;"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:3
 msgid "&lt;i&gt;loud&lt;/i&gt;"
-msgstr ""
+msgstr "&lt;i&gt;響&lt;/i&gt;"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:4
 msgid "&lt;i&gt;quiet&lt;/i&gt;"
-msgstr ""
+msgstr "&lt;i&gt;靜&lt;/i&gt;"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:5
 msgid "&lt;i&gt;slow&lt;/i&gt;"
 msgstr "&lt;i&gt;慢&lt;/i&gt;"
 
+<<<<<<< zh_TW.po
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:6
+msgid "*"
+msgstr "*"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:8
+=======
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:6
 msgid "*"
 msgstr ""
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:8
+>>>>>>> 1.19
 msgid "Cursor"
-msgstr ""
+msgstr "游標"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:9
 msgid "Key_press makes sound"
-msgstr ""
+msgstr "按鍵時會發出聲響(_P)"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:10
 msgid "Keyboard Bell"
@@ -1202,7 +1357,7 @@ msgstr "鍵盤聲響"
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:11
 #: capplets/keyboard/keyboard.desktop.in.h:2
 msgid "Keyboard Properties"
-msgstr "鍵盤設定"
+msgstr "鍵盤屬性"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:12
 msgid "Keyboard _repeats when key is held down"
@@ -1226,15 +1381,15 @@ msgstr "重覆速率"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:17
 msgid "Repeat s_peed:"
-msgstr ""
+msgstr "重覆速度(_P)："
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "Set the speed the cursor blinks in text fields."
-msgstr ""
+msgstr "設定游標在文字欄輸入欄中的閃爍頻率。"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:19
 msgid "Set the volume of the clicking sound made when pressing a key"
-msgstr ""
+msgstr "設定當按下鍵盤時發出的聲響的音量"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
 msgid ""
@@ -1243,10 +1398,16 @@ msgid ""
 "instead of the traditional beeping noise."
 msgstr ""
 
+<<<<<<< zh_TW.po
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:21
+msgid "_Accessibility..."
+msgstr "輔助技術(_A)..."
+=======
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "_Accessibility..."
 msgstr "可用性(_A)"
+>>>>>>> 1.19
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:22
 msgid "_Blink speed:"
@@ -1254,7 +1415,7 @@ msgstr "閃爍速度(_B)："
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:23
 msgid "_Cursor blinks in text fields"
-msgstr ""
+msgstr "游標會在文字輸入欄中閃爍(_C)"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:24
 msgid "_Custom keyboard bell:"
@@ -1262,7 +1423,7 @@ msgstr "自訂鍵盤聲響(_C)："
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:25
 msgid "_Delay before repeating:"
-msgstr ""
+msgstr "重覆按鍵前的延長時間(_D)："
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:27
 msgid "_Sound"
@@ -1272,6 +1433,187 @@ msgstr "音效(_S)"
 msgid "_Volume:"
 msgstr "音量(_V)："
 
+<<<<<<< zh_TW.po
+#. icon box
+#: capplets/mime-type/edit-window.c:266
+msgid "Select an icon..."
+msgstr "選擇圖示..."
+
+#: capplets/mime-type/edit-window.c:276
+#: capplets/mime-type/new-mime-window.c:31
+msgid "Mime Type: "
+msgstr "Mime 類型："
+
+#: capplets/mime-type/edit-window.c:306
+msgid "Add"
+msgstr "新增"
+
+#: capplets/mime-type/edit-window.c:314
+#: capplets/url-properties/url-properties.c:135
+msgid "Remove"
+msgstr "移除"
+
+#. gtk_container_set_border_width (GTK_CONTAINER (table), GNOME_PAD_SMALL);
+#: capplets/mime-type/edit-window.c:341
+#: capplets/mime-type/new-mime-window.c:69
+msgid "First Regular Expression: "
+msgstr "第一個正規表示式："
+
+#: capplets/mime-type/edit-window.c:349
+#: capplets/mime-type/new-mime-window.c:80
+msgid "Second Regular Expression: "
+msgstr "第二個正規表示式："
+
+#. Actions box
+#: capplets/mime-type/edit-window.c:356
+msgid "Mime Type Actions"
+msgstr "Mime 類型的處理方式"
+
+#: capplets/mime-type/edit-window.c:363
+#, c-format
+msgid "Example: emacs %f"
+msgstr "例如：emacs %f"
+
+#: capplets/mime-type/edit-window.c:368
+msgid "Open"
+msgstr "開啟"
+
+#: capplets/mime-type/edit-window.c:374 capplets/mime-type/edit-window.c:390
+#: capplets/mime-type/edit-window.c:405
+msgid "Select a file..."
+msgstr "選擇檔案..."
+
+#: capplets/mime-type/edit-window.c:383
+msgid "View"
+msgstr "檢視"
+
+#: capplets/mime-type/edit-window.c:399
+msgid "Edit"
+msgstr "編輯"
+
+#. we initialize everything
+#: capplets/mime-type/edit-window.c:448
+#, c-format
+msgid "Set actions for %s"
+msgstr "設定 %s 的動作"
+
+#: capplets/mime-type/mime-data.c:384
+msgid "Mime Type"
+msgstr "Mime 類型"
+
+#: capplets/mime-type/mime-data.c:493
+msgid "You must enter a mime-type"
+msgstr "必須輸入 mime 類型"
+
+#: capplets/mime-type/mime-data.c:498
+msgid ""
+"You must add either a regular-expression or\n"
+"a file-name extension"
+msgstr ""
+
+#: capplets/mime-type/mime-data.c:502
+msgid ""
+"Please put your mime-type in the format:\n"
+"CATEGORY/TYPE\n"
+"\n"
+"For Example:\n"
+"image/png"
+msgstr ""
+
+#: capplets/mime-type/mime-data.c:507
+msgid "This mime-type already exists"
+msgstr "這個 mime 類型已經存在"
+
+#: capplets/mime-type/mime-data.c:588 capplets/mime-type/mime-info.c:427
+msgid ""
+"We are unable to create the directory\n"
+"~/.gnome/mime-info\n"
+"\n"
+"We will not be able to save the state."
+msgstr ""
+
+#: capplets/mime-type/mime-data.c:594 capplets/mime-type/mime-info.c:433
+msgid ""
+"We are unable to access the directory\n"
+"~/.gnome/mime-info\n"
+"\n"
+"We will not be able to save the state."
+msgstr ""
+
+#: capplets/mime-type/mime-data.c:605
+msgid ""
+"Cannot create the file\n"
+"~/.gnome/mime-info/user.mime\n"
+"\n"
+"We will not be able to save the state"
+msgstr ""
+
+#: capplets/mime-type/mime-info.c:444
+msgid ""
+"Cannot create the file\n"
+"~/.gnome/mime-info/user.keys.\n"
+"\n"
+"We will not be able to save the state"
+msgstr ""
+
+#: capplets/mime-type/mime-type-capplet.c:83
+#: capplets/wm-properties/wm-properties-capplet.c:1161
+msgid "Delete"
+msgstr "刪除"
+
+#: capplets/mime-type/mime-type-capplet.c:93
+#: capplets/wm-properties/wm-properties-capplet.c:1151
+msgid "Add..."
+msgstr "新增..."
+
+#: capplets/mime-type/mime-type-capplet.c:97
+#: capplets/wm-properties/wm-properties-capplet.c:1156
+msgid "Edit..."
+msgstr "編輯..."
+
+#: capplets/mime-type/mime-type.desktop.in.in.h:1
+msgid "Configure how files are associated and started"
+msgstr "設定檔案關聯屬性以及啟動方式"
+
+#: capplets/mime-type/mime-type.desktop.in.in.h:2
+msgid "Mime Types"
+msgstr "Mime 類型"
+
+#: capplets/mime-type/new-mime-window.c:25
+msgid "Add Mime Type"
+msgstr "新增 Mime 類型"
+
+#: capplets/mime-type/new-mime-window.c:26
+msgid ""
+"Add a new Mime Type\n"
+"For example:  image/tiff; text/x-scheme"
+msgstr ""
+"新增 Mime 類型\n"
+"例如： image/tiff; text/x-scheme"
+
+#: capplets/mime-type/new-mime-window.c:43
+msgid ""
+"Type in the extensions for this mime-type.\n"
+"For example:  .html, .htm"
+msgstr ""
+"請輸入此 mime 類型所用的延伸檔名。\n"
+"例如： .html .htm"
+
+#: capplets/mime-type/new-mime-window.c:50
+msgid "Extension:"
+msgstr "延伸檔名："
+
+#: capplets/mime-type/new-mime-window.c:55
+msgid "Regular Expressions"
+msgstr "正規表示式"
+
+#: capplets/mime-type/new-mime-window.c:59
+msgid ""
+"You can set up two regular expressions here to identify the Mime Type\n"
+"by.  These fields are optional."
+msgstr ""
+
+=======
 #. icon box
 #: capplets/mime-type/edit-window.c:266
 msgid "Select an icon..."
@@ -1450,6 +1792,7 @@ msgid ""
 "by.  These fields are optional."
 msgstr ""
 
+>>>>>>> 1.19
 #: capplets/mouse/gnome-mouse-properties.c:420
 #, c-format
 msgid ""
@@ -1462,60 +1805,82 @@ msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
+"<b>預設的鼠標 - 目前設定</b>\n"
+"X Window 預設使用的鼠標"
 
 #: capplets/mouse/gnome-mouse-properties.c:521
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
+"<b>預設的鼠標</b>\n"
+"X Window 預設使用的鼠標"
 
 #: capplets/mouse/gnome-mouse-properties.c:539
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
+"<b>白色鼠標 - 目前設定</b>\n"
+"和預設的鼠標顏色相反"
 
 #: capplets/mouse/gnome-mouse-properties.c:542
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
+"<b>白色鼠標</b>\n"
+"和預設的鼠標顏色相反"
 
 #: capplets/mouse/gnome-mouse-properties.c:560
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
+"<b>大型鼠標 - 目前設定</b>\n"
+"比正常的鼠標較大"
 
 #: capplets/mouse/gnome-mouse-properties.c:563
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
+"<b>大型鼠標</b>\n"
+"比正常的鼠標較大"
 
 #: capplets/mouse/gnome-mouse-properties.c:581
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
+"<b>大型白色鼠標 - 目前設定</b>\n"
+"比正常的白色鼠標較大"
 
 #: capplets/mouse/gnome-mouse-properties.c:584
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
 msgstr ""
+"<b>大型白色鼠標</b>\n"
+"比正常的白色鼠標較大"
 
 #: capplets/mouse/gnome-mouse-properties.c:718
 #: capplets/mouse/gnome-mouse-properties.glade.h:17
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Mouse Properties"
-msgstr "滑鼠設定"
+msgstr "滑鼠屬性"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:1
 msgid ""
+<<<<<<< zh_TW.po
+"&lt;b&gt;Note:&lt;/b&gt; You will need to logout and log back in for this "
+"setting to take effect."
+msgstr "&lt;b&gt;注意：&lt;/b&gt; 必須登出後再登入才會令設定生效。"
+=======
 "&lt;b&gt;Note:&lt;/b&gt; You will need to logout and log back in for this "
 "setting to take effect."
 msgstr ""
+>>>>>>> 1.19
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:2
 msgid "&lt;i&gt;Fast&lt;/i&gt;"
@@ -1549,7 +1914,7 @@ msgstr ""
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:9
 msgid "C_ursors"
-msgstr ""
+msgstr "鼠標(_U)"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:10
 msgid "Cursor Theme"
@@ -1557,16 +1922,16 @@ msgstr ""
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:11
 msgid "Double-click Delay"
-msgstr ""
+msgstr "Double-click 延遲時間"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:12
 msgid "Drag and Drop"
-msgstr ""
+msgstr "拖曳"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:13
 msgid ""
 "Left-handed mouse mode switches the left and right buttons on the mouse."
-msgstr ""
+msgstr "左手操作滑鼠模式會交換滑鼠的左右按鈕的功能。"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:14
 msgid "Locate Pointer"
@@ -1577,8 +1942,14 @@ msgid ""
 "Maximum time allowed between clicks when double-clicking.   Use the box on "
 "the right to test."
 msgstr ""
+"區分按兩下滑鼠按鈕和一下 double-click 的最長時限。請使用右邊的方格測試。"
 
+<<<<<<< zh_TW.po
 #: capplets/mouse/gnome-mouse-properties.glade.h:16
+#, fuzzy
+=======
+#: capplets/mouse/gnome-mouse-properties.glade.h:16
+>>>>>>> 1.19
 msgid "Mouse Orientation"
 msgstr "滑鼠方向"
 
@@ -1608,7 +1979,7 @@ msgstr "延遲時間[秒](_D)："
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:24
 msgid "_Left-handed mouse"
-msgstr ""
+msgstr "左手操作滑鼠(_L)"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:25
 msgid "_Motion"
@@ -1639,9 +2010,8 @@ msgid "Sound preferences"
 msgstr "音效偏好設定"
 
 #: capplets/sound/sound-properties.glade.h:1
-#, fuzzy
 msgid "E_nable sound server startup"
-msgstr "啟動音效伺服程式"
+msgstr "啟動 GNOME 時啟用音效伺服程式(_N)"
 
 #: capplets/sound/sound-properties.glade.h:2
 msgid "Sound _Events"
@@ -1657,7 +2027,7 @@ msgstr "事件音效(_S)"
 
 #: capplets/theme-switcher/control/control.c:18
 msgid "Eenie Meenie Mynie Moe Catcha Tiger By Its Toe"
-msgstr ""
+msgstr "甲 乙 丙 丁 戊 己 庚 辛"
 
 #: capplets/theme-switcher/control/control.c:43
 msgid "Selected themes from above will be tested by previewing here."
@@ -1670,7 +2040,7 @@ msgstr "按鈕樣本"
 
 #: capplets/theme-switcher/control/control.c:52
 msgid "Sample Check Button"
-msgstr "核對按鈕樣本"
+msgstr "方形按鈕樣本"
 
 #: capplets/theme-switcher/control/control.c:58
 msgid "Sample Text Entry Field"
@@ -1774,7 +2144,7 @@ msgstr "選單項目 5"
 
 #: capplets/ui-properties/gnome2-ui-properties.glade.h:10
 msgid "Menu items have _icons"
-msgstr "選單項目具有圖示"
+msgstr "選單項目具有圖示(_I)"
 
 #: capplets/ui-properties/gnome2-ui-properties.glade.h:11
 #: capplets/ui-properties/ui-properties.glade.h:8
@@ -1827,7 +2197,385 @@ msgstr "選單(_M)"
 
 #: capplets/ui-properties/gnome2-ui-properties.glade.h:23
 msgid "_Toolbars have: "
+msgstr "工具列具有(_T)："
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: capplets/ui-properties/ui-properties.glade.h:7
+msgid "window4"
+msgstr "window4"
+
+#: capplets/ui-properties/ui-properties.glade.h:9
+msgid "Menu bars are detachable"
+msgstr "可以取出選單列"
+
+#: capplets/ui-properties/ui-properties.glade.h:10
+msgid "Menu bars have a border"
+msgstr "選單列有邊框"
+
+#: capplets/ui-properties/ui-properties.glade.h:11
+msgid "Menus can be torn off"
+msgstr "選單可被撕開"
+
+#: capplets/ui-properties/ui-properties.glade.h:12
+msgid "Menu items have icons"
+msgstr "選單項目具有圖示"
+
+#: capplets/ui-properties/ui-properties.glade.h:13
+msgid "Status Bar"
+msgstr "狀態列"
+
+#: capplets/ui-properties/ui-properties.glade.h:14
+msgid "Use status bar instead of dialog when possible"
+msgstr "若有可能，以狀態列代替對話窗"
+
+#: capplets/ui-properties/ui-properties.glade.h:15
+msgid "Status bar is interactive when possible"
+msgstr "若可能，狀態列可互動"
+
+#: capplets/ui-properties/ui-properties.glade.h:16
+msgid "Progress bar is on the left"
+msgstr "進度列在左邊"
+
+#: capplets/ui-properties/ui-properties.glade.h:17
+msgid "Progress bar is on the right"
+msgstr "進度列在右邊"
+
+#: capplets/ui-properties/ui-properties.glade.h:18
+msgid "Tool Bars"
+msgstr "工具列"
+
+#: capplets/ui-properties/ui-properties.glade.h:19
+msgid "Tool bars have a border"
+msgstr "工具列有邊框"
+
+#: capplets/ui-properties/ui-properties.glade.h:20
+msgid "Tool bar buttons pop up on mouse over"
+msgstr "工具列按鈕遇到鼠標時會凸出來"
+
+#: capplets/ui-properties/ui-properties.glade.h:21
+msgid "Tool bars have line separators"
+msgstr "工具列有分隔線"
+
+#: capplets/ui-properties/ui-properties.glade.h:22
+msgid "Tool bars are detachable"
+msgstr "可以取出工具列"
+
+#: capplets/ui-properties/ui-properties.glade.h:23
+msgid "Tool bar buttons are icons only"
+msgstr "工具列按鈕只有圖示"
+
+#: capplets/ui-properties/ui-properties.glade.h:24
+msgid "Tool bar buttons are text below icons"
+msgstr "工具列按鈕圖示下有文字"
+
+#: capplets/ui-properties/ui-properties.glade.h:25
+msgid "Interface"
+msgstr "介面"
+
+#: capplets/ui-properties/ui-properties.glade.h:26
+msgid "Dialogs"
+msgstr "對話窗"
+
+#: capplets/ui-properties/ui-properties.glade.h:27
+msgid "Place dialogs over application window when possible"
+msgstr "若可能，將對話窗置於應用程式視窗之上"
+
+#: capplets/ui-properties/ui-properties.glade.h:28
+msgid "Dialogs open"
+msgstr "對話窗開啟於"
+
+#: capplets/ui-properties/ui-properties.glade.h:29
+msgid "Wherever the Window Manager places them"
+msgstr "由視窗管理程式指定"
+
+#: capplets/ui-properties/ui-properties.glade.h:30
+msgid "At the center of the screen"
+msgstr "螢幕中央"
+
+#: capplets/ui-properties/ui-properties.glade.h:31
+msgid "At the mouse pointer"
+msgstr "鼠標位置"
+
+#: capplets/ui-properties/ui-properties.glade.h:32
+msgid "Dialogs are treated"
+msgstr "對待對話窗於式"
+
+#: capplets/ui-properties/ui-properties.glade.h:33
+msgid "Like any other window"
+msgstr "與其它視窗相同"
+
+#: capplets/ui-properties/ui-properties.glade.h:34
+msgid "Specially by the window manager"
+msgstr "由視窗管理程式特別處理"
+
+#: capplets/ui-properties/ui-properties.glade.h:35
+msgid "Multiple Documents"
+msgstr "多文件介面"
+
+#: capplets/ui-properties/ui-properties.glade.h:36
+msgid "Notebook tabs"
+msgstr "標簽頁方式"
+
+#: capplets/ui-properties/ui-properties.glade.h:37
+msgid "Seperate windows"
+msgstr "分離視窗"
+
+#: capplets/ui-properties/ui-properties.glade.h:38
+msgid "The same window"
+msgstr "同一視窗"
+
+#: capplets/ui-properties/ui-properties.glade.h:39
+msgid "Left"
+msgstr "左邊"
+
+#: capplets/ui-properties/ui-properties.glade.h:40
+msgid "Right"
+msgstr "右邊"
+
+#: capplets/ui-properties/ui-properties.glade.h:41
+msgid "Top"
+msgstr "頂端"
+
+#: capplets/ui-properties/ui-properties.glade.h:42
+msgid "Bottom"
+msgstr "底部"
+
+#: capplets/ui-properties/ui-properties.glade.h:43
+msgid "When opening Multiple documents, use"
+msgstr "當開啟多個文件時，使用："
+
+#: capplets/ui-properties/ui-properties.glade.h:44
+msgid "When using Notebook tabs, place the tabs on the"
+msgstr "當使用標簽頁方式時，將標簽置於："
+
+#: capplets/ui-properties/ui-properties.glade.h:46
+msgid "Settings will not take effect until applications restart"
+msgstr "設定在應用程式重新啟動前不會生效"
+
+#: capplets/url-properties/url.desktop.in.in.h:1
+#: capplets/url-properties/url-properties.desktop.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr "設定顯示 URL 所用的程式"
+
+#: capplets/url-properties/url.desktop.in.in.h:2
+#: capplets/url-properties/url-properties.c:66
+#: capplets/url-properties/url-properties.desktop.in.h:2
+msgid "URL Handlers"
+msgstr "URL 處理程式"
+
+#: capplets/url-properties/url-properties.c:64
+msgid "Protocol"
+msgstr "協定"
+
+#: capplets/url-properties/url-properties.c:64
+msgid "Command"
+msgstr "指令"
+
+#: capplets/url-properties/url-properties.c:89
+msgid "handler:"
+msgstr "處理器："
+
+#. set some commonly used handlers
+#: capplets/url-properties/url-properties.c:99
+msgid "Netscape"
+msgstr "Netscape"
+
+#: capplets/url-properties/url-properties.c:104
+msgid "Netscape (new window)"
+msgstr "Netscape (新視窗)"
+
+#: capplets/url-properties/url-properties.c:110
+msgid "Help browser"
+msgstr "說明文件瀏覽器"
+
+#: capplets/url-properties/url-properties.c:115
+msgid "Help browser (new window)"
+msgstr "說明文件瀏覽器 (新視窗)"
+
+#: capplets/url-properties/url-properties.c:127
+msgid "Set"
+msgstr "設定"
+
+#: capplets/wm-properties/wm-desktops/Enlightenment.desktop.in.in.h:1
+msgid "Enlightenment"
+msgstr "Enlightenment"
+
+#: capplets/wm-properties/wm-desktops/IceWM.desktop.in.in.h:1
+msgid "Ice WM"
+msgstr "Ice WM"
+
+#: capplets/wm-properties/wm-desktops/Scwm.desktop.in.in.h:1
+msgid "Scwm"
+msgstr "Scwm"
+
+#: capplets/wm-properties/wm-desktops/twm.desktop.in.in.h:1
+msgid "twm"
+msgstr "twm"
+
+#: capplets/wm-properties/wm-desktops/WindowMaker.desktop.in.in.h:1
+msgid "Window Maker"
+msgstr "Window Maker"
+
+#: capplets/wm-properties/wm-properties-capplet.c:135
+msgid "Initialize session settings"
+msgstr "初始化作業階段設定"
+
+#: capplets/wm-properties/wm-properties-capplet.c:206
+#, c-format
+msgid ""
+"Starting %s\n"
+"(%d seconds left before operation times out)"
 msgstr ""
+"正在啟動 %s\n"
+"（%d 秒後定為逾時）"
+
+#: capplets/wm-properties/wm-properties-capplet.c:367
+#, c-format
+msgid "%s (Current)"
+msgstr "%s (使用中)"
+
+#: capplets/wm-properties/wm-properties-capplet.c:370
+#, c-format
+msgid "Run Configuration Tool for %s"
+msgstr "執行 %s 的設定工具"
+
+#: capplets/wm-properties/wm-properties-capplet.c:381
+msgid " (Not found)"
+msgstr " (找不到)"
+
+#: capplets/wm-properties/wm-properties-capplet.c:420
+msgid ""
+"wm-properties-capplet: Unable to initialize window manager.\n"
+"\tAnother window manager is already running and could not be killed\n"
+msgstr ""
+"wm-properties-capplet：無法初始化視窗管理程式。\n"
+"\t另一個視窗管理程式已經在執行並且無法停止\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:424
+#, c-format
+msgid ""
+"wm-properties-capplet: Unable to initialize window manager.\n"
+"\t'%s' didn't start\n"
+msgstr ""
+"wm-properties-capplet: 無法初始化視窗管理程式。\n"
+"\t‘%s’無法啟動\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:473
+msgid "Previous window manager did not die\n"
+msgstr "前一個視窗管理程式尚未結束\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:506
+#, c-format
+msgid ""
+"Could not start '%s'.\n"
+"Falling back to previous window manager '%s'\n"
+msgstr ""
+"無法啟動‘%s’。\n"
+"回到前一個視窗管理程式‘%s’\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:537
+msgid ""
+"Could not start fallback window manager.\n"
+"Please run a window manager manually. You can\n"
+"do this by selecting \"Run Program\" in the\n"
+"foot menu\n"
+msgstr ""
+"無法啟動後備的視窗管理程式。請自行啟動\n"
+"視窗管理程式。你可以在腳印選單中選擇\n"
+"「執行程式」來進行。\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:562
+#: capplets/wm-properties/wm-properties-capplet.c:812
+#: capplets/wm-properties/wm-properties-capplet.c:921
+#: capplets/wm-properties/wm-properties-capplet.c:928
+#: capplets/wm-properties/wm-properties-capplet.c:1070
+msgid "OK"
+msgstr "確定"
+
+#: capplets/wm-properties/wm-properties-capplet.c:580
+msgid ""
+"Your current window manager has been changed. In order for\n"
+"this change to be saved, you will need to save your current\n"
+"session. You can do so immediately by selecting the \"Save session\n"
+"now\" below, or you can save your session later.  This can be\n"
+"done either selecting \"Save Current Session\" under \"Settings\"\n"
+"in the main menu, or by turning on \"Save Current Setup\" when\n"
+"you log out.\n"
+msgstr ""
+"現在的視窗管理程式已經改變了。要令設定生效，你必須儲存目前\n"
+"的作業階段。你可以選擇下方的「立刻儲存作業階段」按鈕或之後\n"
+"自行儲存。要自行儲存，可以在主選單的「設定」副選單中選取\n"
+"「立刻儲存作業階段」，或是在登出時選取「儲存目前設定」。\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:587
+msgid "Save Session Later"
+msgstr "稍後再儲存作業階段"
+
+#: capplets/wm-properties/wm-properties-capplet.c:587
+msgid "Save Session Now"
+msgstr "立刻儲存作業階段"
+
+#: capplets/wm-properties/wm-properties-capplet.c:590
+msgid ""
+"Your current window manager has been changed. In order for\n"
+"this change to be saved, you will need to save your current\n"
+"session. This can be done by either selecting \"Save Current Session\"\n"
+"under \"Settings\" in the main menu, or by turning on\n"
+"\"Save Current Setup\" when you log out.\n"
+msgstr ""
+"現在的視窗管理程式已經改變了。要令設定生效，你必須儲存目前\n"
+"的作業階段。要自行儲存，可以在主選單的「設定」副選單中選取\n"
+"「立刻儲存作業階段」，或是在登出時選取「儲存目前設定」。\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:811
+msgid "Add New Window Manager"
+msgstr "新增視窗管理程式"
+
+#: capplets/wm-properties/wm-properties-capplet.c:812
+msgid "Cancel"
+msgstr "取消"
+
+#: capplets/wm-properties/wm-properties-capplet.c:824
+msgid "Name:"
+msgstr "名稱："
+
+#: capplets/wm-properties/wm-properties-capplet.c:837
+msgid "Command:"
+msgstr "指令："
+
+#: capplets/wm-properties/wm-properties-capplet.c:850
+msgid "Configuration Command:"
+msgstr "設定時執行："
+
+#: capplets/wm-properties/wm-properties-capplet.c:869
+msgid "Window manager is session managed"
+msgstr "視窗管理程式接受作業階段管理"
+
+#: capplets/wm-properties/wm-properties-capplet.c:919
+msgid "Name cannot be empty"
+msgstr "名稱欄不能留空"
+
+#: capplets/wm-properties/wm-properties-capplet.c:926
+msgid "Command cannot be empty"
+msgstr "指令欄不能留空"
+
+#: capplets/wm-properties/wm-properties-capplet.c:974
+#: capplets/wm-properties/wm-properties-capplet.c:1012
+msgid "Edit Window Manager"
+msgstr "編輯視窗管理程式清單"
+
+#: capplets/wm-properties/wm-properties-capplet.c:1069
+msgid "You cannot delete the current Window Manager"
+msgstr "你不能刪除正在使用的視窗管理程式"
+
+#: capplets/wm-properties/wm-properties-capplet.c:1111
+#: capplets/wm-properties/wm-properties-capplet.c:1123
+msgid "Window Manager Selector"
+msgstr "視窗管理程式選擇器"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -2312,6 +3060,9 @@ msgid ""
 "You may want to install the gnome-audio package\n"
 "for a set of default sounds."
 msgstr ""
+"代表此事件的音效檔不存在。\n"
+"請安裝 gnome-audio 套件來\n"
+"獲取一套預設的音效。"
 
 #: libsounds/sound-view.c:210
 msgid "Event"
@@ -2321,11 +3072,18 @@ msgstr "事件"
 msgid "File to play"
 msgstr "要播放的音效檔"
 
+<<<<<<< zh_TW.po
+#: libsounds/sound-view.c:232
+msgid "_Sounds"
+msgstr "音效(_S)"
+
+=======
 #: libsounds/sound-view.c:232
 #, fuzzy
 msgid "_Sounds"
 msgstr "音效(_S)"
 
+>>>>>>> 1.19
 #: libsounds/sound-view.c:245
 msgid "_Play"
 msgstr "播放(_P)"
@@ -2358,10 +3116,6 @@ msgstr "選擇音效檔"
 #~ msgid "Background properties"
 #~ msgstr "背景圖屬性"
 
-#, fuzzy
-#~ msgid "Default Applications"
-#~ msgstr "刪除應用程式"
-
 #~ msgid "Configure the settings of the screensaver"
 #~ msgstr "修改螢幕保護程式的選項"
 
@@ -2375,7 +3129,7 @@ msgstr "選擇音效檔"
 #~ "No help is available/installed. Please make sure you\n"
 #~ "have the GNOME User's Guide installed on your system."
 #~ msgstr ""
-#~ "輔助說明尚未安裝或不存在，請確定你已經安裝\n"
+#~ "求助說明尚未安裝或不存在，請確定你已經安裝\n"
 #~ "GNOME 的使用者指南到你的系統中。"
 
 #~ msgid "Close"
@@ -2409,7 +3163,7 @@ msgstr "選擇音效檔"
 #~ msgstr "選擇要在選單中顯示並相關於 MIME 類型 \"%s\" 的應用程式"
 
 #~ msgid "Add Application..."
-#~ msgstr "加入應用程式..."
+#~ msgstr "新增應用程式..."
 
 #~ msgid "Edit Application..."
 #~ msgstr "編輯應用程式..."
@@ -2526,7 +3280,7 @@ msgstr "選擇音效檔"
 #~ msgstr "鍵盤敲擊聲"
 
 #~ msgid "Mouse buttons"
-#~ msgstr "滑鼠按鍵"
+#~ msgstr "滑鼠按鈕"
 
 #~ msgid "Right handed"
 #~ msgstr "右手操作"