diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2f98edb4573b203c4cceda948a252a0547f6a1f5..2547d4b765f9610b65218909b25692a84f138adc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Thunar 0.8.1svn-r25750\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-26 10:40+0200\n"
-"PO-Revision-Date: 2010-06-28 12:31+0800\n"
+"PO-Revision-Date: 2010-08-27 10:24+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
@@ -24,19 +24,19 @@ msgstr "開啟批次重命名對話框"
 
 #: ../thunar/main.c:64
 msgid "Run in daemon mode"
-msgstr "以 daemon 模式執行"
+msgstr "以幕後模式執行"
 
 #: ../thunar/main.c:66
 msgid "Run in daemon mode (not supported)"
-msgstr "以 daemon 模式執行 (未支援)"
+msgstr "以幕後模式執行 (未支援)"
 
 #: ../thunar/main.c:70
 msgid "Quit a running Thunar instance"
-msgstr "跳出一執行中的 Thunar 事件"
+msgstr "退出一執行中的 Thunar 實體"
 
 #: ../thunar/main.c:72
 msgid "Quit a running Thunar instance (not supported)"
-msgstr "跳出一執行中的 Thunar 事件 (未支援)"
+msgstr "退出一執行中的 Thunar 實體 (未支援)"
 
 #: ../thunar/main.c:74
 msgid "Print version information and exit"
@@ -55,13 +55,13 @@ msgstr "[檔案...]"
 #: ../thunar/main.c:166
 #, c-format
 msgid "Thunar: Failed to open display: %s\n"
-msgstr "Thunar: 無法開啟顯示：%s\n"
+msgstr "Thunar：無法開啟顯示：%s\n"
 
 #. yep, there's an error, so print it
 #: ../thunar/main.c:171
 #, c-format
 msgid "Thunar: %s\n"
-msgstr "Thunar: %s\n"
+msgstr "Thunar：%s\n"
 
 #: ../thunar/main.c:182
 msgid "The Thunar development team. All rights reserved."
@@ -69,16 +69,16 @@ msgstr "Thunar 開發團隊。保留所有權利。"
 
 #: ../thunar/main.c:183
 msgid "Written by Benedikt Meurer <benny@xfce.org>."
-msgstr "由 Benedikt Meurer 撰寫 <benny@xfce.org>。"
+msgstr "由 Benedikt Meurer 編寫 <benny@xfce.org>。"
 
 #: ../thunar/main.c:184
 #, c-format
 msgid "Please report bugs to <%s>."
-msgstr "請將程式錯誤回報到 <%s>。"
+msgstr "請將程式錯誤回報至 <%s>。"
 
 #: ../thunar/thunar-abstract-icon-view.c:115
 msgid "Arran_ge Items"
-msgstr "排列項目(_G)"
+msgstr "整理項目(_G)"
 
 #: ../thunar/thunar-abstract-icon-view.c:120
 msgid "Sort By _Name"
@@ -118,7 +118,7 @@ msgstr "讓檔案保照依其修改日期排列"
 
 #: ../thunar/thunar-abstract-icon-view.c:128
 msgid "_Ascending"
-msgstr "升冪(_A)"
+msgstr "遞增(_A)"
 
 #: ../thunar/thunar-abstract-icon-view.c:128
 msgid "Sort items in ascending order"
@@ -126,7 +126,7 @@ msgstr "按照上升的順序排列"
 
 #: ../thunar/thunar-abstract-icon-view.c:129
 msgid "_Descending"
-msgstr "降冪(_D)"
+msgstr "遞減(_D)"
 
 #: ../thunar/thunar-abstract-icon-view.c:129
 msgid "Sort items in descending order"
@@ -138,10 +138,13 @@ msgid "Failed to launch operation"
 msgstr "操作無法啟動"
 
 #. tell the user that we were unable to launch the file specified
-#: ../thunar/thunar-application.c:1036 ../thunar/thunar-application.c:1162
-#: ../thunar/thunar-launcher.c:1062 ../thunar/thunar-location-entry.c:389
+#: ../thunar/thunar-application.c:1036
+#: ../thunar/thunar-application.c:1162
+#: ../thunar/thunar-launcher.c:1062
+#: ../thunar/thunar-location-entry.c:389
 #: ../thunar/thunar-location-entry.c:417
-#: ../thunar/thunar-shortcuts-view.c:1237 ../thunar/thunar-window.c:1506
+#: ../thunar/thunar-shortcuts-view.c:1237
+#: ../thunar/thunar-window.c:1506
 #, c-format
 msgid "Failed to open \"%s\""
 msgstr "無法開啟「%s」"
@@ -217,23 +220,22 @@ msgstr "將垃圾桶中所有檔案和資料夾清除？"
 
 #. append the "Empty Trash" menu action
 #. prepare the menu item
-#: ../thunar/thunar-application.c:1652 ../thunar/thunar-location-buttons.c:171
-#: ../thunar/thunar-shortcuts-view.c:835 ../thunar/thunar-tree-view.c:1145
-#: ../thunar/thunar-window.c:295 ../plugins/thunar-tpa/thunar-tpa.c:169
+#: ../thunar/thunar-application.c:1652
+#: ../thunar/thunar-location-buttons.c:171
+#: ../thunar/thunar-shortcuts-view.c:835
+#: ../thunar/thunar-tree-view.c:1145
+#: ../thunar/thunar-window.c:295
+#: ../plugins/thunar-tpa/thunar-tpa.c:169
 msgid "_Empty Trash"
 msgstr "倒垃圾(_E)"
 
 #: ../thunar/thunar-application.c:1656
-msgid ""
-"If you choose to empty the Trash, all items in it will be permanently lost. "
-"Please note that you can also delete them separately."
-msgstr ""
-"如果您選擇倒垃圾，所有垃圾桶中的東西會永遠遺失。提一下：您也可以分別將它們刪"
-"除。"
+msgid "If you choose to empty the Trash, all items in it will be permanently lost. Please note that you can also delete them separately."
+msgstr "如果您選擇要倒垃圾，所有垃圾桶中的東西會永遠遺失。提醒您：您也可以將它們個別刪除。"
 
 #: ../thunar/thunar-application.c:1673
 msgid "Emptying the Trash..."
-msgstr "正在清空垃圾桶..."
+msgstr "正在倒垃圾..."
 
 #: ../thunar/thunar-application.c:1719
 #, c-format
@@ -244,14 +246,15 @@ msgstr "無法得知「%s」的原始路徑"
 #: ../thunar/thunar-application.c:1736
 #, c-format
 msgid "Could not restore \"%s\""
-msgstr "無法恢復「%s」"
+msgstr "無法還原「%s」"
 
 #: ../thunar/thunar-application.c:1744
 msgid "Restoring files..."
-msgstr "正在恢復檔案..."
+msgstr "正在還原檔案..."
 
 #. tell the user that it didn't work
-#: ../thunar/thunar-chooser-button.c:234 ../thunar/thunar-chooser-dialog.c:465
+#: ../thunar/thunar-chooser-button.c:234
+#: ../thunar/thunar-chooser-dialog.c:465
 #, c-format
 msgid "Failed to set default application for \"%s\""
 msgstr "無法為「%s」設定預設應用程式"
@@ -262,8 +265,7 @@ msgstr "未選取任何應用程式"
 
 #: ../thunar/thunar-chooser-button.c:313
 #, c-format
-msgid ""
-"The selected application is used to open this and other files of type \"%s\"."
+msgid "The selected application is used to open this and other files of type \"%s\"."
 msgstr "選取的應用程式用來開啟本檔案和其它「%s」形式的檔案"
 
 #. add the "Other Application..." choice
@@ -271,7 +273,8 @@ msgstr "選取的應用程式用來開啟本檔案和其它「%s」形式的檔
 msgid "_Other Application..."
 msgstr "其他應用程式(_O)..."
 
-#: ../thunar/thunar-chooser-dialog.c:185 ../thunar/thunar-launcher.c:171
+#: ../thunar/thunar-chooser-dialog.c:185
+#: ../thunar/thunar-launcher.c:171
 msgid "Open With"
 msgstr "以此開啟"
 
@@ -281,9 +284,7 @@ msgid "Use a _custom command:"
 msgstr "使用自訂指令(_C)："
 
 #: ../thunar/thunar-chooser-dialog.c:258
