sync with transifex

1 files changed, 449 insertions, 422 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index ca2f7574..08f06ae4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,112 +1,112 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Chao-Hsiung Liao <[email protected]> , 2008
-# Jeff Huang <[email protected]>, 2015-2017
-# Jing-Jong Shyue <[email protected]>, , 2000
-# Jing-Jong Shyue <[email protected]>, , 2000
-# 趙惟倫 <[email protected]>, 2012
-# Yuan-Chung Cheng <[email protected]>, 1999
-# Jeff Huang <[email protected]>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-15 12:30+0300\n"
-"PO-Revision-Date: 2018-01-15 10:14+0000\n"
-"Last-Translator: Vlad Orlov <[email protected]>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/mate/MATE/language/zh_TW/)\n"
+"POT-Creation-Date: 2018-06-10 08:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Martin Wimpress <[email protected]>, 2018\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/mate/teams/13566/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../accessx-status/applet.c:142
+#: ../accessx-status/applet.c:96
 msgid "Shows the state of AccessX features such as latched modifiers"
 msgstr "顯示無障礙環境鍵盤的狀態"
 
-#: ../accessx-status/applet.c:146 ../battstat/battstat_applet.c:1210
-#: ../charpick/charpick.c:651 ../command/command.c:116
-#: ../cpufreq/src/cpufreq-applet.c:645 ../drivemount/drivemount.c:121
-#: ../geyes/geyes.c:194 ../mateweather/mateweather-about.c:56
-#: ../multiload/main.c:64 ../netspeed/src/netspeed.c:808
-#: ../stickynotes/stickynotes_applet_callbacks.c:389
-#: ../timerapplet/timerapplet.c:260 ../trashapplet/src/trashapplet.c:451
+#: ../accessx-status/applet.c:100 ../battstat/battstat_applet.c:839
+#: ../charpick/charpick.c:618 ../command/command.c:116
+#: ../cpufreq/src/cpufreq-applet.c:640 ../drivemount/drivemount.c:121
+#: ../geyes/geyes.c:181 ../mateweather/mateweather-about.c:56
+#: ../multiload/main.c:64 ../netspeed/src/netspeed.c:838
+#: ../stickynotes/stickynotes_applet_callbacks.c:383
+#: ../timerapplet/timerapplet.c:260 ../trashapplet/src/trashapplet.c:437
 msgid "translator-credits"
-msgstr "黃柏諺 <[email protected]>,2013-15\n趙惟倫 <[email protected]>, 2012\nWoodman Tuen <[email protected]>, 2005-2006\nAbel Cheung <[email protected]>, 2001-2004\nJing-Jong Shyue <[email protected]>, 2000\nYuan-Chung Cheng <[email protected]>, 1999"
-
-#: ../accessx-status/applet.c:169
+msgstr ""
+"黃柏諺 <[email protected]>,2013-14\n"
+"Launchpad 貢獻者：\n"
+"  Jose Sun https://launchpad.net/~josesun\n"
+"  Toomore https://launchpad.net/~toomore\n"
+"  fetag https://launchpad.net/~coolfire\n"
+"Walter Cheuk <[email protected]>, 2016."
+
+#: ../accessx-status/applet.c:119
 #, c-format
 msgid "There was an error launching the help viewer: %s"
 msgstr "啟動說明文件瀏覽器時出現錯誤：%s"
 
-#: ../accessx-status/applet.c:197
+#: ../accessx-status/applet.c:147
 msgid "Open the keyboard preferences dialog"
 msgstr "開啟鍵盤偏好設定對話框"
 
-#: ../accessx-status/applet.c:212
+#: ../accessx-status/applet.c:162
 #, c-format
 msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "啟動鍵盤偏好設定對話方塊時出現錯誤：%s"
 
-#: ../accessx-status/applet.c:227
+#: ../accessx-status/applet.c:177
 msgid "_Keyboard Accessibility Preferences"
 msgstr "無障礙環境鍵盤偏好設定(_K)"
 
-#: ../accessx-status/applet.c:228 ../battstat/battstat_applet.c:64
-#: ../charpick/charpick.c:739 ../cpufreq/src/cpufreq-applet.c:129
-#: ../drivemount/drivemount.c:166 ../geyes/geyes.c:374
-#: ../mateweather/mateweather-applet.c:124 ../multiload/main.c:470
+#: ../accessx-status/applet.c:178 ../battstat/battstat_applet.c:63
+#: ../charpick/charpick.c:699 ../cpufreq/src/cpufreq-applet.c:129
+#: ../drivemount/drivemount.c:159 ../geyes/geyes.c:354
+#: ../mateweather/mateweather-applet.c:117 ../multiload/main.c:483
 #: ../stickynotes/stickynotes_applet.c:46 ../trashapplet/src/trashapplet.c:74
 msgid "_Help"
-msgstr "求助(_H)"
+msgstr "說明(_H)"
 
-#: ../accessx-status/applet.c:229 ../battstat/battstat_applet.c:67
-#: ../charpick/charpick.c:742 ../command/command.c:75
-#: ../cpufreq/src/cpufreq-applet.c:132 ../drivemount/drivemount.c:169
-#: ../geyes/geyes.c:377 ../mateweather/mateweather-applet.c:127
-#: ../multiload/main.c:473 ../stickynotes/stickynotes_applet.c:49
+#: ../accessx-status/applet.c:179 ../battstat/battstat_applet.c:66
+#: ../charpick/charpick.c:702 ../command/command.c:75
+#: ../cpufreq/src/cpufreq-applet.c:132 ../drivemount/drivemount.c:162
+#: ../geyes/geyes.c:357 ../mateweather/mateweather-applet.c:120
+#: ../multiload/main.c:486 ../stickynotes/stickynotes_applet.c:49
 #: ../timerapplet/timerapplet.c:82 ../trashapplet/src/trashapplet.c:77
 msgid "_About"
 msgstr "關於(_A)"
 
 #. Note to translators: the first letter of the alphabet, not the indefinite
 #. article
-#: ../accessx-status/applet.c:484 ../accessx-status/applet.c:518
+#: ../accessx-status/applet.c:499 ../accessx-status/applet.c:553
 msgid "a"
 msgstr "a"
 
-#: ../accessx-status/applet.c:1001 ../accessx-status/applet.c:1067
-#: ../accessx-status/applet.c:1137 ../accessx-status/applet.c:1309
+#: ../accessx-status/applet.c:1036 ../accessx-status/applet.c:1102
+#: ../accessx-status/applet.c:1187 ../accessx-status/applet.c:1381
 msgid "AccessX Status"
 msgstr "無障礙環境狀態"
 
-#: ../accessx-status/applet.c:1002 ../accessx-status/applet.c:1138
+#: ../accessx-status/applet.c:1037 ../accessx-status/applet.c:1188
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "啟用無障礙環境功能時顯示鍵盤狀態。"
 
-#: ../accessx-status/applet.c:1037
+#: ../accessx-status/applet.c:1071
 msgid "XKB Extension is not enabled"
 msgstr "並未啟用 XKB 延伸功能"
 
-#: ../accessx-status/applet.c:1042
+#: ../accessx-status/applet.c:1076
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../accessx-status/applet.c:1046
+#: ../accessx-status/applet.c:1080
 #, c-format
 msgid "Error: %s"
 msgstr "錯誤：%s"
 
-#: ../accessx-status/applet.c:1306
+#: ../accessx-status/applet.c:1378
 #: ../accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in.h:3
 msgid "Keyboard Accessibility Status"
 msgstr "無障礙環境鍵盤狀態"
 
-#: ../accessx-status/applet.c:1310
+#: ../accessx-status/applet.c:1382
 msgid "Displays current state of keyboard accessibility features"
 msgstr "顯示目前的無障礙環境鍵盤狀態"
 
@@ -122,56 +122,56 @@ msgstr "無障礙環境鍵盤狀態面板程式工廠"
 msgid "Shows the status of keyboard accessibility features"
 msgstr "顯示無障礙環境鍵盤狀態"
 
-#: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:736
+#: ../battstat/battstat_applet.c:60 ../charpick/charpick.c:696
 #: ../command/command.c:74 ../cpufreq/src/cpufreq-applet.c:126
-#: ../geyes/geyes.c:371 ../mateweather/mateweather-applet.c:121
-#: ../multiload/main.c:464 ../stickynotes/stickynotes_applet.c:43
+#: ../geyes/geyes.c:351 ../mateweather/mateweather-applet.c:114
+#: ../multiload/main.c:477 ../stickynotes/stickynotes_applet.c:43
 #: ../timerapplet/timerapplet.c:81
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../battstat/battstat_applet.c:72
+#: ../battstat/battstat_applet.c:71
 msgid "System is running on AC power"
 msgstr "系統正在使用交流電"
 
-#: ../battstat/battstat_applet.c:73
+#: ../battstat/battstat_applet.c:72
 msgid "System is running on battery power"
 msgstr "系統正在使用電池"
 
-#: ../battstat/battstat_applet.c:339
+#: ../battstat/battstat_applet.c:176
 #, c-format
 msgid "Battery charged (%d%%)"
 msgstr "電池已充電 (%d%%)"
 
-#: ../battstat/battstat_applet.c:341
+#: ../battstat/battstat_applet.c:178
 #, c-format
 msgid "Unknown time (%d%%) remaining"
 msgstr "無法決定可使用時間，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:343
+#: ../battstat/battstat_applet.c:180
 #, c-format
 msgid "Unknown time (%d%%) until charged"
 msgstr "無法決定充電所需時間，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:348
