Sync translations from transifex (for real this time... tx pull -a --minimum-perc=1 -f)

1 files changed, 617 insertions, 556 deletions

diff --git a/po/cmn.po b/po/cmn.po
index e8856476..f6ed50f7 100644
--- a/po/cmn.po
+++ b/po/cmn.po
@@ -5,23 +5,23 @@
 # Translators:
 # Chao-Hsiung Liao <[email protected]> , 2008
 # Jing-Jong Shyue <[email protected]>, 2000
-# Wei-Lun Chao <[email protected]>, 2012-2013
+# 趙惟倫 <[email protected]>, 2012-2013
 # Yuan-Chung Cheng <[email protected]>, 1999
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-03 18:28+0100\n"
-"PO-Revision-Date: 2014-02-03 18:03+0000\n"
-"Last-Translator: Stefano Karapetsas <[email protected]>\n"
-"Language-Team: Chinese (Mandarin) (http://www.transifex.com/projects/p/MATE/language/cmn/)\n"
+"POT-Creation-Date: 2015-11-06 15:28+0300\n"
+"PO-Revision-Date: 2015-09-06 19:57+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Chinese (Mandarin) (http://www.transifex.com/mate/MATE/language/cmn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cmn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../accessx-status/applet.c:145
+#: ../accessx-status/applet.c:147
 msgid "Shows the state of AccessX features such as latched modifiers"
 msgstr "顯示無障礙環境鍵盤的狀態"
 
@@ -30,84 +30,85 @@ msgstr "顯示無障礙環境鍵盤的狀態"
 #. about.set_artists([])
 #. about.set_documenters([])
 #. translators: These appear in the About dialog, usual format applies.
-#. "documenters",        documenters,
-#: ../accessx-status/applet.c:149 ../battstat/battstat_applet.c:1438
-#: ../charpick/charpick.c:600 ../command/command.c:111
-#: ../cpufreq/src/cpufreq-applet.c:697 ../drivemount/drivemount.c:121
-#: ../geyes/geyes.c:201 ../mateweather/mateweather-about.c:52
-#: ../invest-applet/invest/about.py:34 ../modemlights/modem-applet.c:1023
-#: ../multiload/main.c:70 ../stickynotes/stickynotes_applet_callbacks.c:443
-#: ../timerapplet/timerapplet.c:254 ../trashapplet/src/trashapplet.c:446
+#: ../accessx-status/applet.c:151 ../battstat/battstat_applet.c:1214
+#: ../charpick/charpick.c:651 ../command/command.c:115
+#: ../cpufreq/src/cpufreq-applet.c:711 ../drivemount/drivemount.c:122
+#: ../geyes/geyes.c:173 ../mateweather/mateweather-about.c:54
+#: ../invest-applet/invest/about.py:34 ../multiload/main.c:70
+#: ../stickynotes/stickynotes_applet_callbacks.c:379
+#: ../timerapplet/timerapplet.c:260 ../trashapplet/src/trashapplet.c:437
 msgid "translator-credits"
 msgstr "趙惟倫 <[email protected]>, 2012-2013\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:165
+#: ../accessx-status/applet.c:167
 #, c-format
 msgid "There was an error launching the help viewer: %s"
 msgstr "啟動說明文件瀏覽器時出現錯誤：%s"
 
-#: ../accessx-status/applet.c:204
+#: ../accessx-status/applet.c:195
+msgid "Open the keyboard preferences dialog"
+msgstr ""
+
+#: ../accessx-status/applet.c:209
 #, c-format
 msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "啟動鍵盤偏好設定對話方塊時出現錯誤：%s"
 
-#: ../accessx-status/applet.c:217
+#: ../accessx-status/applet.c:224
 msgid "_Keyboard Accessibility Preferences"
 msgstr "無障礙環境鍵盤偏好設定(_K)"
 
-#: ../accessx-status/applet.c:218 ../battstat/battstat_applet.c:64
-#: ../charpick/charpick.c:681 ../cpufreq/src/cpufreq-applet.c:139
-#: ../drivemount/drivemount.c:157 ../geyes/geyes.c:375
-#: ../mateweather/mateweather-applet.c:126 ../modemlights/modem-applet.c:151
-#: ../multiload/main.c:451 ../stickynotes/stickynotes_applet.c:45
-#: ../trashapplet/src/trashapplet.c:77
+#: ../accessx-status/applet.c:225 ../battstat/battstat_applet.c:71
+#: ../charpick/charpick.c:732 ../cpufreq/src/cpufreq-applet.c:138
+#: ../drivemount/drivemount.c:160 ../geyes/geyes.c:343
+#: ../mateweather/mateweather-applet.c:122 ../multiload/main.c:464
+#: ../stickynotes/stickynotes_applet.c:45 ../trashapplet/src/trashapplet.c:80
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../accessx-status/applet.c:219 ../battstat/battstat_applet.c:67
-#: ../charpick/charpick.c:684 ../command/command.c:74
-#: ../cpufreq/src/cpufreq-applet.c:142 ../drivemount/drivemount.c:160
-#: ../geyes/geyes.c:378 ../mateweather/mateweather-applet.c:129
-#: ../modemlights/modem-applet.c:154 ../multiload/main.c:454
-#: ../stickynotes/stickynotes_applet.c:48 ../timerapplet/timerapplet.c:81
-#: ../trashapplet/src/trashapplet.c:80
+#: ../accessx-status/applet.c:226 ../battstat/battstat_applet.c:74
+#: ../charpick/charpick.c:735 ../command/command.c:78
+#: ../cpufreq/src/cpufreq-applet.c:141 ../drivemount/drivemount.c:163
+#: ../geyes/geyes.c:346 ../mateweather/mateweather-applet.c:125
+#: ../multiload/main.c:467 ../stickynotes/stickynotes_applet.c:48
+#: ../timerapplet/timerapplet.c:86 ../trashapplet/src/trashapplet.c:83
 msgid "_About"
 msgstr "關於(_A)"
 
 #. Note to translators: the first letter of the alphabet, not the indefinite
 #. article
-#: ../accessx-status/applet.c:521 ../accessx-status/applet.c:555
+#: ../accessx-status/applet.c:503 ../accessx-status/applet.c:537
 msgid "a"
 msgstr "a"
 
-#: ../accessx-status/applet.c:1038 ../accessx-status/applet.c:1104
-#: ../accessx-status/applet.c:1174 ../accessx-status/applet.c:1389
+#: ../accessx-status/applet.c:1020 ../accessx-status/applet.c:1086
+#: ../accessx-status/applet.c:1159 ../accessx-status/applet.c:1333
 msgid "AccessX Status"
 msgstr "無障礙環境狀態"
 
-#: ../accessx-status/applet.c:1039 ../accessx-status/applet.c:1175
+#: ../accessx-status/applet.c:1021 ../accessx-status/applet.c:1160
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "啟用無障礙環境功能時顯示鍵盤狀態。"
 
-#: ../accessx-status/applet.c:1074
+#: ../accessx-status/applet.c:1056
 msgid "XKB Extension is not enabled"
 msgstr "並未啟用 XKB 延伸功能"
 
-#: ../accessx-status/applet.c:1079
+#: ../accessx-status/applet.c:1061
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../accessx-status/applet.c:1083
+#: ../accessx-status/applet.c:1065
 #, c-format
 msgid "Error: %s"
 msgstr "錯誤：%s"
 
-#: ../accessx-status/applet.c:1386
+#: ../accessx-status/applet.c:1330
 #: ../accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in.h:3
 msgid "Keyboard Accessibility Status"
 msgstr "無障礙環境鍵盤狀態"
 
-#: ../accessx-status/applet.c:1390
+#: ../accessx-status/applet.c:1334
 msgid "Displays current state of keyboard accessibility features"
 msgstr "顯示目前的無障礙環境鍵盤狀態"
 
@@ -123,56 +124,56 @@ msgstr "無障礙環境鍵盤狀態面板程式工廠"
 msgid "Shows the status of keyboard accessibility features"
 msgstr "顯示無障礙環境鍵盤狀態"
 
-#: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:678
-#: ../command/command.c:73 ../cpufreq/src/cpufreq-applet.c:136
-#: ../geyes/geyes.c:372 ../mateweather/mateweather-applet.c:123
-#: ../multiload/main.c:445 ../stickynotes/stickynotes_applet.c:42
-#: ../timerapplet/timerapplet.c:80
+#: ../battstat/battstat_applet.c:68 ../charpick/charpick.c:729
+#: ../command/command.c:77 ../cpufreq/src/cpufreq-applet.c:135
+#: ../geyes/geyes.c:340 ../mateweather/mateweather-applet.c:119
+#: ../multiload/main.c:458 ../stickynotes/stickynotes_applet.c:42
+#: ../timerapplet/timerapplet.c:85
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../battstat/battstat_applet.c:72
+#: ../battstat/battstat_applet.c:79
 msgid "System is running on AC power"
 msgstr "系統正在使用交流電"
 
-#: ../battstat/battstat_applet.c:73
+#: ../battstat/battstat_applet.c:80
 msgid "System is running on battery power"
 msgstr "系統正在使用電池"
 
-#: ../battstat/battstat_applet.c:411
+#: ../battstat/battstat_applet.c:346
 #, c-format
 msgid "Battery charged (%d%%)"
 msgstr "電池已充電 (%d%%)"
 
-#: ../battstat/battstat_applet.c:413
+#: ../battstat/battstat_applet.c:348
 #, c-format
 msgid "Unknown time (%d%%) remaining"
 msgstr "無法決定可使用時間，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:415
+#: ../battstat/battstat_applet.c:350
 #, c-format
 msgid "Unknown time (%d%%) until charged"
 msgstr "無法決定充電所需時間，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:420
+#: ../battstat/battstat_applet.c:355
 #, c-format
 msgid "%d minute (%d%%) remaining"
 msgid_plural "%d minutes (%d%%) remaining"
 msgstr[0] "可使用 %d 分鐘，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:425
+#: ../battstat/battstat_applet.c:360
 #, c-format
 msgid "%d minute until charged (%d%%)"
 msgid_plural "%d minutes until charged (%d%%)"
 msgstr[0] "距離完全充電還有 %d 分鐘，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:431
+#: ../battstat/battstat_applet.c:366
 #, c-format
 msgid "%d hour (%d%%) remaining"
 msgid_plural "%d hours (%d%%) remaining"
 msgstr[0] "可使用 %d 小時，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:436