-msgid ""
-"Use a custom command for an application that is not available from the above "
-"application list."
+msgid "Use a custom command for an application that is not available from the above application list."
 msgstr "使用自訂指令來執行上面應用程式清單中所沒有的應用程式。"
 
 #. create the "Custom command" button
@@ -320,15 +321,12 @@ msgstr "開啟 <i>%s</i> 和其它「%s」類型的檔案，使用： "
 
 #: ../thunar/thunar-chooser-dialog.c:657
 #, c-format
-msgid ""
-"Browse the file system to select an application to open files of type \"%s\"."
+msgid "Browse the file system to select an application to open files of type \"%s\"."
 msgstr "瀏覽檔案系統以選取一應用程式來開啟「%s」類型的檔案"
 
 #: ../thunar/thunar-chooser-dialog.c:663
 #, c-format
-msgid ""
-"Change the default application for files of type \"%s\" to the selected "
-"application."
+msgid "Change the default application for files of type \"%s\" to the selected application."
 msgstr "將開啟「%s」類型檔案的預設應用程式改設為所選取者。"
 
 #: ../thunar/thunar-chooser-dialog.c:710
@@ -338,16 +336,13 @@ msgstr "您確定要刪除「%s」？"
 
 #: ../thunar/thunar-chooser-dialog.c:716
 msgid ""
-"This will remove the application launcher that appears in the file context "
-"menu, but will not uninstall the application itself.\n"
+"This will remove the application launcher that appears in the file context menu, but will not uninstall the application itself.\n"
 "\n"
-"You can only remove application launchers that were created using the custom "
-"command box in the \"Open With\" dialog of the file manager."
+"You can only remove application launchers that were created using the custom command box in the \"Open With\" dialog of the file manager."
 msgstr ""
 "將會移除右鍵選單中快速啟動的選項， 不過並不會移除選項所關聯的程式。\n"
 "\n"
-"您可以選擇只移除透過檔案管理程式中「以其它程式開啟」的選項所建立的檔案開啟方"
-"式。"
+"您可以選擇只移除透過檔案管理程式中「以其它程式開啟」的選項所建立的檔案開啟方式。"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:731
@@ -472,9 +467,11 @@ msgstr "依需求自動延展欄位(_E)"
 #. the file_time is invalid
 #. reset page title
 #. tell the user that we're unable to determine the file info
-#: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:682
+#: ../thunar/thunar-column-model.c:858
+#: ../thunar/thunar-list-model.c:682
 #: ../thunar/thunar-list-model.c:710
-#: ../thunar/thunar-permissions-chooser.c:240 ../thunar/thunar-util.c:236
+#: ../thunar/thunar-permissions-chooser.c:240
+#: ../thunar/thunar-util.c:236
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:458
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:285
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:286
@@ -494,7 +491,8 @@ msgstr "簡潔檢視"
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../thunar/thunar-create-dialog.c:151 ../thunar/thunar-dialogs.c:110
+#: ../thunar/thunar-create-dialog.c:151
+#: ../thunar/thunar-dialogs.c:110
 msgid "Enter the new name:"
 msgstr "輸入新名稱："
 
@@ -556,7 +554,8 @@ msgstr ""
 
 #. display an error message to the user
 #. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:365 ../thunar/thunar-renamer-dialog.c:942
+#: ../thunar/thunar-dialogs.c:365
+#: ../thunar/thunar-renamer-dialog.c:942
 msgid "Failed to open the documentation browser"
 msgstr "無法開啟文件瀏覽器"
 
@@ -631,12 +630,14 @@ msgstr ""
 #.
 #. Fourth box (size, volume, free space)
 #.
-#: ../thunar/thunar-dialogs.c:640 ../thunar/thunar-dialogs.c:671
+#: ../thunar/thunar-dialogs.c:640
+#: ../thunar/thunar-dialogs.c:671
 #: ../thunar/thunar-properties-dialog.c:408
 msgid "Size:"
 msgstr "大小："
 
-#: ../thunar/thunar-dialogs.c:640 ../thunar/thunar-dialogs.c:671
+#: ../thunar/thunar-dialogs.c:640
+#: ../thunar/thunar-dialogs.c:671
 #: ../thunar/thunar-properties-dialog.c:369
 msgid "Modified:"
 msgstr "修改："
@@ -667,7 +668,8 @@ msgstr "連結到這裡(_L)"
 
 #. display an error to the user
 #. display an error message to the user
-#: ../thunar/thunar-dnd.c:253 ../thunar/thunar-launcher.c:537
+#: ../thunar/thunar-dnd.c:253
+#: ../thunar/thunar-launcher.c:537
 #, c-format
 msgid "Failed to execute file \"%s\""
 msgstr "無法執行檔案「%s」"
@@ -702,7 +704,8 @@ msgstr "群組"
 msgid "MIME Type"
 msgstr "MIME é¡žåž‹"
 
-#: ../thunar/thunar-enum-types.c:119 ../thunar/thunar-renamer-dialog.c:408
+#: ../thunar/thunar-enum-types.c:119
+#: ../thunar/thunar-renamer-dialog.c:408
 #: ../thunarx/thunarx-renamer.c:145
 msgid "Name"
 msgstr "名稱"
@@ -714,7 +717,8 @@ msgstr "擁有者"
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-enum-types.c:121 ../thunar/thunar-properties-dialog.c:481
+#: ../thunar/thunar-enum-types.c:121
+#: ../thunar/thunar-properties-dialog.c:481
 msgid "Permissions"
 msgstr "權限"
 
@@ -734,7 +738,8 @@ msgstr "檔案"
 msgid "File Name"
 msgstr "檔案名稱"
 
-#: ../thunar/thunar-file.c:836 ../thunar/thunar-shortcuts-view.c:278
+#: ../thunar/thunar-file.c:836
+#: ../thunar/thunar-shortcuts-view.c:278
 #: ../thunar/thunar-window.c:311
 msgid "File System"
 msgstr "檔案系統"
@@ -795,7 +800,8 @@ msgstr "圖示方式目錄列表"
 msgid "Icon view"
 msgstr "圖示檢視"
 
-#: ../thunar/thunar-io-jobs.c:161 ../thunar/thunar-io-jobs.c:298
+#: ../thunar/thunar-io-jobs.c:161
+#: ../thunar/thunar-io-jobs.c:298
 #, c-format
 msgid "The file \"%s\" already exists"
 msgstr "檔案「%s」已存在"
@@ -847,8 +853,10 @@ msgstr "無法更改 \"%s\" 的權限設定"
 msgid "copy of %s"
 msgstr "%s 的複本"
 
-#: ../thunar/thunar-io-jobs-util.c:37 ../thunar/thunar-list-model.c:727
-#: ../thunar/thunar-list-model.c:1626 ../thunar/thunar-list-model.c:1637
+#: ../thunar/thunar-io-jobs-util.c:37
+#: ../thunar/thunar-list-model.c:727
+#: ../thunar/thunar-list-model.c:1626
+#: ../thunar/thunar-list-model.c:1637
 #: ../thunar/thunar-properties-dialog.c:873
 #, c-format
 msgid "link to %s"
@@ -886,36 +894,42 @@ msgid "%uth link to %s"
 msgstr "%2$s的第%1$u個連結"
 
 #: ../thunar/thunar-job.c:254
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The file \"%s\" already exists. Would you like to replace it?\n"
 "\n"
 "If you replace an existing file, its contents will be overwritten."
-msgstr "檔案 \"%s\" 已經存在。您想要用一個空檔案取而代之嗎？"
+msgstr ""
+"檔案「%s」已經存在。您想要取而代之嗎？\n"
+"\n"
+"如果您要取代已經存在的檔案，其內容將被覆寫。"
 
 #: ../thunar/thunar-job.c:334
 msgid "Do you want to overwrite it?"
 msgstr "您想要覆蓋它嗎？"
 
 #: ../thunar/thunar-job.c:388
-#, fuzzy
 msgid "Do you want to create it?"