+#: ../battstat/battstat_applet.c:185
 #, c-format
 msgid "%d minute (%d%%) remaining"
 msgid_plural "%d minutes (%d%%) remaining"
 msgstr[0] "可使用 %d 分鐘，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:353
+#: ../battstat/battstat_applet.c:190
 #, c-format
 msgid "%d minute until charged (%d%%)"
 msgid_plural "%d minutes until charged (%d%%)"
 msgstr[0] "距離完全充電還有 %d 分鐘，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:359
+#: ../battstat/battstat_applet.c:196
 #, c-format
 msgid "%d hour (%d%%) remaining"
 msgid_plural "%d hours (%d%%) remaining"
 msgstr[0] "可使用 %d 小時，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:364
+#: ../battstat/battstat_applet.c:201
 #, c-format
 msgid "%d hour until charged (%d%%)"
 msgid_plural "%d hours until charged (%d%%)"
@@ -179,47 +179,47 @@ msgstr[0] "距離完全充電還有 %d 小時，剩餘電量 %d%%"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:371
+#: ../battstat/battstat_applet.c:208
 #, c-format
 msgid "%d %s %d %s (%d%%) remaining"
 msgstr "可使用 %d %s %d %s，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:372 ../battstat/battstat_applet.c:379
+#: ../battstat/battstat_applet.c:209 ../battstat/battstat_applet.c:216
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../battstat/battstat_applet.c:373 ../battstat/battstat_applet.c:380
+#: ../battstat/battstat_applet.c:210 ../battstat/battstat_applet.c:217
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "分鐘"
+msgstr[0] "分"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:378
+#: ../battstat/battstat_applet.c:215
 #, c-format
 msgid "%d %s %d %s until charged (%d%%)"
 msgstr "距離完全充電還有 %d %s %d %s，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:392
+#: ../battstat/battstat_applet.c:229
 msgid "Battery Monitor"
 msgstr "電池電量監控程式"
 
-#: ../battstat/battstat_applet.c:402 ../battstat/battstat_applet.c:461
+#: ../battstat/battstat_applet.c:240 ../battstat/battstat_applet.c:300
 msgid "Your battery is now fully recharged"
 msgstr "電池已完成充電"
 
-#: ../battstat/battstat_applet.c:438 ../battstat/battstat_applet.c:593
+#: ../battstat/battstat_applet.c:275 ../battstat/battstat_applet.c:432
 msgid "Battery Notice"
 msgstr "電池狀態通知"
 
 #. we don't know the remaining time
-#: ../battstat/battstat_applet.c:538
+#: ../battstat/battstat_applet.c:377
 #, c-format
 msgid "You have %d%% of your total battery capacity remaining."
 msgstr "您的電池總電量剩下 %d%%。"
 
-#: ../battstat/battstat_applet.c:544
+#: ../battstat/battstat_applet.c:383
 #, c-format
 msgid ""
 "You have %d minute of battery power remaining (%d%% of the total capacity)."
@@ -230,71 +230,78 @@ msgstr[0] "現在電池剩餘 %d 分鐘的電量（總電量為 %d%%）。"
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop does not support suspend.
-#: ../battstat/battstat_applet.c:556
+#: ../battstat/battstat_applet.c:395
 msgid ""
 "To avoid losing your work:\n"
 " • plug your laptop into external power, or\n"
 " • save open documents and shut your laptop down."
-msgstr "為了避免您的工作遺失：\n • 替筆電插上外部電源，或\n • 儲存已開啟的文件及關機。"
+msgstr ""
+"為了避免您的工作遺失：\n"
+" • 替筆電插上外部電源，或\n"
+" • 儲存已開啟的文件及關機。"
 
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop supports suspend.
-#: ../battstat/battstat_applet.c:564
+#: ../battstat/battstat_applet.c:403
 msgid ""
 "To avoid losing your work:\n"
 " • suspend your laptop to save power,\n"
 " • plug your laptop into external power, or\n"
 " • save open documents and shut your laptop down."
-msgstr "為了避免您的工作遺失：\n • 暫停筆電來節省用電，\n • 替筆電插上外部電源，或\n • 儲存已開啟的文件及關機。"
+msgstr ""
+"為了避免您的工作遺失：\n"
+" • 暫停筆電來節省用電，\n"
+" • 替筆電插上外部電源，或\n"
+" • 儲存已開啟的文件及關機。"
 
-#: ../battstat/battstat_applet.c:572
+#: ../battstat/battstat_applet.c:411
 msgid "Your battery is running low"
 msgstr "電池電量甚低"
 
-#: ../battstat/battstat_applet.c:667
+#: ../battstat/battstat_applet.c:508
 msgid "No battery present"
 msgstr "電池不存在"
 
-#: ../battstat/battstat_applet.c:670
+#: ../battstat/battstat_applet.c:511
 msgid "Battery status unknown"
 msgstr "電池狀態不詳"
 
-#: ../battstat/battstat_applet.c:850
+#: ../battstat/battstat_applet.c:540
 msgid "N/A"
 msgstr "不適用"
 
-#: ../battstat/battstat_applet.c:1154 ../drivemount/drivemount.c:154
-#: ../geyes/geyes.c:359 ../geyes/themes.c:233
-#: ../mateweather/mateweather-applet.c:70
-#: ../mateweather/mateweather-pref.c:759
-#: ../stickynotes/stickynotes_applet_callbacks.c:351
-#: ../stickynotes/stickynotes_applet_callbacks.c:547
-#: ../trashapplet/src/trashapplet.c:413
+#: ../battstat/battstat_applet.c:783 ../drivemount/drivemount.c:147
+#: ../geyes/geyes.c:339 ../geyes/themes.c:226
+#: ../mateweather/mateweather-applet.c:63
+#: ../mateweather/mateweather-pref.c:751
+#: ../stickynotes/stickynotes_applet_callbacks.c:345
+#: ../stickynotes/stickynotes_applet_callbacks.c:535
+#: ../trashapplet/src/trashapplet.c:399
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "顯示說明文件時出現錯誤：%s"
 
-#: ../battstat/battstat_applet.c:1199
+#: ../battstat/battstat_applet.c:828
 msgid "This utility shows the status of your laptop battery."
 msgstr "本公用程式可以顯示筆電的電池狀態。"
 
 #. true
-#: ../battstat/battstat_applet.c:1201
+#: ../battstat/battstat_applet.c:830
 msgid "upower backend enabled."
 msgstr "已啟用 upower 後端。"
 
 #. false
-#: ../battstat/battstat_applet.c:1202
+#: ../battstat/battstat_applet.c:831
 msgid "Legacy backend enabled."
 msgstr "舊版後端已啟用。"
 
-#: ../battstat/battstat_applet.c:1572 ../battstat/battstat_applet.c:1624
+#: ../battstat/battstat_applet.c:1109 ../battstat/battstat_applet.c:1159
 #: ../battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in.h:2
 msgid "Battery Charge Monitor"
 msgstr "電池電量監控程式"
 
-#: ../battstat/battstat_applet.c:1625
+#: ../battstat/battstat_applet.c:1160
 #: ../battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in.h:3
 msgid "Monitor a laptop's remaining power"
 msgstr "監控筆電的剩餘電量"
@@ -308,43 +315,27 @@ msgid "Appearance"
 msgstr "外觀"
 
 #: ../battstat/battstat_applet.ui.h:3
-msgid "_Compact view"
-msgstr "簡潔顯示(_E)"
-
-#: ../battstat/battstat_applet.ui.h:4
-msgid "(shows single image for status and charge)"
-msgstr "（只顯示一個圖形來代表狀態及電量）"
-
-#: ../battstat/battstat_applet.ui.h:5
-msgid "_Expanded view"
-msgstr "詳細顯示(_E)"
-
-#: ../battstat/battstat_applet.ui.h:6
-msgid "(two images: one for status, one for charge)"
-msgstr "（兩個圖形，一個代表狀態，另一個代表電量）"
-
-#: ../battstat/battstat_applet.ui.h:7
 msgid "_Show time/percentage:"
 msgstr "顯示時間/百分比(_S):"
 
-#: ../battstat/battstat_applet.ui.h:8
+#: ../battstat/battstat_applet.ui.h:4
 msgid "Show _time remaining"
 msgstr "顯示剩餘時間(_T)"
 
-#: ../battstat/battstat_applet.ui.h:9
+#: ../battstat/battstat_applet.ui.h:5
 msgid "Show _percentage remaining"
 msgstr "顯示剩餘的百分比(_P)"
 
-#: ../battstat/battstat_applet.ui.h:10
+#: ../battstat/battstat_applet.ui.h:6
 msgid "Notifications"
 msgstr "通知"
 
 #. TRANSLATOR: This is the beginning of the sentence
-#: ../battstat/battstat_applet.ui.h:12
+#: ../battstat/battstat_applet.ui.h:8
 msgid "_Warn when battery charge drops to:"
 msgstr "當電量下降至剩餘(_W)"
 
-#: ../battstat/battstat_applet.ui.h:13
+#: ../battstat/battstat_applet.ui.h:9
 msgid "_Notify when battery is fully recharged"
 msgstr "當完全充電後發出通知(_N)"
 
@@ -397,50 +388,24 @@ msgid "Beep when displaying a warning."
 msgstr "顯示訊息時同時發出聲響。"
 
 #: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:11