+#: ../battstat/battstat_applet.c:371
 #, c-format
 msgid "%d hour until charged (%d%%)"
 msgid_plural "%d hours until charged (%d%%)"
@@ -180,47 +181,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:443
+#: ../battstat/battstat_applet.c:378
 #, c-format
 msgid "%d %s %d %s (%d%%) remaining"
 msgstr "可使用 %d %s %d %s，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:444 ../battstat/battstat_applet.c:451
+#: ../battstat/battstat_applet.c:379 ../battstat/battstat_applet.c:386
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../battstat/battstat_applet.c:445 ../battstat/battstat_applet.c:452
+#: ../battstat/battstat_applet.c:380 ../battstat/battstat_applet.c:387
 msgid "minute"
 msgid_plural "minutes"
 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:450
+#: ../battstat/battstat_applet.c:385
 #, c-format
 msgid "%d %s %d %s until charged (%d%%)"
 msgstr "距離完全充電還有 %d %s %d %s，剩餘電量 %d%%"
 
-#: ../battstat/battstat_applet.c:464
+#: ../battstat/battstat_applet.c:399
 msgid "Battery Monitor"
 msgstr "電池電量監控程式"
 
-#: ../battstat/battstat_applet.c:474 ../battstat/battstat_applet.c:542
+#: ../battstat/battstat_applet.c:409 ../battstat/battstat_applet.c:468
 msgid "Your battery is now fully recharged"
 msgstr "電池已完成充電"
 
-#: ../battstat/battstat_applet.c:510 ../battstat/battstat_applet.c:674
+#: ../battstat/battstat_applet.c:445 ../battstat/battstat_applet.c:604
 msgid "Battery Notice"
 msgstr "電池狀態通知"
 
 #. we don't know the remaining time
-#: ../battstat/battstat_applet.c:619
+#: ../battstat/battstat_applet.c:549
 #, c-format
 msgid "You have %d%% of your total battery capacity remaining."
 msgstr "您的電池總電量剩下 %d%%。"
 
-#: ../battstat/battstat_applet.c:625
+#: ../battstat/battstat_applet.c:555
 #, c-format
 msgid ""
 "You have %d minute of battery power remaining (%d%% of the total capacity)."
@@ -231,7 +232,7 @@ 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:637
+#: ../battstat/battstat_applet.c:567
 msgid ""
 "To avoid losing your work:\n"
 " • plug your laptop into external power, or\n"
@@ -241,7 +242,7 @@ msgstr "為了避免您的工作遺失：\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:645
+#: ../battstat/battstat_applet.c:575
 msgid ""
 "To avoid losing your work:\n"
 " • suspend your laptop to save power,\n"
@@ -249,58 +250,53 @@ msgid ""
 " • save open documents and shut your laptop down."
 msgstr "為了避免您的工作遺失：\n • 暫停筆電來節省用電，\n • 替筆電插上外部電源，或\n • 儲存已開啟的文件及關機。"
 
-#: ../battstat/battstat_applet.c:653
+#: ../battstat/battstat_applet.c:583
 msgid "Your battery is running low"
 msgstr "電池電量甚低"
 
-#: ../battstat/battstat_applet.c:756
+#: ../battstat/battstat_applet.c:678
 msgid "No battery present"
 msgstr "電池不存在"
 
-#: ../battstat/battstat_applet.c:759
+#: ../battstat/battstat_applet.c:681
 msgid "Battery status unknown"
 msgstr "電池狀態不詳"
 
-#: ../battstat/battstat_applet.c:1014
+#: ../battstat/battstat_applet.c:861
 msgid "N/A"
 msgstr "不適用"
 
-#: ../battstat/battstat_applet.c:1383 ../drivemount/drivemount.c:145
-#: ../geyes/geyes.c:360 ../geyes/themes.c:230
-#: ../mateweather/mateweather-applet.c:72
-#: ../mateweather/mateweather-pref.c:758
-#: ../stickynotes/stickynotes_applet_callbacks.c:409
-#: ../stickynotes/stickynotes_applet_callbacks.c:602
-#: ../trashapplet/src/trashapplet.c:413
+#: ../battstat/battstat_applet.c:1161 ../drivemount/drivemount.c:148
+#: ../geyes/geyes.c:328 ../geyes/themes.c:227
+#: ../mateweather/mateweather-applet.c:68
+#: ../mateweather/mateweather-pref.c:763
+#: ../stickynotes/stickynotes_applet_callbacks.c:345
+#: ../stickynotes/stickynotes_applet_callbacks.c:546
+#: ../trashapplet/src/trashapplet.c:404
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "顯示說明文件時出現錯誤：%s"
 
-#: ../battstat/battstat_applet.c:1423
+#: ../battstat/battstat_applet.c:1201
 msgid "This utility shows the status of your laptop battery."
 msgstr "本公用程式可以顯示筆電的電池狀態。"
 
-#. ture
-#: ../battstat/battstat_applet.c:1425
+#. true
+#: ../battstat/battstat_applet.c:1203
 msgid "upower backend enabled."
 msgstr "已啟用 upower 後端。"
 
-#. true
-#: ../battstat/battstat_applet.c:1427
-msgid "HAL backend enabled."
-msgstr "已啟用 HAL 後端。"
-
 #. false
-#: ../battstat/battstat_applet.c:1428
-msgid "Legacy (non-HAL) backend enabled."
-msgstr "已啟用舊的（非 HAL）後端。"
+#: ../battstat/battstat_applet.c:1204
+msgid "Legacy backend enabled."
+msgstr ""
 
-#: ../battstat/battstat_applet.c:1809 ../battstat/battstat_applet.c:1864
+#: ../battstat/battstat_applet.c:1578 ../battstat/battstat_applet.c:1630
 #: ../battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in.h:2
 msgid "Battery Charge Monitor"
 msgstr "電池電量監控程式"
 
-#: ../battstat/battstat_applet.c:1865
+#: ../battstat/battstat_applet.c:1631
 #: ../battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in.h:3
 msgid "Monitor a laptop's remaining power"
 msgstr "監控筆電的剩餘電量"
@@ -355,113 +351,88 @@ msgstr "當電量下降至剩餘(_W)"
 msgid "_Notify when battery is fully recharged"
 msgstr "當完全充電後發出通知(_N)"
 
-#: ../battstat/battstat-hal.c:343 ../battstat/battstat-hal.c:368
-msgid "HAL error"
-msgstr "HAL 錯誤"
-
-#: ../battstat/battstat-hal.c:343
-msgid "Could not create libhal_ctx"
-msgstr "無法建立 libhal_ctx"
-
-#: ../battstat/battstat-hal.c:368
-msgid "No batteries found"
-msgstr "找不到電池"
-
-#: ../battstat/battstat-hal.c:417
-#, c-format
-msgid "Unable to initialise HAL: %s: %s"
-msgstr "無法初始化 HAL：%s：%s"
-
 #: ../battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in.h:1
 msgid "Battstat Factory"
 msgstr "Battstat 工廠"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:1
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:1
 msgid "Red value level"
 msgstr "紅色表示電量"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:2
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:2
 msgid ""
 "The battery level below which the battery is displayed as red. Also the "
 "value at which the low battery warning is displayed."
 msgstr "電池電量低於這個數值時會顯示為紅色。同樣低於這個數值時會發出警告。"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:3
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:3
 msgid "Warn on low time rather than low percentage"
 msgstr "以低剩餘時間發出警告，而非以電量的低百分比"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:4
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:4
 msgid ""
 "Use the value defined in red_value as a time remaining to show the warning "
 "dialog rather than a percentage."
 msgstr "使用 red_value 定義的數值作為剩餘時間顯示警告對話方塊，而非以電量的百分比。"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:5
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:5
 msgid "Low Battery Notification"
 msgstr "電量太低時發出通知"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:6
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:6
 msgid "Notify user when the battery is low."
 msgstr "當電量太低時通知使用者。"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:7
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:7
 msgid "Full Battery Notification"
 msgstr "電量全滿時發出通知"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:8
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:8
 msgid "Notify user when the battery is full."
 msgstr "當充電完成後通知使用者。"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:9
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:9
 msgid "Beep for warnings"
 msgstr "顯示訊息時發出聲響"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:10
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:10
 msgid "Beep when displaying a warning."
 msgstr "顯示訊息時同時發出聲響。"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:11
+#: ../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.in.h:12
+#: ../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.in.h:13
+#: ../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.in.h:14
+#: ../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.in.h:15
+#: ../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.in.h:16
+#: ../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.in.h:17
+#: ../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.in.h:18
+#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.h:18
 msgid "0 for no label, 1 for percentage and 2 for time remaining."
 msgstr "「0」則沒有標籤，「1」則顯示百分比，「2」則顯示剩餘時間。"
 
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:19
-msgid "Disable HAL"
-msgstr ""
-
-#: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:20
-msgid "Disable HAL if true"
-msgstr ""
-
 #. TRANSLATOR: this is a selectable item in a drop-down menu to end
 #. * this sentence:
 #. *   "Warn when battery charge drops to: [XX] percent".
@@ -488,40 +459,40 @@ msgstr "電池電量過低"
 msgid "Battery fully re-charged"
 msgstr "電池電量全滿"
 
-#: ../charpick/charpick.c:426
+#: ../charpick/charpick.c:470
 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:473
+#: ../charpick/charpick.c:517
 #, c-format
 msgid "Insert \"%s\""
 msgstr "插入“%s”"
 
-#: ../charpick/charpick.c:476
+#: ../charpick/charpick.c:520
 msgid "Insert special character"
 msgstr "插入特殊字元"
 
-#: ../charpick/charpick.c:480
+#: ../charpick/charpick.c:524
 #, c-format
 msgid "insert special character %s"
 msgstr "插入特殊字元 %s"
 
-#: ../charpick/charpick.c:595
+#: ../charpick/charpick.c:646
 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:707 ../charpick/charpick.c:721
+#: ../charpick/charpick.c:758 ../charpick/charpick.c:772
 #: ../charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in.h:2
-#: ../charpick/properties.c:451
+#: ../charpick/properties.c:456
 msgid "Character Palette"
 msgstr "字元選擇盤"
 
-#: ../charpick/charpick.c:707
+#: ../charpick/charpick.c:758
 #: ../charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in.h:3
 msgid "Insert characters"
 msgstr "加入字元"
@@ -530,127 +501,139 @@ msgstr "加入字元"
 msgid "Charpicker Applet Factory"
 msgstr "字元選擇面板程式工廠"
 