-msgstr "您想要覆蓋它嗎?"
+msgstr "您想要建立它嗎?"
 
 #: ../thunar/thunar-job.c:490
 msgid "Do you want to skip it?"
 msgstr "您想要略過它嗎？"
 
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:168 ../thunar/thunar-launcher.c:801
+#: ../thunar/thunar-launcher.c:168
+#: ../thunar/thunar-launcher.c:801
 #: ../thunar/thunar-location-buttons.c:168
-#: ../thunar/thunar-shortcuts-view.c:786 ../thunar/thunar-tree-view.c:1095
+#: ../thunar/thunar-shortcuts-view.c:786
+#: ../thunar/thunar-tree-view.c:1095
 msgid "_Open"
 msgstr "é–‹å•Ÿ(_O)"
 
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:169 ../thunar/thunar-location-buttons.c:169
-#: ../thunar/thunar-shortcuts-view.c:797 ../thunar/thunar-tree-view.c:1107
+#: ../thunar/thunar-launcher.c:169
+#: ../thunar/thunar-location-buttons.c:169
+#: ../thunar/thunar-shortcuts-view.c:797
+#: ../thunar/thunar-tree-view.c:1107
 msgid "Open in New Window"
 msgstr "在新視窗中開啟"
 
@@ -923,11 +937,13 @@ msgstr "在新視窗中開啟"
 msgid "Open the selected directory in a new window"
 msgstr "在新視窗中開啟所選取的目錄"
 
-#: ../thunar/thunar-launcher.c:170 ../thunar/thunar-launcher.c:172
+#: ../thunar/thunar-launcher.c:170
+#: ../thunar/thunar-launcher.c:172
 msgid "Open With Other _Application..."
 msgstr "以其他應用程式開啟(_A)"
 
-#: ../thunar/thunar-launcher.c:170 ../thunar/thunar-launcher.c:172
+#: ../thunar/thunar-launcher.c:170
+#: ../thunar/thunar-launcher.c:172
 #: ../thunar/thunar-launcher.c:884
 msgid "Choose another application with which to open the selected file"
 msgstr "選擇其他應用程式來開啟選取的檔案"
@@ -997,7 +1013,8 @@ msgstr[0] "執行所選取的檔案"
 msgid "_Open With \"%s\""
 msgstr "以「%s」開啟(_O)"
 
-#: ../thunar/thunar-launcher.c:860 ../thunar/thunar-launcher.c:946
+#: ../thunar/thunar-launcher.c:860
+#: ../thunar/thunar-launcher.c:946
 #, c-format
 msgid "Use \"%s\" to open the selected file"
 msgid_plural "Use \"%s\" to open the selected files"
@@ -1021,9 +1038,11 @@ msgstr[0] "以預設的應用程式開啟所選取的檔案"
 msgid "Open With \"%s\""
 msgstr "以「%s」開啟"
 
-#: ../thunar/thunar-launcher.c:1380 ../thunar/thunar-location-entry.c:641
+#: ../thunar/thunar-launcher.c:1380
+#: ../thunar/thunar-location-entry.c:641
 #: ../thunar/thunar-shortcuts-view.c:1267
-#: ../thunar/thunar-shortcuts-view.c:1505 ../thunar/thunar-tree-view.c:1908
+#: ../thunar/thunar-shortcuts-view.c:1505
+#: ../thunar/thunar-tree-view.c:1908
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "無法掛載「%s」"
@@ -1038,7 +1057,8 @@ msgid "Create a link to the selected file on the desktop"
 msgid_plural "Create links to the selected files on the desktop"
 msgstr[0] "在桌面上為所選的檔案建立連結"
 
-#: ../thunar/thunar-launcher.c:1537 ../thunar/thunar-launcher.c:1594
+#: ../thunar/thunar-launcher.c:1537
+#: ../thunar/thunar-launcher.c:1594
 #, c-format
 msgid "Send the selected file to \"%s\""
 msgid_plural "Send the selected files to \"%s\""
@@ -1093,7 +1113,8 @@ msgstr "「%s」(%s) %s"
 #. * where the trashed file/folder was located before it was moved to the trash), otherwise the
 #. * properties dialog width will be messed up.
 #.
-#: ../thunar/thunar-list-model.c:2367 ../thunar/thunar-properties-dialog.c:330
+#: ../thunar/thunar-list-model.c:2367
+#: ../thunar/thunar-properties-dialog.c:330
 msgid "Original Path:"
 msgstr "原始路徑："
 
@@ -1108,7 +1129,7 @@ msgstr "影像大小："
 #, c-format
 msgid "%d item selected (%s)"
 msgid_plural "%d items selected (%s)"
-msgstr[0] "已選取 %d 個項目(%s)"
+msgstr[0] "已選取 %d 個項目 (%s)"
 
 #: ../thunar/thunar-list-model.c:2404
 #, c-format
@@ -1118,11 +1139,13 @@ msgstr[0] "已選取 %d 個項目"
 
 #. append the "Create Folder" menu action
 #: ../thunar/thunar-location-buttons.c:170
-#: ../thunar/thunar-standard-view.c:337 ../thunar/thunar-tree-view.c:1161
+#: ../thunar/thunar-standard-view.c:337
+#: ../thunar/thunar-tree-view.c:1161
 msgid "Create _Folder..."
 msgstr "建立資料夾(_F)..."
 
-#: ../thunar/thunar-location-buttons.c:171 ../thunar/thunar-window.c:295
+#: ../thunar/thunar-location-buttons.c:171
+#: ../thunar/thunar-window.c:295
 msgid "Delete all files and folders in the Trash"
 msgstr "將垃圾桶中所以檔案及資料夾刪除？"
 
@@ -1132,7 +1155,8 @@ msgid "Paste Into Folder"
 msgstr "貼到資料夾中"
 
 #: ../thunar/thunar-location-buttons.c:173
-#: ../thunar/thunar-renamer-dialog.c:184 ../thunar/thunar-standard-view.c:338
+#: ../thunar/thunar-renamer-dialog.c:184
+#: ../thunar/thunar-standard-view.c:338
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
@@ -1161,8 +1185,7 @@ msgstr "在此「%s」建立新的資料夾"
 
 #: ../thunar/thunar-location-buttons.c:1243
 #, c-format
-msgid ""
-"Move or copy files previously selected by a Cut or Copy command into \"%s\""
+msgid "Move or copy files previously selected by a Cut or Copy command into \"%s\""
 msgstr "將之前複製或剪下的檔案在此複製或移動到「%s」"
 
 #: ../thunar/thunar-location-buttons.c:1249
@@ -1171,12 +1194,14 @@ msgid "View the properties of the folder \"%s\""
 msgstr "檢視資料夾「%s」內容資訊"
 
 #: ../thunar/thunar-location-buttons.c:1285
-#: ../thunar/thunar-standard-view.c:1787 ../thunar/thunar-tree-view.c:1569
+#: ../thunar/thunar-standard-view.c:1787
+#: ../thunar/thunar-tree-view.c:1569
 msgid "New Folder"
 msgstr "新資料夾"
 
 #: ../thunar/thunar-location-buttons.c:1286
-#: ../thunar/thunar-standard-view.c:1788 ../thunar/thunar-tree-view.c:1570
+#: ../thunar/thunar-standard-view.c:1788
+#: ../thunar/thunar-tree-view.c:1570
 msgid "Create New Folder"
 msgstr "建立新資料夾"
 
@@ -1200,34 +1225,32 @@ msgstr "無法決定「%s」的掛載點"
 
 #: ../thunar/thunar-notify.c:93
 msgid "Unmounting device"
-msgstr ""
+msgstr "正在卸載裝置"
 
 #: ../thunar/thunar-notify.c:94
 #, c-format
-msgid ""
-"The device \"%s\" is being unmounted by the system. Please do not remove the "
-"media or disconnect the drive"
-msgstr ""
+msgid "The device \"%s\" is being unmounted by the system. Please do not remove the media or disconnect the drive"
+msgstr "裝置「%s」正被系統卸載。請不要移除該媒體，或是斷開該磁碟的連接"
 
-#: ../thunar/thunar-notify.c:100 ../thunar/thunar-notify.c:207
+#: ../thunar/thunar-notify.c:100
+#: ../thunar/thunar-notify.c:207
 msgid "Writing data to device"
-msgstr ""
+msgstr "正在將資料寫入裝置"
 