-msgid "Drain from top"
-msgstr "指示棒從頂部開始縮短"
-
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:12
-msgid ""
-"Show the battery meter draining from the top of the battery. Only "
-"implemented for traditional battery view."
-msgstr "在電池頂部顯示電量棒。只適用於傳統電量顯示模式。"
-
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:13
-msgid "Upright (small) battery"
-msgstr "垂直（較小）電池圖樣"
-
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:14
-msgid "Show the upright, smaller battery on the panel."
-msgstr "在面板上顯示垂直的，較小的電池圖樣。"
-
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:15
-msgid "Show the horizontal battery"
-msgstr "顯示水平電池圖樣"
-
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:16
-msgid "Show the traditional, horizontal battery on the panel."
-msgstr "在面板上顯示傳統的，水平的電池圖樣。"
-
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:17
 msgid "Show the time/percent label"
 msgstr "顯示時間/百分比標籤"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:18
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:12
 msgid "0 for no label, 1 for percentage and 2 for time remaining."
 msgstr "‘0’則沒有標籤，‘1’則顯示百分比，‘2’則顯示剩餘時間。"
 
 #. TRANSLATOR: this is a selectable item in a drop-down menu to end
 #. * this sentence:
 #. *   "Warn when battery charge drops to: [XX] percent".
-#: ../battstat/properties.c:287
+#: ../battstat/properties.c:237
 msgid "Percent"
-msgstr "% 時發出警告"
+msgstr "百分比"
 
 #. TRANSLATOR: this is a selectable item in a drop-down menu to end
 #. * this sentence:
 #. *   "Warn when battery charge drops to: [XX] minutes remaining"
-#: ../battstat/properties.c:293
+#: ../battstat/properties.c:243
 msgid "Minutes Remaining"
 msgstr "分鐘時發出警告"
 
@@ -456,40 +421,40 @@ msgstr "電池電量過低"
 msgid "Battery fully re-charged"
 msgstr "電池電量全滿"
 
-#: ../charpick/charpick.c:464
+#: ../charpick/charpick.c:435
 msgid "Available palettes"
 msgstr "可供選用的字盤"
 
 #. TRANSLATOR: This sentance reads something like 'Insert "PILCROW SIGN"'
 #. *             hopefully, the name of the unicode character has already
 #. *             been translated.
-#: ../charpick/charpick.c:515
+#: ../charpick/charpick.c:484
 #, c-format
 msgid "Insert \"%s\""
 msgstr "插入“%s”"
 
-#: ../charpick/charpick.c:518
+#: ../charpick/charpick.c:487
 msgid "Insert special character"
 msgstr "插入特殊字元"
 
-#: ../charpick/charpick.c:522
+#: ../charpick/charpick.c:491
 #, c-format
 msgid "insert special character %s"
 msgstr "插入特殊字元 %s"
 
-#: ../charpick/charpick.c:646
+#: ../charpick/charpick.c:613
 msgid ""
 "Mate Panel applet for selecting strange characters that are not on my "
 "keyboard. Released under GNU General Public Licence."
 msgstr "本 MATE 面板程式可用來選取在鍵盤上找不到的特殊字元。遵照 GNU 公共授權條款 (GPL) 發行。"
 
-#: ../charpick/charpick.c:765 ../charpick/charpick.c:779
+#: ../charpick/charpick.c:725 ../charpick/charpick.c:739
 #: ../charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in.h:2
-#: ../charpick/properties.c:455
+#: ../charpick/properties.c:451
 msgid "Character Palette"
 msgstr "字元選擇盤"
 
-#: ../charpick/charpick.c:765
+#: ../charpick/charpick.c:725
 #: ../charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in.h:3
 msgid "Insert characters"
 msgstr "加入字元"
@@ -523,7 +488,7 @@ msgstr "編輯(_E)"
 
 #: ../charpick/properties.c:116
 msgid "_Palette:"
-msgstr "選字盤(_P):"
+msgstr "調色板(_P):"
 
 #: ../charpick/properties.c:124
 msgid "Palette entry"
@@ -545,35 +510,35 @@ msgstr "修改選字盤"
 msgid "Palettes list"
 msgstr "選字盤清單"
 
-#: ../charpick/properties.c:460
+#: ../charpick/properties.c:456
 msgid "_Palettes:"
 msgstr "選字盤(_P):"
 
-#: ../charpick/properties.c:480
+#: ../charpick/properties.c:478
 msgid "Add button"
 msgstr "加入按鈕"
 
-#: ../charpick/properties.c:481
+#: ../charpick/properties.c:479
 msgid "Click to add a new palette"
 msgstr "按這裡可以加入新的選字盤"
 
-#: ../charpick/properties.c:488
+#: ../charpick/properties.c:491
 msgid "Edit button"
 msgstr "修改按鈕"
 
-#: ../charpick/properties.c:489
+#: ../charpick/properties.c:492
 msgid "Click to edit the selected palette"
 msgstr "按這裡可以修改指定的選字盤"
 
-#: ../charpick/properties.c:496
+#: ../charpick/properties.c:504
 msgid "Delete button"
 msgstr "刪除按鈕"
 
-#: ../charpick/properties.c:497
+#: ../charpick/properties.c:505
 msgid "Click to delete the selected palette"
 msgstr "按這裡可以刪除指定的選字盤"
 
-#: ../charpick/properties.c:555
+#: ../charpick/properties.c:556
 msgid "Character Palette Preferences"
 msgstr "選字盤偏好設定"
 
@@ -590,21 +555,21 @@ msgstr "命令列小程式偏好設定"
 msgid "Command:"
 msgstr "指令："
 
-#: ../command/command.c:158
+#: ../command/command.c:154
 msgid "Interval (seconds):"
 msgstr "間隔（秒）："
 
-#: ../command/command.c:170
+#: ../command/command.c:162
 msgid "Maximum width (chars):"
 msgstr "最大寬度（字元數）："
 
-#: ../command/command.c:182
+#: ../command/command.c:170
 #: ../command/org.mate.panel.applet.command.gschema.xml.in.h:7
 #: ../netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in.h:7
 msgid "Show icon"
 msgstr "顯示圖示"
 
-#: ../command/command.c:333
+#: ../command/command.c:321
 msgid "Command Applet"
 msgstr "命令列小程式"
 
@@ -614,7 +579,7 @@ msgstr "指令工廠"
 
 #: ../command/org.mate.applets.CommandApplet.mate-panel-applet.in.in.h:2
 msgid "Command"
-msgstr "命令"
+msgstr "指令"
 
 #: ../command/org.mate.panel.applet.command.gschema.xml.in.h:1
 msgid "Command to execute"
@@ -677,7 +642,7 @@ msgid "Show CPU frequency as _percentage"
 msgstr "以百分比來顯示 C_PU 頻率"
 
 #: ../cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in.h:1
-#: ../cpufreq/src/cpufreq-applet.c:988 ../cpufreq/src/cpufreq-applet.c:1043
+#: ../cpufreq/src/cpufreq-applet.c:991 ../cpufreq/src/cpufreq-applet.c:1046
 msgid "CPU Frequency Scaling Monitor"
 msgstr "CPU 頻率調整監控程式"
 
@@ -704,7 +669,8 @@ msgid ""
 "A 0 value means to show the applet in graphic mode (pixmap only), 1 to show "
 "the applet in text mode (not to show the pixmap) and 2 to show the applet in"
 " graphic and text mode."
-msgstr "數值 0 代表面板程式以圖形模式顯示（只顯示 pixmap），1 代表以文字模式顯示（不顯示 pixmap），2 代表以文字及圖形模式顯示。"
+msgstr ""
+"數值 0 代表面板程式以圖形模式顯示（只顯示 pixmap），1 代表以文字模式顯示（不顯示 pixmap），2 代表以文字及圖形模式顯示。"
 
 #: ../cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.h:5
 msgid "The type of text to display (if the text is enabled)."
@@ -716,27 +682,27 @@ msgid ""
 "to show percentage instead of frequency."
 msgstr "數值 0 代表顯示處理器頻率，1 代表顯示頻率及單位，2 代表顯以百分比取代頻率顯示。"
 
-#: ../cpufreq/src/cpufreq-applet.c:609 ../cpufreq/src/cpufreq-prefs.c:372
+#: ../cpufreq/src/cpufreq-applet.c:604 ../cpufreq/src/cpufreq-prefs.c:365
 msgid "Could not open help document"
 msgstr "無法開啟說明文件"
 
-#: ../cpufreq/src/cpufreq-applet.c:640
+#: ../cpufreq/src/cpufreq-applet.c:635
 msgid "This utility shows the current CPU Frequency Scaling."
 msgstr "此工具程式能顯示目前 CPU 頻率的調整。"
 
-#: ../cpufreq/src/cpufreq-applet.c:1044
+#: ../cpufreq/src/cpufreq-applet.c:1047
 msgid "This utility shows the current CPU Frequency"
 msgstr "此工具程式能顯示目前 CPU 的頻率"
 
-#: ../cpufreq/src/cpufreq-prefs.c:507
+#: ../cpufreq/src/cpufreq-prefs.c:500
 msgid "Graphic"
 msgstr "圖示"
 
-#: ../cpufreq/src/cpufreq-prefs.c:512
+#: ../cpufreq/src/cpufreq-prefs.c:505
 msgid "Text"
 msgstr "文字"
 
-#: ../cpufreq/src/cpufreq-prefs.c:517
+#: ../cpufreq/src/cpufreq-prefs.c:510
 msgid "Graphic and Text"
 msgstr "圖示及文字"
 