-#: ../charpick/org.mate.panel.applet.charpick.gschema.xml.in.in.h:1
+#: ../charpick/org.mate.panel.applet.charpick.gschema.xml.in.h:1
 msgid "Characters shown on applet startup"
 msgstr "面板程式啟動時所顯示的字元"
 
-#: ../charpick/org.mate.panel.applet.charpick.gschema.xml.in.in.h:2
+#: ../charpick/org.mate.panel.applet.charpick.gschema.xml.in.h:2
 msgid ""
 "The string that the user had selected when the applet was last used. This "
 "string will be displayed when the user starts the applet."
 msgstr "這是使用者在上次啟動面板程式時選擇的字串。使用者下次啟動面板程式時會再顯示這個字串。"
 
-#: ../charpick/org.mate.panel.applet.charpick.gschema.xml.in.in.h:3
-#: ../charpick/properties.c:378
+#: ../charpick/org.mate.panel.applet.charpick.gschema.xml.in.h:3
+#: ../charpick/properties.c:383
 msgid "List of available palettes"
 msgstr "可供選用的選字盤"
 
-#: ../charpick/org.mate.panel.applet.charpick.gschema.xml.in.in.h:4
+#: ../charpick/org.mate.panel.applet.charpick.gschema.xml.in.h:4
 msgid "List of strings containing the available palettes."
 msgstr "列出所有可供選用的選字盤。"
 
-#: ../charpick/properties.c:28
+#: ../charpick/properties.c:33
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../charpick/properties.c:116
+#: ../charpick/properties.c:121
 msgid "_Palette:"
 msgstr "選字盤(_P):"
 
-#: ../charpick/properties.c:124
+#: ../charpick/properties.c:129
 msgid "Palette entry"
 msgstr "選字盤項目"
 
-#: ../charpick/properties.c:125
+#: ../charpick/properties.c:130
 msgid "Modify a palette by adding or removing characters"
 msgstr "在選字盤中加減字元"
 
-#: ../charpick/properties.c:239
+#: ../charpick/properties.c:244
 msgid "Add Palette"
 msgstr "加入選字盤"
 
-#: ../charpick/properties.c:276
+#: ../charpick/properties.c:281
 msgid "Edit Palette"
 msgstr "修改選字盤"
 
-#: ../charpick/properties.c:377
+#: ../charpick/properties.c:382
 msgid "Palettes list"
 msgstr "選字盤列表"
 
-#: ../charpick/properties.c:456
+#: ../charpick/properties.c:461
 msgid "_Palettes:"
 msgstr "選字盤(_P):"
 
-#: ../charpick/properties.c:472
+#: ../charpick/properties.c:477
 msgid "Add button"
 msgstr "加入按鈕"
 
-#: ../charpick/properties.c:473
+#: ../charpick/properties.c:478
 msgid "Click to add a new palette"
 msgstr "按這裡可以加入新的選字盤"
 
-#: ../charpick/properties.c:480
+#: ../charpick/properties.c:485
 msgid "Edit button"
 msgstr "修改按鈕"
 
-#: ../charpick/properties.c:481
+#: ../charpick/properties.c:486
 msgid "Click to edit the selected palette"
 msgstr "按這裡可以修改指定的選字盤"
 
-#: ../charpick/properties.c:488
+#: ../charpick/properties.c:493
 msgid "Delete button"
 msgstr "刪除按鈕"
 
-#: ../charpick/properties.c:489
+#: ../charpick/properties.c:494
 msgid "Click to delete the selected palette"
 msgstr "按這裡可以刪除指定的選字盤"
 
-#: ../charpick/properties.c:540
+#: ../charpick/properties.c:545
 msgid "Character Palette Preferences"
 msgstr "選字盤偏好設定"
 
-#: ../command/command.c:110
+#: ../command/command.c:114
 msgid "Shows the output of a command"
 msgstr ""
 
-#: ../command/command.c:127
+#: ../command/command.c:132
 msgid "Command Applet Preferences"
 msgstr ""
 
-#: ../command/command.c:139
+#: ../command/command.c:145
 msgid "Command:"
 msgstr ""
 
-#: ../command/command.c:150
+#: ../command/command.c:156
 msgid "Interval (seconds):"
 msgstr ""
 
-#: ../command/command.c:161
-#: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:5
+#: ../command/command.c:167
+msgid "Maximum width (chars):"
+msgstr ""
+
+#: ../command/command.c:178
+#: ../command/org.mate.panel.applet.command.gschema.xml.in.h:7
 msgid "Show icon"
 msgstr ""
 
-#: ../command/command.c:297
+#: ../command/command.c:328
 msgid "Command Applet"
 msgstr ""
 
-#: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:1
+#: ../command/org.mate.panel.applet.command.gschema.xml.in.h:1
 msgid "Command to execute"
 msgstr ""
 
-#: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:2
+#: ../command/org.mate.panel.applet.command.gschema.xml.in.h:2
 msgid "Command/script to execute to get the output"
 msgstr ""
 
-#: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:3
+#: ../command/org.mate.panel.applet.command.gschema.xml.in.h:3
 msgid "Interval for the command"
 msgstr ""
 
-#: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:4
+#: ../command/org.mate.panel.applet.command.gschema.xml.in.h:4
 msgid "Interval to execute the command (in seconds)"
 msgstr ""
 
-#: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:6
+#: ../command/org.mate.panel.applet.command.gschema.xml.in.h:5
+msgid "Width of output"
+msgstr ""
+
+#: ../command/org.mate.panel.applet.command.gschema.xml.in.h:6
+msgid "Number of characters to display"
+msgstr ""
+
+#: ../command/org.mate.panel.applet.command.gschema.xml.in.h:8
 msgid "If applet icon is shown or not"
 msgstr ""
 
@@ -687,7 +670,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:1035 ../cpufreq/src/cpufreq-applet.c:1090
+#: ../cpufreq/src/cpufreq-applet.c:1067 ../cpufreq/src/cpufreq-applet.c:1122
 msgid "CPU Frequency Scaling Monitor"
 msgstr "CPU 頻率調整監控程式"
 
@@ -695,31 +678,62 @@ msgstr "CPU 頻率調整監控程式"
 msgid "Monitor the CPU Frequency Scaling"
 msgstr "監控 CPU 頻率的調整"
 
-#: ../cpufreq/src/cpufreq-applet.c:665 ../cpufreq/src/cpufreq-prefs.c:394
+#: ../cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.h:1
+msgid "CPU to Monitor"
+msgstr ""
+
+#: ../cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.h:2
+msgid ""
+"Set the CPU to monitor. In a single processor system you don't have to "
+"change it."
+msgstr ""
+
+#: ../cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.h:3
+msgid "Mode to show cpu usage"
+msgstr ""
+
+#: ../cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.h:4
+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 ""
+
+#: ../cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.h:5
+msgid "The type of text to display (if the text is enabled)."
+msgstr ""
+
+#: ../cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.h:6
+msgid ""
+"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 "
+"to show percentage instead of frequency."
+msgstr ""
+
+#: ../cpufreq/src/cpufreq-applet.c:679 ../cpufreq/src/cpufreq-prefs.c:365
 msgid "Could not open help document"
 msgstr "無法開啟說明文件"
 
-#: ../cpufreq/src/cpufreq-applet.c:692
+#: ../cpufreq/src/cpufreq-applet.c:706
 msgid "This utility shows the current CPU Frequency Scaling."
 msgstr "此工具程式能顯示目前 CPU 頻率的調整。"
 
-#: ../cpufreq/src/cpufreq-applet.c:1091
+#: ../cpufreq/src/cpufreq-applet.c:1123
 msgid "This utility shows the current CPU Frequency"
 msgstr "此工具程式能顯示目前 CPU 的頻率"
 
-#: ../cpufreq/src/cpufreq-prefs.c:529
+#: ../cpufreq/src/cpufreq-prefs.c:500
 msgid "Graphic"
 msgstr "圖示"
 
-#: ../cpufreq/src/cpufreq-prefs.c:534
+#: ../cpufreq/src/cpufreq-prefs.c:505
 msgid "Text"
 msgstr "文字"
 
-#: ../cpufreq/src/cpufreq-prefs.c:539
+#: ../cpufreq/src/cpufreq-prefs.c:510
 msgid "Graphic and Text"
 msgstr "圖示及文字"
 
-#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:117
+#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:121
 msgid "Frequency Scaling Unsupported"
 msgstr "不支援頻率調整"
 
@@ -753,48 +767,48 @@ msgstr "（已掛載）"
 msgid "(not mounted)"
 msgstr "（未掛載）"
 
-#: ../drivemount/drive-button.c:614
+#: ../drivemount/drive-button.c:630
 msgid "Cannot execute Caja"
 msgstr ""
 
-#: ../drivemount/drive-button.c:616
+#: ../drivemount/drive-button.c:632
 #, c-format
 msgid "Cannot execute '%s'"
 msgstr "無法執行「%s」"
 
-#: ../drivemount/drive-button.c:940
+#: ../drivemount/drive-button.c:957
 msgid "_Play DVD"
 msgstr "播放 D_VD"
 
-#: ../drivemount/drive-button.c:944
+#: ../drivemount/drive-button.c:961
 msgid "_Play CD"
 msgstr "播放 _CD"
 
-#: ../drivemount/drive-button.c:947
+#: ../drivemount/drive-button.c:964
 #, c-format
 msgid "_Open %s"
 msgstr "開啟 %s(_O)"
 
-#: ../drivemount/drive-button.c:956
+#: ../drivemount/drive-button.c:972
 #, c-format
 msgid "Un_mount %s"
 msgstr "卸載 %s(_M)"
 
-#: ../drivemount/drive-button.c:963
+#: ../drivemount/drive-button.c:978
 #, c-format
 msgid "_Mount %s"
 msgstr "掛載 %s(_M)"
 
-#: ../drivemount/drive-button.c:971
+#: ../drivemount/drive-button.c:986
 #, c-format
 msgid "_Eject %s"
 msgstr "退出碟片 %s(_E)"
 
-#: ../drivemount/drivemount.c:118
+#: ../drivemount/drivemount.c:119
 msgid "Applet for mounting and unmounting block volumes."
 msgstr "掛載及卸載檔案系統的面板程式。"
 
-#: ../drivemount/drivemount.c:177 ../drivemount/drivemount.c:211
+#: ../drivemount/drivemount.c:180 ../drivemount/drivemount.c:214
 #: ../drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in.h:3
 msgid "Disk Mounter"
 msgstr "檔案系統掛載程式"