-#: ../thunar/thunar-notify.c:101 ../thunar/thunar-notify.c:208
+#: ../thunar/thunar-notify.c:101
+#: ../thunar/thunar-notify.c:208
 #, c-format
-msgid ""
-"There is data that needs to be written to the device \"%s\" before it can be "
-"removed. Please do not remove the media or disconnect the drive"
-msgstr ""
+msgid "There is data that needs to be written to the device \"%s\" before it can be removed. Please do not remove the media or disconnect the drive"
+msgstr "在裝置「%s」移除前，有資料需要寫入其中。請不要移除該媒體，或是斷開該磁碟的連接"
 
 #: ../thunar/thunar-notify.c:201
 msgid "Ejecting device"
-msgstr ""
+msgstr "正在退出裝置"
 
 #: ../thunar/thunar-notify.c:202
 #, c-format
 msgid "The device \"%s\" is being ejected. This may take some time"
-msgstr ""
+msgstr "裝置「%s」正在退出。這可能會花上一些時間"
 
 #: ../thunar/thunar-misc-jobs.c:84
 #, c-format
@@ -1341,13 +1364,8 @@ msgid "Do _not ask me again"
 msgstr "不用再問我(_N)"
 
 #: ../thunar/thunar-permissions-chooser.c:557
-msgid ""
-"If you select this option your choice will be remembered and you won't be "
-"asked again. You can use the preferences dialog to alter your choice "
-"afterwards."
-msgstr ""
-"若您選擇此項，您的設定將被記住並不再顯示提示訊息。·之後您可以在偏好設定對話框"
-"中變更別的設定方式。"
+msgid "If you select this option your choice will be remembered and you won't be asked again. You can use the preferences dialog to alter your choice afterwards."
+msgstr "若您選擇此項，您的設定將被記住並不再顯示提示訊息。·之後您可以在偏好設定對話框中變更別的設定方式。"
 
 #: ../thunar/thunar-permissions-chooser.c:854
 msgid "Unknown file owner"
@@ -1362,13 +1380,8 @@ msgid "Correct folder permissions"
 msgstr "更正資料夾權限"
 
 #: ../thunar/thunar-permissions-chooser.c:988
-msgid ""
-"The folder permissions will be reset to a consistent state. Only users "
-"allowed to read the contents of this folder will be allowed to enter the "
-"folder afterwards."
-msgstr ""
-"資料夾權限將被設定為完全許可狀態。原本對資料夾只擁有讀取權限的使用者將可進入"
-"資料夾進行其他的操作行為。"
+msgid "The folder permissions will be reset to a consistent state. Only users allowed to read the contents of this folder will be allowed to enter the folder afterwards."
+msgstr "資料夾權限將被設定為完全許可狀態。原本對資料夾只擁有讀取權限的使用者將可進入資料夾進行其他的操作行為。"
 
 #: ../thunar/thunar-preferences-dialog.c:192
 msgid "File Manager Preferences"
@@ -1419,9 +1432,7 @@ msgid "_Show thumbnails"
 msgstr "顯示縮圖(_S)"
 
 #: ../thunar/thunar-preferences-dialog.c:255
-msgid ""
-"Select this option to display previewable files within a folder as "
-"automatically generated thumbnail icons."
+msgid "Select this option to display previewable files within a folder as automatically generated thumbnail icons."
 msgstr "選擇此選項以便在設定可預覽的資料夾中·顯示自動產生的縮圖圖示。"
 
 #: ../thunar/thunar-preferences-dialog.c:276
@@ -1429,9 +1440,7 @@ msgid "_Text beside icons"
 msgstr "文字位於偏旁(_T)"
 
 #: ../thunar/thunar-preferences-dialog.c:278
-msgid ""
-"Select this option to place the icon captions for items beside the icon "
-"rather than below the icon."
+msgid "Select this option to place the icon captions for items beside the icon rather than below the icon."
 msgstr "選擇此選項可將圖示說明放在圖示偏旁·而不是位於圖示底下。"
 
 #: ../thunar/thunar-preferences-dialog.c:287
@@ -1448,15 +1457,15 @@ msgstr "格式(_F)："
 #.
 #: ../thunar/thunar-preferences-dialog.c:320
 msgid "Side Pane"
-msgstr "側邊欄"
+msgstr "側窗格"
 
 #: ../thunar/thunar-preferences-dialog.c:330
 msgid "Shortcuts Pane"
-msgstr "捷徑列"
+msgstr "捷徑窗格"
 
 #: ../thunar/thunar-preferences-dialog.c:342
 msgid "_Icon Size:"
-msgstr "圖示大小(_I)"
+msgstr "圖示大小(_I)："
 
 #: ../thunar/thunar-preferences-dialog.c:347
 #: ../thunar/thunar-preferences-dialog.c:389
@@ -1498,16 +1507,12 @@ msgid "Show Icon _Emblems"
 msgstr "顯示圖示標記(_E)"
 
 #: ../thunar/thunar-preferences-dialog.c:363
-msgid ""
-"Select this option to display icon emblems in the shortcuts pane for all "
-"folders for which emblems have been defined in the folders properties dialog."
-msgstr ""
-"選擇此選項以便在側邊欄捷徑區中顯示在資料夾內容中已有定義標記圖示的資料夾其所"
-"有的標記圖示。"
+msgid "Select this option to display icon emblems in the shortcuts pane for all folders for which emblems have been defined in the folders properties dialog."
+msgstr "選擇此選項以便在捷徑窗格中顯示在資料夾內容中已有定義標記圖示的資料夾其所有的標記圖示。"
 
 #: ../thunar/thunar-preferences-dialog.c:372
 msgid "Tree Pane"
-msgstr "樹狀邊欄"
+msgstr "樹狀窗格"
 
 #: ../thunar/thunar-preferences-dialog.c:384
 msgid "Icon _Size:"
@@ -1518,12 +1523,8 @@ msgid "Show Icon E_mblems"
 msgstr "顯示標記圖示(_M)"
 
 #: ../thunar/thunar-preferences-dialog.c:405
-msgid ""
-"Select this option to display icon emblems in the tree pane for all folders "
-"for which emblems have been defined in the folders properties dialog."
-msgstr ""
-"選擇此選項以便在樹狀圖檢視模式底下顯示·在資料夾內容對話框中已有定義標記的資料"
-"夾它們的標記圖示。"
+msgid "Select this option to display icon emblems in the tree pane for all folders for which emblems have been defined in the folders properties dialog."
+msgstr "選擇此選項以便在樹狀圖檢視窗格中顯示在資料夾內容對話框中已有定義標記的資料夾它們的標記圖示。"
 
 #.
 #. Behavior
@@ -1549,17 +1550,8 @@ msgstr ""
 "所需的 延遲空檔 (_E)長度:"
 
 #: ../thunar/thunar-preferences-dialog.c:468
-msgid ""
-"When single-click activation is enabled, pausing the mouse pointer over an "
-"item will automatically select that item after the chosen delay. You can "
-"disable this behavior by moving the slider to the left-most position. This "
-"behavior may be useful when single clicks activate items, and you want only "
-"to select the item without activating it."
-msgstr ""
-"當啟用了滑鼠單點啟用選項時，在將滑鼠游標指向某個項目（資料夾或檔案） 時則在指"
-"定的延遲空檔後此項目會被自動選取。您可以停用這個預設行為，只要將此橫桿拉到最"
-"左邊（停用）之處即可。這樣的設定在您只想選取單一項目，但卻不想立刻執行它時，"
-"將會十分有用。"
+msgid "When single-click activation is enabled, pausing the mouse pointer over an item will automatically select that item after the chosen delay. You can disable this behavior by moving the slider to the left-most position. This behavior may be useful when single clicks activate items, and you want only to select the item without activating it."
+msgstr "當啟用了滑鼠單點啟用選項時，在將滑鼠游標指向某個項目（資料夾或檔案） 時則在指定的延遲空檔後此項目會被自動選取。您可以停用這個預設行為，只要將此橫桿拉到最左邊（停用）之處即可。這樣的設定在您只想選取單一項目，但卻不想立刻執行它時，將會十分有用。"
 
 #: ../thunar/thunar-preferences-dialog.c:486
 msgid "Disabled"