@@ -766,42 +732,42 @@ msgstr "調整 CPU 頻率"
 msgid "Privileges are required to change the CPU Frequency scaling."
 msgstr "要調整 CPU 頻率需要權限。"
 
-#: ../drivemount/drive-button.c:424 ../drivemount/drive-button.c:442
+#: ../drivemount/drive-button.c:397 ../drivemount/drive-button.c:411
 msgid "(mounted)"
 msgstr "（已掛載）"
 
-#: ../drivemount/drive-button.c:429
+#: ../drivemount/drive-button.c:404
 msgid "(not mounted)"
 msgstr "（未掛載）"
 
-#: ../drivemount/drive-button.c:700
+#: ../drivemount/drive-button.c:673
 msgid "Cannot execute Caja"
 msgstr "無法執行 Caja"
 
-#: ../drivemount/drive-button.c:1024
+#: ../drivemount/drive-button.c:997
 msgid "_Play DVD"
 msgstr "播放 D_VD"
 
-#: ../drivemount/drive-button.c:1028
+#: ../drivemount/drive-button.c:1001
 msgid "_Play CD"
 msgstr "播放 _CD"
 
-#: ../drivemount/drive-button.c:1031
+#: ../drivemount/drive-button.c:1004
 #, c-format
 msgid "_Open %s"
 msgstr "開啟 %s(_O)"
 
-#: ../drivemount/drive-button.c:1039
+#: ../drivemount/drive-button.c:1012
 #, c-format
 msgid "Un_mount %s"
 msgstr "卸載 %s(_M)"
 
-#: ../drivemount/drive-button.c:1045
+#: ../drivemount/drive-button.c:1018
 #, c-format
 msgid "_Mount %s"
 msgstr "掛載 %s(_M)"
 
-#: ../drivemount/drive-button.c:1053
+#: ../drivemount/drive-button.c:1026
 #, c-format
 msgid "_Eject %s"
 msgstr "退出碟片 %s(_E)"
@@ -810,7 +776,7 @@ msgstr "退出碟片 %s(_E)"
 msgid "Applet for mounting and unmounting block volumes."
 msgstr "掛載及卸載檔案系統的面板程式。"
 
-#: ../drivemount/drivemount.c:186 ../drivemount/drivemount.c:226
+#: ../drivemount/drivemount.c:179 ../drivemount/drivemount.c:219
 #: ../drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in.h:3
 msgid "Disk Mounter"
 msgstr "檔案系統掛載程式"
@@ -827,16 +793,16 @@ msgstr "可產生檔案系統掛載面板程式的工廠"
 msgid "Mount local disks and devices"
 msgstr "掛載本機磁碟及裝置"
 
-#: ../geyes/geyes.c:189
+#: ../geyes/geyes.c:176
 msgid "A goofy set of eyes for the MATE panel. They follow your mouse."
 msgstr "MATE 面板上的一對眼睛程式。它們會看著滑鼠游標的方向。"
 
-#: ../geyes/geyes.c:404 ../geyes/geyes.c:434 ../geyes/geyes.c:436
+#: ../geyes/geyes.c:384 ../geyes/geyes.c:414 ../geyes/geyes.c:416
 #: ../geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in.h:2
 msgid "Eyes"
 msgstr "小眼睛"
 
-#: ../geyes/geyes.c:437
+#: ../geyes/geyes.c:417
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "眼睛會望向滑鼠指標"
 
@@ -860,15 +826,15 @@ msgstr "無法啟動小眼睛面板程式。"
 msgid "There was a fatal error while trying to load the theme."
 msgstr "嘗試載入布景主題時出現嚴重錯誤。"
 
-#: ../geyes/themes.c:292
+#: ../geyes/themes.c:285
 msgid "Geyes Preferences"
 msgstr "小眼睛偏好設定"
 
-#: ../geyes/themes.c:325
+#: ../geyes/themes.c:318
 msgid "Themes"
 msgstr "主題"
 
-#: ../geyes/themes.c:350
+#: ../geyes/themes.c:339
 msgid "_Select a theme:"
 msgstr "選取主題(_S):"
 
@@ -876,130 +842,133 @@ msgstr "選取主題(_S):"
 msgid "A panel application for monitoring local weather conditions."
 msgstr "監控本地天氣情況的面板程式。"
 
-#: ../mateweather/mateweather-applet.c:115
+#: ../mateweather/mateweather-applet.c:108
 msgid "_Details"
-msgstr "詳細資訊(_D)"
+msgstr "詳細設定(_D)"
 
-#: ../mateweather/mateweather-applet.c:118
-#: ../mateweather/mateweather-dialog.c:193
+#: ../mateweather/mateweather-applet.c:111
+#: ../mateweather/mateweather-dialog.c:186
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../mateweather/mateweather-applet.c:346
+#: ../mateweather/mateweather-applet.c:339
 #: ../mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in.h:3
 msgid "Weather Report"
 msgstr "天氣報告"
 
-#: ../mateweather/mateweather-applet.c:364
-#: ../mateweather/mateweather-applet.c:368
+#: ../mateweather/mateweather-applet.c:357
+#: ../mateweather/mateweather-applet.c:361
 msgid "MATE Weather"
 msgstr "MATE 天氣預報"
 
-#: ../mateweather/mateweather-applet.c:468
+#: ../mateweather/mateweather-applet.c:460
 msgid "Weather Forecast"
 msgstr "天氣預報"
 
-#: ../mateweather/mateweather-applet.c:480
+#: ../mateweather/mateweather-applet.c:472
 #, c-format
 msgid ""
 "City: %s\n"
 "Sky: %s\n"
 "Temperature: %s"
-msgstr "城市：%s\n天氣：%s\n溫度：%s"
+msgstr ""
+"城市：%s\n"
+"天氣：%s\n"
+"溫度：%s"
 
-#: ../mateweather/mateweather-applet.c:532
+#: ../mateweather/mateweather-applet.c:521
 msgid "Updating..."
 msgstr "更新中…"
 
-#: ../mateweather/mateweather-dialog.c:191
+#: ../mateweather/mateweather-dialog.c:184
 msgid "Details"
 msgstr "詳細資料"
 
-#: ../mateweather/mateweather-dialog.c:233
+#: ../mateweather/mateweather-dialog.c:226
 msgid "City:"
 msgstr "城市："
 
-#: ../mateweather/mateweather-dialog.c:243
+#: ../mateweather/mateweather-dialog.c:232
 msgid "Last update:"
 msgstr "最後更新："
 
-#: ../mateweather/mateweather-dialog.c:253
+#: ../mateweather/mateweather-dialog.c:238
 msgid "Conditions:"
 msgstr "情況："
 
-#: ../mateweather/mateweather-dialog.c:263
+#: ../mateweather/mateweather-dialog.c:244
 msgid "Sky:"
 msgstr "天氣："
 
-#: ../mateweather/mateweather-dialog.c:273
+#: ../mateweather/mateweather-dialog.c:250
 msgid "Temperature:"
 msgstr "溫度："
 
-#: ../mateweather/mateweather-dialog.c:283
+#: ../mateweather/mateweather-dialog.c:256
 msgid "Feels like:"
 msgstr "感覺像："
 
-#: ../mateweather/mateweather-dialog.c:293
+#: ../mateweather/mateweather-dialog.c:262
 msgid "Dew point:"
 msgstr "露點："
 
-#: ../mateweather/mateweather-dialog.c:303
+#: ../mateweather/mateweather-dialog.c:268
 msgid "Relative humidity:"
 msgstr "相對溼度："
 
-#: ../mateweather/mateweather-dialog.c:313
+#: ../mateweather/mateweather-dialog.c:274
 msgid "Wind:"
 msgstr "風向："
 
-#: ../mateweather/mateweather-dialog.c:323
+#: ../mateweather/mateweather-dialog.c:280
 msgid "Pressure:"
 msgstr "氣壓："
 
-#: ../mateweather/mateweather-dialog.c:333
+#: ../mateweather/mateweather-dialog.c:286
 msgid "Visibility:"
 msgstr "能見度："
 
-#: ../mateweather/mateweather-dialog.c:343
+#: ../mateweather/mateweather-dialog.c:292
 msgid "Sunrise:"
 msgstr "日出："
 
-#: ../mateweather/mateweather-dialog.c:353
+#: ../mateweather/mateweather-dialog.c:298
 msgid "Sunset:"
 msgstr "日落："
 
-#: ../mateweather/mateweather-dialog.c:515
+#: ../mateweather/mateweather-dialog.c:404
 msgid "Current Conditions"
 msgstr "目前的天氣情況"
 
-#: ../mateweather/mateweather-dialog.c:532
+#: ../mateweather/mateweather-dialog.c:421
 msgid "Forecast Report"
 msgstr "天氣預報"
 
-#: ../mateweather/mateweather-dialog.c:532
+#: ../mateweather/mateweather-dialog.c:421
 msgid "See the ForeCast Details"
 msgstr "收看天氣預報"
 
-#: ../mateweather/mateweather-dialog.c:542
+#: ../mateweather/mateweather-dialog.c:431
 msgid "Forecast"
 msgstr "預報"
 
-#: ../mateweather/mateweather-dialog.c:550
+#: ../mateweather/mateweather-dialog.c:439
 msgid "Radar Map"
 msgstr "雷達圖"
 
-#: ../mateweather/mateweather-dialog.c:581
+#: ../mateweather/mateweather-dialog.c:470
 msgid "_Visit Weather.com"
 msgstr "瀏覽 _Weather.com"
 