@@ -811,16 +825,16 @@ msgstr "可產生檔案系統掛載面板程式的工廠"
 msgid "Mount local disks and devices"
 msgstr "掛載本機磁碟及裝置"
 
-#: ../geyes/geyes.c:196
+#: ../geyes/geyes.c:168
 msgid "A goofy set of eyes for the MATE panel. They follow your mouse."
 msgstr "MATE 面板上的一對眼睛程式。它們會看著滑鼠游標的方向。"
 
-#: ../geyes/geyes.c:405 ../geyes/geyes.c:438 ../geyes/geyes.c:440
+#: ../geyes/geyes.c:373 ../geyes/geyes.c:403 ../geyes/geyes.c:405
 #: ../geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in.h:2
 msgid "Eyes"
 msgstr "小眼睛"
 
-#: ../geyes/geyes.c:441
+#: ../geyes/geyes.c:406
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "眼睛會望向滑鼠指標"
 
@@ -832,62 +846,62 @@ msgstr "小眼睛面板程式工廠"
 msgid "A set of eyeballs for your panel"
 msgstr "在面板上顯示眼睛"
 
-#: ../geyes/org.mate.panel.applet.geyes.gschema.xml.in.in.h:1
+#: ../geyes/org.mate.panel.applet.geyes.gschema.xml.in.h:1
 msgid "Directory in which the theme is located"
 msgstr "布景主題所在的目錄"
 
-#: ../geyes/themes.c:130
+#: ../geyes/themes.c:131
 msgid "Can not launch the eyes applet."
 msgstr "無法啟動小眼睛面板程式。"
 
-#: ../geyes/themes.c:131
+#: ../geyes/themes.c:132
 msgid "There was a fatal error while trying to load the theme."
 msgstr "嘗試載入布景主題時出現嚴重錯誤。"
 
-#: ../geyes/themes.c:289
+#: ../geyes/themes.c:286
 msgid "Geyes Preferences"
 msgstr "小眼睛偏好設定"
 
-#: ../geyes/themes.c:325
+#: ../geyes/themes.c:319
 msgid "Themes"
 msgstr "主題"
 
-#: ../geyes/themes.c:346
+#: ../geyes/themes.c:340
 msgid "_Select a theme:"
 msgstr "選取主題(_S):"
 
-#: ../mateweather/mateweather-about.c:48
+#: ../mateweather/mateweather-about.c:50
 msgid "© 1999-2005 by S. Papadimitriou and others"
 msgstr "著作權 © 1999-2005 S。Papadimitriou 及其他"
 
-#: ../mateweather/mateweather-about.c:49
+#: ../mateweather/mateweather-about.c:51
 msgid "A panel application for monitoring local weather conditions."
 msgstr "監控本地天氣情況的面板程式。"
 
-#: ../mateweather/mateweather-applet.c:117
+#: ../mateweather/mateweather-applet.c:113
 msgid "_Details"
 msgstr "詳細資訊(_D)"
 
-#: ../mateweather/mateweather-applet.c:120
-#: ../mateweather/mateweather-dialog.c:186
+#: ../mateweather/mateweather-applet.c:116
+#: ../mateweather/mateweather-dialog.c:191
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../mateweather/mateweather-applet.c:333
+#: ../mateweather/mateweather-applet.c:342
 #: ../mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in.h:3
 msgid "Weather Report"
 msgstr "天氣報告"
 
-#: ../mateweather/mateweather-applet.c:355
-#: ../mateweather/mateweather-applet.c:359
+#: ../mateweather/mateweather-applet.c:360
+#: ../mateweather/mateweather-applet.c:364
 msgid "MATE Weather"
 msgstr "MATE 天氣預報"
 
-#: ../mateweather/mateweather-applet.c:459
+#: ../mateweather/mateweather-applet.c:463
 msgid "Weather Forecast"
 msgstr "天氣預報"
 
-#: ../mateweather/mateweather-applet.c:471
+#: ../mateweather/mateweather-applet.c:475
 #, c-format
 msgid ""
 "City: %s\n"
@@ -895,294 +909,294 @@ msgid ""
 "Temperature: %s"
 msgstr "城市：%s\n天氣：%s\n溫度：%s"
 
-#: ../mateweather/mateweather-applet.c:520
+#: ../mateweather/mateweather-applet.c:524
 msgid "Updating..."
 msgstr "更新中…"
 
-#: ../mateweather/mateweather-dialog.c:184
+#: ../mateweather/mateweather-dialog.c:189
 msgid "Details"
 msgstr "詳細資料"
 
-#: ../mateweather/mateweather-dialog.c:229
+#: ../mateweather/mateweather-dialog.c:231
 msgid "City:"
 msgstr "城市："
 
-#: ../mateweather/mateweather-dialog.c:237
+#: ../mateweather/mateweather-dialog.c:239
 msgid "Last update:"
 msgstr "最後更新："
 
-#: ../mateweather/mateweather-dialog.c:245
+#: ../mateweather/mateweather-dialog.c:247
 msgid "Conditions:"
 msgstr "情況："
 
-#: ../mateweather/mateweather-dialog.c:253
+#: ../mateweather/mateweather-dialog.c:255
 msgid "Sky:"
 msgstr "天氣："
 
-#: ../mateweather/mateweather-dialog.c:261
+#: ../mateweather/mateweather-dialog.c:263
 msgid "Temperature:"
 msgstr "溫度："
 
-#: ../mateweather/mateweather-dialog.c:269
+#: ../mateweather/mateweather-dialog.c:271
 msgid "Feels like:"
 msgstr "感覺像："
 
-#: ../mateweather/mateweather-dialog.c:277
+#: ../mateweather/mateweather-dialog.c:279
 msgid "Dew point:"
 msgstr "露點："
 
-#: ../mateweather/mateweather-dialog.c:285
+#: ../mateweather/mateweather-dialog.c:287
 msgid "Relative humidity:"
 msgstr "相對溼度："
 
-#: ../mateweather/mateweather-dialog.c:293
+#: ../mateweather/mateweather-dialog.c:295
 msgid "Wind:"
 msgstr "風向："
 
-#: ../mateweather/mateweather-dialog.c:301
+#: ../mateweather/mateweather-dialog.c:303
 msgid "Pressure:"
 msgstr "氣壓："
 
-#: ../mateweather/mateweather-dialog.c:309
+#: ../mateweather/mateweather-dialog.c:311
 msgid "Visibility:"
 msgstr "能見度："
 
-#: ../mateweather/mateweather-dialog.c:317
+#: ../mateweather/mateweather-dialog.c:319
 msgid "Sunrise:"
 msgstr "日出："
 
-#: ../mateweather/mateweather-dialog.c:325
+#: ../mateweather/mateweather-dialog.c:327
 msgid "Sunset:"
 msgstr "日落："
 
-#: ../mateweather/mateweather-dialog.c:459
+#: ../mateweather/mateweather-dialog.c:461
 msgid "Current Conditions"
 msgstr "目前的天氣情況"
 
-#: ../mateweather/mateweather-dialog.c:476
+#: ../mateweather/mateweather-dialog.c:478
 msgid "Forecast Report"
 msgstr "天氣預報"
 
-#: ../mateweather/mateweather-dialog.c:476
+#: ../mateweather/mateweather-dialog.c:478
 msgid "See the ForeCast Details"
 msgstr "收看天氣預報"
 
-#: ../mateweather/mateweather-dialog.c:486
+#: ../mateweather/mateweather-dialog.c:488
 msgid "Forecast"
 msgstr "預報"
 
-#: ../mateweather/mateweather-dialog.c:494
+#: ../mateweather/mateweather-dialog.c:496
 msgid "Radar Map"
 msgstr "雷達圖"
 
-#: ../mateweather/mateweather-dialog.c:525
+#: ../mateweather/mateweather-dialog.c:527
 msgid "_Visit Weather.com"
 msgstr "瀏覽 _Weather.com"
 
-#: ../mateweather/mateweather-dialog.c:526
+#: ../mateweather/mateweather-dialog.c:528
 msgid "Visit Weather.com"
 msgstr "瀏覽 Weather.com"
 
-#: ../mateweather/mateweather-dialog.c:526
+#: ../mateweather/mateweather-dialog.c:528
 msgid "Click to Enter Weather.com"
 msgstr "請按這裡進入 Weather.com"
 
-#: ../mateweather/mateweather-dialog.c:611
+#: ../mateweather/mateweather-dialog.c:613
 msgid "Forecast not currently available for this location."
 msgstr "無法提供這個地點的天氣預報。"
 
 #. Accessible Name and Description for the components in Preference Dialog
-#: ../mateweather/mateweather-pref.c:161
+#: ../mateweather/mateweather-pref.c:166
 msgid "Location view"
 msgstr "位置檢視模式"
 
-#: ../mateweather/mateweather-pref.c:161
+#: ../mateweather/mateweather-pref.c:166
 msgid "Select Location from the list"
 msgstr "從列表中選擇地點"
 
-#: ../mateweather/mateweather-pref.c:162
+#: ../mateweather/mateweather-pref.c:167
 msgid "Update spin button"
 msgstr "數值更新按鈕"
 
-#: ../mateweather/mateweather-pref.c:162
+#: ../mateweather/mateweather-pref.c:167
 msgid "Spinbutton for updating"
 msgstr "更新數值用的按鈕"
 
-#: ../mateweather/mateweather-pref.c:163
+#: ../mateweather/mateweather-pref.c:168
 msgid "Address Entry"
 msgstr "地址輸入欄"
 
-#: ../mateweather/mateweather-pref.c:163
+#: ../mateweather/mateweather-pref.c:168
 msgid "Enter the URL"
 msgstr "請輸入 URL"
 
-#: ../mateweather/mateweather-pref.c:290
+#: ../mateweather/mateweather-pref.c:295
 msgid ""
 "Failed to load the Locations XML database.  Please report this as a bug."
 msgstr "無法載入位置 XML 資料庫。請報告錯誤。"
 
-#: ../mateweather/mateweather-pref.c:824
+#: ../mateweather/mateweather-pref.c:825
 msgid "Weather Preferences"
 msgstr "天氣程式偏好設定"
 
-#: ../mateweather/mateweather-pref.c:854
-#: ../mateweather/mateweather-pref.c:1052
+#: ../mateweather/mateweather-pref.c:852
+#: ../mateweather/mateweather-pref.c:1050
 msgid "_Automatically update every:"
 msgstr "自動更新相隔時間(_A):"
 
 #. * Units settings page.
 #. Temperature Unit