@@ -1717,7 +1709,8 @@ msgstr "標記"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:624
-#: ../thunar/thunar-standard-view.c:2166 ../thunar/thunar-tree-view.c:1672
+#: ../thunar/thunar-standard-view.c:2166
+#: ../thunar/thunar-tree-view.c:1672
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "無法重新命名「%s」"
@@ -1746,15 +1739,18 @@ msgstr "%s - 屬性"
 msgid "broken link"
 msgstr "連結失效"
 
-#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:292
+#: ../thunar/thunar-renamer-dialog.c:177
+#: ../thunar/thunar-window.c:292
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:294
+#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-window.c:294
 msgid "_Send To"
 msgstr "寄到(_S)"
 
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:335
+#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-standard-view.c:335
 msgid "File Context Menu"
 msgstr "檔案右鍵選單"
 
@@ -1774,7 +1770,8 @@ msgstr "清除"
 msgid "Clear the file list below"
 msgstr "清除底下列出的檔案"
 
-#: ../thunar/thunar-renamer-dialog.c:183 ../thunar/thunar-window.c:322
+#: ../thunar/thunar-renamer-dialog.c:183
+#: ../thunar/thunar-window.c:322
 msgid "_About"
 msgstr "關於(_A)"
 
@@ -1782,7 +1779,8 @@ msgstr "關於(_A)"
 msgid "Display information about Thunar Bulk Rename"
 msgstr "顯示 Thunar 批次重新命名工具的資訊"
 
-#: ../thunar/thunar-renamer-dialog.c:184 ../thunar/thunar-standard-view.c:338
+#: ../thunar/thunar-renamer-dialog.c:184
+#: ../thunar/thunar-standard-view.c:338
 msgid "View the properties of the selected file"
 msgstr "檢視所選檔案的內容資訊"
 
@@ -1798,8 +1796,7 @@ msgid "_Rename Files"
 msgstr "重新命名(_R)"
 
 #: ../thunar/thunar-renamer-dialog.c:350
-msgid ""
-"Click here to actually rename the files listed above to their new names."
+msgid "Click here to actually rename the files listed above to their new names."
 msgstr "點選這裡以便將上面列出來的檔案轉換為新的檔名。"
 
 #: ../thunar/thunar-renamer-dialog.c:424
@@ -1875,14 +1872,8 @@ msgid "Failed to rename \"%s\" to \"%s\"."
 msgstr "無法將「%s」重命名為「%s」。"
 
 #: ../thunar/thunar-renamer-progress.c:187
-msgid ""
-"You can either choose to skip this file and continue to rename the remaining "
-"files, or revert the previously renamed files to their previous names, or "
-"cancel the operation without reverting previous changes."
-msgstr ""
-"您可以選擇略過這個檔案並繼續處理其他要重新命名的檔案， 或選擇讓之前已重新命名"
-"過的檔案保持它們原先的名稱，或者 也可取消此次操作以便保留之前已重新命名的檔案"
-"成果。"
+msgid "You can either choose to skip this file and continue to rename the remaining files, or revert the previously renamed files to their previous names, or cancel the operation without reverting previous changes."
+msgstr "您可以選擇略過這個檔案並繼續處理其他要重新命名的檔案， 或選擇讓之前已重新命名過的檔案保持它們原先的名稱，或者 也可取消此次操作以便保留之前已重新命名的檔案成果。"
 
 #: ../thunar/thunar-renamer-progress.c:192
 msgid "_Revert Changes"
@@ -1894,8 +1885,7 @@ msgid "_Skip This File"
 msgstr "忽略這個檔案(_S)"
 
 #: ../thunar/thunar-renamer-progress.c:199
-msgid ""
-"Do you want to skip this file and continue to rename the remaining files?"
+msgid "Do you want to skip this file and continue to rename the remaining files?"
 msgstr "您是否要略過這個檔案並繼續對其他檔案重新命名的動作？"
 
 #: ../thunar/thunar-shortcuts-model.c:299
@@ -1910,15 +1900,17 @@ msgstr[0] "側窗格 (建立捷徑)"
 #: ../thunar/thunar-shortcuts-pane.c:362
 msgid "Add the selected folder to the shortcuts side pane"
 msgid_plural "Add the selected folders to the shortcuts side pane"
-msgstr[0] "將選取的資料夾加入邊欄的捷徑區中"
+msgstr[0] "將選取的資料夾加入捷徑側窗格中"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:811 ../thunar/thunar-tree-view.c:1121
+#: ../thunar/thunar-shortcuts-view.c:811
+#: ../thunar/thunar-tree-view.c:1121
 msgid "_Mount Volume"
 msgstr "掛載裝置(_M)"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:821 ../thunar/thunar-tree-view.c:1131
+#: ../thunar/thunar-shortcuts-view.c:821
+#: ../thunar/thunar-tree-view.c:1131
 msgid "E_ject Volume"
 msgstr "退出裝置(_J)"
 
@@ -1943,7 +1935,8 @@ msgid "Failed to add new shortcut"
 msgstr "無法建立新捷徑"
 
 #: ../thunar/thunar-shortcuts-view.c:1373
-#: ../thunar/thunar-shortcuts-view.c:1414 ../thunar/thunar-tree-view.c:1748
+#: ../thunar/thunar-shortcuts-view.c:1414
+#: ../thunar/thunar-tree-view.c:1748
 #: ../thunar/thunar-tree-view.c:1789
 #, c-format
 msgid "Failed to eject \"%s\""
@@ -1983,12 +1976,14 @@ msgid "Create an empty folder within the current folder"
 msgstr "在目前的資料夾中建立一個空白的資料夾"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:339 ../thunar/thunar-tree-view.c:1182
+#: ../thunar/thunar-standard-view.c:339
+#: ../thunar/thunar-tree-view.c:1182
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:340 ../thunar/thunar-tree-view.c:1194
+#: ../thunar/thunar-standard-view.c:340
+#: ../thunar/thunar-tree-view.c:1194
 msgid "_Copy"
 msgstr "複製(_C)"
 
@@ -2001,14 +1996,13 @@ msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr "將之前剪下或複製的檔案現在移動或複製到"
 
 #. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:342 ../thunar/thunar-tree-view.c:1229
+#: ../thunar/thunar-standard-view.c:342
+#: ../thunar/thunar-tree-view.c:1229
 msgid "_Delete"
 msgstr "刪除(_D)"
 
 #: ../thunar/thunar-standard-view.c:343
-msgid ""
-"Move or copy files previously selected by a Cut or Copy command into the "
-"selected folder"
+msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
 msgstr "將之前剪下或複製的檔案現在貼上或複製到目前的資料夾"
 
 #: ../thunar/thunar-standard-view.c:344
@@ -2031,19 +2025,21 @@ msgstr "選取所有符合關鍵字的檔案"
 msgid "Du_plicate"
 msgstr "翻製檔案(_P)"
 
-#: ../thunar/thunar-standard-view.c:347 ../thunar/thunar-standard-view.c:3424
+#: ../thunar/thunar-standard-view.c:347
+#: ../thunar/thunar-standard-view.c:3424
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "建立連結(_K)"
 
 #. append the "Rename" menu action
-#: ../thunar/thunar-standard-view.c:348 ../thunar/thunar-tree-view.c:1253
+#: ../thunar/thunar-standard-view.c:348
+#: ../thunar/thunar-tree-view.c:1253
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
 #: ../thunar/thunar-standard-view.c:349
 msgid "_Restore"
-msgstr "恢復(_R)"
+msgstr "還原(_R)"
 
 #. add the "Create Document" sub menu action
 #: ../thunar/thunar-standard-view.c:562
@@ -2129,7 +2125,7 @@ msgstr[0] "重新命名所選的檔案"
 #: ../thunar/thunar-standard-view.c:3442
 msgid "Restore the selected file"
 msgid_plural "Restore the selected files"
-msgstr[0] "恢復所選的檔案"
+msgstr[0] "還原所選的檔案"
 
 #. add the "Empty File" item
 #: ../thunar/thunar-templates-action.c:482
@@ -2144,21 +2140,17 @@ msgstr "收集檔案中..."
 #: ../thunar/thunar-transfer-job.c:665
 #, c-format
 msgid "Trying to restore \"%s\""