-#: ../mateweather/mateweather-dialog.c:582
+#: ../mateweather/mateweather-dialog.c:471
 msgid "Visit Weather.com"
 msgstr "瀏覽 Weather.com"
 
-#: ../mateweather/mateweather-dialog.c:582
+#: ../mateweather/mateweather-dialog.c:471
 msgid "Click to Enter Weather.com"
 msgstr "請按這裡進入 Weather.com"
 
-#: ../mateweather/mateweather-dialog.c:667
+#: ../mateweather/mateweather-dialog.c:556
 msgid "Forecast not currently available for this location."
 msgstr "無法提供這個地點的天氣預報。"
 
@@ -1033,168 +1002,168 @@ msgid ""
 "Failed to load the Locations XML database.  Please report this as a bug."
 msgstr "無法載入位置 XML 資料庫。請報告錯誤。"
 
-#: ../mateweather/mateweather-pref.c:820
+#: ../mateweather/mateweather-pref.c:812
 msgid "Weather Preferences"
 msgstr "天氣程式偏好設定"
 
-#: ../mateweather/mateweather-pref.c:847
-#: ../mateweather/mateweather-pref.c:1065
+#: ../mateweather/mateweather-pref.c:839
+#: ../mateweather/mateweather-pref.c:1041
 msgid "_Automatically update every:"
 msgstr "自動更新相隔時間(_A):"
 
 #. * Units settings page.
 #. Temperature Unit
-#: ../mateweather/mateweather-pref.c:862
+#: ../mateweather/mateweather-pref.c:854
 msgid "_Temperature unit:"
 msgstr "溫度單位(_T):"
 
 #. gtk_combo_box_append_text (GTK_COMBO_BOX (temp_combo), _("Default"));
-#: ../mateweather/mateweather-pref.c:876
+#: ../mateweather/mateweather-pref.c:864
 msgid "Kelvin"
-msgstr "絕對溫度"
+msgstr "凱氏"
 
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../mateweather/mateweather-pref.c:878
+#: ../mateweather/mateweather-pref.c:866
 msgid "Celsius"
 msgstr "攝氏"
 
-#: ../mateweather/mateweather-pref.c:879
+#: ../mateweather/mateweather-pref.c:867
 msgid "Fahrenheit"
 msgstr "華氏"
 
 #. Speed Unit
-#: ../mateweather/mateweather-pref.c:888
+#: ../mateweather/mateweather-pref.c:876
 msgid "_Wind speed unit:"
 msgstr "風速單位(_W):"
 
 #. gtk_combo_box_append_text (GTK_COMBO_BOX (speed_combo), _("Default"));
 #. TRANSLATOR: The wind speed unit "meters per second"
-#: ../mateweather/mateweather-pref.c:903
+#: ../mateweather/mateweather-pref.c:887
 msgid "m/s"
 msgstr "公尺/秒"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../mateweather/mateweather-pref.c:905
+#: ../mateweather/mateweather-pref.c:889
 msgid "km/h"
 msgstr "公里/小時"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../mateweather/mateweather-pref.c:907
+#: ../mateweather/mateweather-pref.c:891
 msgid "mph"
 msgstr "浬/小時"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../mateweather/mateweather-pref.c:909
+#: ../mateweather/mateweather-pref.c:893
 msgid "knots"
 msgstr "節"
 
-#: ../mateweather/mateweather-pref.c:910
+#: ../mateweather/mateweather-pref.c:894
 msgid "Beaufort scale"
 msgstr "蒲福氏風級"
 
 #. Pressure Unit
-#: ../mateweather/mateweather-pref.c:919
+#: ../mateweather/mateweather-pref.c:903
 msgid "_Pressure unit:"
 msgstr "氣壓單位(_P):"
 
 #. gtk_combo_box_append_text (GTK_COMBO_BOX (pres_combo), _("Default"));
 #. TRANSLATOR: The pressure unit "kiloPascals"
-#: ../mateweather/mateweather-pref.c:934
+#: ../mateweather/mateweather-pref.c:914
 msgid "kPa"
 msgstr "千帕"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../mateweather/mateweather-pref.c:936
+#: ../mateweather/mateweather-pref.c:916
 msgid "hPa"
 msgstr "百帕"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../mateweather/mateweather-pref.c:938
+#: ../mateweather/mateweather-pref.c:918
 msgid "mb"
-msgstr "毫巴"
+msgstr "mb"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../mateweather/mateweather-pref.c:940
+#: ../mateweather/mateweather-pref.c:920
 msgid "mmHg"
 msgstr "mmHg"
 
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../mateweather/mateweather-pref.c:942
+#: ../mateweather/mateweather-pref.c:922
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../mateweather/mateweather-pref.c:944
+#: ../mateweather/mateweather-pref.c:924
 msgid "atm"
 msgstr "atm"
 
 #. Distance Unit
-#: ../mateweather/mateweather-pref.c:953
+#: ../mateweather/mateweather-pref.c:933
 msgid "_Visibility unit:"
 msgstr "能見度單位(_V):"
 
 #. gtk_combo_box_append_text (GTK_COMBO_BOX (dist_combo), _("Default"));
 #. TRANSLATOR: The distance unit "meters"
-#: ../mateweather/mateweather-pref.c:968
+#: ../mateweather/mateweather-pref.c:944
 msgid "meters"
 msgstr "公尺"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../mateweather/mateweather-pref.c:970
+#: ../mateweather/mateweather-pref.c:946
 msgid "km"
 msgstr "公里"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../mateweather/mateweather-pref.c:972
+#: ../mateweather/mateweather-pref.c:948
 msgid "miles"
 msgstr "英里"
 
-#: ../mateweather/mateweather-pref.c:1002
+#: ../mateweather/mateweather-pref.c:978
 msgid "Enable _radar map"
 msgstr "啟用雷達圖(_R)"
 
-#: ../mateweather/mateweather-pref.c:1018
+#: ../mateweather/mateweather-pref.c:994
 msgid "Use _custom address for radar map"
 msgstr "自行指定雷達圖的地址(_C)"
 
-#: ../mateweather/mateweather-pref.c:1036
+#: ../mateweather/mateweather-pref.c:1012
 msgid "A_ddress:"
-msgstr "地址(_D):"
+msgstr "地址(_A):"
 
 #. setup show-notifications button
-#: ../mateweather/mateweather-pref.c:1051
+#: ../mateweather/mateweather-pref.c:1027
 msgid "Show _notifications"
 msgstr "顯示通知(_N)"
 
-#: ../mateweather/mateweather-pref.c:1061
+#: ../mateweather/mateweather-pref.c:1037
 msgid "Update"
 msgstr "更新"
 
-#: ../mateweather/mateweather-pref.c:1078
+#: ../mateweather/mateweather-pref.c:1054
 msgid "minutes"
 msgstr "分"
 
-#: ../mateweather/mateweather-pref.c:1096
+#: ../mateweather/mateweather-pref.c:1072
 msgid "Display"
 msgstr "顯示"
 
-#: ../mateweather/mateweather-pref.c:1115
+#: ../mateweather/mateweather-pref.c:1091
 msgid "General"
 msgstr "一般"
 
-#: ../mateweather/mateweather-pref.c:1126
+#: ../mateweather/mateweather-pref.c:1102
 msgid "_Select a location:"
 msgstr "選取位置(_S):"
 
-#: ../mateweather/mateweather-pref.c:1152
+#: ../mateweather/mateweather-pref.c:1124
 msgid "_Find:"
 msgstr "尋找(_F):"
 
-#: ../mateweather/mateweather-pref.c:1158
+#: ../mateweather/mateweather-pref.c:1130
 msgid "Find _Next"
 msgstr "找下一個(_N)"
 
-#: ../mateweather/mateweather-pref.c:1179
+#: ../mateweather/mateweather-pref.c:1151
 msgid "Location"
 msgstr "位置"
 
@@ -1216,64 +1185,70 @@ msgid ""
 "space use, plus network traffic."
 msgstr "系統負載監控程式可以顯示 CPU、記憶體、交換記憶及網路使用量。"
 
-#: ../multiload/main.c:131
+#: ../multiload/main.c:124
 msgid "Start system-monitor"
 msgstr "啟動系統監察器"
 
-#: ../multiload/main.c:153
+#: ../multiload/main.c:146
 #, c-format
 msgid "There was an error executing '%s': %s"
 msgstr "執行‘%s’時出現錯誤：%s"
 
-#: ../multiload/main.c:281 ../multiload/properties.c:594
+#: ../multiload/main.c:274 ../multiload/properties.c:600
 msgid "Processor"
 msgstr "處理器"
 
-#: ../multiload/main.c:283 ../multiload/properties.c:602
+#: ../multiload/main.c:276 ../multiload/properties.c:608
 msgid "Memory"
-msgstr "記憶體"
+msgstr "記憶"
 
-#: ../multiload/main.c:285 ../multiload/properties.c:610
+#: ../multiload/main.c:278 ../multiload/properties.c:616
 msgid "Network"
 msgstr "網路"
 
-#: ../multiload/main.c:287 ../multiload/properties.c:617
+#: ../multiload/main.c:280 ../multiload/properties.c:625
 msgid "Swap Space"
 msgstr "交換記憶"
 
-#: ../multiload/main.c:289 ../multiload/main.c:368
+#: ../multiload/main.c:282 ../multiload/main.c:361
 msgid "Load Average"
 msgstr "平均負載"
 