-#: ../mateweather/mateweather-pref.c:869
+#: ../mateweather/mateweather-pref.c:867
 msgid "_Temperature unit:"
 msgstr "溫度單位(_T):"
 
 #. gtk_combo_box_append_text (GTK_COMBO_BOX (temp_combo), _("Default"));
-#: ../mateweather/mateweather-pref.c:879
+#: ../mateweather/mateweather-pref.c:877
 msgid "Kelvin"
 msgstr "絕對溫度"
 
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../mateweather/mateweather-pref.c:881
+#: ../mateweather/mateweather-pref.c:879
 msgid "Celsius"
 msgstr "攝氏"
 
-#: ../mateweather/mateweather-pref.c:882
+#: ../mateweather/mateweather-pref.c:880
 msgid "Fahrenheit"
 msgstr "華氏"
 
 #. Speed Unit
-#: ../mateweather/mateweather-pref.c:891
+#: ../mateweather/mateweather-pref.c:889
 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:902
+#: ../mateweather/mateweather-pref.c:900
 msgid "m/s"
 msgstr "公尺/秒"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../mateweather/mateweather-pref.c:904
+#: ../mateweather/mateweather-pref.c:902
 msgid "km/h"
 msgstr "公里/小時"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../mateweather/mateweather-pref.c:906
+#: ../mateweather/mateweather-pref.c:904
 msgid "mph"
 msgstr "浬/小時"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../mateweather/mateweather-pref.c:908
+#: ../mateweather/mateweather-pref.c:906
 msgid "knots"
 msgstr "節"
 
-#: ../mateweather/mateweather-pref.c:909
+#: ../mateweather/mateweather-pref.c:907
 msgid "Beaufort scale"
 msgstr "蒲福氏風級"
 
 #. Pressure Unit
-#: ../mateweather/mateweather-pref.c:918
+#: ../mateweather/mateweather-pref.c:916
 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:929
+#: ../mateweather/mateweather-pref.c:927
 msgid "kPa"
 msgstr "千帕"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../mateweather/mateweather-pref.c:931
+#: ../mateweather/mateweather-pref.c:929
 msgid "hPa"
 msgstr "百帕"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../mateweather/mateweather-pref.c:933
+#: ../mateweather/mateweather-pref.c:931
 msgid "mb"
 msgstr "毫巴"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../mateweather/mateweather-pref.c:935
+#: ../mateweather/mateweather-pref.c:933
 msgid "mmHg"
 msgstr "mmHg"
 
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../mateweather/mateweather-pref.c:937
+#: ../mateweather/mateweather-pref.c:935
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../mateweather/mateweather-pref.c:939
+#: ../mateweather/mateweather-pref.c:937
 msgid "atm"
 msgstr "atm"
 
 #. Distance Unit
-#: ../mateweather/mateweather-pref.c:948
+#: ../mateweather/mateweather-pref.c:946
 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:959
+#: ../mateweather/mateweather-pref.c:957
 msgid "meters"
 msgstr "公尺"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../mateweather/mateweather-pref.c:961
+#: ../mateweather/mateweather-pref.c:959
 msgid "km"
 msgstr "公里"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../mateweather/mateweather-pref.c:963
+#: ../mateweather/mateweather-pref.c:961
 msgid "miles"
 msgstr "英里"
 
-#: ../mateweather/mateweather-pref.c:989
+#: ../mateweather/mateweather-pref.c:987
 msgid "Enable _radar map"
 msgstr "啟用雷達圖(_R)"
 
-#: ../mateweather/mateweather-pref.c:1005
+#: ../mateweather/mateweather-pref.c:1003
 msgid "Use _custom address for radar map"
 msgstr "自行指定雷達圖的地址(_C)"
 
-#: ../mateweather/mateweather-pref.c:1023
+#: ../mateweather/mateweather-pref.c:1021
 msgid "A_ddress:"
 msgstr "地址(_D):"
 
 #. setup show-notifications button
-#: ../mateweather/mateweather-pref.c:1038
+#: ../mateweather/mateweather-pref.c:1036
 msgid "Show _notifications"
 msgstr ""
 
-#: ../mateweather/mateweather-pref.c:1048
+#: ../mateweather/mateweather-pref.c:1046
 msgid "Update"
 msgstr "更新"
 
-#: ../mateweather/mateweather-pref.c:1071
+#: ../mateweather/mateweather-pref.c:1069
 msgid "minutes"
 msgstr "分"
 
-#: ../mateweather/mateweather-pref.c:1089
+#: ../mateweather/mateweather-pref.c:1087
 msgid "Display"
 msgstr "顯示"
 
-#: ../mateweather/mateweather-pref.c:1108
+#: ../mateweather/mateweather-pref.c:1106
 msgid "General"
 msgstr "一般"
 
-#: ../mateweather/mateweather-pref.c:1119
+#: ../mateweather/mateweather-pref.c:1117
 msgid "_Select a location:"
 msgstr "選取位置(_S):"
 
-#: ../mateweather/mateweather-pref.c:1141
+#: ../mateweather/mateweather-pref.c:1139
 msgid "_Find:"
 msgstr "尋找(_F):"
 
-#: ../mateweather/mateweather-pref.c:1147
+#: ../mateweather/mateweather-pref.c:1145
 msgid "Find _Next"
 msgstr "找下一個(_N)"
 
-#: ../mateweather/mateweather-pref.c:1168
+#: ../mateweather/mateweather-pref.c:1166
 msgid "Location"
 msgstr "位置"
 
@@ -1199,46 +1213,46 @@ msgid "Monitor the current weather conditions, and forecasts"
 msgstr "監控目前的天氣情況及進行天氣預報"
 
 #: ../invest-applet/data/financialchart.ui.h:1
+#: ../invest-applet/invest/chart.py:118
+msgid "Financial Chart"
+msgstr "股價圖表"
+
+#: ../invest-applet/data/financialchart.ui.h:2
+msgid "_Ticker symbol: "
+msgstr "股票代號(_T):"
+
+#: ../invest-applet/data/financialchart.ui.h:3
+msgid "Auto _refresh"
+msgstr "自動重整(_R)"
+
+#: ../invest-applet/data/financialchart.ui.h:4
 msgid "Today"
 msgstr "今天"
 
-#: ../invest-applet/data/financialchart.ui.h:2
+#: ../invest-applet/data/financialchart.ui.h:5
 msgid "5 Days"
 msgstr "5 天"
 
-#: ../invest-applet/data/financialchart.ui.h:3
+#: ../invest-applet/data/financialchart.ui.h:6
 msgid "3 Months"
 msgstr "3 個月"
 
-#: ../invest-applet/data/financialchart.ui.h:4
+#: ../invest-applet/data/financialchart.ui.h:7
 msgid "6 Months"
 msgstr "6 個月"
 
-#: ../invest-applet/data/financialchart.ui.h:5
+#: ../invest-applet/data/financialchart.ui.h:8
 msgid "1 Year"
 msgstr "1 年"
 
-#: ../invest-applet/data/financialchart.ui.h:6
+#: ../invest-applet/data/financialchart.ui.h:9
 msgid "5 Years"
 msgstr "5 年"
 
-#: ../invest-applet/data/financialchart.ui.h:7
+#: ../invest-applet/data/financialchart.ui.h:10
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../invest-applet/data/financialchart.ui.h:8
-#: ../invest-applet/invest/chart.py:111
-msgid "Financial Chart"
-msgstr "股價圖表"
-
-#: ../invest-applet/data/financialchart.ui.h:9
-msgid "_Ticker symbol: "
-msgstr "股票代號(_T):"
-
-#: ../invest-applet/data/financialchart.ui.h:10
-msgid "Auto _refresh"
-msgstr "自動重整(_R)"
-
 #: ../invest-applet/data/financialchart.ui.h:11
 msgid "_Graph style: "
 msgstr "圖表類型(_G):"
@@ -1374,10 +1388,34 @@ msgid "MACD"
 msgstr "MACD"
 
 #: ../invest-applet/data/financialchart.ui.h:53
+msgid "Line"
+msgstr ""
+
+#: ../invest-applet/data/financialchart.ui.h:54
+msgid "Bar"
+msgstr ""
+
+#: ../invest-applet/data/financialchart.ui.h:55
+msgid "Candle"
+msgstr ""
+
+#: ../invest-applet/data/financialchart.ui.h:56
+msgid "Scale: "
+msgstr ""
+
+#: ../invest-applet/data/financialchart.ui.h:57
+msgid "Linear"
+msgstr ""
+
+#: ../invest-applet/data/financialchart.ui.h:58
+msgid "Logarithmic"
+msgstr ""
+
+#: ../invest-applet/data/financialchart.ui.h:59
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../invest-applet/data/financialchart.ui.h:54
+#: ../invest-applet/data/financialchart.ui.h:60
 msgid "Downloading chart from <b>Yahoo!</b>"
 msgstr "從 <b>Yahoo！</b> 下載圖表"
 
@@ -1412,51 +1450,51 @@ msgid "Track your invested money."
 msgstr "追蹤您的金錢投資。"
 
 #. name, stock_id, label, accellerator, tooltip, callback
-#: ../invest-applet/invest/applet.py:27
+#: ../invest-applet/invest/applet.py:28
 msgid "About"
 msgstr ""
 
-#: ../invest-applet/invest/applet.py:28
+#: ../invest-applet/invest/applet.py:29
 msgid "Help"
 msgstr ""
 
-#: ../invest-applet/invest/applet.py:29
+#: ../invest-applet/invest/applet.py:30
 msgid "Preferences"
 msgstr ""
 
-#: ../invest-applet/invest/applet.py:30
+#: ../invest-applet/invest/applet.py:31
 msgid "Refresh"
 msgstr ""
 
 #. a) We aren't configured yet
-#: ../invest-applet/invest/applet.py:62
+#: ../invest-applet/invest/applet.py:63
 msgid "<b>You have not entered any stock information yet</b>"
 msgstr "<b>您尚未輸入任何股票資訊</b>"
 
-#: ../invest-applet/invest/applet.py:67
+#: ../invest-applet/invest/applet.py:68
 msgid "<b>No stock quotes are currently available</b>"
 msgstr "<b>目前沒有可用的股價</b>"
 
-#: ../invest-applet/invest/applet.py:68
+#: ../invest-applet/invest/applet.py:69
 msgid ""
 "The server could not be contacted. The computer is either offline or the "
 "servers are down. Try again later."
 msgstr "無法連接伺服器。可能電腦為離線狀態或該伺服器已關機。請稍後再試。"
 