-msgstr "正在嘗試恢復「%s」"
+msgstr "正在嘗試還原「%s」"
 
 #: ../thunar/thunar-transfer-job.c:690
 #, c-format
-msgid ""
-"The folder \"%s\" does not exist anymore but is required to restore the file "
-"\"%s\" from the trash"
-msgstr ""
-"資料夾「%s」不復存在，但若要從垃圾桶中恢復檔案「%s」需要它。您想要再建立該資"
-"料夾嗎？"
+msgid "The folder \"%s\" does not exist anymore but is required to restore the file \"%s\" from the trash"
+msgstr "資料夾「%s」不復存在，但若要從垃圾桶中還原檔案「%s」便需要它。您想要再建立該資料夾嗎？"
 
 #: ../thunar/thunar-transfer-job.c:715
 #, c-format
 msgid "Failed to restore the folder \"%s\""
-msgstr "無法開啟資料夾「%s」"
+msgstr "無法還原資料夾「%s」"
 
 #. update progress information
 #: ../thunar/thunar-transfer-job.c:732
@@ -2432,7 +2424,7 @@ msgstr "捷徑(_S)"
 
 #: ../thunar/thunar-window.c:330
 msgid "Toggles the visibility of the shortcuts pane"
-msgstr "設定是否要顯示側邊欄的捷徑區"
+msgstr "設定是否要顯示捷徑窗格"
 
 #: ../thunar/thunar-window.c:331
 msgid "_Tree"
@@ -2440,7 +2432,7 @@ msgstr "樹狀圖(_T)"
 
 #: ../thunar/thunar-window.c:331
 msgid "Toggles the visibility of the tree pane"
-msgstr "切換是否以樹狀圖方式檢視側邊欄"
+msgstr "切換是否以樹狀圖方式檢視窗格"
 
 #: ../thunar/thunar-window.c:332
 msgid "St_atusbar"
@@ -2520,20 +2512,14 @@ msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr "位於此資料夾的文件都會出現在「建立文件」的選單中。"
 
 #: ../thunar/thunar-window.c:2196
-#, fuzzy
 msgid ""
-"If you frequently create certain kinds  of documents, make a copy of one and "
-"put it in this folder. Thunar will add an entry for this document in the "
-"\"Create Document\" menu.\n"
+"If you frequently create certain kinds  of documents, make a copy of one and put it in this folder. Thunar will add an entry for this document in the \"Create Document\" menu.\n"
 "\n"
-"You can then select the entry from the \"Create Document\" menu and a copy "
-"of the document will be created in the directory you are viewing."
+"You can then select the entry from the \"Create Document\" menu and a copy of the document will be created in the directory you are viewing."
 msgstr ""
-"如果您常需要建立某些類型的文件，先做出一份並放到這個資料夾裡。·Thunar會將它加"
-"入\"建立新文件\"的·右鍵選單中。\n"
+"如果您常需要建立某些類型的文件，先做出一份並放到這個資料夾裡。Thunar會將它加入「建立新文件」的右鍵選單中。\n"
 "\n"
-"接下來您只要利用·\"建立新文件\"·的右鍵選單就可以·在目前檢視的資料夾中輕鬆建立"
-"好一份新的文件了。"
+"接下來您只要利用「建立新文件」的右鍵選單就可以在目前檢視的資料夾中輕鬆建立好一份新的文件了。"
 
 #: ../thunar/thunar-window.c:2208
 msgid "Do _not display this message again"
@@ -2563,7 +2549,8 @@ msgstr ""
 "是附屬於 Xfce 桌面環境計畫的工具程式。"
 
 #. set window title and icon
-#: ../thunar/thunar-window.c:2403 ../Thunar.desktop.in.in.h:2
+#: ../thunar/thunar-window.c:2403
+#: ../Thunar.desktop.in.in.h:2
 #: ../thunar/thunar-settings.desktop.in.h:2
 msgid "File Manager"
 msgstr "檔案管理程式"
@@ -2609,9 +2596,7 @@ msgid "Description:"
 msgstr "描述："
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:157
-msgid ""
-"The generic name of the entry, for example \"Web Browser\" in case of "
-"Firefox."
+msgid "The generic name of the entry, for example \"Web Browser\" in case of Firefox."
 msgstr "此欄目的通用稱呼，例如 Firefox 的通用稱呼即為「網頁瀏覽器」。"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:173
@@ -2635,12 +2620,8 @@ msgid "Comment:"
 msgstr "註解："
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:224
-msgid ""
-"Tooltip for the entry, for example \"View sites on the Internet\" in case of "
-"Firefox. Should not be redundant with the name or the description."
-msgstr ""
-"本欄目的小提示，以Firefox 為例，您可以輸入 \"讓您瀏覽網站訊息\"。 儘量不要與"
-"程式名稱或描述重覆以便釐清程式的功用。"
+msgid "Tooltip for the entry, for example \"View sites on the Internet\" in case of Firefox. Should not be redundant with the name or the description."
+msgstr "本欄目的小提示，以Firefox 為例，您可以輸入 \"讓您瀏覽網站訊息\"。 儘量不要與程式名稱或描述重覆以便釐清程式的功用。"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:244
 msgid "Options:"
@@ -2651,13 +2632,8 @@ msgid "Use _startup notification"
 msgstr "使用啟動提示(_S)"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:251
-msgid ""
-"Select this option to enable startup notification when the command is run "
-"from the file manager or the menu. Not every application supports startup "
-"notification."
-msgstr ""
-"選取此選項後，於檔案管理程式或選單執行命令時將獲得啟動提示，請注意並不是所有"
-"程式皆支援啟動提示功能。"
+msgid "Select this option to enable startup notification when the command is run from the file manager or the menu. Not every application supports startup notification."
+msgstr "選取此選項後，於檔案管理程式或選單執行命令時將獲得啟動提示，請注意並不是所有程式皆支援啟動提示功能。"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
 msgid "Run in _terminal"
@@ -2758,11 +2734,7 @@ msgid "Insert _time:"
 msgstr "插入時間(_T)："
 
 #: ../plugins/thunar-sbr/thunar-sbr-date-renamer.c:224
-msgid ""
-"The format describes the date and time parts to insert into the file name. "
-"For example, %Y will be substituted with the year, %m with the month and %d "
-"with the day. See the documentation of the date utility for additional "
-"information."
+msgid "The format describes the date and time parts to insert into the file name. For example, %Y will be substituted with the year, %m with the month and %d with the day. See the documentation of the date utility for additional information."
 msgstr ""
 
 #: ../plugins/thunar-sbr/thunar-sbr-date-renamer.c:243
@@ -2898,21 +2870,15 @@ msgid "Regular _Expression"
 msgstr "常規表示法(_E)"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:224
-msgid ""
-"If you enable this option, the pattern will be treated as a regular "
-"expression and matched using the Perl-compatible regular expressions (PCRE). "
-"Check the documentation for details about the regular expression syntax."
-msgstr ""
-"如果您啟用這個選項，輸入的關鍵字將視為常規表示法並以·Perl相容標準常規表示法"
-"(PCRE)為基準來處理。請查閱相關文件以便了解常規表示法的使用方式。"
+msgid "If you enable this option, the pattern will be treated as a regular expression and matched using the Perl-compatible regular expressions (PCRE). Check the documentation for details about the regular expression syntax."
+msgstr "如果您啟用這個選項，輸入的關鍵字將視為常規表示法並以·Perl相容標準常規表示法(PCRE)為基準來處理。請查閱相關文件以便了解常規表示法的使用方式。"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:231
 msgid "Replace _With:"
 msgstr "取代目標(_W)："
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:239
-msgid ""
-"Enter the text that should be used as replacement for the pattern above."
+msgid "Enter the text that should be used as replacement for the pattern above."
 msgstr "輸入要取代上面特定字眼的文字。"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:251
@@ -2920,12 +2886,8 @@ msgid "C_ase Sensitive Search"
 msgstr "搜尋時區分大小寫(_A)"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:253