-#: ../multiload/main.c:291
+#: ../multiload/main.c:284
 msgid "Disk"
 msgstr "磁碟"
 
 #. xgettext: use and cache are > 1 most of the time,
 #. please assume that they always are.
-#: ../multiload/main.c:307
+#: ../multiload/main.c:300
 #, c-format
 msgid ""
 "%s:\n"
 "%u%% in use by programs\n"
 "%u%% in use as cache"
-msgstr "%s:\n%u%% 由程式使用中\n%u%% 使用為快取記憶"
+msgstr ""
+"%s:\n"
+"%u%% 由程式使用中\n"
+"%u%% 使用為快取記憶"
 
-#: ../multiload/main.c:315
+#: ../multiload/main.c:308
 #, c-format
 msgid "The system load average is %0.02f"
 msgstr "系統平均負載為 %0.02f"
 
 #. xgettext: same as in graphic tab of g-s-m
-#: ../multiload/main.c:323
+#: ../multiload/main.c:316
 #, c-format
 msgid ""
 "%s:\n"
 "Receiving %s\n"
 "Sending %s"
-msgstr "%s：\n接收 %s\n傳送 %s"
+msgstr ""
+"%s：\n"
+"接收 %s\n"
+"傳送 %s"
 
-#: ../multiload/main.c:339
+#: ../multiload/main.c:332
 #, c-format
 msgid ""
 "%s:\n"
@@ -1281,33 +1256,35 @@ msgid ""
 msgid_plural ""
 "%s:\n"
 "%u%% in use"
-msgstr[0] "%s:\n%u%% 使用中"
+msgstr[0] ""
+"%s:\n"
+"%u%% 使用中"
 
-#: ../multiload/main.c:364
+#: ../multiload/main.c:357
 msgid "CPU Load"
 msgstr "CPU 負載"
 
-#: ../multiload/main.c:365
+#: ../multiload/main.c:358
 msgid "Memory Load"
 msgstr "記憶體負載"
 
-#: ../multiload/main.c:366
+#: ../multiload/main.c:359
 msgid "Net Load"
 msgstr "網路負載"
 
-#: ../multiload/main.c:367
+#: ../multiload/main.c:360
 msgid "Swap Load"
 msgstr "交換檔負載"
 
-#: ../multiload/main.c:369
+#: ../multiload/main.c:362
 msgid "Disk Load"
 msgstr "磁碟負載"
 
-#: ../multiload/main.c:467
+#: ../multiload/main.c:480
 msgid "_Open System Monitor"
 msgstr "啟動系統監控程式(_O)"
 
-#: ../multiload/main.c:495
+#: ../multiload/main.c:512
 #: ../multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in.h:1
 msgid "System Monitor"
 msgstr "系統監控"
@@ -1416,183 +1393,224 @@ msgid "Network graph background color"
 msgstr "網路圖表背景顏色"
 
 #: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:24
+msgid "Grid line color"
+msgstr "格線色彩"
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:25
+msgid "Indicator color"
+msgstr "指示器色彩"
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:26
+msgid "Network threshold 1 in bytes"
+msgstr "以位元組計的網路閾值 1"
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:27
+msgid "Network threshold 2 in bytes"
+msgstr "以位元組計的網路閾值 2"
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:28
+msgid "Network threshold 3 in bytes"
+msgstr "以位元組計的網路閾值 3"
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:29
 msgid "Graph color for user-related swap usage"
 msgstr "代表和使用者有關的交換記憶用量的顏色"
 
-#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:25
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:30
 msgid "Swap graph background color"
 msgstr "交換記憶體圖表背景顏色"
 
-#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:26
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:31
 msgid "Graph color for load average"
 msgstr "代表系統平均負載的顏色"
 
-#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:27
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:32
 msgid "Load graph background color"
 msgstr "系統負載量背景顏色"
 
-#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:28
-msgid "Grid line color"
-msgstr "格線色彩"
-
-#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:29
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:33
 msgid "Graph color for disk read"
 msgstr "代表磁碟讀取的顏色"
 
-#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:30
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:34
 msgid "Graph color for disk write"
 msgstr "代表磁碟寫入的顏色"
 
-#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:31
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:35
 msgid "Background color for disk load graph"
 msgstr "磁碟負載圖的背景色彩"
 
-#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:32
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:36
 msgid "The desktop description file to execute as the system monitor"
 msgstr "以系統監視器執行的桌面描述檔案"
 
-#: ../multiload/properties.c:328
+#: ../multiload/properties.c:362
 msgid "Monitored Resources"
 msgstr "受監控的資源"
 
-#: ../multiload/properties.c:357
+#: ../multiload/properties.c:387
 msgid "_Processor"
 msgstr "處理器(_P)"
 
-#: ../multiload/properties.c:370
+#: ../multiload/properties.c:400
 msgid "_Memory"
 msgstr "記憶體(_M)"
 
-#: ../multiload/properties.c:383
+#: ../multiload/properties.c:413
 msgid "_Network"
 msgstr "網路(_N)"
 
-#: ../multiload/properties.c:396
+#: ../multiload/properties.c:426
 msgid "S_wap Space"
 msgstr "交換記憶(_W)"
 
-#: ../multiload/properties.c:409
+#: ../multiload/properties.c:439
 msgid "_Load"
 msgstr "負載(_L)"
 
-#: ../multiload/properties.c:422
+#: ../multiload/properties.c:452
 msgid "_Harddisk"
 msgstr "硬碟(_H)"
 
-#: ../multiload/properties.c:437
+#: ../multiload/properties.c:467
 msgid "Options"
 msgstr "選項"
 
-#: ../multiload/properties.c:471
+#: ../multiload/properties.c:497
 msgid "System m_onitor width: "
 msgstr "系統監控程式寬度(_O):"
 
-#: ../multiload/properties.c:473
+#: ../multiload/properties.c:499
 msgid "System m_onitor height: "
 msgstr "系統監控程式高度(_O):"
 
-#: ../multiload/properties.c:508
+#: ../multiload/properties.c:530
 msgid "pixels"
 msgstr "像素"
 
-#: ../multiload/properties.c:520
+#: ../multiload/properties.c:538
 msgid "Sys_tem monitor update interval: "
 msgstr "系統監控更新間隔(_T):"
 
-#: ../multiload/properties.c:550
+#: ../multiload/properties.c:564
 msgid "milliseconds"
 msgstr "亳秒"
 
-#: ../multiload/properties.c:565
+#: ../multiload/properties.c:575
 msgid "Colors"
-msgstr "色彩"
+msgstr "顏色"
 
-#: ../multiload/properties.c:596 ../multiload/properties.c:604
+#: ../multiload/properties.c:602 ../multiload/properties.c:610
 msgid "_User"
 msgstr "使用者(_U)"
 
-#: ../multiload/properties.c:597
+#: ../multiload/properties.c:603
 msgid "S_ystem"
 msgstr "系統(_Y)"
 
-#: ../multiload/properties.c:598
+#: ../multiload/properties.c:604
 msgid "N_ice"
 msgstr "N_ice"
 
-#: ../multiload/properties.c:599
+#: ../multiload/properties.c:605
 msgid "I_OWait"
 msgstr "I_OWait"
 
-#: ../multiload/properties.c:600
+#: ../multiload/properties.c:606
 msgid "I_dle"
 msgstr "閒置(_D)"
 
-#: ../multiload/properties.c:605
+#: ../multiload/properties.c:611
 msgid "Sh_ared"
 msgstr "分享(_A)"
 
-#: ../multiload/properties.c:606
+#: ../multiload/properties.c:612
 msgid "_Buffers"
 msgstr "緩衝區(_B)"
 
-#: ../multiload/properties.c:607
+#: ../multiload/properties.c:613
 msgid "Cach_ed"
 msgstr "快取記憶(_E)"
 
-#: ../multiload/properties.c:608
+#: ../multiload/properties.c:614
 msgid "F_ree"
 msgstr "未用(_R)"
 
-#: ../multiload/properties.c:612
+#: ../multiload/properties.c:618
 msgid "_In"
 msgstr "進(_I)"
 
-#: ../multiload/properties.c:613
+#: ../multiload/properties.c:619
 msgid "_Out"
 msgstr "出(_O)"
 
-#: ../multiload/properties.c:614
+#: ../multiload/properties.c:620
 msgid "_Local"
 msgstr "本地端(_L)"
 
-#: ../multiload/properties.c:615 ../multiload/properties.c:625
-#: ../multiload/properties.c:632
+#: ../multiload/properties.c:621 ../multiload/properties.c:633
+#: ../multiload/properties.c:640
 msgid "_Background"
 msgstr "背景顏色(_B)"
 
-#: ../multiload/properties.c:619
+#: ../multiload/properties.c:622 ../multiload/properties.c:634
+msgid "_Gridline"
+msgstr "格線(_G)"
+
+#: ../multiload/properties.c:623
+msgid "_Indicator"
+msgstr "指示器(_I)"
+
+#: ../multiload/properties.c:627
 msgid "_Used"
 msgstr "使用中(_U)"
 
-#: ../multiload/properties.c:620
+#: ../multiload/properties.c:628
 msgid "_Free"
 msgstr "可用(_F)"
 
-#: ../multiload/properties.c:622
+#: ../multiload/properties.c:630
 msgid "Load"
 msgstr "負載"
 
-#: ../multiload/properties.c:624
+#: ../multiload/properties.c:632
 msgid "_Average"
 msgstr "平均(_A)"
 