-#: ../invest-applet/invest/chart.py:160
+#: ../invest-applet/invest/chart.py:167
 #, python-format
 msgid "Financial Chart - %s"
 msgstr "股價圖表 - %s"
 
-#: ../invest-applet/invest/chart.py:227
+#: ../invest-applet/invest/chart.py:234
 msgid "Opening Chart"
 msgstr "開啟圖表中"
 
-#: ../invest-applet/invest/chart.py:242
+#: ../invest-applet/invest/chart.py:249
 msgid "Chart downloaded"
 msgstr "下載的圖表"
 
-#: ../invest-applet/invest/chart.py:244
+#: ../invest-applet/invest/chart.py:251
 msgid "Chart could not be downloaded"
 msgstr "無法下載圖表"
 
@@ -1464,44 +1502,38 @@ msgstr "無法下載圖表"
 msgid "Invest Applet"
 msgstr "股票投資面板程式"
 
-#: ../invest-applet/invest/preferences.py:34
+#: ../invest-applet/invest/preferences.py:36
 msgid "Symbol"
 msgstr "股票代碼"
 
-#: ../invest-applet/invest/preferences.py:34
+#: ../invest-applet/invest/preferences.py:36
 msgid "Label"
 msgstr "標籤"
 
-#: ../invest-applet/invest/preferences.py:34
+#: ../invest-applet/invest/preferences.py:36
 msgid "Amount"
 msgstr "數量"
 
-#: ../invest-applet/invest/preferences.py:34
+#: ../invest-applet/invest/preferences.py:36
 msgid "Price"
 msgstr "價格"
 
-#: ../invest-applet/invest/preferences.py:34
+#: ../invest-applet/invest/preferences.py:36
 msgid "Commission"
 msgstr "佣金"
 
-#: ../invest-applet/invest/preferences.py:34
+#: ../invest-applet/invest/preferences.py:36
 msgid "Currency Rate"
 msgstr "貨幣匯率"
 
-#: ../invest-applet/invest/quotes.py:136
+#: ../invest-applet/invest/quotes.py:171
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "無法連線至 Yahoo！ 金融"
 
-#. Translators: %s is an hour (%H:%M)
-#: ../invest-applet/invest/quotes.py:139 ../invest-applet/invest/quotes.py:168
-#, python-format
-msgid "Updated at %s"
-msgstr "更新於 %s"
-
 #. Translators: This is share-market jargon. It is the average percentage
 #. change of all stock prices. The %s gets replaced with the string value of
 #. the change (localized), including the percent sign.
-#: ../invest-applet/invest/quotes.py:158
+#: ../invest-applet/invest/quotes.py:213
 #, python-format
 msgid "Average change: %s"
 msgstr "平均變更：%s"
@@ -1512,180 +1544,87 @@ msgstr "平均變更：%s"
 #. they were sold right now. The first string is the change value, the second
 #. the currency, and the third value is the percentage of the change,
 #. formatted using user's locale.
-#: ../invest-applet/invest/quotes.py:167
+#: ../invest-applet/invest/quotes.py:222
 #, python-format
 msgid "Positions balance: %s %s (%s)"
 msgstr "位置平衡：%s %s (%s)"
 
+#: ../invest-applet/invest/quotes.py:224
+#, python-format
+msgid "Updated at %s"
+msgstr "更新於 %s"
+
 #. model: SYMBOL, LABEL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE,
 #. VARIATION_PCT, PB
 #. Translators: these words all refer to a stock. Last is short
 #. for "last price". Gain is referring to the gain since the
 #. stock was purchased.
-#: ../invest-applet/invest/widgets.py:58
+#: ../invest-applet/invest/widgets.py:59
 msgid "Ticker"
 msgstr "股票行情指示"
 
-#: ../invest-applet/invest/widgets.py:58
+#: ../invest-applet/invest/widgets.py:59
 msgid "Last"
 msgstr "最後"
 
-#: ../invest-applet/invest/widgets.py:58
+#: ../invest-applet/invest/widgets.py:59
 msgid "Change %"
 msgstr "變化 %s"
 
-#: ../invest-applet/invest/widgets.py:58
+#: ../invest-applet/invest/widgets.py:59
 msgid "Chart"
 msgstr "圖表"
 
-#: ../invest-applet/invest/widgets.py:58
+#: ../invest-applet/invest/widgets.py:59
 msgid "Gain"
 msgstr "收益"
 
-#: ../invest-applet/invest/widgets.py:58
+#: ../invest-applet/invest/widgets.py:59
 msgid "Gain %"
 msgstr "收益 %s"
 
-#: ../modemlights/modem-applet.c:142
-msgid "_Activate"
-msgstr "連線(_A)"
-
-#: ../modemlights/modem-applet.c:145
-msgid "_Deactivate"
-msgstr "斷線(_D)"
-
-#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:4
-msgid "_Properties"
-msgstr "屬性(_P)"
-
-#: ../modemlights/modem-applet.c:184
-#: ../modemlights/org.mate.applets.ModemApplet.mate-panel-applet.in.in.h:1
-msgid "Modem Monitor"
-msgstr "數據機監控程式"
-
-#: ../modemlights/modem-applet.c:710
-msgid "Connection active, but could not get connection time"
-msgstr "已經連接，但無法取得連線時間"
-
-#: ../modemlights/modem-applet.c:726
-#, c-format
-msgid "Time connected: %.1d:%.2d"
-msgstr "已連線時間：%.1d:%.2d"
-
-#: ../modemlights/modem-applet.c:730
-msgid "Not connected"
-msgstr "沒有連線"
-
-#: ../modemlights/modem-applet.c:752
-msgid ""
-"To connect to your Internet service provider, you need administrator "
-"privileges"
-msgstr "要連接您的網路服務供應商，您需要系統管理員的權限"
-
-#: ../modemlights/modem-applet.c:753
-msgid ""
-"To disconnect from your Internet service provider, you need administrator "
-"privileges"
-msgstr "要從您的網路服務供應商斷線，您需要有系統管理員的權限"
-
-#: ../modemlights/modem-applet.c:828
-msgid "The entered password is invalid"
-msgstr "輸入的密碼不正確"
-
-#: ../modemlights/modem-applet.c:830
-msgid ""
-"Check that you have typed it correctly and that you haven't activated the "
-"\"caps lock\" key"
-msgstr "請檢查您所輸入的是否正確及沒有按下了“Caps Lock”鍵"
-
-#: ../modemlights/modem-applet.c:932
-msgid "Do you want to connect?"
-msgstr "您要撥接連線嗎？"
-
-#: ../modemlights/modem-applet.c:933
-msgid "Do you want to disconnect?"
-msgstr "您要斷線嗎？"
-
-#: ../modemlights/modem-applet.c:942
-msgid "C_onnect"
-msgstr "連線(_O)"
-
-#: ../modemlights/modem-applet.c:942
-msgid "_Disconnect"
-msgstr "斷線(_D)"
-
-#: ../modemlights/modem-applet.c:995
-msgid "Could not launch network configuration tool"
-msgstr "無法執行網路設置工具"
-
-#: ../modemlights/modem-applet.c:997
-msgid ""
-"Check that it's installed in the correct path and that it has the correct "
-"permissions"
-msgstr "請檢查安裝的路徑是否正確及它的權限正確"
-
-#: ../modemlights/modem-applet.c:1020
-msgid "Applet for activating and monitoring a dial-up network connection."
-msgstr "連接及監控撥接網路的面板程式"
-
-#: ../modemlights/modemlights.ui.h:1
-msgid "Enter password"
-msgstr "輸入密碼"
-
-#: ../modemlights/modemlights.ui.h:2
-msgid "Root password required"
-msgstr "需要 root 的密碼 "
-
-#: ../modemlights/modemlights.ui.h:3
-msgid "Password:"
-msgstr "密碼:"
-
-#: ../modemlights/modemlights.ui.h:4
-msgid "Connecting with Internet Service Provider"
-msgstr "使用網路服務供應商連線"
-
-#: ../modemlights/org.mate.applets.ModemApplet.mate-panel-applet.in.in.h:2
-msgid "Activate and monitor a dial-up network connection"
-msgstr "啟用及監控撥接網路連線"
-
 #: ../multiload/main.c:65
 msgid ""
 "A system load monitor capable of displaying graphs for CPU, ram, and swap "
 "space use, plus network traffic."
 msgstr "系統負載監控程式可以顯示 CPU、記憶體、交換記憶及網路使用量。"
 
-#: ../multiload/main.c:136
+#: ../multiload/main.c:128
+msgid "Start system-monitor"
+msgstr ""
+
+#: ../multiload/main.c:149
 #, c-format
 msgid "There was an error executing '%s': %s"
 msgstr "執行「%s」時出現錯誤：%s"
 
-#: ../multiload/main.c:264 ../multiload/properties.c:570
+#: ../multiload/main.c:277 ../multiload/properties.c:576
 msgid "Processor"
 msgstr "處理器"
 
-#: ../multiload/main.c:266 ../multiload/properties.c:578
+#: ../multiload/main.c:279 ../multiload/properties.c:584
 msgid "Memory"
 msgstr "記憶體"
 
-#: ../multiload/main.c:268 ../multiload/properties.c:586
+#: ../multiload/main.c:281 ../multiload/properties.c:592
 msgid "Network"
 msgstr "網路"
 
-#: ../multiload/main.c:270 ../multiload/properties.c:593
+#: ../multiload/main.c:283 ../multiload/properties.c:599
 msgid "Swap Space"
 msgstr "交換記憶"
 
-#: ../multiload/main.c:272 ../multiload/main.c:351
+#: ../multiload/main.c:285 ../multiload/main.c:364
 msgid "Load Average"
 msgstr "平均負載"
 
-#: ../multiload/main.c:274
+#: ../multiload/main.c:287
 msgid "Disk"
 msgstr "磁碟"
 
 #. xgettext: use and cache are > 1 most of the time,
 #. please assume that they always are.
-#: ../multiload/main.c:290
+#: ../multiload/main.c:303
 #, c-format
 msgid ""
 "%s:\n"
@@ -1693,13 +1632,13 @@ msgid ""
 "%u%% in use as cache"
 msgstr "%s:\n%u%% 由程式使用中\n%u%% 使用為快取記憶"
 
-#: ../multiload/main.c:298
+#: ../multiload/main.c:311
 #, 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:306
+#: ../multiload/main.c:319
 #, c-format
 msgid ""
 "%s:\n"
@@ -1707,7 +1646,7 @@ msgid ""
 "Sending %s"
 msgstr "%s：\n接收 %s\n傳送 %s"
 