-msgid ""
-"If you enable this option, the pattern will be searched in a case-sensitive "
-"manner. The default is to use a case-insensitive search."
-msgstr ""
-"如果您啟用此選項，要搜尋的關鍵字將以區分大小寫方式來加以·處理。預設的搜尋方式"
-"是不區分大小寫的。"
+msgid "If you enable this option, the pattern will be searched in a case-sensitive manner. The default is to use a case-insensitive search."
+msgstr "如果您啟用此選項，要搜尋的關鍵字將以區分大小寫方式來加以·處理。預設的搜尋方式是不區分大小寫的。"
 
 #. setup a tooltip with the error message
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:610
@@ -2952,13 +2914,8 @@ msgid "Send com_pressed"
 msgstr "寄出壓縮檔(_P)"
 
 #: ../plugins/thunar-sendto-email/main.c:202
-msgid ""
-"When sending a file via email, you can either choose to send the file "
-"directly, as is, or compress the file before attaching it to an email. It is "
-"highly recommended to compress large files before sending them."
-msgstr ""
-"以電子郵件郵寄檔案時，您可以選擇直接寄送原本的檔案，或是在附加到郵件之前先予"
-"以壓縮。強烈建議：寄送大型檔案之前先將其壓縮。"
+msgid "When sending a file via email, you can either choose to send the file directly, as is, or compress the file before attaching it to an email. It is highly recommended to compress large files before sending them."
+msgstr "以電子郵件郵寄檔案時，您可以選擇直接寄送原本的檔案，或是在附加到郵件之前先予以壓縮。強烈建議：寄送大型檔案之前先將其壓縮。"
 
 #: ../plugins/thunar-sendto-email/main.c:213
 #, c-format
@@ -2971,15 +2928,8 @@ msgid "Send as _archive"
 msgstr "以合併檔寄出(_A)"
 
 #: ../plugins/thunar-sendto-email/main.c:221
-msgid ""
-"When sending multiple files via email, you can either choose to send the "
-"files directly, attaching multiple files to an email, or send all files "
-"compressed into a single archive file and attach the archive. It is highly "
-"recommended to send multiple large files as archive."
-msgstr ""
-"以電子郵件寄送多個檔案時，您可以選擇直接寄送檔案(將多個檔案附加到一郵件上)，"
-"或將這些檔案以單一合併壓縮檔案的方式寄送。強烈建議在寄送多個大型檔案時採用合"
-"併檔的方式"
+msgid "When sending multiple files via email, you can either choose to send the files directly, attaching multiple files to an email, or send all files compressed into a single archive file and attach the archive. It is highly recommended to send multiple large files as archive."
+msgstr "以電子郵件寄送多個檔案時，您可以選擇直接寄送檔案(將多個檔案附加到一郵件上)，或將這些檔案以單一合併壓縮檔案的方式寄送。強烈建議在寄送多個大型檔案時採用合併檔的方式"
 
 #. allocate the progress dialog
 #. setup the label
@@ -3120,30 +3070,16 @@ msgid "_Description:"
 msgstr "描述(_D)："
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:154
-msgid ""
-"The description of the action that will be displayed as tooltip in the "
-"statusbar when selecting the item from the context menu."
-msgstr ""
-"當您在滑鼠右鍵選單中選取特定功能時，此功能的相關描述將出現在狀態列的提示中。"
+msgid "The description of the action that will be displayed as tooltip in the statusbar when selecting the item from the context menu."
+msgstr "當您在滑鼠右鍵選單中選取特定功能時，此功能的相關描述將出現在狀態列的提示中。"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid "_Command:"
 msgstr "指令(_C)："
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:176
-msgid ""
-"The command (including the necessary parameters) to perform the action. See "
-"the command parameter legend below for a list of supported parameter "
-"variables, which will be substituted when launching the command. When upper-"
-"case letters (e.g. %F, %D, %N) are used, the action will be applicable even "
-"if more than one item is selected. Else the action will only be applicable "
-"if exactly one item is selected."
-msgstr ""
-"此命令 (包含必要的參數) 可用來執行的動作。請參看 the command parameter "
-"legend below for a list of 支援的參數列表 variables, which will be "
-"substituted when launching the command. 當使用大寫字母 (e.g. %F, %D, %N) 的參"
-"數時，即使有下其他參數大寫字母關聯的動作也會被優先執行。如果選取了 超過一個項"
-"目， Else the action will only be applicable if exactly one item is selected."
+msgid "The command (including the necessary parameters) to perform the action. See the command parameter legend below for a list of supported parameter variables, which will be substituted when launching the command. When upper-case letters (e.g. %F, %D, %N) are used, the action will be applicable even if more than one item is selected. Else the action will only be applicable if exactly one item is selected."
+msgstr "此命令 (包含必要的參數) 可用來執行的動作。請參看 the command parameter legend below for a list of 支援的參數列表 variables, which will be substituted when launching the command. 當使用大寫字母 (e.g. %F, %D, %N) 的參數時，即使有下其他參數大寫字母關聯的動作也會被優先執行。如果選取了 超過一個項目， Else the action will only be applicable if exactly one item is selected."
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:187
 msgid "Browse the file system to select an application to use for this action."
@@ -3154,13 +3090,8 @@ msgid "Use Startup Notification"
 msgstr "使用啟動提示"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:204
-msgid ""
-"Enable this option if you want a waiting cursor to be shown while the action "
-"is launched. This is also highly recommended if you have focus stealing "
-"prevention enabled in your window manager."
-msgstr ""
-"如果您想要在動作啟動時顯示等待狀態的游標，請啟用此選項。如果您在視窗管理員中"
-"已啟用預防焦點竊取，極度建議您啟用此選項。"
+msgid "Enable this option if you want a waiting cursor to be shown while the action is launched. This is also highly recommended if you have focus stealing prevention enabled in your window manager."
+msgstr "如果您想要在動作啟動時顯示等待狀態的游標，請啟用此選項。如果您在視窗管理員中已啟用預防焦點竊取，極度建議您啟用此選項。"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:210
 msgid "_Icon:"
@@ -3173,11 +3104,8 @@ msgid "No icon"
 msgstr "無圖示"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:219
-msgid ""
-"Click this button to select an icon file that will be displayed in the "
-"context menu in addition to the action name chosen above."
-msgstr ""
-"請按此按鈕以選擇圖示檔，此圖示會出現在右鍵選單以代表您在上面所設的動作。"
+msgid "Click this button to select an icon file that will be displayed in the context menu in addition to the action name chosen above."
+msgstr "請按此按鈕以選擇圖示檔，此圖示會出現在右鍵選單以代表您在上面所設的動作。"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:250
 msgid ""
@@ -3222,14 +3150,8 @@ msgid "_File Pattern:"
 msgstr "檔案關鍵字(_F)："
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:375
-msgid ""
-"Enter a list of patterns that will be used to determine whether this action "
-"should be displayed for a selected file. If you specify more than one "
-"pattern here, the list items must be separated with semicolons (e.g. *.txt;*."
-"doc)."
-msgstr ""
-"輸入一些字眼以便於偵測此動作是否應出現於所選檔案，如果要輸入超過一個字眼，那"
-"麼請以半型分號將其隔開 (例：*.txt;*.doc)。"
+msgid "Enter a list of patterns that will be used to determine whether this action should be displayed for a selected file. If you specify more than one pattern here, the list items must be separated with semicolons (e.g. *.txt;*.doc)."
+msgstr "輸入一些字眼以便於偵測此動作是否應出現於所選檔案，如果要輸入超過一個字眼，那麼請以半型分號將其隔開 (例：*.txt;*.doc)。"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:394
 msgid "Appears if selection contains:"
@@ -3313,8 +3235,7 @@ msgid "Configure c_ustom actions..."
 msgstr "設定自訂動作(_C)..."
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:178
-msgid ""
-"Setup custom actions that will appear in the file managers context menus"
+msgid "Setup custom actions that will appear in the file managers context menus"
 msgstr "自訂會出現在檔案管理程式右鍵選單的動作"
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:412
@@ -3360,136 +3281,92 @@ msgstr "設定 Thunar 檔案管理程式"
 
 #~ msgid "Failed to execute \"%s\""
 #~ msgstr "無法執行「%s」"
-
 #~ msgid "Unknown error"
 #~ msgstr "未知的錯誤"
-
 #~ msgid "Moving files..."
 #~ msgstr "正在移動檔案..."