-#: ../multiload/properties.c:626
-msgid "_Gridline"
-msgstr "格線(_G)"
-
-#: ../multiload/properties.c:628
+#: ../multiload/properties.c:636
 msgid "Harddisk"
 msgstr "硬碟"
 
-#: ../multiload/properties.c:630
+#: ../multiload/properties.c:638
 msgid "_Read"
 msgstr "讀(_R)"
 
-#: ../multiload/properties.c:631
+#: ../multiload/properties.c:639
 msgid "_Write"
 msgstr "寫(_W)"
 
-#: ../multiload/properties.c:656
+#: ../multiload/properties.c:642
+msgid "Network speed thresholds"
+msgstr "網路速度閾值"
+
+#: ../multiload/properties.c:671
+msgid "Threshold 1: "
+msgstr "閾值 1："
+
+#: ../multiload/properties.c:702 ../multiload/properties.c:737
+#: ../multiload/properties.c:772 ../netspeed/src/netspeed.c:432
+msgid "bytes"
+msgstr "個位元組"
+
+#: ../multiload/properties.c:710
+msgid "Threshold 2: "
+msgstr "閾值 2："
+
+#: ../multiload/properties.c:745
+msgid "Threshold 3: "
+msgstr "閾值 3："
+
+#: ../multiload/properties.c:810
 msgid "System Monitor Preferences"
 msgstr "系統監控程式偏好設定"
 
@@ -1703,260 +1721,267 @@ msgid "Network Monitor"
 msgstr "網路監視器"
 
 #. translators: bits (short)
-#: ../netspeed/src/netspeed.c:389
+#: ../netspeed/src/netspeed.c:427
 msgid "b"
 msgstr "位元"
 
 #. translators: Bytes (short)
-#: ../netspeed/src/netspeed.c:389
+#: ../netspeed/src/netspeed.c:427
 msgid "B"
 msgstr "位元組"
 
-#: ../netspeed/src/netspeed.c:391
+#: ../netspeed/src/netspeed.c:429
 msgid "b/s"
 msgstr "位元/秒"
 
-#: ../netspeed/src/netspeed.c:391
+#: ../netspeed/src/netspeed.c:429
 msgid "B/s"
 msgstr "位元組/秒"
 
-#: ../netspeed/src/netspeed.c:394
+#: ../netspeed/src/netspeed.c:432
 msgid "bits"
 msgstr "位元"
 
-#: ../netspeed/src/netspeed.c:394
-msgid "bytes"
-msgstr "個位元組"
-
 #. translators: kilobits (short)
-#: ../netspeed/src/netspeed.c:402
+#: ../netspeed/src/netspeed.c:440
 msgid "k"
 msgstr "k"
 
 #. translators: Kilobytes (short)
-#: ../netspeed/src/netspeed.c:402
+#: ../netspeed/src/netspeed.c:440
 msgid "K"
 msgstr "K"
 
-#: ../netspeed/src/netspeed.c:404
+#: ../netspeed/src/netspeed.c:442
 msgid "kb/s"
 msgstr "kb/s"
 
-#: ../netspeed/src/netspeed.c:404
+#: ../netspeed/src/netspeed.c:442
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: ../netspeed/src/netspeed.c:407
+#: ../netspeed/src/netspeed.c:445
 msgid "kb"
 msgstr "kb"
 
-#: ../netspeed/src/netspeed.c:407
+#: ../netspeed/src/netspeed.c:445
 msgid "KiB"
 msgstr "KiB"
 
 #. translators: megabits (short)
-#: ../netspeed/src/netspeed.c:417
+#: ../netspeed/src/netspeed.c:455
 msgid "m"
 msgstr "m"
 
 #. translators: Megabytes (short)
-#: ../netspeed/src/netspeed.c:417
+#: ../netspeed/src/netspeed.c:455
 msgid "M"
 msgstr "M"
 
-#: ../netspeed/src/netspeed.c:419
+#: ../netspeed/src/netspeed.c:457
 msgid "Mb/s"
 msgstr "Mb/秒"
 
-#: ../netspeed/src/netspeed.c:419
+#: ../netspeed/src/netspeed.c:457
 msgid "MiB/s"
 msgstr "MiB/s"
 
-#: ../netspeed/src/netspeed.c:422
+#: ../netspeed/src/netspeed.c:460
 msgid "Mb"
 msgstr "Mb"
 
-#: ../netspeed/src/netspeed.c:422
+#: ../netspeed/src/netspeed.c:460
 msgid "MiB"
 msgstr "MiB"
 
-#: ../netspeed/src/netspeed.c:761
+#: ../netspeed/src/netspeed.c:791
 #, c-format
 msgid ""
 "There was an error displaying help:\n"
 "%s"
-msgstr "出現了錯誤顯示說明：\n%s"
+msgstr ""
+"出現了錯誤顯示說明：\n"
+"%s"
 
-#: ../netspeed/src/netspeed.c:805
+#: ../netspeed/src/netspeed.c:835
 msgid ""
 "A little applet that displays some information on the traffic on the "
 "specified network device"
 msgstr "會顯示在指定網路裝置上流量的某些資訊的小型程式"
 
-#: ../netspeed/src/netspeed.c:966
+#: ../netspeed/src/netspeed.c:996
 msgid "Mate Netspeed Preferences"
 msgstr "Mate Netspeed 偏好設定"
 
-#: ../netspeed/src/netspeed.c:988
+#: ../netspeed/src/netspeed.c:1018
 msgid "General Settings"
 msgstr "一般設定"
 
-#: ../netspeed/src/netspeed.c:1014
+#: ../netspeed/src/netspeed.c:1040
 msgid "Network _device:"
 msgstr "網路裝置(_D)："
 
 #. Default means device with default route set
-#: ../netspeed/src/netspeed.c:1030
+#: ../netspeed/src/netspeed.c:1052
 msgid "Default"
 msgstr "預設值"
 
-#: ../netspeed/src/netspeed.c:1043
+#: ../netspeed/src/netspeed.c:1065
 msgid "Show _sum instead of in & out"
 msgstr "顯示總和以代替連入 & 連出(_S)"
 
-#: ../netspeed/src/netspeed.c:1047
+#: ../netspeed/src/netspeed.c:1069
 msgid "Show _bits instead of bytes"
 msgstr "顯示位元以代替位元組(_B)"
 
-#: ../netspeed/src/netspeed.c:1051
+#: ../netspeed/src/netspeed.c:1073
 msgid "Shorten _unit legend"
 msgstr "縮短單位說明(_U)"
 
-#: ../netspeed/src/netspeed.c:1055
+#: ../netspeed/src/netspeed.c:1077
 msgid "_Change icon according to the selected device"
 msgstr "根據已選裝置變更圖示(_C)"
 
-#: ../netspeed/src/netspeed.c:1059
+#: ../netspeed/src/netspeed.c:1081
 msgid "Show _icon"
 msgstr "顯示圖示(_I)"
 
-#: ../netspeed/src/netspeed.c:1063
+#: ../netspeed/src/netspeed.c:1085
 msgid "Show signal _quality icon for wireless devices"
 msgstr "顯示無線網路裝置的訊號品質圖示(_Q)"
 
-#: ../netspeed/src/netspeed.c:1181
+#: ../netspeed/src/netspeed.c:1203
 #, c-format
 msgid "Device Details for %s"
 msgstr "關於 %s 的裝置詳細資訊"
 
-#: ../netspeed/src/netspeed.c:1206
+#: ../netspeed/src/netspeed.c:1228
 msgid "_In graph color"
 msgstr "連入的圖形顏色(_I)"
 
-#: ../netspeed/src/netspeed.c:1207
+#: ../netspeed/src/netspeed.c:1229
 msgid "_Out graph color"
 msgstr "連出的圖形顏色(_O)"
 
-#: ../netspeed/src/netspeed.c:1223
+#: ../netspeed/src/netspeed.c:1245
 msgid "Internet Address:"
 msgstr "網際網路位址："
 
-#: ../netspeed/src/netspeed.c:1224
+#: ../netspeed/src/netspeed.c:1246
 msgid "Netmask:"
 msgstr "網路遮罩："
 
-#: ../netspeed/src/netspeed.c:1225
+#: ../netspeed/src/netspeed.c:1247
 msgid "Hardware Address:"
 msgstr "硬體位址："
 
-#: ../netspeed/src/netspeed.c:1226
+#: ../netspeed/src/netspeed.c:1248
 msgid "P-t-P Address:"
 msgstr "P-t-P 位址："
 
-#: ../netspeed/src/netspeed.c:1227
+#: ../netspeed/src/netspeed.c:1249
 msgid "Bytes in:"
 msgstr "位元組連入："
 
-#: ../netspeed/src/netspeed.c:1228
+#: ../netspeed/src/netspeed.c:1250
 msgid "Bytes out:"
 msgstr "位元組連出："
 
-#: ../netspeed/src/netspeed.c:1230 ../netspeed/src/netspeed.c:1231
-#: ../netspeed/src/netspeed.c:1232 ../netspeed/src/netspeed.c:1233
+#: ../netspeed/src/netspeed.c:1252 ../netspeed/src/netspeed.c:1253
+#: ../netspeed/src/netspeed.c:1254 ../netspeed/src/netspeed.c:1255
 msgid "none"
 msgstr "無"
 
-#: ../netspeed/src/netspeed.c:1299
+#: ../netspeed/src/netspeed.c:1306
 msgid "IPV6 Address:"
 msgstr "IPV6 位址："
 