-#: ../multiload/main.c:322
+#: ../multiload/main.c:335
 #, c-format
 msgid ""
 "%s:\n"
@@ -1717,31 +1656,31 @@ msgid_plural ""
 "%u%% in use"
 msgstr[0] "%s:\n%u%% 使用中"
 
-#: ../multiload/main.c:347
+#: ../multiload/main.c:360
 msgid "CPU Load"
 msgstr "CPU 負載"
 
-#: ../multiload/main.c:348
+#: ../multiload/main.c:361
 msgid "Memory Load"
 msgstr "記憶體負載"
 
-#: ../multiload/main.c:349
+#: ../multiload/main.c:362
 msgid "Net Load"
 msgstr "網路負載"
 
-#: ../multiload/main.c:350
+#: ../multiload/main.c:363
 msgid "Swap Load"
 msgstr "交換檔負載"
 
-#: ../multiload/main.c:352
+#: ../multiload/main.c:365
 msgid "Disk Load"
 msgstr "磁碟負載"
 
-#: ../multiload/main.c:448
+#: ../multiload/main.c:461
 msgid "_Open System Monitor"
 msgstr "啟動系統監控程式(_O)"
 
-#: ../multiload/main.c:476
+#: ../multiload/main.c:489
 #: ../multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in.h:1
 msgid "System Monitor"
 msgstr "系統監控"
@@ -1755,144 +1694,270 @@ msgstr "%s/s"
 msgid "A system load indicator"
 msgstr "系統負載指示器"
 
-#: ../multiload/properties.c:332
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:1
+msgid "Enable CPU load graph"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:2
+msgid "Enable memory load graph"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:3
+msgid "Enable network load graph"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:4
+msgid "Enable swap load graph"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:5
+msgid "Enable load average graph"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:6
+msgid "Enable disk load graph"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:7
+msgid "Applet refresh rate in milliseconds"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:8
+msgid "Graph size"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:9
+msgid ""
+"For horizontal panels, the width of the graphs in pixels. For vertical "
+"panels, this is the height of the graphs."
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:10
+msgid "Graph color for user-related CPU activity"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:11
+msgid "Graph color for system-related CPU activity"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:12
+msgid "Graph color for nice-related CPU activity"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:13
+msgid "Graph color for iowait related CPU activity"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:14
+msgid "CPU graph background color"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:15
+msgid "Graph color for user-related memory usage"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:16
+msgid "Graph color for shared memory"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:17
+msgid "Graph color for buffer memory"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:18
+msgid "Graph color for cached memory"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:19
+msgid "Memory graph background color"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:20
+msgid "Graph color for input network activity"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:21
+msgid "Graph color for output network activity"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:22
+msgid "Graph color for loopback network usage"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:23
+msgid "Network graph background color"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:24
+msgid "Graph color for user-related swap usage"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:25
+msgid "Swap graph background color"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:26
+msgid "Graph color for load average"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:27
+msgid "Load graph background color"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:28
+msgid "Graph color for disk read"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:29
+msgid "Graph color for disk write"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:30
+msgid "Background color for disk load graph"
+msgstr ""
+
+#: ../multiload/org.mate.panel.applet.multiload.gschema.xml.in.h:31
+msgid "The desktop description file to execute as the system monitor"
+msgstr ""
+
+#: ../multiload/properties.c:338
 msgid "Monitored Resources"
 msgstr "受監控的資源"
 
-#: ../multiload/properties.c:357
+#: ../multiload/properties.c:363
 msgid "_Processor"
 msgstr "處理器(_P)"
 
-#: ../multiload/properties.c:370
+#: ../multiload/properties.c:376
 msgid "_Memory"
 msgstr "記憶體(_M)"
 
-#: ../multiload/properties.c:383
+#: ../multiload/properties.c:389
 msgid "_Network"
 msgstr "網路(_N)"
 
-#: ../multiload/properties.c:396
+#: ../multiload/properties.c:402
 msgid "S_wap Space"
 msgstr "交換記憶(_W)"
 
-#: ../multiload/properties.c:409
+#: ../multiload/properties.c:415
 msgid "_Load"
 msgstr "負載(_L)"
 
-#: ../multiload/properties.c:422
+#: ../multiload/properties.c:428
 msgid "_Harddisk"
 msgstr "硬碟(_H)"
 
-#: ../multiload/properties.c:437
+#: ../multiload/properties.c:443
 msgid "Options"
 msgstr "選項"
 
-#: ../multiload/properties.c:467
+#: ../multiload/properties.c:473
 msgid "System m_onitor width: "
 msgstr "系統監控程式寬度(_O):"
 
-#: ../multiload/properties.c:469
+#: ../multiload/properties.c:475
 msgid "System m_onitor height: "
 msgstr "系統監控程式高度(_O):"
 
-#: ../multiload/properties.c:500
+#: ../multiload/properties.c:506
 msgid "pixels"
 msgstr "像素"
 
-#: ../multiload/properties.c:508
+#: ../multiload/properties.c:514
 msgid "Sys_tem monitor update interval: "
 msgstr "系統監控更新間隔(_T):"
 
-#: ../multiload/properties.c:534
+#: ../multiload/properties.c:540
 msgid "milliseconds"
 msgstr "亳秒"
 
-#: ../multiload/properties.c:545
+#: ../multiload/properties.c:551
 msgid "Colors"
 msgstr "色彩"
 
-#: ../multiload/properties.c:572 ../multiload/properties.c:580
+#: ../multiload/properties.c:578 ../multiload/properties.c:586
 msgid "_User"
 msgstr "使用者(_U)"
 
-#: ../multiload/properties.c:573
+#: ../multiload/properties.c:579
 msgid "S_ystem"
 msgstr "系統(_Y)"
 
-#: ../multiload/properties.c:574
+#: ../multiload/properties.c:580
 msgid "N_ice"
 msgstr "N_ice"
 
-#: ../multiload/properties.c:575
+#: ../multiload/properties.c:581
 msgid "I_OWait"
 msgstr "I_OWait"
 
-#: ../multiload/properties.c:576
+#: ../multiload/properties.c:582
 msgid "I_dle"
 msgstr "閒置(_D)"
 
-#: ../multiload/properties.c:581
+#: ../multiload/properties.c:587
 msgid "Sh_ared"
 msgstr "分享(_A)"
 
-#: ../multiload/properties.c:582
+#: ../multiload/properties.c:588
 msgid "_Buffers"
 msgstr "緩衝區(_B)"
 
-#: ../multiload/properties.c:583
+#: ../multiload/properties.c:589
 msgid "Cach_ed"
 msgstr "快取記憶(_E)"
 
-#: ../multiload/properties.c:584
+#: ../multiload/properties.c:590
 msgid "F_ree"
 msgstr "未用(_R)"
 
-#: ../multiload/properties.c:588
+#: ../multiload/properties.c:594
 msgid "_In"
 msgstr "進(_I)"
 
-#: ../multiload/properties.c:589
+#: ../multiload/properties.c:595
 msgid "_Out"
 msgstr "出(_O)"
 
-#: ../multiload/properties.c:590
+#: ../multiload/properties.c:596
 msgid "_Local"
 msgstr "本地端(_L)"
 
-#: ../multiload/properties.c:591 ../multiload/properties.c:601
-#: ../multiload/properties.c:607
+#: ../multiload/properties.c:597 ../multiload/properties.c:607
+#: ../multiload/properties.c:613
 msgid "_Background"
 msgstr "背景顏色(_B)"
 
-#: ../multiload/properties.c:595
+#: ../multiload/properties.c:601
 msgid "_Used"
 msgstr "使用中(_U)"
 
-#: ../multiload/properties.c:596
+#: ../multiload/properties.c:602
 msgid "_Free"
 msgstr "可用(_F)"
 
-#: ../multiload/properties.c:598
+#: ../multiload/properties.c:604
 msgid "Load"
 msgstr "負載"
 
-#: ../multiload/properties.c:600
+#: ../multiload/properties.c:606
 msgid "_Average"
 msgstr "平均(_A)"
 
-#: ../multiload/properties.c:603
+#: ../multiload/properties.c:609
 msgid "Harddisk"
 msgstr "硬碟"
 
-#: ../multiload/properties.c:605
+#: ../multiload/properties.c:611
 msgid "_Read"
 msgstr "讀(_R)"
 
-#: ../multiload/properties.c:606
+#: ../multiload/properties.c:612
 msgid "_Write"
 msgstr "寫(_W)"
 
-#: ../multiload/properties.c:631
+#: ../multiload/properties.c:637
 msgid "System Monitor Preferences"
 msgstr "系統監控程式偏好設定"
 
@@ -1970,21 +2035,13 @@ msgstr "這些項目現在會從您的設置中移除："
 msgid "You will not receive this message again."
 msgstr "您以後不會再收到這訊息。"
 
-#: ../stickynotes/data/MATE_StickyNotesApplet.server.in.h:1
-msgid "Tomboy (ne Stickynotes)"
-msgstr "Tomboy （前身為 Stickynotes）"
-
-#: ../stickynotes/data/MATE_StickyNotesApplet.server.in.h:2
-msgid "Tomboy (transparent upgrade from stickynotes)"
-msgstr "Tomboy（Stickynotes 的升級版本）"
-
 #: ../stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in.h:1
 msgid "Sticky Notes Applet Factory"
 msgstr "便條面板程式工廠"
 
 #: ../stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in.h:2
-#: ../stickynotes/stickynotes_applet.c:147
-#: ../stickynotes/stickynotes_applet.c:415
+#: ../stickynotes/stickynotes_applet.c:145
+#: ../stickynotes/stickynotes_applet.c:411
 msgid "Sticky Notes"
 msgstr "便條"
 
@@ -1992,11 +2049,11 @@ msgstr "便條"
 msgid "Create, view, and manage sticky notes on the desktop"
 msgstr "在桌面中製作、顯示和管理便條"
 
-#: ../stickynotes/stickynotes.c:634
+#: ../stickynotes/stickynotes.c:656
 msgid "This note is locked."
 msgstr "這便條已鎖定。"
 
-#: ../stickynotes/stickynotes.c:638
+#: ../stickynotes/stickynotes.c:660
 msgid "This note is unlocked."
 msgstr "這便條未上鎖。"
 
@@ -2012,6 +2069,10 @@ msgstr "刪除便條(_D)…"
 msgid "_Lock Note"
 msgstr "鎖定便條內容(_L)"
 