-
 #~ msgid "Failed to read folder contents"
 #~ msgstr "無法讀取資料夾內容"
-
 #~ msgid "Failed to parse file"
 #~ msgstr "無法處理檔案"
-
 #~ msgid "Invalid file name"
 #~ msgstr "無效的檔名"
-
 #~ msgid "Only local files may be renamed"
 #~ msgstr "只能重新命名本地檔案"
-
 #~ msgid "Failed to open \"%s\" for reading"
 #~ msgstr "無法開啟 \"%s\" 來讀取"
-
 #~ msgid "Failed to open \"%s\" for writing"
 #~ msgstr "無法開啟 \"%s\" 來寫入"
-
 #~ msgid "Failed to write data to \"%s\""
 #~ msgstr "無法將資料寫入 \"%s\""
-
 #~ msgid "Failed to read data from \"%s\""
 #~ msgstr "無法從 \"%s\" 讀取資料"
-
 #~ msgid "Failed to determine file info for \"%s\""
 #~ msgstr "無法決定 \"%s\" 的檔案資訊"
-
 #~ msgid "Failed to create directory \"%s\""
 #~ msgstr "無法建立目錄 \"%s\""
-
 #~ msgid "Failed to create named fifo \"%s\""
 #~ msgstr "無法建立名稱·fifo·\"%s\""
-
 #~ msgid "Special files cannot be copied"
 #~ msgstr "特殊檔案無法複製"
-
 #~ msgid "Symbolic links are not supported"
 #~ msgstr "尚未支援符號連結"
-
 #~ msgid "Failed to copy \"%s\" to \"%s\""
 #~ msgstr "無法將 \"%s\" 重命名為 \"%s\""
-
 #~ msgid "Failed to link \"%s\" to \"%s\""
 #~ msgstr "無法將 \"%s\" 連結至 \"%s\""
-
 #~ msgid "Failed to move \"%s\" to \"%s\""
 #~ msgstr "無法將 \"%s\" 移動至 \"%s\""
-
 #~ msgid "The URI \"%s\" does not refer to a valid resource in the trash"
 #~ msgstr "URI \"%s\" 並未指向垃圾桶中有效的資源"
-
 #~ msgid "Trash"
 #~ msgstr "垃圾桶"
-
 #~ msgid "Cannot move or copy files within the trash"
 #~ msgstr "在垃圾桶中無法移動或複製檔案"
-
 #~ msgid "Failed to load application from file %s"
 #~ msgstr "無法由檔案 %s 載入應用程式"
-
 #~ msgid "Failed to remove \"%s\": %s"
 #~ msgstr "無法移除 \"%s\"：%s"
-
 #~ msgid "Command"
 #~ msgstr "指令"
-
 #~ msgid "The command to run the mime handler"
 #~ msgstr "執行 mime 處置元的指令"
-
 #~ msgid "Flags"
 #~ msgstr "旗標"
-
 #~ msgid "The flags for the mime handler"
 #~ msgstr "mime 處置元的旗標"
-
 #~ msgid "Icon"
 #~ msgstr "圖示"
-
 #~ msgid "The icon of the mime handler"
 #~ msgstr "mime 處置元的圖示"
-
 #~ msgid "The name of the mime handler"
 #~ msgstr "mime 處置元的名稱"
-
 #~ msgid "%s document"
 #~ msgstr "%s 文件"
-
 #~ msgid "The URI \"%s\" is invalid"
 #~ msgstr "URI \"%s\" 無效"
-
 #~ msgid "Path too long to fit into buffer"
 #~ msgstr "路徑太長，無法放入緩衝區"
-
 #~ msgid "URI too long to fit into buffer"
 #~ msgstr "URI 太長，無法放入緩衝區"
-
 #~ msgid "Operation not supported"
 #~ msgstr "此項操作尚未支援"
-
 #~ msgid "Invalidly escaped characters"
 #~ msgstr "無效的跳脫字元"
-
 #~ msgid "The desired thumbnail size"
 #~ msgstr "指定縮圖大小"
-
 #~ msgid "Failed to connect to the HAL daemon: %s"
 #~ msgstr "無法連結至·HAL·服務:·%s"
-
 #~ msgid "Create the folder \"%s\"?"
 #~ msgstr "建立資料夾 \"%s\"？"
-
 #~ msgid "C_reate Folder"
 #~ msgstr "建立資料夾(_R)"
-
 #~ msgid "Failed to change group"
 #~ msgstr "無法變更群組"
-
 #~ msgid "Failed to apply new permissions"
 #~ msgstr "無法套用新的權限設定"
-
 #~ msgid "_Unmount Volume"
 #~ msgstr "卸載裝置(_U)"
-
 #~ msgid "Failed to unmount \"%s\""
 #~ msgstr "無法卸載·\"%s\""
 
@@ -3504,46 +3381,32 @@ msgstr "設定 Thunar 檔案管理程式"
 #, fuzzy
 #~ msgid "%s (%s)"
 #~ msgstr "\"%s\" (%s) %s"
-
 #~ msgid "Views"
 #~ msgstr "檢視"
-
 #~ msgid "Copyright (c) 2004-2006"
 #~ msgstr "Copyright (c) 2004-2006"
-
 #~ msgid "Go To:"
 #~ msgstr "前往："
-
 #~ msgid "Switch to path bar mode"
 #~ msgstr "切換到路徑列模式"
-
 #~ msgid "_Location..."
 #~ msgstr "開啟位址(_L)..."
-
 #~ msgid "_Main Toolbar"
 #~ msgstr "主要工作列(_M)"
-
 #~ msgid "Change the visibility of this window's main toolbar"
 #~ msgstr "設定是否顯示目前視窗的主要工作列"
-
 #~ msgid "_Location Bar"
 #~ msgstr "位址列(_L)"
-
 #~ msgid "Change the visibility of this window's location bar"
 #~ msgstr "設定是否顯示目前視窗的位址列"
-
 #~ msgid "_Properties"
 #~ msgstr "內容(_P)"
-
 #~ msgid "_Hidden"
 #~ msgstr "隱藏(_H)"
-
 #~ msgid "Don't display any location selector"
 #~ msgstr "不要顯示任何位置表示方式"
-
 #~ msgid "Links from or to resources in the trash are not supported"
 #~ msgstr "不支援來自或指向垃圾桶中資源的連結"
-
 #~ msgid "Delete the selected file permanently"
 #~ msgid_plural "Delete the selected files permanently"
 #~ msgstr[0] "永久刪除所選的檔案"
@@ -3551,10 +3414,8 @@ msgstr "設定 Thunar 檔案管理程式"
 #, fuzzy
 #~ msgid "Failed to change permisions of \"%s\""
 #~ msgstr "無法更改 \"%s\" 的權限設定： %s"
-
 #~ msgid "Failed to determine file info of \"%s\": %s"
 #~ msgstr "無法決定 \"%s\" 的檔案資訊：%s"
-
 #~ msgid ""
 #~ "Failed to remove \"%s\".\n"
 #~ "\n"
@@ -3563,7 +3424,6 @@ msgstr "設定 Thunar 檔案管理程式"
 #~ "無法移除 \"%s\".\n"
 #~ "\n"
 #~ "您想要跳過嗎？"
-
 #~ msgid ""
 #~ "Failed to create empty file \"%s\".\n"
 #~ "\n"
@@ -3572,21 +3432,16 @@ msgstr "設定 Thunar 檔案管理程式"
 #~ "無法建立空檔案 \"%s\".\n"
 #~ "\n"
 #~ "您想要跳過嗎？"
-
 #~ msgid "Deleting directories..."
 #~ msgstr "刪除目錄中..."
-
 #~ msgid "Failed to remove directory \"%s\": %s"
 #~ msgstr "無法移除目錄 \"%s\"：%s"
-
 #~ msgid "Cannot transfer the root directory"
 #~ msgstr "無法轉移根目錄"
-
 #~ msgid "Operation canceled"
 #~ msgstr "操作取消"
-
 #~ msgid "Failed to read link target from \"%s\""
 #~ msgstr "無法讀取連結目標 \"%s\""
-
 #~ msgid "Failed to copy special file \"%s\""
 #~ msgstr "無法複製特殊檔案 \"%s\""
+