-#: ../netspeed/src/netspeed.c:1337
+#: ../netspeed/src/netspeed.c:1339
 msgid "Signal Strength:"
 msgstr "訊號強度："
 
-#: ../netspeed/src/netspeed.c:1338
+#: ../netspeed/src/netspeed.c:1340
 msgid "ESSID:"
 msgstr "ESSID："
 
-#: ../netspeed/src/netspeed.c:1385
+#: ../netspeed/src/netspeed.c:1381
 msgid "Device _Details"
 msgstr "裝置詳細資訊(_D)"
 
-#: ../netspeed/src/netspeed.c:1387
+#: ../netspeed/src/netspeed.c:1383
 msgid "Preferences..."
 msgstr "偏好設定…"
 
-#: ../netspeed/src/netspeed.c:1389
+#: ../netspeed/src/netspeed.c:1385
 msgid "Help"
-msgstr "求助"
+msgstr "說明"
 
-#: ../netspeed/src/netspeed.c:1391
+#: ../netspeed/src/netspeed.c:1387
 msgid "About..."
 msgstr "關於…"
 
-#: ../netspeed/src/netspeed.c:1432
+#: ../netspeed/src/netspeed.c:1428
 #, c-format
 msgid "Do you want to disconnect %s now?"
 msgstr "您現在要中斷連線 %s 嗎？"
 
-#: ../netspeed/src/netspeed.c:1436
+#: ../netspeed/src/netspeed.c:1432
 #, c-format
 msgid "Do you want to connect %s now?"
 msgstr "您現在要連線 %s 嗎？"
 
-#: ../netspeed/src/netspeed.c:1463
+#: ../netspeed/src/netspeed.c:1459
 #, c-format
 msgid ""
 "<b>Running command %s failed</b>\n"
 "%s"
-msgstr "<b>執行命令 %s 失敗</b>\n%s"
+msgstr ""
+"<b>執行命令 %s 失敗</b>\n"
+"%s"
 
-#: ../netspeed/src/netspeed.c:1522
+#: ../netspeed/src/netspeed.c:1518
 #, c-format
 msgid "%s is down"
 msgstr "%s 已停止"
 
-#: ../netspeed/src/netspeed.c:1527
+#: ../netspeed/src/netspeed.c:1523
 #, c-format
 msgid ""
 "%s: %s\n"
 "in: %s out: %s"
-msgstr "%s：%s\n連入：%s 連出：%s"
+msgstr ""
+"%s：%s\n"
+"連入：%s 連出：%s"
 
-#: ../netspeed/src/netspeed.c:1529 ../netspeed/src/netspeed.c:1538
+#: ../netspeed/src/netspeed.c:1525 ../netspeed/src/netspeed.c:1534
 msgid "has no ip"
 msgstr "沒有任何 ip"
 
-#: ../netspeed/src/netspeed.c:1536
+#: ../netspeed/src/netspeed.c:1532
 #, c-format
 msgid ""
 "%s: %s\n"
 "sum: %s"
-msgstr "%s：%s\n總和：%s"
+msgstr ""
+"%s：%s\n"
+"總和：%s"
 
-#: ../netspeed/src/netspeed.c:1545
+#: ../netspeed/src/netspeed.c:1541
 #, c-format
 msgid ""
 "\n"
 "ESSID: %s\n"
 "Strength: %d %%"
-msgstr "\nESSID：%s\n強度：%d %%"
+msgstr ""
+"\n"
+"ESSID：%s\n"
+"強度：%d %%"
 
-#: ../netspeed/src/netspeed.c:1546
+#: ../netspeed/src/netspeed.c:1542
 msgid "unknown"
 msgstr "不明"
 
-#: ../netspeed/src/netspeed.c:1597
+#: ../netspeed/src/netspeed.c:1593
 msgid "Mate Netspeed"
 msgstr "Mate Netspeed"
 
@@ -1965,8 +1990,8 @@ msgid "Sticky Notes Applet Factory"
 msgstr "便條面板程式工廠"
 
 #: ../stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in.h:2
-#: ../stickynotes/stickynotes_applet.c:164
-#: ../stickynotes/stickynotes_applet.c:406
+#: ../stickynotes/stickynotes_applet.c:170
+#: ../stickynotes/stickynotes_applet.c:412
 msgid "Sticky Notes"
 msgstr "便條"
 
@@ -1974,11 +1999,11 @@ msgstr "便條"
 msgid "Create, view, and manage sticky notes on the desktop"
 msgstr "在桌面中製作、顯示和管理便條"
 
-#: ../stickynotes/stickynotes.c:583
+#: ../stickynotes/stickynotes.c:576
 msgid "This note is locked."
 msgstr "這便條已鎖定。"
 
-#: ../stickynotes/stickynotes.c:587
+#: ../stickynotes/stickynotes.c:580
 msgid "This note is unlocked."
 msgstr "這便條未上鎖。"
 
@@ -2060,7 +2085,7 @@ msgstr "寬度(_W):"
 
 #: ../stickynotes/stickynotes.ui.h:20
 msgid "Behavior"
-msgstr "項目行為"
+msgstr "運作方式"
 
 #: ../stickynotes/stickynotes.ui.h:21
 msgid "Hide notes when the des_ktop is clicked on"
@@ -2164,7 +2189,7 @@ msgstr "指定便條的標題"
 
 #: ../stickynotes/stickynotes.ui.h:46
 msgid "_Title:"
-msgstr "標題(_T):"
+msgstr "職稱(_T):"
 
 #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:1
 msgid "Default width for new notes"
@@ -2301,17 +2326,17 @@ msgstr "刪除便條(_D)"
 msgid "_Lock Notes"
 msgstr "鎖定便條(_L)"
 
-#: ../stickynotes/stickynotes_applet.c:582
+#: ../stickynotes/stickynotes_applet.c:591
 #, c-format
 msgid "%d note"
 msgid_plural "%d notes"
 msgstr[0] "%d 張便條"
 
-#: ../stickynotes/stickynotes_applet.c:583
+#: ../stickynotes/stickynotes_applet.c:592
 msgid "Show sticky notes"
 msgstr "顯示便條"
 
-#: ../stickynotes/stickynotes_applet_callbacks.c:385
+#: ../stickynotes/stickynotes_applet_callbacks.c:379
 msgid "Sticky Notes for the MATE Desktop Environment"
 msgstr "適用於 MATE 桌面環境的便條程式"
 
@@ -2372,27 +2397,27 @@ msgstr "計時器小程式偏好設定"
 msgid "Name:"
 msgstr "名稱："
 
-#: ../timerapplet/timerapplet.c:318
+#: ../timerapplet/timerapplet.c:314
 msgid "Hours:"
 msgstr "小時："
 
-#: ../timerapplet/timerapplet.c:333
+#: ../timerapplet/timerapplet.c:325
 msgid "Minutes:"
 msgstr "分鐘："
 
-#: ../timerapplet/timerapplet.c:348
+#: ../timerapplet/timerapplet.c:336
 msgid "Seconds:"
 msgstr "秒鐘："
 
-#: ../timerapplet/timerapplet.c:363
+#: ../timerapplet/timerapplet.c:347
 msgid "Show notification popup"
 msgstr "顯示彈出通知"
 
-#: ../timerapplet/timerapplet.c:367
+#: ../timerapplet/timerapplet.c:351
 msgid "Show dialog"
 msgstr "顯示對話框"
 
-#: ../timerapplet/timerapplet.c:389
+#: ../timerapplet/timerapplet.c:373
 msgid "Timer Applet"
 msgstr "計時器小程式"
 
@@ -2422,33 +2447,35 @@ msgstr[0] "回收筒中有 %d 個項目"
 msgid "No Items in Trash"
 msgstr "回收筒中沒有任何項目"
 
-#: ../trashapplet/src/trashapplet.c:385
+#: ../trashapplet/src/trashapplet.c:378
 #, c-format
 msgid ""
 "Error while spawning caja:\n"
 "%s"
-msgstr "當執行 caja 時發生錯誤：\n%s"
+msgstr ""
+"當執行 caja 時發生錯誤：\n"
+"%s"
 
-#: ../trashapplet/src/trashapplet.c:446
+#: ../trashapplet/src/trashapplet.c:432
 msgid ""
 "A MATE trash bin that lives in your panel. You can use it to view the trash "
 "or drag and drop items into the trash."
 msgstr "面板上的回收筒。您可以用它來查看回收筒及將項目拖曳進去。"
 
-#: ../trashapplet/src/trashapplet.c:471
+#: ../trashapplet/src/trashapplet.c:457
 msgid "Delete Immediately?"
 msgstr "立即刪除？"
 
-#: ../trashapplet/src/trashapplet.c:501
+#: ../trashapplet/src/trashapplet.c:487
 msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr "無法將項目丟到回收筒，要立即刪除它嗎？"
 
-#: ../trashapplet/src/trashapplet.c:506
+#: ../trashapplet/src/trashapplet.c:492
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr "有些項目無法丟到回收筒，要立即刪除它嗎？"
 
-#: ../trashapplet/src/trashapplet.c:644
+#: ../trashapplet/src/trashapplet.c:622
 msgid "Trash Applet"
 msgstr "回收筒面板程式"
 
@@ -2480,4 +2507,4 @@ msgstr "正在清理回收筒"
 
 #: ../trashapplet/trashapplet-empty-progress.ui.h:2
 msgid "From:"
-msgstr "從："
+msgstr "從:"