+#: ../stickynotes/stickynotes.ui.h:4
+msgid "_Properties"
+msgstr "屬性(_P)"
+
 #: ../stickynotes/stickynotes.ui.h:5
 msgid "Sticky Notes Preferences"
 msgstr "便條偏好設定"
@@ -2125,8 +2186,8 @@ msgid "Lock/Unlock note"
 msgstr "鎖定/不鎖定便條內容"
 
 #: ../stickynotes/stickynotes.ui.h:33
-msgid "Close note"
-msgstr "關閉便條"
+msgid "Delete note"
+msgstr ""
 
 #: ../stickynotes/stickynotes.ui.h:34
 msgid "Resize note"
@@ -2180,126 +2241,126 @@ msgstr "指定便條的標題"
 msgid "_Title:"
 msgstr "標題(_T):"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:1
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:1
 msgid "Default width for new notes"
 msgstr "新的便條的預設寬度"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:2
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:2
 msgid "Default width for new sticky notes in pixels."
 msgstr "新的便條的預設寬度，以像素計算。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:3
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:3
 msgid "Default height for new notes"
 msgstr "新的便條的預設高度"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:4
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:4
 msgid "Default height for new sticky notes in pixels."
 msgstr "新的便條的預設高度，以像素計算。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:5
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:5
 msgid "Default color for new notes"
 msgstr "新便條預設使用的顏色"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:6
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:6
 msgid ""
 "Default color for new sticky notes. This should be in html hex "
 "specification, for example \"#30FF50\"."
 msgstr "新便條預設使用的顏色。它應該使用像 HTML 中的 16 進制數字來表示，例如“#30FF50”。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:7
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:7
 msgid "Default color for font"
 msgstr "預設的字型顏色"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:8
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:8
 msgid ""
 "Default font color for new sticky notes. This should be in html hex "
 "specification, for example \"#000000\"."
 msgstr "新便條預設使用的字型顏色。它應該使用像 HTML 中的 16 進制數字來表示，例如“#000000”。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:9
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:9
 msgid "Default font for new notes"
 msgstr "新便條預設使用的字型"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:10
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:10
 msgid ""
 "Default font for new sticky notes. This should be a Pango Font Name, for "
 "example \"Sans Italic 10\"."
 msgstr "新便條預設使用的字型。它應該使用 Pango 格式的字型名稱，例如“Sans Italic 10”。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:11
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:11
 msgid "Sticky notes' workspace stickyness"
 msgstr "是否在所有工作區顯示便條"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:12
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:12
 msgid ""
 "Specifies whether the sticky notes are visible on ALL workspaces on the "
 "desktop, or not."
 msgstr "指定是否在所有桌面中顯示便條。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:13
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:13
 msgid "Sticky notes' locked state"
 msgstr "是否鎖定便條內容"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:14
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:14
 msgid "Specifies whether the sticky notes are locked (non-editable) or not."
 msgstr "指定便條內容是否鎖定（不允許編輯）。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:15
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:15
 msgid "Date format of note's title"
 msgstr "便條標題的日期格式"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:16
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:16
 msgid ""
 "By default, sticky notes are given the current date as the title when they "
 "are created. This format is used; anything that can be parsed by strftime() "
 "is valid."
 msgstr "當產生便條時，預設是使用該天的日期作為標題的。這裡指定顯示日期的格式，規定為任何 strftime() 能夠接受的格式。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:17
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:17
 msgid "Whether to use the default system color"
 msgstr "是否使用系統預設的色彩"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:18
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:18
 msgid ""
 "If this option is disabled, a custom color can be used as the default color "
 "for all sticky notes."
 msgstr "如停用本選項，您可以自行指定一種顏色作為所有便條的預設顏色。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:19
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:19
 msgid "Whether to use the default system font"
 msgstr "是否使用系統預設字型"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:20
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:20
 msgid ""
 "If this option is disabled, a custom font can be used as the default font "
 "for all sticky notes."
 msgstr "如停用本選項，您可以自行指定一種字型作為所有便條的預設字型。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:21
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:21
 msgid "Whether to force the default color and font on all notes"
 msgstr "是否強迫所有便條使用預設顏色和字型"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:22
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:22
 msgid ""
 "If this option is enabled, the custom colors and fonts that have been "
 "assigned to individual notes will be ignored."
 msgstr "如選用本選項，任何個別便條使用的字型和顏色設定都會被忽略。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:23
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:23
 msgid "Whether to hide all notes when the desktop is selected"
 msgstr "是否在桌面被點選時隱藏所有的筆記"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:24
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:24
 msgid ""
 "If this option is enabled, selecting the desktop in any way will "
 "automatically hide all the open notes."
 msgstr "如果啟用這個選項，以任何方式選取桌面都會自動隱藏所有開啟的筆記。"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:25
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:25
 msgid "Whether to ask for confirmation when deleting a note"
 msgstr "刪除便條前是否需要確認"
 
-#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:26
+#: ../stickynotes/org.mate.stickynotes.gschema.xml.in.h:26
 msgid "Empty notes are always deleted without confirmation."
 msgstr "刪除沒有內容的便條時不需要確認。"
 
@@ -2315,89 +2376,89 @@ msgstr "刪除便條(_D)"
 msgid "_Lock Notes"
 msgstr "鎖定便條(_L)"
 
-#: ../stickynotes/stickynotes_applet.c:595
+#: ../stickynotes/stickynotes_applet.c:601
 #, c-format
 msgid "%d note"
 msgid_plural "%d notes"
 msgstr[0] "%d 張便條"
 
-#: ../stickynotes/stickynotes_applet.c:596
+#: ../stickynotes/stickynotes_applet.c:602
 msgid "Show sticky notes"
 msgstr "顯示便條"
 
-#: ../stickynotes/stickynotes_applet_callbacks.c:439
+#: ../stickynotes/stickynotes_applet_callbacks.c:375
 msgid "Sticky Notes for the MATE Desktop Environment"
 msgstr "適用於 MATE 桌面環境的便條程式"
 
-#: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:1
+#: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.h:1
 msgid "Name of timer"
 msgstr ""
 
-#: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:2
+#: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.h:2
 msgid "Duration of timer in seconds"
 msgstr ""
 
-#: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:3
+#: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.h:3
 msgid "Show notification popup when timer finish"
 msgstr ""
 
-#: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:4
+#: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.h:4
 msgid "Show dialog window when timer finish"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:77
+#: ../timerapplet/timerapplet.c:82
 msgid "_Start timer"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:78
+#: ../timerapplet/timerapplet.c:83
 msgid "P_ause timer"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:79
+#: ../timerapplet/timerapplet.c:84
 msgid "S_top timer"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:139
+#: ../timerapplet/timerapplet.c:144
 msgid "Finished"
 msgstr "結束"
 
-#: ../timerapplet/timerapplet.c:146 ../timerapplet/timerapplet.c:158
+#: ../timerapplet/timerapplet.c:151 ../timerapplet/timerapplet.c:163
 msgid "Timer finished!"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:253
+#: ../timerapplet/timerapplet.c:259
 msgid "Start a timer and receive a notification when it is finished"
 msgstr "啟動計時器並於它結束時接收通知"
 
-#: ../timerapplet/timerapplet.c:286
+#: ../timerapplet/timerapplet.c:292
 msgid "Timer Applet Preferences"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:298
+#: ../timerapplet/timerapplet.c:305
 msgid "Name:"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:310
+#: ../timerapplet/timerapplet.c:317
 msgid "Hours:"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:324
+#: ../timerapplet/timerapplet.c:331
 msgid "Minutes:"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:338
+#: ../timerapplet/timerapplet.c:345
 msgid "Seconds:"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:352
+#: ../timerapplet/timerapplet.c:359
 msgid "Show notification popup"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:358
+#: ../timerapplet/timerapplet.c:365
 msgid "Show dialog"
 msgstr ""
 
-#: ../timerapplet/timerapplet.c:376
+#: ../timerapplet/timerapplet.c:389
 msgid "Timer Applet"
 msgstr "計時器小程式"
 
@@ -2409,51 +2470,51 @@ msgstr "回收筒"
 msgid "Go to Trash"
 msgstr "前往回收筒"
 
-#: ../trashapplet/src/trashapplet.c:71 ../trashapplet/src/trash-empty.c:365
+#: ../trashapplet/src/trashapplet.c:74 ../trashapplet/src/trash-empty.c:353
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../trashapplet/src/trashapplet.c:74
+#: ../trashapplet/src/trashapplet.c:77
 msgid "_Open Trash"
 msgstr "開啟回收筒(_O)"
 
-#: ../trashapplet/src/trashapplet.c:130
+#: ../trashapplet/src/trashapplet.c:133
 #, c-format
 msgid "%d Item in Trash"
 msgid_plural "%d Items in Trash"
 msgstr[0] "回收筒中有 %d 個項目"
 
-#: ../trashapplet/src/trashapplet.c:138
+#: ../trashapplet/src/trashapplet.c:141
 msgid "No Items in Trash"
 msgstr "回收筒中沒有任何項目"
 
-#: ../trashapplet/src/trashapplet.c:392
+#: ../trashapplet/src/trashapplet.c:383
 #, c-format
 msgid ""
 "Error while spawning caja:\n"
 "%s"
 msgstr "當執行 caja 時發生錯誤：\n%s"
 
-#: ../trashapplet/src/trashapplet.c:441
+#: ../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:466
+#: ../trashapplet/src/trashapplet.c:457
 msgid "Delete Immediately?"
 msgstr "立即刪除？"
 
-#: ../trashapplet/src/trashapplet.c:498
+#: ../trashapplet/src/trashapplet.c:486
 msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr "無法將項目丟到回收筒，要立即刪除它嗎？"
 
-#: ../trashapplet/src/trashapplet.c:503
+#: ../trashapplet/src/trashapplet.c:491
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr "有些項目無法丟到回收筒，要立即刪除它嗎？"
 
-#: ../trashapplet/src/trashapplet.c:645
+#: ../trashapplet/src/trashapplet.c:621
 msgid "Trash Applet"
 msgstr "回收筒面板程式"
 
@@ -2469,11 +2530,11 @@ msgstr "正在移除項目 %s / %s"
 msgid "Removing: %s"
 msgstr "正在移除：%s"
 
-#: ../trashapplet/src/trash-empty.c:344
+#: ../trashapplet/src/trash-empty.c:332
 msgid "Empty all of the items from the trash?"
 msgstr "要清除回收筒中所有的項目？"
 
-#: ../trashapplet/src/trash-empty.c:351
+#: ../trashapplet/src/trash-empty.c:339
 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."