[gnome-applets] Update Simplified Chinese translation.



commit 45fbc26df010eee6c01ee9ab8ae5ed361ab5cd40
Author: Aron Xu <aronxu gnome org>
Date:   Mon Nov 30 00:24:01 2009 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1072 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 580 insertions(+), 492 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index de69974..75773c7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-applets&component=general\n";
-"POT-Creation-Date: 2009-02-05 06:28+0000\n"
-"PO-Revision-Date: 2009-02-05 21:12+0700\n"
-"Last-Translator: ç??é?²(Gan Lu) <rhythm gan gmail com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"applets&component=general\n"
+"POT-Creation-Date: 2009-11-28 00:12+0000\n"
+"PO-Revision-Date: 2009-11-28 13:35+0800\n"
+"Last-Translator: è??è¿?强 <wzssyqa gmail com>\n"
 "Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,8 +30,7 @@ msgstr ""
 #: ../gweather/GNOME_GWeatherApplet.xml.h:1
 #: ../invest-applet/data/Invest_Applet.xml.h:1
 #: ../mini-commander/src/GNOME_MiniCommanderApplet.xml.h:1
-#: ../mixer/GNOME_MixerApplet.xml.h:2
-#: ../modemlights/GNOME_ModemLights.xml.h:1
+#: ../mixer/GNOME_MixerApplet.xml.h:2 ../modemlights/GNOME_ModemLights.xml.h:1
 #: ../multiload/GNOME_MultiloadApplet.xml.h:1
 #: ../stickynotes/GNOME_StickyNotesApplet.xml.h:2
 #: ../trashapplet/GNOME_Panel_TrashApplet.xml.h:1
@@ -46,8 +46,7 @@ msgstr "��(_A)"
 #: ../gswitchit/GNOME_GSwitchItApplet.xml.h:6
 #: ../gweather/GNOME_GWeatherApplet.xml.h:3
 #: ../mini-commander/src/GNOME_MiniCommanderApplet.xml.h:2
-#: ../mixer/GNOME_MixerApplet.xml.h:3
-#: ../modemlights/GNOME_ModemLights.xml.h:4
+#: ../mixer/GNOME_MixerApplet.xml.h:3 ../modemlights/GNOME_ModemLights.xml.h:4
 #: ../multiload/GNOME_MultiloadApplet.xml.h:2
 #: ../stickynotes/GNOME_StickyNotesApplet.xml.h:4
 #: ../trashapplet/GNOME_Panel_TrashApplet.xml.h:3
@@ -63,7 +62,7 @@ msgid "AccessX Status Applet Factory"
 msgstr "AccessX ç?¶æ??å°?ç¨?åº?å·¥å??"
 
 #: ../accessx-status/GNOME_AccessxStatusApplet.server.in.in.h:2
-#: ../accessx-status/applet.c:1323
+#: ../accessx-status/applet.c:1322
 msgid "Keyboard Accessibility Status"
 msgstr "é?®ç??è¾?å?©å??è?½ç?¶æ??"
 
@@ -83,20 +82,13 @@ msgstr "æ?¾ç¤º AccessX ç?¹æ?§ç??ç?¶æ??ï¼?å¦?æ??é??修饰"
 #. about.set_documenters([])
 #. translators: These appear in the About dialog, usual format applies.
 #. "documenters",        documenters,
-#: ../accessx-status/applet.c:142
-#: ../battstat/battstat_applet.c:1246
-#: ../charpick/charpick.c:600
-#: ../cpufreq/src/cpufreq-applet.c:611
-#: ../drivemount/drivemount.c:117
-#: ../geyes/geyes.c:194
-#: ../gswitchit/gswitchit-applet.c:465
-#: ../gweather/gweather-about.c:55
-#: ../invest-applet/invest/about.py:32
-#: ../mini-commander/src/about.c:54
-#: ../mixer/applet.c:1412
-#: ../modemlights/modem-applet.c:1025
-#: ../multiload/main.c:62
-#: ../stickynotes/stickynotes_applet_callbacks.c:384
+#: ../accessx-status/applet.c:142 ../battstat/battstat_applet.c:1246
+#: ../charpick/charpick.c:611 ../cpufreq/src/cpufreq-applet.c:611
+#: ../drivemount/drivemount.c:117 ../geyes/geyes.c:195
+#: ../gswitchit/gswitchit-applet.c:465 ../gweather/gweather-about.c:55
+#: ../invest-applet/invest/about.py:32 ../mini-commander/src/about.c:54
+#: ../mixer/applet.c:1430 ../modemlights/modem-applet.c:1025
+#: ../multiload/main.c:62 ../stickynotes/stickynotes_applet_callbacks.c:384
 #: ../trashapplet/src/trashapplet.c:432
 msgid "translator-credits"
 msgstr ""
@@ -114,43 +106,38 @@ msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "è°?ç?¨é?®ç??é¦?é??项对è¯?æ¡?æ?¶å?ºé??ï¼?%s"
 
 #. Note to translators: the first letter of the alphabet, not the indefinite article
-#: ../accessx-status/applet.c:468
-#: ../accessx-status/applet.c:506
+#: ../accessx-status/applet.c:468 ../accessx-status/applet.c:506
 msgid "a"
 msgstr "a"
 
-#: ../accessx-status/applet.c:976
-#: ../accessx-status/applet.c:1049
-#: ../accessx-status/applet.c:1118
-#: ../accessx-status/applet.c:1326
+#: ../accessx-status/applet.c:975 ../accessx-status/applet.c:1048
+#: ../accessx-status/applet.c:1117 ../accessx-status/applet.c:1325
 msgid "AccessX Status"
 msgstr "AccessX ç?¶æ??"
 
-#: ../accessx-status/applet.c:977
-#: ../accessx-status/applet.c:1119
+#: ../accessx-status/applet.c:976 ../accessx-status/applet.c:1118
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "æ?¾ç¤ºä½¿ç?¨è¾?å?©å??è?½æ?¶é?®ç??ç??ç?¶æ??ã??"
 
-#: ../accessx-status/applet.c:1011
+#: ../accessx-status/applet.c:1010
 msgid "XKB Extension is not enabled"
 msgstr "XKB �����"
 
-#: ../accessx-status/applet.c:1016
+#: ../accessx-status/applet.c:1015
 msgid "Unknown error"
 msgstr "æ?ªç?¥é??误"
 
-#: ../accessx-status/applet.c:1024
+#: ../accessx-status/applet.c:1023
 #, c-format
 msgid "Error: %s"
 msgstr "é??误ï¼?%s"
 
-#: ../accessx-status/applet.c:1328
+#: ../accessx-status/applet.c:1327
 msgid "Displays current state of keyboard accessibility features"
 msgstr "æ?¾ç¤ºé?®ç??è¾?å?©å??è?½ç?¹æ?§ç??å½?å??ç?¶æ??"
 
 #: ../battstat/GNOME_BattstatApplet.server.in.in.h:1
-#: ../battstat/battstat_applet.c:1610
-#: ../battstat/battstat_applet.c:1663
+#: ../battstat/battstat_applet.c:1610 ../battstat/battstat_applet.c:1663
 msgid "Battery Charge Monitor"
 msgstr "ç?µæ± ç?µé??ç??è§?å?¨"
 
@@ -165,8 +152,7 @@ msgstr "ç??è§?ç¬?è®°æ?¬è®¡ç®?æ?ºç?µæ± ç??å?©ä½?ç?µé??"
 
 #: ../battstat/GNOME_BattstatApplet.xml.h:3
 #: ../charpick/GNOME_CharpickerApplet.xml.h:3
-#: ../cpufreq/GNOME_CPUFreqApplet.xml.h:3
-#: ../geyes/GNOME_GeyesApplet.xml.h:3
+#: ../cpufreq/GNOME_CPUFreqApplet.xml.h:3 ../geyes/GNOME_GeyesApplet.xml.h:3
 #: ../gweather/GNOME_GWeatherApplet.xml.h:4
 #: ../invest-applet/data/Invest_Applet.xml.h:2
 #: ../mini-commander/src/GNOME_MiniCommanderApplet.xml.h:3
@@ -230,14 +216,12 @@ msgstr[0] "离å??满è¿?å?© %d å°?æ?¶ (%d%%)"
 msgid "%d %s %d %s (%d%%) remaining"
 msgstr "è¿?å?© %d %s %d %s (%d%%)"
 
-#: ../battstat/battstat_applet.c:403
-#: ../battstat/battstat_applet.c:410
+#: ../battstat/battstat_applet.c:403 ../battstat/battstat_applet.c:410
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ?¶"
 
-#: ../battstat/battstat_applet.c:404
-#: ../battstat/battstat_applet.c:411
+#: ../battstat/battstat_applet.c:404 ../battstat/battstat_applet.c:411
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
@@ -253,13 +237,11 @@ msgstr "离å??满è¿?å?© %d %s %d %s (%d%%)"
 msgid "Battery Monitor"
 msgstr "ç?µæ± ç??è§?å?¨"
 
-#: ../battstat/battstat_applet.c:433
-#: ../battstat/battstat_applet.c:493
+#: ../battstat/battstat_applet.c:433 ../battstat/battstat_applet.c:493
 msgid "Your battery is now fully recharged"
 msgstr "æ?¨ç??ç?µæ± ç?°å·²å??满ç?µ"
 
-#: ../battstat/battstat_applet.c:469
-#: ../battstat/battstat_applet.c:625
+#: ../battstat/battstat_applet.c:469 ../battstat/battstat_applet.c:625
 msgid "Battery Notice"
 msgstr "ç?µé??æ??示"
 
@@ -271,8 +253,10 @@ msgstr "æ?¨ç??ç?µæ± å®¹é??è¿?å?© %d%%ã??"
 
 #: ../battstat/battstat_applet.c:576
 #, c-format
-msgid "You have %d minute of battery power remaining (%d%% of the total capacity)."
-msgid_plural "You have %d minutes of battery power remaining (%d%% of the total capacity)."
+msgid ""
+"You have %d minute of battery power remaining (%d%% of the total capacity)."
+msgid_plural ""
+"You have %d minutes of battery power remaining (%d%% of the total capacity)."
 msgstr[0] "ç?µæ± è¿?å?© %d å??é??(æ?»å®¹é??ç?? %d%%)ã??"
 
 #. TRANSLATORS: this is a list, it is left as a single string
@@ -319,13 +303,9 @@ msgstr "ç?µæ± ç?¶æ??æ?ªç?¥"
 msgid "N/A"
 msgstr "���"
 
-#: ../battstat/battstat_applet.c:1193
-#: ../drivemount/drivemount.c:142
-#: ../geyes/geyes.c:345
-#: ../geyes/themes.c:244
-#: ../gweather/gweather-applet.c:69
-#: ../gweather/gweather-pref.c:744
-#: ../mini-commander/src/preferences.c:366
+#: ../battstat/battstat_applet.c:1193 ../drivemount/drivemount.c:142
+#: ../geyes/geyes.c:346 ../geyes/themes.c:244 ../gweather/gweather-applet.c:72
+#: ../gweather/gweather-pref.c:748 ../mini-commander/src/preferences.c:366
 #: ../stickynotes/stickynotes_applet_callbacks.c:349
 #: ../stickynotes/stickynotes_applet_callbacks.c:559
 #: ../trashapplet/src/trashapplet.c:398
@@ -348,25 +328,25 @@ msgid "Legacy (non-HAL) backend enabled."
 msgstr "ä¼ ç»?(é?? HAL)å??端已å?¯ç?¨ã??"
 
 #: ../battstat/battstat_applet.ui.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>��</b>"
+msgid "(shows single image for status and charge)"
+msgstr "(ç?¶æ??å??ç?µé??æ?¾ç¤ºä¸ºå??å¼ å?¾ç??)"
 
 #: ../battstat/battstat_applet.ui.h:2
-msgid "<b>Notifications</b>"
-msgstr "<b>é??ç?¥</b>"
+msgid "(two images: one for status, one for charge)"
+msgstr "(两张å?¾ç??ï¼?ä¸?为ç?¶æ??ï¼?äº?为ç?µé??)"
 
 #: ../battstat/battstat_applet.ui.h:3
-msgid "<small>(shows single image for status and charge)</small>"
-msgstr "<small>(ç?¶æ??å??ç?µé??æ?¾ç¤ºä¸ºå??å¼ å?¾ç??)</small>"
+msgid "Appearance"
+msgstr "��"
 
 #: ../battstat/battstat_applet.ui.h:4
-msgid "<small>(two images: one for status, one for charge)</small>"
-msgstr "<small>(两张å?¾ç??ï¼?ä¸?为ç?¶æ??ï¼?äº?为ç?µé??)</small>"
-
-#: ../battstat/battstat_applet.ui.h:5
 msgid "Battery Charge Monitor Preferences"
 msgstr "ç?µæ± ç?µé??ç??è§?å?¨é¦?é??项"
 
+#: ../battstat/battstat_applet.ui.h:5
+msgid "Notifications"
+msgstr "é??ç?¥"
+
 #: ../battstat/battstat_applet.ui.h:6
 msgid "Show _percentage remaining"
 msgstr "æ?¾ç¤ºå?©ä½?ç?¾å??æ¯?(_P)"
@@ -391,12 +371,12 @@ msgstr "å½?ç?µæ± å·²å??满æ?¶é??ç?¥(_N)"
 msgid "_Show time/percentage:"
 msgstr "æ?¾ç¤ºæ?¶é?´/ç?¾å??æ¯?(_S)ï¼?"
 
-#: ../battstat/battstat_applet.ui.h:12
+#. TRANSLATOR: This is the beginning of the sentence 'Warn when battery charge drops to: [XX] percent/minutes remaining'
+#: ../battstat/battstat_applet.ui.h:13
 msgid "_Warn when battery charge drops to:"
 msgstr "è­¦å??å½?ç?µæ± ç?µé??ä¸?é??å?°(_W)ï¼?"
 
-#: ../battstat/battstat-hal.c:343
-#: ../battstat/battstat-hal.c:368
+#: ../battstat/battstat-hal.c:343 ../battstat/battstat-hal.c:368
 msgid "HAL error"
 msgstr "HAL é??误"
 
@@ -450,7 +430,9 @@ msgid "Red value level"
 msgstr "红��级�"
 
 #: ../battstat/battstat.schemas.in.h:10
-msgid "Show the battery meter draining from the top of the battery. Only implemented for traditional battery view."
+msgid ""
+"Show the battery meter draining from the top of the battery. Only "
+"implemented for traditional battery view."
 msgstr "æ?¾ç¤ºç?µæ± ç?µé??ï¼?ä»?ç?µæ± ç??ä¸?æ?¹æµ?èµ°ã??ä»?å?¨ä¼ ç»?ç?µæ± è§?å?¾ä¸­å®?ç?°ã??"
 
 #: ../battstat/battstat.schemas.in.h:11
@@ -470,7 +452,9 @@ msgid "Show the upright, smaller battery on the panel."
 msgstr "å?¨é?¢æ?¿ä¸?æ?¾ç¤ºè¾?å°?ç??ç«?ç?´ç?µæ± "
 
 #: ../battstat/battstat.schemas.in.h:15
-msgid "The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed."
+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/battstat.schemas.in.h:16
@@ -478,7 +462,9 @@ msgid "Upright (small) battery"
 msgstr "ç«?ç?´ç??å°?ç?µæ± "
 
 #: ../battstat/battstat.schemas.in.h:17
-msgid "Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage."
+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/battstat.schemas.in.h:18
@@ -514,8 +500,7 @@ msgid "Battery power low"
 msgstr "ç?µæ± ç?µé??ä½?"
 
 #: ../charpick/GNOME_CharpickerApplet.server.in.in.h:1
-#: ../charpick/charpick.c:730
-#: ../charpick/charpick.c:742
+#: ../charpick/charpick.c:741 ../charpick/charpick.c:753
 #: ../charpick/properties.c:452
 msgid "Character Palette"
 msgstr "�符�"
@@ -525,11 +510,11 @@ msgid "Charpicker Applet Factory"
 msgstr "å­?符æ?¾å??å°?ç¨?åº?å·¥å??"
 
 #: ../charpick/GNOME_CharpickerApplet.server.in.in.h:3
-#: ../charpick/charpick.c:730
+#: ../charpick/charpick.c:741
 msgid "Insert characters"
 msgstr "æ??å?¥å­?符"
 
-#: ../charpick/charpick.c:425
+#: ../charpick/charpick.c:436
 msgid "Available palettes"
 msgstr "å?¯ç?¨ç??å­?符æ?¿"
 
@@ -537,23 +522,26 @@ msgstr "å?¯ç?¨ç??å­?符æ?¿"
 #. *             hopefully, the name of the unicode character has already
 #. *             been translated.
 #.
-#: ../charpick/charpick.c:472
+#: ../charpick/charpick.c:483
 #, c-format
 msgid "Insert \"%s\""
 msgstr "æ??å?¥â??%sâ??"
 
-#: ../charpick/charpick.c:475
+#: ../charpick/charpick.c:486
 msgid "Insert special character"
 msgstr "æ??å?¥ç?¹æ®?å­?符"
 
-#: ../charpick/charpick.c:479
+#: ../charpick/charpick.c:490
 #, c-format
 msgid "insert special character %s"
 msgstr "æ??å?¥ç?¹æ®?å­?符 %s"
 
-#: ../charpick/charpick.c:595
-msgid "Gnome Panel applet for selecting strange characters that are not on my keyboard. Released under GNU General Public Licence."
-msgstr "GNOME é?¢æ?¿å°?ç¨?åº?ï¼?ç?¨äº?é??æ?©é?£äº?å?¨ä½ ç??é?®ç??ä¸?æ?¾ä¸?å?°ç??å­?符ã??以 GNU GPL å??å¸?ã??"
+#: ../charpick/charpick.c:606
+msgid ""
+"Gnome Panel applet for selecting strange characters that are not on my "
+"keyboard. Released under GNU General Public Licence."
+msgstr ""
+"GNOME é?¢æ?¿å°?ç¨?åº?ï¼?ç?¨äº?é??æ?©é?£äº?å?¨ä½ ç??é?®ç??ä¸?æ?¾ä¸?å?°ç??å­?符ã??以 GNU GPL å??å¸?ã??"
 
 #: ../charpick/charpick.schemas.in.h:1
 msgid "Characters shown on applet startup"
@@ -563,8 +551,7 @@ msgstr "å°?ç¨?åº?å?¯å?¨æ?¶æ?¾ç¤ºç??å­?符"
 msgid "DEPRECATED - Characters shown on applet startup"
 msgstr "ä¸?æ?¨è?? - å°?ç¨?åº?å?¯å?¨æ?¶æ?¾ç¤ºç??å­?符"
 
-#: ../charpick/charpick.schemas.in.h:3
-#: ../charpick/properties.c:379
+#: ../charpick/charpick.schemas.in.h:3 ../charpick/properties.c:379
 msgid "List of available palettes"
 msgstr "å?¯ç?¨å­?符æ?¿å??表"
 
@@ -573,7 +560,9 @@ msgid "List of strings containing the available palettes."
 msgstr "å??å?«å?¯ç?¨å­?符æ?¿ç??å­?符串å??表"
 
 #: ../charpick/charpick.schemas.in.h:5
-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."
+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/properties.c:28
@@ -637,8 +626,7 @@ msgid "Character Palette Preferences"
 msgstr "å­?符æ?¿é¦?é??项"
 
 #: ../cpufreq/GNOME_CPUFreqApplet.server.in.in.h:1
-#: ../cpufreq/src/cpufreq-applet.c:943
-#: ../cpufreq/src/cpufreq-applet.c:999
+#: ../cpufreq/src/cpufreq-applet.c:943 ../cpufreq/src/cpufreq-applet.c:999
 msgid "CPU Frequency Scaling Monitor"
 msgstr "CPU é¢?ç??è??å?´ç??è§?å?¨"
 
@@ -647,12 +635,21 @@ msgid "Monitor the CPU Frequency Scaling"
 msgstr "ç??è§? CPU é¢?ç??è??å?´"
 
 #: ../cpufreq/cpufreq-applet.schemas.in.h:1
-msgid "A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency."
-msgstr "0 å?¼æ??å?³ç??æ?¾ç¤º CPU é¢?ç??ï¼?1 æ??å?³ç??æ?¾ç¤ºé¢?ç??å??å??ä½?ï¼?2 æ??å?³ç??æ?¾ç¤ºä¸ºç?¾å??æ¯?è??é??é¢?ç??ã??"
+msgid ""
+"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 "
+"to show percentage instead of frequency."
+msgstr ""
+"0 å?¼æ??å?³ç??æ?¾ç¤º CPU é¢?ç??ï¼?1 æ??å?³ç??æ?¾ç¤ºé¢?ç??å??å??ä½?ï¼?2 æ??å?³ç??æ?¾ç¤ºä¸ºç?¾å??æ¯?è??é??é¢?"
+"ç??ã??"
 
 #: ../cpufreq/cpufreq-applet.schemas.in.h:2
-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 å?¼æ??å?³ç??以å?¾å½¢æ?¹å¼?æ?¾ç¤ºå°?ç¨?åº?ï¼?1 æ??å?³ç??以æ??å­?æ?¹å¼?æ?¾ç¤ºå°?ç¨?åº?ï¼?2 æ??å?³ç??å??æ?¶æ?¾ç¤ºå?¾å½¢å??æ??æ?¬ã??"
+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 å?¼æ??å?³ç??以å?¾å½¢æ?¹å¼?æ?¾ç¤ºå°?ç¨?åº?ï¼?1 æ??å?³ç??以æ??å­?æ?¹å¼?æ?¾ç¤ºå°?ç¨?åº?ï¼?2 æ??å?³ç??å??æ?¶æ?¾"
+"示å?¾å½¢å??æ??æ?¬ã??"
 
 #: ../cpufreq/cpufreq-applet.schemas.in.h:3
 msgid "CPU to Monitor"
@@ -663,7 +660,9 @@ msgid "Mode to show cpu usage"
 msgstr "æ?¾ç¤º CPU ç??模å¼?"
 
 #: ../cpufreq/cpufreq-applet.schemas.in.h:5
-msgid "Set the CPU to monitor. In a single processor system you don't have to change it."
+msgid ""
+"Set the CPU to monitor. In a single processor system you don't have to "
+"change it."
 msgstr "设置è¦?ç??è§?ç?? CPUã??å?¨å??å¤?ç??å?¨ç³»ç»?中ï¼?æ?¨æ? é??è¿?è¡?æ?´æ?¹ã??"
 
 #: ../cpufreq/cpufreq-applet.schemas.in.h:6
@@ -671,45 +670,38 @@ msgid "The type of text to display (if the text is enabled)."
 msgstr "è¦?æ?¾ç¤ºç??æ??æ?¬ç±»å??(è?¥å?¯ç?¨äº?æ??æ?¬ç??è¯?)ã??"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:1
-#: ../mini-commander/src/mini-commander.ui.h:1
-#: ../stickynotes/stickynotes.ui.h:1
-msgid "    "
-msgstr "    "
+msgid "CPU Frequency Monitor Preferences"
+msgstr "CPU é¢?ç??ç??è§?å?¨é¦?é??项"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:2
-msgid "<b>Display Settings</b>"
-msgstr "<b>�示设置</b>"
+msgid "Display Settings"
+msgstr "�示设置"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:3
-msgid "<b>Monitor Settings</b>"
-msgstr "<b>�示�设置</b>"
+msgid "Monitor Settings"
+msgstr "�示�设置"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:4
-msgid "CPU Frequency Monitor Preferences"
-msgstr "CPU é¢?ç??ç??è§?å?¨é¦?é??项"
-
-#: ../cpufreq/cpufreq-preferences.ui.h:5
 msgid "Show CPU frequency as _frequency"
 msgstr "æ?¾ç¤º CPU é¢?ç??为é¢?ç??(_F)"
 
-#: ../cpufreq/cpufreq-preferences.ui.h:6
+#: ../cpufreq/cpufreq-preferences.ui.h:5
 msgid "Show CPU frequency as _percentage"
 msgstr "æ?¾ç¤º CPU é¢?ç??为ç?¾å??æ¯?"
 
-#: ../cpufreq/cpufreq-preferences.ui.h:7
+#: ../cpufreq/cpufreq-preferences.ui.h:6
 msgid "Show frequency _units"
 msgstr "æ?¾ç¤ºé¢?ç??å??ä½?(_U)"
 
-#: ../cpufreq/cpufreq-preferences.ui.h:8
+#: ../cpufreq/cpufreq-preferences.ui.h:7
 msgid "_Appearance:"
 msgstr "��(_A)"
 
-#: ../cpufreq/cpufreq-preferences.ui.h:9
+#: ../cpufreq/cpufreq-preferences.ui.h:8
 msgid "_Monitored CPU:"
 msgstr "ç??è§?中ç?? CPU(_M)ï¼?"
 
-#: ../cpufreq/src/cpufreq-applet.c:578
-#: ../cpufreq/src/cpufreq-prefs.c:478
+#: ../cpufreq/src/cpufreq-applet.c:578 ../cpufreq/src/cpufreq-prefs.c:478
 msgid "Could not open help document"
 msgstr "æ? æ³?æ??å¼?帮å?©æ??æ¡£"
 
@@ -746,8 +738,12 @@ msgid "CPU frequency scaling unsupported"
 msgstr "CPU é¢?ç??è°?è??ä¸?æ?¯æ??"
 
 #: ../cpufreq/src/cpufreq-monitor-factory.c:60
-msgid "You will not be able to modify the frequency of your machine.  Your machine may be misconfigured or not have hardware support for CPU frequency scaling."
-msgstr "æ?¨å?¯è?½æ? æ³?ä¿®æ?¹æ?¨è®¡ç®?æ?ºç??é¢?ç??ã??æ?¨ç??计ç®?æ?ºå?¯è?½é??ç½®ä¸?正确ï¼?æ??è??硬件ä¸?æ?¯æ?? CPU é¢?ç??è°?è??ã??"
+msgid ""
+"You will not be able to modify the frequency of your machine.  Your machine "
+"may be misconfigured or not have hardware support for CPU frequency scaling."
+msgstr ""
+"æ?¨å?¯è?½æ? æ³?ä¿®æ?¹æ?¨è®¡ç®?æ?ºç??é¢?ç??ã??æ?¨ç??计ç®?æ?ºå?¯è?½é??ç½®ä¸?正确ï¼?æ??è??硬件ä¸?æ?¯æ?? CPU é¢?"
+"ç??è°?è??ã??"
 
 #: ../cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in.h:1
 msgid "Change CPU Frequency scaling"
@@ -758,8 +754,7 @@ msgid "Privileges are required to change the CPU Frequency scaling."
 msgstr "è¦?æ?´æ?¹ CPU é¢?ç??è??å?´ï¼?é??è¦?ä¸?å®?ç?¹æ??ã??"
 
 #: ../drivemount/GNOME_DriveMountApplet.server.in.in.h:1
-#: ../drivemount/drivemount.c:169
-#: ../drivemount/drivemount.c:201
+#: ../drivemount/drivemount.c:169 ../drivemount/drivemount.c:201
 msgid "Disk Mounter"
 msgstr "ç£?ç??æ??è½½è??"
 
@@ -775,8 +770,7 @@ msgstr "ç?¨äº?驱å?¨å?¨æ??è½½å°?ç¨?åº?ç??å·¥å??"
 msgid "Mount local disks and devices"
 msgstr "å? è½½æ?¬å?°ç£?ç??å??设å¤?"
 
-#: ../drivemount/drive-button.c:338
-#: ../drivemount/drive-button.c:351
+#: ../drivemount/drive-button.c:338 ../drivemount/drive-button.c:351
 msgid "(mounted)"
 msgstr "(å·²æ??è½½)"
 
@@ -789,30 +783,30 @@ msgstr "(æ?ªæ??è½½)"
 msgid "Cannot execute '%s'"
 msgstr "æ? æ³?æ?§è¡?â??%sâ??"
 
-#: ../drivemount/drive-button.c:860
+#: ../drivemount/drive-button.c:871
 msgid "_Play DVD"
 msgstr "æ?­æ?¾ DVD(_P)"
 
-#: ../drivemount/drive-button.c:864
+#: ../drivemount/drive-button.c:875
 msgid "_Play CD"
 msgstr "æ?­æ?¾ CD(_P)"
 
-#: ../drivemount/drive-button.c:867
+#: ../drivemount/drive-button.c:878
 #, c-format
 msgid "_Open %s"
 msgstr "æ??å¼? %s(_O)"
 
-#: ../drivemount/drive-button.c:876
+#: ../drivemount/drive-button.c:887
 #, c-format
 msgid "Un_mount %s"
 msgstr "�载 %s(_M)"
 
-#: ../drivemount/drive-button.c:883
+#: ../drivemount/drive-button.c:894
 #, c-format
 msgid "_Mount %s"
 msgstr "æ??è½½ %s(_M)"
 
-#: ../drivemount/drive-button.c:891
+#: ../drivemount/drive-button.c:902
 #, c-format
 msgid "_Eject %s"
 msgstr "弹� %s(_E)"
@@ -833,10 +827,8 @@ msgstr "æ¯?次ç?¶æ??æ?´æ?°ä¹?é?´ç­?å¾?ç??ç§?æ?°"
 msgid "A set of eyeballs for your panel"
 msgstr "ç?¨äº?æ?¨é?¢æ?¿ç??ä¸?ç»?ç?¼ç??"
 
-#: ../geyes/GNOME_GeyesApplet.server.in.in.h:2
-#: ../geyes/geyes.c:384
-#: ../geyes/geyes.c:414
-#: ../geyes/geyes.c:416
+#: ../geyes/GNOME_GeyesApplet.server.in.in.h:2 ../geyes/geyes.c:385
+#: ../geyes/geyes.c:415 ../geyes/geyes.c:417
 msgid "Eyes"
 msgstr "Eyes"
 
@@ -844,11 +836,11 @@ msgstr "Eyes"
 msgid "Geyes Applet Factory"
 msgstr "Geyes å°?ç¨?åº?å·¥å??"
 
-#: ../geyes/geyes.c:189
+#: ../geyes/geyes.c:190
 msgid "A goofy set of eyes for the GNOME panel. They follow your mouse."
 msgstr "ç?¨äº? GNOME é?¢æ?¿ç??ä¸?ç»?æ??è ¢ç??ç?¼ç??ã??å®?们ä¼?ç?¯ç??æ?¨ç??é¼ æ ?ã??"
 
-#: ../geyes/geyes.c:417
+#: ../geyes/geyes.c:418
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "ä¸?å??å??è§?ç??é¼ æ ?æ??é??æ?¹å??ç??ç?¼ç??"
 
@@ -876,13 +868,11 @@ msgstr "主�"
 msgid "_Select a theme:"
 msgstr "é??æ?©ä¸»é¢?(_S)ï¼?"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:1
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:1
+#: ../gkb-new/xmodmap/base.xml.in.h:1 ../gkb-new/xmodmap.sun/base.xml.in.h:1
 msgid "Alt+Control changes layout."
 msgstr "Alt+Ctrl æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:2
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:2
+#: ../gkb-new/xmodmap/base.xml.in.h:2 ../gkb-new/xmodmap.sun/base.xml.in.h:2
 msgid "Alt+Shift changes layout."
 msgstr "Alt+Shift æ?´æ?¹å¸?å±?ã??"
 
@@ -902,18 +892,15 @@ msgstr "å·´æ?¯å??语"
 msgid "Belgian"
 msgstr "���语"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:7
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:6
+#: ../gkb-new/xmodmap/base.xml.in.h:7 ../gkb-new/xmodmap.sun/base.xml.in.h:6
 msgid "Both Alt keys together change layout."
 msgstr "å??æ?¶æ??ä¸?两个 Alt é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:8
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:7
+#: ../gkb-new/xmodmap/base.xml.in.h:8 ../gkb-new/xmodmap.sun/base.xml.in.h:7
 msgid "Both Ctrl keys together change layout."
 msgstr "å??æ?¶æ??ä¸?两个 Ctrl é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:9
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:8
+#: ../gkb-new/xmodmap/base.xml.in.h:9 ../gkb-new/xmodmap.sun/base.xml.in.h:8
 msgid "Both Shift keys together change layout."
 msgstr "å??æ?¶æ??ä¸?两个 Shift é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -929,13 +916,11 @@ msgstr "ä¿?å? å?©äº?西é??å°?æ??"
 msgid "Bulgarian keymap"
 msgstr "ä¿?å? å?©äº?语é?®ç??æ? å°?"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:13
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:16
+#: ../gkb-new/xmodmap/base.xml.in.h:13 ../gkb-new/xmodmap.sun/base.xml.in.h:16
 msgid "CapsLock key changes layout."
 msgstr "CapsLock é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:14
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:17
+#: ../gkb-new/xmodmap/base.xml.in.h:14 ../gkb-new/xmodmap.sun/base.xml.in.h:17
 msgid "Control+Shift changes layout."
 msgstr "Ctrl+Shift æ?´æ?¹å¸?å±?ã??"
 
@@ -987,8 +972,7 @@ msgstr "GB 102 é?®"
 msgid "GB 105-key"
 msgstr "GB 105 é?®"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:27
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:27
+#: ../gkb-new/xmodmap/base.xml.in.h:27 ../gkb-new/xmodmap.sun/base.xml.in.h:27
 msgid "Generic Keyboard"
 msgstr "é??ç?¨é?®ç??"
 
@@ -1064,28 +1048,23 @@ msgstr "æ?¥è¯­é?®ç??æ? å°?"
 msgid "Lao keymap"
 msgstr "è??æ??语é?®ç??æ? å°?"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:46
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:41
+#: ../gkb-new/xmodmap/base.xml.in.h:46 ../gkb-new/xmodmap.sun/base.xml.in.h:41
 msgid "Layout shift behavior"
 msgstr "å¸?å±?å??æ?¢è¡?为"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:47
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:42
+#: ../gkb-new/xmodmap/base.xml.in.h:47 ../gkb-new/xmodmap.sun/base.xml.in.h:42
 msgid "Left Alt key changes layout."
 msgstr "å·¦ Alt é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:48
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:43
+#: ../gkb-new/xmodmap/base.xml.in.h:48 ../gkb-new/xmodmap.sun/base.xml.in.h:43
 msgid "Left Ctrl key changes group."
 msgstr "å·¦ Ctrl é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:49
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:44
+#: ../gkb-new/xmodmap/base.xml.in.h:49 ../gkb-new/xmodmap.sun/base.xml.in.h:44
 msgid "Left Shift key changes group."
 msgstr "å·¦ Shift é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:50
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:45
+#: ../gkb-new/xmodmap/base.xml.in.h:50 ../gkb-new/xmodmap.sun/base.xml.in.h:45
 msgid "Left Win-key changes layout."
 msgstr "å·¦ Windows é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1097,8 +1076,7 @@ msgstr "ç«?é?¶å®?语é?®ç??æ? å°?"
 msgid "Macedonian"
 msgstr "马�顿语"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:53
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:48
+#: ../gkb-new/xmodmap/base.xml.in.h:53 ../gkb-new/xmodmap.sun/base.xml.in.h:48
 msgid "Menu key changes layout."
 msgstr "è??å??é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1142,23 +1120,19 @@ msgstr "è?¡è??ç??语å??é?®"
 msgid "Portuguese keymap"
 msgstr "è?¡è??ç??语é?®ç??æ? å°?"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:64
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:53
+#: ../gkb-new/xmodmap/base.xml.in.h:64 ../gkb-new/xmodmap.sun/base.xml.in.h:53
 msgid "Right Alt key changes layout."
 msgstr "å?³ Alt é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:65
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:54
+#: ../gkb-new/xmodmap/base.xml.in.h:65 ../gkb-new/xmodmap.sun/base.xml.in.h:54
 msgid "Right Ctrl key changes group."
 msgstr "å?³ Ctrl é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:66
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:55
+#: ../gkb-new/xmodmap/base.xml.in.h:66 ../gkb-new/xmodmap.sun/base.xml.in.h:55
 msgid "Right Shift key changes group."
 msgstr "å?³ Shift é?®æ?´æ?¹å¸?å±?ã??"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:67
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:56
+#: ../gkb-new/xmodmap/base.xml.in.h:67 ../gkb-new/xmodmap.sun/base.xml.in.h:56
 msgid "Right Win-key changes layout."
 msgstr "å?³ Windows é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1174,8 +1148,7 @@ msgstr "ä¿?语é?®ç??æ? å°?"
 msgid "Serbian keymap"
 msgstr "å¡?å°?ç»´äº?语é?®ç??æ? å°?"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:71
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:60
+#: ../gkb-new/xmodmap/base.xml.in.h:71 ../gkb-new/xmodmap.sun/base.xml.in.h:60
 msgid "Shift+CapsLock changes layout."
 msgstr "Shift+CapsLock æ?´æ?¹å¸?å±?ã??"
 
@@ -1570,8 +1543,7 @@ msgstr "é?®ç??å¸?å±?"
 msgid "_Details"
 msgstr "ç»?è??(_D)"
 
-#: ../gweather/GNOME_GWeatherApplet.xml.h:5
-#: ../gweather/gweather-dialog.c:215
+#: ../gweather/GNOME_GWeatherApplet.xml.h:5 ../gweather/gweather-dialog.c:215
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
@@ -1588,7 +1560,7 @@ msgid "Monitor the current weather conditions, and forecasts"
 msgstr "å½?å??æ°?象æ?¡ä»¶å??æ°?象é¢?æ?¥ç??è§?å?¨"
 
 #: ../gweather/GNOME_GWeatherApplet_Factory.server.in.in.h:4
-#: ../gweather/gweather-applet.c:321
+#: ../gweather/gweather-applet.c:324
 msgid "Weather Report"
 msgstr "æ°?象æ?¥å??"
 
@@ -1600,16 +1572,15 @@ msgstr "(c)1999-2005 S. Papadimitriou å??å?¶ä»?人"
 msgid "A panel application for monitoring local weather conditions."
 msgstr "ç?¨äº?ç??è§?æ?¬å?°å¤©æ°?æ??å?µç??é?¢æ?¿å°?ç¨?åº?ã??"
 
-#: ../gweather/gweather-applet.c:339
-#: ../gweather/gweather-applet.c:343
+#: ../gweather/gweather-applet.c:342 ../gweather/gweather-applet.c:346
 msgid "GNOME Weather"
 msgstr "GNOME 天�"
 
-#: ../gweather/gweather-applet.c:444
+#: ../gweather/gweather-applet.c:447
 msgid "Weather Forecast"
 msgstr "天���"
 
-#: ../gweather/gweather-applet.c:456
+#: ../gweather/gweather-applet.c:459
 #, c-format
 msgid ""
 "City: %s\n"
@@ -1620,7 +1591,7 @@ msgstr ""
 "天��%s\n"
 "温度�%s"
 
-#: ../gweather/gweather-applet.c:506
+#: ../gweather/gweather-applet.c:509
 msgid "Updating..."
 msgstr "正���..."
 
@@ -1742,15 +1713,15 @@ msgid "Enter the URL"
 msgstr "è¾?å?¥ URL"
 
 #: ../gweather/gweather-pref.c:317
-msgid "Failed to load the Locations XML database.  Please report this as a bug."
+msgid ""
+"Failed to load the Locations XML database.  Please report this as a bug."
 msgstr "è£?å?¥ä½?ç½® XML æ?°æ?®åº?失败ã??请æ?¥å??æ­¤é??误ã??"
 
-#: ../gweather/gweather-pref.c:803
+#: ../gweather/gweather-pref.c:807
 msgid "Weather Preferences"
 msgstr "天æ°?é¦?é??项"
 
-#: ../gweather/gweather-pref.c:835
-#: ../gweather/gweather-pref.c:1020
+#: ../gweather/gweather-pref.c:839 ../gweather/gweather-pref.c:1024
 msgid "_Automatically update every:"
 msgstr "è?ªå?¨æ?´æ?°ç??é?´é??(_A)ï¼?"
 
@@ -1758,156 +1729,154 @@ msgstr "è?ªå?¨æ?´æ?°ç??é?´é??(_A)ï¼?"
 #. * Units settings page.
 #.
 #. Temperature Unit
-#: ../gweather/gweather-pref.c:848
+#: ../gweather/gweather-pref.c:852
 msgid "_Temperature unit:"
 msgstr "温度å??ä½?(_T)ï¼?"
 
-#: ../gweather/gweather-pref.c:857
-#: ../gweather/gweather-pref.c:877
-#: ../gweather/gweather-pref.c:903
-#: ../gweather/gweather-pref.c:931
+#: ../gweather/gweather-pref.c:861 ../gweather/gweather-pref.c:881
+#: ../gweather/gweather-pref.c:907 ../gweather/gweather-pref.c:935
 msgid "Default"
 msgstr "�认�"
 
-#: ../gweather/gweather-pref.c:858
+#: ../gweather/gweather-pref.c:862
 msgid "Kelvin"
 msgstr "å¼?å°?æ??"
 
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../gweather/gweather-pref.c:860
+#: ../gweather/gweather-pref.c:864
 msgid "Celsius"
 msgstr "æ??æ°?度"
 
-#: ../gweather/gweather-pref.c:861
+#: ../gweather/gweather-pref.c:865
 msgid "Fahrenheit"
 msgstr "å??æ°?度"
 
 #. Speed Unit
-#: ../gweather/gweather-pref.c:868
+#: ../gweather/gweather-pref.c:872
 msgid "_Wind speed unit:"
 msgstr "é£?é??å??ä½?(_W)ï¼?"
 
 #. TRANSLATOR: The wind speed unit "meters per second"
-#: ../gweather/gweather-pref.c:879
+#: ../gweather/gweather-pref.c:883
 msgid "m/s"
 msgstr "m/s"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../gweather/gweather-pref.c:881
+#: ../gweather/gweather-pref.c:885
 msgid "km/h"
 msgstr "km/h"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../gweather/gweather-pref.c:883
+#: ../gweather/gweather-pref.c:887
 msgid "mph"
 msgstr "mph"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../gweather/gweather-pref.c:885
+#: ../gweather/gweather-pref.c:889
 msgid "knots"
 msgstr "è??"
 
-#: ../gweather/gweather-pref.c:887
+#: ../gweather/gweather-pref.c:891
 msgid "Beaufort scale"
 msgstr "��级"
 
 #. Pressure Unit
-#: ../gweather/gweather-pref.c:894
+#: ../gweather/gweather-pref.c:898
 msgid "_Pressure unit:"
 msgstr "æ°?å??å??ä½?(_P)ï¼?"
 
 #. TRANSLATOR: The pressure unit "kiloPascals"
-#: ../gweather/gweather-pref.c:905
+#: ../gweather/gweather-pref.c:909
 msgid "kPa"
 msgstr "å??å¸?"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../gweather/gweather-pref.c:907
+#: ../gweather/gweather-pref.c:911
 msgid "hPa"
 msgstr "��"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../gweather/gweather-pref.c:909
+#: ../gweather/gweather-pref.c:913
 msgid "mb"
 msgstr "mb"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../gweather/gweather-pref.c:911
+#: ../gweather/gweather-pref.c:915
 msgid "mmHg"
 msgstr "mmHg"
 
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../gweather/gweather-pref.c:913
+#: ../gweather/gweather-pref.c:917
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../gweather/gweather-pref.c:915
+#: ../gweather/gweather-pref.c:919
 msgid "atm"
 msgstr "大æ°?å??"
 
 #. Distance Unit
-#: ../gweather/gweather-pref.c:922
+#: ../gweather/gweather-pref.c:926
 msgid "_Visibility unit:"
 msgstr "è?½è§?度å??ä½?(_V)ï¼?"
 
 #. TRANSLATOR: The distance unit "meters"
-#: ../gweather/gweather-pref.c:933
+#: ../gweather/gweather-pref.c:937
 msgid "meters"
 msgstr "ç±³"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../gweather/gweather-pref.c:935
+#: ../gweather/gweather-pref.c:939
 msgid "km"
 msgstr "å??ç±³"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../gweather/gweather-pref.c:937
+#: ../gweather/gweather-pref.c:941
 msgid "miles"
 msgstr "è?±é??"
 
-#: ../gweather/gweather-pref.c:971
+#: ../gweather/gweather-pref.c:975
 msgid "Enable _radar map"
 msgstr "���达�(_R)"
 
-#: ../gweather/gweather-pref.c:985
+#: ../gweather/gweather-pref.c:989
 msgid "Use _custom address for radar map"
 msgstr "对é?·è¾¾å?¾ä½¿ç?¨è?ªå®?ä¹?å?°å??(_C)"
 
-#: ../gweather/gweather-pref.c:1002
+#: ../gweather/gweather-pref.c:1006
 msgid "A_ddress:"
 msgstr "å?°å??(_D)ï¼?"
 
-#: ../gweather/gweather-pref.c:1016
+#: ../gweather/gweather-pref.c:1020
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../gweather/gweather-pref.c:1040
+#: ../gweather/gweather-pref.c:1044
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../gweather/gweather-pref.c:1056
+#: ../gweather/gweather-pref.c:1060
 msgid "Display"
 msgstr "�示"
 
-#: ../gweather/gweather-pref.c:1071
-#: ../mini-commander/src/mini-commander.ui.h:12
+#: ../gweather/gweather-pref.c:1075
+#: ../mini-commander/src/mini-commander.ui.h:9
 msgid "General"
 msgstr "常�"
 
-#: ../gweather/gweather-pref.c:1084
+#: ../gweather/gweather-pref.c:1088
 msgid "_Select a location:"
 msgstr "é??æ?©ä½?ç½®(_S)ï¼?"
 
-#: ../gweather/gweather-pref.c:1109
+#: ../gweather/gweather-pref.c:1113
 msgid "_Find:"
 msgstr "��(_F)�"
 
-#: ../gweather/gweather-pref.c:1116
+#: ../gweather/gweather-pref.c:1120
 msgid "Find _Next"
 msgstr "����个(_N)"
 
-#: ../gweather/gweather-pref.c:1138
+#: ../gweather/gweather-pref.c:1142
 msgid "Location"
 msgstr "ä½?ç½®"
 
@@ -1919,135 +1888,159 @@ msgstr "æ??èµ?"
 #: ../invest-applet/data/Invest_Applet.server.in.in.h:2
 #: ../invest-applet/invest/about.py:23
 msgid "Track your invested money."
-msgstr "è·?踪æ?¨æ??èµ?ç??è´§å¸?ã??"
+msgstr "è·?踪æ?¨ç??æ??èµ?ã??"
 
 #: ../invest-applet/data/Invest_Applet.xml.h:3
 msgid "_Refresh"
 msgstr "å?·æ?°(_R)"
 
 #: ../invest-applet/data/financialchart.ui.h:1
+msgid "1 Year"
+msgstr "�年"
+
+#: ../invest-applet/data/financialchart.ui.h:2
 msgid "10"
 msgstr "10"
 
-#: ../invest-applet/data/financialchart.ui.h:2
+#: ../invest-applet/data/financialchart.ui.h:3
 msgid "100"
 msgstr "100"
 
-#: ../invest-applet/data/financialchart.ui.h:3
+#: ../invest-applet/data/financialchart.ui.h:4
 msgid "20"
 msgstr "20"
 
-#: ../invest-applet/data/financialchart.ui.h:4
+#: ../invest-applet/data/financialchart.ui.h:5
 msgid "200"
 msgstr "200"
 
-#: ../invest-applet/data/financialchart.ui.h:5
+#: ../invest-applet/data/financialchart.ui.h:6
+msgid "3 Months"
+msgstr "ä¸?个æ??"
+
+#: ../invest-applet/data/financialchart.ui.h:7
 msgid "5"
 msgstr "5"
 
-#: ../invest-applet/data/financialchart.ui.h:6
+#: ../invest-applet/data/financialchart.ui.h:8
+msgid "5 Days"
+msgstr "�天"
+
+#: ../invest-applet/data/financialchart.ui.h:9
+msgid "5 Years"
+msgstr "5å¹´"
+
+#: ../invest-applet/data/financialchart.ui.h:10
 msgid "50"
 msgstr "50"
 
-#: ../invest-applet/data/financialchart.ui.h:7
+#: ../invest-applet/data/financialchart.ui.h:11
+msgid "6 Months"
+msgstr "å?­ä¸ªæ??"
+
+#: ../invest-applet/data/financialchart.ui.h:12
 msgid "Auto _refresh"
 msgstr "����(_R)"
 
-#: ../invest-applet/data/financialchart.ui.h:8
+#: ../invest-applet/data/financialchart.ui.h:13
 msgid "Bollinger"
 msgstr "å¸?æ??线"
 
-#: ../invest-applet/data/financialchart.ui.h:9
+#: ../invest-applet/data/financialchart.ui.h:14
 msgid "Downloading chart from <b>Yahoo!</b>"
 msgstr "正�� <b>Yahoo!</b> �载�表"
 
-#: ../invest-applet/data/financialchart.ui.h:10
+#: ../invest-applet/data/financialchart.ui.h:15
 msgid "Exponential moving average: "
 msgstr "æ??æ?°å¹³å??æ?°æ??æ ?ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:11
+#: ../invest-applet/data/financialchart.ui.h:16
 msgid "Fast stoch"
 msgstr "å¿«é??æ?ºæ??æ?°"
 
-#: ../invest-applet/data/financialchart.ui.h:12
-#: ../invest-applet/invest/chart.py:105
+#: ../invest-applet/data/financialchart.ui.h:17
+#: ../invest-applet/invest/chart.py:107
 msgid "Financial Chart"
 msgstr "é??è??å?¾è¡¨"
 
-#: ../invest-applet/data/financialchart.ui.h:13
+#: ../invest-applet/data/financialchart.ui.h:18
 msgid "Indicators: "
 msgstr "æ??示å?¨ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:14
+#: ../invest-applet/data/financialchart.ui.h:19
 msgid "MACD"
 msgstr "MACD"
 
-#: ../invest-applet/data/financialchart.ui.h:15
+#: ../invest-applet/data/financialchart.ui.h:20
 msgid "MFI"
 msgstr "MFI"
 
-#: ../invest-applet/data/financialchart.ui.h:16
+#: ../invest-applet/data/financialchart.ui.h:21
+msgid "Maximum"
+msgstr "æ??大"
+
+#: ../invest-applet/data/financialchart.ui.h:22
 msgid "Moving average: "
 msgstr "移å?¨å¹³å??线ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:17
+#: ../invest-applet/data/financialchart.ui.h:23
 msgid "Overlays: "
 msgstr "é??å¤?å? ä½?段ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:18
+#: ../invest-applet/data/financialchart.ui.h:24
 msgid "ROC"
 msgstr "ROC"
 
-#: ../invest-applet/data/financialchart.ui.h:19
+#: ../invest-applet/data/financialchart.ui.h:25
 msgid "RSI"
 msgstr "RSI"
 
-#: ../invest-applet/data/financialchart.ui.h:20
+#: ../invest-applet/data/financialchart.ui.h:26
 msgid "SAR"
 msgstr "SAR"
 
-#: ../invest-applet/data/financialchart.ui.h:21
+#: ../invest-applet/data/financialchart.ui.h:27
 msgid "Slow stoch"
 msgstr "æ?¢é??æ?ºæ??æ?°"
 
-#: ../invest-applet/data/financialchart.ui.h:22
+#: ../invest-applet/data/financialchart.ui.h:28
 msgid "Splits"
 msgstr "é??è?¡"
 
-#: ../invest-applet/data/financialchart.ui.h:23
+#: ../invest-applet/data/financialchart.ui.h:29
+msgid "Today"
+msgstr "�天"
+
+#: ../invest-applet/data/financialchart.ui.h:30
 msgid "Vol"
 msgstr "æ??交é??"
 
-#: ../invest-applet/data/financialchart.ui.h:24
+#: ../invest-applet/data/financialchart.ui.h:31
 msgid "Vol+MA"
 msgstr "Vol+MA"
 
-#: ../invest-applet/data/financialchart.ui.h:25
+#: ../invest-applet/data/financialchart.ui.h:32
 msgid "Volumes"
 msgstr "é?³é??"
 
-#: ../invest-applet/data/financialchart.ui.h:27
+#: ../invest-applet/data/financialchart.ui.h:34
 #, no-c-format
 msgid "W%R"
 msgstr "W%R"
 
-#: ../invest-applet/data/financialchart.ui.h:28
+#: ../invest-applet/data/financialchart.ui.h:35
 msgid "_Graph style: "
 msgstr "�形�格(_G)�"
 
-#: ../invest-applet/data/financialchart.ui.h:29
+#: ../invest-applet/data/financialchart.ui.h:36
 msgid "_Options"
 msgstr "é??项(_O)"
 
-#: ../invest-applet/data/financialchart.ui.h:30
+#: ../invest-applet/data/financialchart.ui.h:37
 msgid "_Ticker symbol: "
 msgstr "è?¡ç¥¨è¡?æ??è?ªå?¨æ?¶å½?å?¨ç¬¦å?·(_T)ï¼?"
 
 #: ../invest-applet/data/prefs-dialog.ui.h:1
-msgid "<b>Stocks</b>"
-msgstr "<b>�票</b>"
-
-#: ../invest-applet/data/prefs-dialog.ui.h:2
 msgid ""
 "<i><small><b>Note:</b> Quotes are delayed at least 15 minutes.\n"
 "<b>Source: </b> Yahoo!</small></i>"
@@ -2055,10 +2048,14 @@ msgstr ""
 "<i><small><b>注æ??ï¼?</b> æ?¥ä»·å»¶è¿?äº?è?³å°? 15 å??é??ã??\n"
 "<b>���</b> Yahoo!</small></i>"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:4
+#: ../invest-applet/data/prefs-dialog.ui.h:3
 msgid "Invest Preferences"
 msgstr "æ??èµ? é¦?é??项"
 
+#: ../invest-applet/data/prefs-dialog.ui.h:4
+msgid "Stocks"
+msgstr "�票"
+
 #: ../invest-applet/data/prefs-dialog.ui.h:5
 msgid "label"
 msgstr "æ ?ç­¾"
@@ -2073,27 +2070,29 @@ msgid "<b>No stock quotes are currently available</b>"
 msgstr "<b>ç?®å??没æ??è?¡ç¥¨æ?¥ä»·</b>"
 
 #: ../invest-applet/invest/applet.py:55
-msgid "The server could not be contacted. The computer is either offline or the servers are down. Try again later."
+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:153
+#: ../invest-applet/invest/chart.py:156
 #, python-format
 msgid "Financial Chart - %s"
 msgstr "é??è??å?¾è¡¨ - %s"
 
-#: ../invest-applet/invest/chart.py:220
+#: ../invest-applet/invest/chart.py:223
 msgid "Opening Chart"
 msgstr "æ??å¼?å?¾è¡¨"
 
-#: ../invest-applet/invest/chart.py:235
+#: ../invest-applet/invest/chart.py:238
 msgid "Chart downloaded"
 msgstr "�表已�载"
 
-#: ../invest-applet/invest/chart.py:237
+#: ../invest-applet/invest/chart.py:240
 msgid "Chart could not be downloaded"
 msgstr "���载�表"
 
-#: ../invest-applet/invest/invest-applet.py:44
+#: ../invest-applet/invest/invest-applet.py:41
 msgid "Invest Applet"
 msgstr "æ??èµ?å°?ç¨?åº?"
 
@@ -2102,6 +2101,10 @@ msgid "Symbol"
 msgstr "代�"
 
 #: ../invest-applet/invest/preferences.py:24
+msgid "Label"
+msgstr "æ ?ç­¾"
+
+#: ../invest-applet/invest/preferences.py:24
 msgid "Amount"
 msgstr "æ?»é??"
 
@@ -2113,53 +2116,52 @@ msgstr "ä»·æ ¼"
 msgid "Commission"
 msgstr "交æ??"
 
-#: ../invest-applet/invest/quotes.py:91
+#: ../invest-applet/invest/quotes.py:92
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "æ??èµ?å°?ç¨?åº?æ? æ³?è¿?æ?¥å?° Yahoo! è´¢ç»?"
 
-#: ../invest-applet/invest/quotes.py:93
-#: ../invest-applet/invest/quotes.py:106
+#: ../invest-applet/invest/quotes.py:94 ../invest-applet/invest/quotes.py:107
 #, python-format
 msgid "Updated at %s"
 msgstr "� %s ��"
 
 #. Translators: This is share-market jargon. It is the percentage change in the price of a stock. The %% gets changed to a single percent sign and the %+.2f gets replaced with the value of the change.
-#: ../invest-applet/invest/quotes.py:102
+#: ../invest-applet/invest/quotes.py:103
 #, python-format
 msgid "Quotes average change %%: %+.2f%%"
 msgstr "æ?¥ä»·å¹³å??å??å?? %%: %+.2f%%"
 
 #. Translators: This is share-market jargon. It refers to the total difference between the current price and purchase price for all the shares put together. i.e. How much money would be earned if they were sold right now.
-#: ../invest-applet/invest/quotes.py:105
+#: ../invest-applet/invest/quotes.py:106
 #, python-format
 msgid "Positions balance: %+.2f"
 msgstr "å??ä½?平衡ï¼?%+.2f"
 
-#. model: SYMBOL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB
+#. 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:52
+#: ../invest-applet/invest/widgets.py:53
 msgid "Ticker"
 msgstr "è?¡ç¥¨è¡?æ??è?ªå?¨æ?¶å½?å?¨"
 
-#: ../invest-applet/invest/widgets.py:52
+#: ../invest-applet/invest/widgets.py:53
 msgid "Last"
 msgstr "æ??è¿?"
 
-#: ../invest-applet/invest/widgets.py:52
+#: ../invest-applet/invest/widgets.py:53
 msgid "Change %"
 msgstr "å??å?¨ %"
 
-#: ../invest-applet/invest/widgets.py:52
+#: ../invest-applet/invest/widgets.py:53
 msgid "Chart"
 msgstr "�表"
 
-#: ../invest-applet/invest/widgets.py:52
+#: ../invest-applet/invest/widgets.py:53
 msgid "Gain"
 msgstr "æ?¶ç??"
 
-#: ../invest-applet/invest/widgets.py:52
+#: ../invest-applet/invest/widgets.py:53
 msgid "Gain %"
 msgstr "æ?¶ç??ç?¾å??æ¯?"
 
@@ -2172,7 +2174,7 @@ msgid "Deskbar (transparent upgrade from Mini-Commander)"
 msgstr "æ¡?é?¢æ ?(ä»?è¿·ä½ æ??æ?¥å®?ç??é??æ??å??级)"
 
 #: ../mini-commander/src/GNOME_MiniCommanderApplet.server.in.in.h:1
-#: ../mini-commander/src/mini-commander_applet.c:362
+#: ../mini-commander/src/mini-commander_applet.c:355
 msgid "Command Line"
 msgstr "�令�"
 
@@ -2185,23 +2187,26 @@ msgid "MiniCommander Applet Factory"
 msgstr "å°?å??å?½ä»¤è¡?å°?ç¨?åº?å·¥å??"
 
 #: ../mini-commander/src/about.c:49
-msgid "This GNOME applet adds a command line to the panel. It features command completion, command history, and changeable macros."
-msgstr "æ­¤ GNOME å°?ç¨?åº?å?¨é?¢æ?¿ä¸­æ·»å? ä¸?个å?½ä»¤è¡?ã??å®?æ?¯æ??å?½ä»¤è¡¥å?¨ã??å?½ä»¤å??å?²å??å?¯æ?´æ?¹ç??å®?ã??"
+msgid ""
+"This GNOME applet adds a command line to the panel. It features command "
+"completion, command history, and changeable macros."
+msgstr ""
+"æ­¤ GNOME å°?ç¨?åº?å?¨é?¢æ?¿ä¸­æ·»å? ä¸?个å?½ä»¤è¡?ã??å®?æ?¯æ??å?½ä»¤è¡¥å?¨ã??å?½ä»¤å??å?²å??å?¯æ?´æ?¹ç??å®?ã??"
 
-#: ../mini-commander/src/command_line.c:354
+#: ../mini-commander/src/command_line.c:345
 msgid "No items in history"
 msgstr "å??å?²ä¸­æ? é¡¹ç?®"
 
 #. build file select dialog
-#: ../mini-commander/src/command_line.c:478
+#: ../mini-commander/src/command_line.c:469
 msgid "Start program"
 msgstr "����"
 
-#: ../mini-commander/src/command_line.c:530
+#: ../mini-commander/src/command_line.c:522
 msgid "Command line"
 msgstr "�令�"
 
-#: ../mini-commander/src/command_line.c:531
+#: ../mini-commander/src/command_line.c:523
 msgid "Type a command here and Gnome will execute it for you"
 msgstr "�此���令让 GNOME ��"
 
@@ -2210,32 +2215,32 @@ msgstr "�此���令让 GNOME ��"
 msgid "Cannot get schema for %s: %s"
 msgstr "æ? æ³?å¾?å?° %s ç??模å¼?ï¼?%s"
 
-#: ../mini-commander/src/mc-install-default-macros.c:108
+#: ../mini-commander/src/mc-install-default-macros.c:111
 #, c-format
 msgid "Cannot set schema for %s: %s"
 msgstr "æ? æ³?设置 %s ç??模å¼?ï¼?%s"
 
-#: ../mini-commander/src/mc-install-default-macros.c:114
+#: ../mini-commander/src/mc-install-default-macros.c:117
 #, c-format
 msgid "Set default list value for %s\n"
 msgstr "设置 %s ç??é»?认å??表å?¼\n"
 
-#: ../mini-commander/src/mc-install-default-macros.c:126
+#: ../mini-commander/src/mc-install-default-macros.c:129
 #, c-format
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr "已设置 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL�����模�\n"
 
-#: ../mini-commander/src/mc-install-default-macros.c:134
+#: ../mini-commander/src/mc-install-default-macros.c:137
 #, c-format
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "å¿?须设置 GCONF_CONFIG_SOURCE ç?¯å¢?å??é??\n"
 
-#: ../mini-commander/src/mc-install-default-macros.c:151
+#: ../mini-commander/src/mc-install-default-macros.c:154
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "æ? æ³?访é?®é??ç½®æº?ï¼?%s\n"
 
-#: ../mini-commander/src/mc-install-default-macros.c:166
+#: ../mini-commander/src/mc-install-default-macros.c:169
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "å??æ­¥é??ç½®æ?°æ?®æ?¶å?ºé??ï¼?%s"
@@ -2258,81 +2263,76 @@ msgstr "å®?å?½ä»¤å??表"
 msgid "Macro pattern list"
 msgstr "å®?模å¼?å??表"
 
-#: ../mini-commander/src/mini-commander.ui.h:2
-msgid "*"
-msgstr "*"
-
-#: ../mini-commander/src/mini-commander.ui.h:3
-msgid "<b>Auto Completion</b>"
-msgstr "<b>è?ªå?¨å®?æ??</b>"
-
-#: ../mini-commander/src/mini-commander.ui.h:4
-msgid "<b>Colors</b>"
-msgstr "<b>��</b>"
-
-#: ../mini-commander/src/mini-commander.ui.h:5
-msgid "<b>Size</b>"
-msgstr "<b>大�</b>"
-
-#: ../mini-commander/src/mini-commander.ui.h:6
+#: ../mini-commander/src/mini-commander.ui.h:1
 msgid "Add New Macro"
 msgstr "添���"
 
-#: ../mini-commander/src/mini-commander.ui.h:7
+#: ../mini-commander/src/mini-commander.ui.h:2
+msgid "Auto Completion"
+msgstr "è?ªå?¨å®?æ??"
+
+#: ../mini-commander/src/mini-commander.ui.h:3
 msgid "Co_mmand:"
 msgstr "�令(_M)�"
 
-#: ../mini-commander/src/mini-commander.ui.h:8
+#: ../mini-commander/src/mini-commander.ui.h:4 ../multiload/properties.c:571
+msgid "Colors"
+msgstr "��"
+
+#: ../mini-commander/src/mini-commander.ui.h:5
 msgid "Command Line Preferences"
 msgstr "å?½ä»¤è¡?é¦?é??项"
 
-#: ../mini-commander/src/mini-commander.ui.h:9
+#: ../mini-commander/src/mini-commander.ui.h:6
 msgid "Command line _background:"
 msgstr "å?½ä»¤è¡?è??æ?¯(_B)ï¼?"
 
-#: ../mini-commander/src/mini-commander.ui.h:10
+#: ../mini-commander/src/mini-commander.ui.h:7
 msgid "Command line _foreground:"
 msgstr "å?½ä»¤è¡?å??æ?¯(_F)ï¼?"
 
-#: ../mini-commander/src/mini-commander.ui.h:11
+#: ../mini-commander/src/mini-commander.ui.h:8
 msgid "E_nable history-based auto completion"
 msgstr "å?¯ç?¨å?ºäº?å??å?²ç??è?ªå?¨è¡¥å?¨(_N)"
 
-#: ../mini-commander/src/mini-commander.ui.h:13
+#: ../mini-commander/src/mini-commander.ui.h:10
 msgid "Macros"
 msgstr "å®?"
 
-#: ../mini-commander/src/mini-commander.ui.h:14
+#: ../mini-commander/src/mini-commander.ui.h:11
 msgid "Pick a color"
 msgstr "é??æ?©ä¸?ç§?é¢?è?²"
 
-#: ../mini-commander/src/mini-commander.ui.h:15
+#: ../mini-commander/src/mini-commander.ui.h:12
+msgid "Size"
+msgstr "大�"
+
+#: ../mini-commander/src/mini-commander.ui.h:13
 msgid "_Add Macro..."
 msgstr "添��(_A)..."
 
-#: ../mini-commander/src/mini-commander.ui.h:16
+#: ../mini-commander/src/mini-commander.ui.h:14
 msgid "_Delete Macro"
 msgstr "���(_D)"
 
-#: ../mini-commander/src/mini-commander.ui.h:17
+#: ../mini-commander/src/mini-commander.ui.h:15
 msgid "_Macros:"
 msgstr "å®?(_M)ï¼?"
 
-#: ../mini-commander/src/mini-commander.ui.h:18
+#: ../mini-commander/src/mini-commander.ui.h:16
 msgid "_Pattern:"
 msgstr "��(_P)�"
 
-#: ../mini-commander/src/mini-commander.ui.h:19
+#: ../mini-commander/src/mini-commander.ui.h:17
 msgid "_Use default theme colors"
 msgstr "使��认主���(_U)"
 
-#: ../mini-commander/src/mini-commander.ui.h:20
-#: ../stickynotes/stickynotes.ui.h:48
+#: ../mini-commander/src/mini-commander.ui.h:18
+#: ../stickynotes/stickynotes.ui.h:40
 msgid "_Width:"
 msgstr "宽度(_W)�"
 
-#: ../mini-commander/src/mini-commander.ui.h:21
-#: ../multiload/properties.c:526
+#: ../mini-commander/src/mini-commander.ui.h:19 ../multiload/properties.c:526
 msgid "pixels"
 msgstr "å??ç´ "
 
@@ -2421,8 +2421,12 @@ msgid "The red component of the foreground color."
 msgstr "å??æ?¯è?²ç??红è?²å??é??ã??"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:24
-msgid "This per-applet key is deprecated in favour of the global key, /schemas/apps/mini-commander-global/macro_patterns."
-msgstr "ä¸?æ?¨è??设置此å??个ç¨?åº?ç??é?®ï¼?è??åº?该设置å?¨å±?é?®ï¼?/schemas/apps/mini-commander-global/macro_patternsã??"
+msgid ""
+"This per-applet key is deprecated in favour of the global key, /schemas/apps/"
+"mini-commander-global/macro_patterns."
+msgstr ""
+"ä¸?æ?¨è??设置此å??个ç¨?åº?ç??é?®ï¼?è??åº?该设置å?¨å±?é?®ï¼?/schemas/apps/mini-commander-"
+"global/macro_patternsã??"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:25
 msgid "Use the default theme colors"
@@ -2440,33 +2444,33 @@ msgstr "宽度"
 msgid "Width of the applet"
 msgstr "å°?ç¨?åº?ç??宽度"
 
-#: ../mini-commander/src/mini-commander_applet.c:245
-#: ../mini-commander/src/mini-commander_applet.c:249
+#: ../mini-commander/src/mini-commander_applet.c:238
+#: ../mini-commander/src/mini-commander_applet.c:242
 msgid "Browser"
 msgstr "���"
 
-#: ../mini-commander/src/mini-commander_applet.c:250
+#: ../mini-commander/src/mini-commander_applet.c:243
 msgid "Click this button to start the browser"
 msgstr "å??å?»æ­¤æ??é?®å?¯å?¨æµ?è§?å?¨"
 
-#: ../mini-commander/src/mini-commander_applet.c:263
-#: ../mini-commander/src/mini-commander_applet.c:267
+#: ../mini-commander/src/mini-commander_applet.c:256
+#: ../mini-commander/src/mini-commander_applet.c:260
 msgid "History"
 msgstr "å??å?²"
 
-#: ../mini-commander/src/mini-commander_applet.c:268
+#: ../mini-commander/src/mini-commander_applet.c:261
 msgid "Click this button for the list of previous commands"
 msgstr "å??å?»æ­¤æ??é?®æ?¥ç??以å??ç??å?½ä»¤ç??å??表"
 
-#: ../mini-commander/src/mini-commander_applet.c:347
+#: ../mini-commander/src/mini-commander_applet.c:340
 msgid "Command line has been disabled by your system administrator"
 msgstr "å?½ä»¤è¡?å·²ç»?被æ?¨ç??ç³»ç»?管ç??å??ç¦?ç?¨"
 
-#: ../mini-commander/src/mini-commander_applet.c:409
+#: ../mini-commander/src/mini-commander_applet.c:402
 msgid "Mini-Commander applet"
 msgstr "å°?å??å?½ä»¤è¡?å°?ç¨?åº?"
 
-#: ../mini-commander/src/mini-commander_applet.c:410
+#: ../mini-commander/src/mini-commander_applet.c:403
 msgid "This applet adds a command line to the panel"
 msgstr "此�������添��个�令�工�"
 
@@ -2500,9 +2504,9 @@ msgid "Adjust the sound volume"
 msgstr "è°?æ?´é?³é??"
 
 #. tooltip over applet
-#: ../mixer/GNOME_MixerApplet.server.in.in.h:2
-#: ../mixer/applet.c:196
-#: ../mixer/applet.c:217
+#: ../mixer/GNOME_MixerApplet.server.in.in.h:2 ../mixer/applet.c:203
+#: ../mixer/applet.c:224 ../null_applet/null_applet.c:44
+#: ../null_applet/null_applet.c:46
 msgid "Volume Control"
 msgstr "é?³é??æ?§å?¶"
 
@@ -2514,25 +2518,33 @@ msgstr "é??é?³(_T)"
 msgid "_Open Volume Control"
 msgstr "æ??å¼?é?³é??æ?§å?¶(_O)"
 
-#: ../mixer/applet.c:180
-#| msgid "Invest Applet"
+#: ../mixer/applet.c:187
 msgid "Volume Applet"
 msgstr "é?³é??å°?ç¨?åº?"
 
-#: ../mixer/applet.c:535
-msgid "The volume control did not find any elements and/or devices to control. This means either that you don't have the right GStreamer plugins installed, or that you don't have a sound card configured."
-msgstr "é?³é??æ?§å?¶æ?¾ä¸?å?°è¦?æ?§å?¶ç??ä»»ä½?å??ç´ å??/æ??设å¤?ã??è¿?æ??å?³ç??æ?¨å?¯è?½æ²¡æ??å®?è£?正确ç?? GStreamer æ??件ï¼?æ??è??æ?¨æ²¡æ??é??置好声å?¡ã??"
+#: ../mixer/applet.c:542
+msgid ""
+"The volume control did not find any elements and/or devices to control. This "
+"means either that you don't have the right GStreamer plugins installed, or "
+"that you don't have a sound card configured."
+msgstr ""
+"é?³é??æ?§å?¶æ?¾ä¸?å?°è¦?æ?§å?¶ç??ä»»ä½?å??ç´ å??/æ??设å¤?ã??è¿?æ??å?³ç??æ?¨å?¯è?½æ²¡æ??å®?è£?正确ç?? "
+"GStreamer æ??件ï¼?æ??è??æ?¨æ²¡æ??é??置好声å?¡ã??"
 
-#: ../mixer/applet.c:539
-msgid "You can remove the volume control from the panel by right-clicking the speaker icon on the panel and selecting \"Remove From Panel\" from the menu."
-msgstr "å¦?æ??æ?¨æ?³è¦?ä»?é?¢æ?¿ä¸­å? é?¤é?³é??æ?§å?¶ï¼?å?¯ä»¥ç?¨å?³é?®å??å?»é?¢æ?¿ä¸?ç??æ?¬å£°å?¨æ??é?®ï¼?ç?¶å??ä»?è??å??中é??æ?©â??ä»?é?¢æ?¿å? é?¤â??ã??"
+#: ../mixer/applet.c:546
+msgid ""
+"You can remove the volume control from the panel by right-clicking the "
+"speaker icon on the panel and selecting \"Remove From Panel\" from the menu."
+msgstr ""
+"å¦?æ??æ?¨æ?³è¦?ä»?é?¢æ?¿ä¸­å? é?¤é?³é??æ?§å?¶ï¼?å?¯ä»¥ç?¨å?³é?®å??å?»é?¢æ?¿ä¸?ç??æ?¬å£°å?¨æ??é?®ï¼?ç?¶å??ä»?è??å??"
+"中é??æ?©â??ä»?é?¢æ?¿å? é?¤â??ã??"
 
-#: ../mixer/applet.c:713
+#: ../mixer/applet.c:714
 #, c-format
 msgid "Failed to start Volume Control: %s"
 msgstr "å?¯å?¨é?³é??æ?§å?¶å¤±è´¥ï¼?%s"
 
-#: ../mixer/applet.c:1149
+#: ../mixer/applet.c:1164
 #, c-format
 msgid "%s: muted"
 msgstr "%sï¼?å·²é??é?³"
@@ -2541,31 +2553,29 @@ msgstr "%sï¼?å·²é??é?³"
 #. * to mark as a translation, but anyway. The string is a list of
 #. * selected tracks, the number is the volume in percent. You
 #. * most likely want to keep this as-is.
-#: ../mixer/applet.c:1155
+#: ../mixer/applet.c:1170
 #, c-format
 msgid "%s: %d%%"
 msgstr "%sï¼?%d%%"
 
-#: ../mixer/applet.c:1390
+#: ../mixer/applet.c:1408
 #, c-format
 msgid "Failed to display help: %s"
 msgstr "�示帮�失败�%s"
 
-#: ../mixer/applet.c:1403
+#: ../mixer/applet.c:1421
 msgid "Volume control for your GNOME Panel."
 msgstr "ä»? GNOME é?¢æ?¿ä¸?è¿?è¡?é?³é??æ?§å?¶ã??"
 
-#: ../mixer/applet.c:1404
+#: ../mixer/applet.c:1422
 msgid "Using GStreamer 0.10."
 msgstr "使ç?¨ GStreamer 0.10ã??"
 
-#: ../mixer/dock.c:176
-#| msgid "Mu_te"
+#: ../mixer/dock.c:218
 msgid "Mute"
 msgstr "é??é?³"
 
-#: ../mixer/dock.c:182
-#| msgid "Volume Control"
+#: ../mixer/dock.c:224
 msgid "Volume Control..."
 msgstr "é?³é??æ?§å?¶..."
 
@@ -2588,7 +2598,6 @@ msgstr "ä¿?å­?é?³é??以便å?¨å?¯å?¨æ?¶æ?¢å¤?"
 
 #. make window look cute
 #: ../mixer/preferences.c:90
-#| msgid "Volume Control (Deprecated)"
 msgid "Volume Control Preferences"
 msgstr "é?³é??æ?§å?¶é¦?é??项"
 
@@ -2614,7 +2623,6 @@ msgid "_Deactivate"
 msgstr "æ?­å¼?(_D)"
 
 #: ../modemlights/GNOME_ModemLights.xml.h:5
-#: ../stickynotes/stickynotes.ui.h:45
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
@@ -2632,11 +2640,15 @@ msgid "Not connected"
 msgstr "���"
 
 #: ../modemlights/modem-applet.c:750
-msgid "To connect to your Internet service provider, you need administrator privileges"
+msgid ""
+"To connect to your Internet service provider, you need administrator "
+"privileges"
 msgstr "è¦?è¿?æ?¥å?°æ?¨ç?? ISPï¼?æ?¨é??è¦?æ??管ç??å??æ??é??"
 
 #: ../modemlights/modem-applet.c:751
-msgid "To disconnect from your Internet service provider, you need administrator privileges"
+msgid ""
+"To disconnect from your Internet service provider, you need administrator "
+"privileges"
 msgstr "è¦?ä»?æ?¨ç?? ISP æ?­å¼?è¿?æ?¥ï¼?æ?¨é??è¦?æ??管ç??å??æ??é??"
 
 #: ../modemlights/modem-applet.c:826
@@ -2644,7 +2656,9 @@ msgid "The entered password is invalid"
 msgstr "è¾?å?¥ç??å¯?ç ?æ? æ??"
 
 #: ../modemlights/modem-applet.c:828
-msgid "Check that you have typed it correctly and that you haven't activated the \"caps lock\" key"
+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:930
@@ -2668,7 +2682,9 @@ msgid "Could not launch network configuration tool"
 msgstr "æ? æ³?è°?ç?¨ç½?ç»?é??置工å?·"
 
 #: ../modemlights/modem-applet.c:998
-msgid "Check that it's installed in the correct path and that it has the correct permissions"
+msgid ""
+"Check that it's installed in the correct path and that it has the correct "
+"permissions"
 msgstr "请æ£?æ?¥è¯¥å·¥å?·æ?¯å?¦å·²ç»?å®?è£?å?¨æ­£ç¡®è·¯å¾?中ï¼?æ??é??æ?¯å?¦æ­£ç¡®"
 
 #: ../modemlights/modem-applet.c:1022
@@ -2676,21 +2692,21 @@ msgid "Applet for activating and monitoring a dial-up network connection."
 msgstr "æ¿?活并ç??è§?æ?¨å?·ç½?ç»?è¿?æ?¥ç??å°?ç¨?åº?ã??"
 
 #: ../modemlights/modemlights.ui.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Connecting with Internet Service Provider</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">使ç?¨äº?è??ç½?æ??å?¡æ??ä¾?å??è¿?æ?¥</span>"
+msgid "Connecting with Internet Service Provider"
+msgstr "æ­£å?¨è¿?æ?¥äº?è??ç½?æ??å?¡æ??ä¾?å??"
 
 #: ../modemlights/modemlights.ui.h:2
-msgid "<span weight=\"bold\" size=\"larger\">Root password required</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">��根����</span>"
-
-#: ../modemlights/modemlights.ui.h:3
 msgid "Enter password"
 msgstr "����"
 
-#: ../modemlights/modemlights.ui.h:4
+#: ../modemlights/modemlights.ui.h:3
 msgid "Password:"
 msgstr "���"
 
+#: ../modemlights/modemlights.ui.h:4
+msgid "Root password required"
+msgstr "é??è¦? root å?£ä»¤"
+
 #: ../multiload/GNOME_MultiLoadApplet_Factory.server.in.in.h:1
 msgid "A system load indicator"
 msgstr "ç³»ç»?è´?è½½æ??示å?¨"
@@ -2705,36 +2721,35 @@ msgid "_Open System Monitor"
 msgstr "æ??å¼?ç³»ç»?ç??è§?å?¨(_O)"
 
 #: ../multiload/main.c:57
-msgid "A system load monitor capable of displaying graphs for CPU, ram, and swap space use, plus network traffic."
-msgstr "ä¸?个è?½å¤?以å?¾å½¢æ?¹å¼?æ?¾ç¤º CPUã??å??å­?ã??对æ?¢æ??件使ç?¨æ??å?µï¼?以å??ç½?ç»?æµ?é??ç??ç³»ç»?ç??è§?å?¨ã??"
+msgid ""
+"A system load monitor capable of displaying graphs for CPU, ram, and swap "
+"space use, plus network traffic."
+msgstr ""
+"ä¸?个è?½å¤?以å?¾å½¢æ?¹å¼?æ?¾ç¤º CPUã??å??å­?ã??对æ?¢æ??件使ç?¨æ??å?µï¼?以å??ç½?ç»?æµ?é??ç??ç³»ç»?ç??è§?"
+"å?¨ã??"
 
 #: ../multiload/main.c:126
 #, c-format
 msgid "There was an error executing '%s': %s"
 msgstr "æ?§è¡?â??%sâ??æ?¶å??ç??é??误ï¼?%s"
 
-#: ../multiload/main.c:288
-#: ../multiload/properties.c:596
+#: ../multiload/main.c:288 ../multiload/properties.c:596
 msgid "Processor"
 msgstr "å¤?ç??å?¨"
 
-#: ../multiload/main.c:290
-#: ../multiload/properties.c:604
+#: ../multiload/main.c:290 ../multiload/properties.c:604
 msgid "Memory"
 msgstr "å??å­?"
 
-#: ../multiload/main.c:292
-#: ../multiload/properties.c:612
+#: ../multiload/main.c:292 ../multiload/properties.c:612
 msgid "Network"
 msgstr "ç½?ç»?"
 
-#: ../multiload/main.c:294
-#: ../multiload/properties.c:619
+#: ../multiload/main.c:294 ../multiload/properties.c:619
 msgid "Swap Space"
 msgstr "交�空�"
 
-#: ../multiload/main.c:296
-#: ../multiload/main.c:378
+#: ../multiload/main.c:296 ../multiload/main.c:378
 msgid "Load Average"
 msgstr "è´?è½½å??å?¼"
 
@@ -2842,7 +2857,9 @@ msgid "Enable swap load graph"
 msgstr "��交��载�形"
 
 #: ../multiload/multiload.schemas.in.h:10
-msgid "For horizontal panels, the width of the graphs in pixels. For vertical panels, this is the height of the graphs."
+msgid ""
+"For horizontal panels, the width of the graphs in pixels. For vertical "
+"panels, this is the height of the graphs."
 msgstr "对äº?æ°´å¹³é?¢æ?¿ï¼?å°±æ?¯å?¾å??ç??宽度ã??对äº?å??ç?´é?¢æ?¿ï¼?å°±æ?¯å?¾å??ç??é«?度ã??"
 
 #: ../multiload/multiload.schemas.in.h:11
@@ -2982,12 +2999,7 @@ msgstr "ç³»ç»?ç??è§?å?¨æ?´æ?°é?´é??(_T)ï¼?"
 msgid "milliseconds"
 msgstr "毫�"
 
-#: ../multiload/properties.c:571
-msgid "Colors"
-msgstr "��"
-
-#: ../multiload/properties.c:598
-#: ../multiload/properties.c:606
+#: ../multiload/properties.c:598 ../multiload/properties.c:606
 msgid "_User"
 msgstr "��(_U)"
 
@@ -3035,8 +3047,7 @@ msgstr "å?º(_O)"
 msgid "_Local"
 msgstr "��(_L)"
 
-#: ../multiload/properties.c:617
-#: ../multiload/properties.c:627
+#: ../multiload/properties.c:617 ../multiload/properties.c:627
 #: ../multiload/properties.c:633
 msgid "_Background"
 msgstr "è??æ?¯(_B)"
@@ -3109,19 +3120,29 @@ msgstr "ç??è§?æ? çº¿ç½?ç»?é?¾è·¯ç??ä¿¡å?·è´¨é??"
 msgid "Wireless Link Monitor"
 msgstr "æ? çº¿ç½?ç»?é?¾è·¯ç??è§?å?¨"
 
-#: ../null_applet/null_applet.c:151
+#: ../null_applet/null_applet.c:40
+msgid "Inbox Monitor"
+msgstr "æ?¶ä»¶ç®±ç??è§?å?¨"
+
+#: ../null_applet/null_applet.c:42
+msgid "CD Player"
+msgstr "CD ���"
+
+#: ../null_applet/null_applet.c:149
 msgid "Some panel items are no longer available"
 msgstr "æ??äº?é?¢æ?¿é¡¹ä¸?å??å?¯ç?¨"
 
-#: ../null_applet/null_applet.c:152
-msgid "One or more panel items (also referred to as applets) are no longer available in the GNOME desktop."
+#: ../null_applet/null_applet.c:150
+msgid ""
+"One or more panel items (also referred to as applets) are no longer "
+"available in the GNOME desktop."
 msgstr "ä¸?个æ??å¤?个é?¢æ?¿é¡¹(ä¹?称为å°?ç¨?åº?)ä¸?å??å??å?«äº? GNOME æ¡?é?¢ä¸­ã??"
 
-#: ../null_applet/null_applet.c:154
+#: ../null_applet/null_applet.c:152
 msgid "These items will now be removed from your configuration:"
 msgstr "è¿?äº?项ç?®å°?ä¼?ä»?æ?¨ç??é??置中å? é?¤ï¼?"
 
-#: ../null_applet/null_applet.c:157
+#: ../null_applet/null_applet.c:155
 msgid "You will not receive this message again."
 msgstr "æ?¨å°?ä¸?ä¼?å??æ?¶å?°æ­¤æ¶?æ?¯ã??"
 
@@ -3139,7 +3160,7 @@ msgstr "å?¨æ¡?é?¢ä¸?å??建ã??æ?¥ç??å??管ç??置顶便笺"
 
 #: ../stickynotes/GNOME_StickyNotesApplet.server.in.in.h:2
 #: ../stickynotes/stickynotes_applet.c:130
-#: ../stickynotes/stickynotes_applet.c:399
+#: ../stickynotes/stickynotes_applet.c:402
 msgid "Sticky Notes"
 msgstr "置顶便笺"
 
@@ -3160,193 +3181,181 @@ msgid "_Lock Notes"
 msgstr "é??å®?便笺(_L)"
 
 #: ../stickynotes/GNOME_StickyNotesApplet.xml.h:6
-#: ../stickynotes/stickynotes.ui.h:44
 msgid "_New Note"
 msgstr "�建便笺(_N)"
 
-#: ../stickynotes/stickynotes.c:630
+#: ../stickynotes/stickynotes.c:635
 msgid "This note is locked."
 msgstr "此便笺已é??å®?ã??"
 
-#: ../stickynotes/stickynotes.c:634
+#: ../stickynotes/stickynotes.c:639
 msgid "This note is unlocked."
 msgstr "此便笺æ?ªé??å®?ã??"
 
-#: ../stickynotes/stickynotes.ui.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>�为</b>"
-
-#: ../stickynotes/stickynotes.ui.h:3
-msgid "<b>Default Note Properties</b>"
-msgstr "<b>�认便笺��</b>"
-
-#: ../stickynotes/stickynotes.ui.h:4
-msgid ""
-"<b>Delete all sticky notes?</b>\n"
-"\n"
-"This cannot be undone."
-msgstr ""
-"<b>����记�贴�</b>\n"
-"\n"
-"å°?ä¸?å?»ä¸?å¤?è¿?å?¦ã??"
-
-#: ../stickynotes/stickynotes.ui.h:7
-msgid ""
-"<b>Delete this sticky note?</b>\n"
-"\n"
-"This cannot be undone."
-msgstr ""
-"<b>��该记�贴�</b>\n"
-"\n"
-"å°?ä¸?å?»ä¸?å¤?è¿?å?¦ã??"
-
-#: ../stickynotes/stickynotes.ui.h:10
-msgid "<b>Properties</b>"
-msgstr "<b>å±?æ?§</b>"
+#: ../stickynotes/stickynotes.ui.h:1
+msgid "Behavior"
+msgstr "�为"
 
-#: ../stickynotes/stickynotes.ui.h:11
+#: ../stickynotes/stickynotes.ui.h:2
 msgid "Choose a base color to use for all sticky notes"
 msgstr "为å?¨é?¨è®°äº?è´´é??æ?©æ??个å?ºæ?¬é¢?è?²"
 
-#: ../stickynotes/stickynotes.ui.h:12
+#: ../stickynotes/stickynotes.ui.h:3
 msgid "Choose a color for the note"
 msgstr "为便笺é??æ?©æ??个é¢?è?²"
 
-#: ../stickynotes/stickynotes.ui.h:13
+#: ../stickynotes/stickynotes.ui.h:4
 msgid "Choose a font for the note"
 msgstr "为便笺é??æ?©æ??个å­?ä½?"
 
-#: ../stickynotes/stickynotes.ui.h:14
+#: ../stickynotes/stickynotes.ui.h:5
 msgid "Choose a font to use for all sticky notes"
 msgstr "为å?¨é?¨è®°äº?è´´é??æ?©ä¸?个è¦?使ç?¨ç??å­?ä½?"
 
-#: ../stickynotes/stickynotes.ui.h:15
+#: ../stickynotes/stickynotes.ui.h:6
 msgid "Choose if notes are visible on all workspaces"
 msgstr "é??æ?©æ?¯å?¦ä¾¿ç¬ºå?¨æ??æ??å·¥ä½?å?ºå??å?¯è§?"
 
-#: ../stickynotes/stickynotes.ui.h:16
+#: ../stickynotes/stickynotes.ui.h:7
 msgid "Choose if the default style is forced on all notes"
 msgstr "é??æ?©æ?¯å?¦å¼ºå?¶å¯¹å?¨é?¨ä¾¿ç¬ºä½¿ç?¨é»?认é£?æ ¼"
 
-#: ../stickynotes/stickynotes.ui.h:17
+#: ../stickynotes/stickynotes.ui.h:8
 msgid "Close note"
 msgstr "��便笺"
 
-#: ../stickynotes/stickynotes.ui.h:18
+#: ../stickynotes/stickynotes.ui.h:9
+msgid "Default Note Properties"
+msgstr "�认便笺��"
+
+#: ../stickynotes/stickynotes.ui.h:10
+msgid "Delete all sticky notes?"
+msgstr "å? é?¤æ??æ??ç??置顶便签ï¼?"
+
+#: ../stickynotes/stickynotes.ui.h:11
+msgid "Delete this sticky note?"
+msgstr "��此置顶便签�"
+
+#: ../stickynotes/stickynotes.ui.h:12
 msgid "Font C_olor:"
 msgstr "����(_O)�"
 
-#: ../stickynotes/stickynotes.ui.h:19
+#: ../stickynotes/stickynotes.ui.h:13
 msgid "Font Co_lor:"
 msgstr "����(_L)�"
 
-#: ../stickynotes/stickynotes.ui.h:20
+#: ../stickynotes/stickynotes.ui.h:14
 msgid "Force _default color and font on notes"
 msgstr "强å?¶å¯¹å?¨é?¨ä¾¿ç¬ºä½¿ç?¨é»?认é¢?è?²å??å­?ä½?(_D)"
 
-#: ../stickynotes/stickynotes.ui.h:21
+#: ../stickynotes/stickynotes.ui.h:15
 msgid "H_eight:"
 msgstr "�度(_E)�"
 
-#: ../stickynotes/stickynotes.ui.h:22
+#: ../stickynotes/stickynotes.ui.h:16
 msgid "Lock/Unlock note"
 msgstr "é??å®?/解é?¤é??å®?便笺"
 
-#: ../stickynotes/stickynotes.ui.h:23
+#: ../stickynotes/stickynotes.ui.h:17
 msgid "Note C_olor:"
 msgstr "便笺��(_O)�"
 
-#: ../stickynotes/stickynotes.ui.h:24
+#: ../stickynotes/stickynotes.ui.h:18
 msgid "Note _Color:"
 msgstr "便笺��(_C)�"
 
-#: ../stickynotes/stickynotes.ui.h:25
+#: ../stickynotes/stickynotes.ui.h:19
 msgid "Pick a color for the sticky note"
 msgstr "为记äº?è´´æ??é??æ??个é¢?è?²"
 
-#: ../stickynotes/stickynotes.ui.h:26
+#: ../stickynotes/stickynotes.ui.h:20
 msgid "Pick a default sticky note color"
 msgstr "为记äº?è´´æ??é??é»?认é¢?è?²"
 
-#: ../stickynotes/stickynotes.ui.h:27
+#: ../stickynotes/stickynotes.ui.h:21
 msgid "Pick a default sticky note font"
 msgstr "æ??é??ä¸?个é»?认ç??è®°äº?è´´å­?ä½?"
 
-#: ../stickynotes/stickynotes.ui.h:28
+#: ../stickynotes/stickynotes.ui.h:22
 msgid "Pick a font for the sticky note"
 msgstr "为该记äº?è´´æ??é??ä¸?个å­?ä½?"
 
-#: ../stickynotes/stickynotes.ui.h:29
+#: ../stickynotes/stickynotes.ui.h:23
+msgid "Properties"
+msgstr "å±?æ?§"
+
+#: ../stickynotes/stickynotes.ui.h:24
 msgid "Resize note"
 msgstr "��便笺大�"
 
-#: ../stickynotes/stickynotes.ui.h:30
+#: ../stickynotes/stickynotes.ui.h:25
 msgid "Specify a title for the note"
 msgstr "为记äº?è´´æ??å®?æ??个æ ?é¢?"
 
-#: ../stickynotes/stickynotes.ui.h:31
+#: ../stickynotes/stickynotes.ui.h:26
 msgid "Specify the default height (in pixels) of new notes"
 msgstr "æ??å®?æ?°ä¾¿ç¬ºç??é»?认é«?度(以å??素为å??ä½?)"
 
-#: ../stickynotes/stickynotes.ui.h:32
+#: ../stickynotes/stickynotes.ui.h:27
 msgid "Specify the default width (in pixels) of new notes"
 msgstr "æ??å®?æ?°ä¾¿ç¬ºç??é»?认宽度(以å??素为å??ä½?)"
 
-#: ../stickynotes/stickynotes.ui.h:33
+#: ../stickynotes/stickynotes.ui.h:28
 msgid "Sticky Note"
 msgstr "记�贴"
 
-#: ../stickynotes/stickynotes.ui.h:34
+#: ../stickynotes/stickynotes.ui.h:29
 msgid "Sticky Note Properties"
 msgstr "记�贴��"
 
-#: ../stickynotes/stickynotes.ui.h:35
+#: ../stickynotes/stickynotes.ui.h:30
 msgid "Sticky Notes Preferences"
 msgstr "è®°äº?è´´é¦?é??项"
 
-#: ../stickynotes/stickynotes.ui.h:36
+#: ../stickynotes/stickynotes.ui.h:31
+msgid "This cannot be undone."
+msgstr "è¿?ä¸?è?½æ?¤é??ã??"
+
+#: ../stickynotes/stickynotes.ui.h:32
 msgid "Use co_lor from the system theme"
 msgstr "使�系�主���(_L)"
 
-#: ../stickynotes/stickynotes.ui.h:37
+#: ../stickynotes/stickynotes.ui.h:33
 msgid "Use default co_lor"
 msgstr "使��认��(_L)"
 
-#: ../stickynotes/stickynotes.ui.h:38
+#: ../stickynotes/stickynotes.ui.h:34
 msgid "Use default fo_nt"
 msgstr "使��认��(_N)"
 
-#: ../stickynotes/stickynotes.ui.h:39
+#: ../stickynotes/stickynotes.ui.h:35
 msgid "Use fo_nt from the system theme"
 msgstr "使�系�主���(_N)"
 
-#: ../stickynotes/stickynotes.ui.h:40
+#: ../stickynotes/stickynotes.ui.h:36
 msgid "_Delete All"
 msgstr "����(_D)"
 
-#: ../stickynotes/stickynotes.ui.h:41
-msgid "_Delete Note..."
-msgstr "��便笺(_D)..."
-
-#: ../stickynotes/stickynotes.ui.h:42
+#: ../stickynotes/stickynotes.ui.h:37
 msgid "_Font:"
 msgstr "å­?ä½?(_F)ï¼?"
 
-#: ../stickynotes/stickynotes.ui.h:43
-msgid "_Lock Note"
-msgstr "é??å®?便笺(_L)"
-
-#: ../stickynotes/stickynotes.ui.h:46
+#: ../stickynotes/stickynotes.ui.h:38
 msgid "_Put notes on all workspaces"
 msgstr "å°?便笺æ?¾ç½®å?¨æ??æ??å·¥ä½?å?º(_P)"
 
-#: ../stickynotes/stickynotes.ui.h:47
+#: ../stickynotes/stickynotes.ui.h:39
 msgid "_Title:"
 msgstr "��(_T)�"
 
 #: ../stickynotes/stickynotes.schemas.in.h:1
-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() 解æ??ç??æ ¼å¼?é?½æ?¯å??æ³?ç??ã??"
+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/stickynotes.schemas.in.h:2
 msgid "Date format of note's title"
@@ -3361,11 +3370,15 @@ msgid "Default color for new notes"
 msgstr "æ?°ä¾¿ç¬ºç??é»?认é¢?è?²"
 
 #: ../stickynotes/stickynotes.schemas.in.h:5
-msgid "Default color for new sticky notes. This should be in html hex specification, for example \"#30FF50\"."
+msgid ""
+"Default color for new sticky notes. This should be in html hex "
+"specification, for example \"#30FF50\"."
 msgstr "æ?°ç½®é¡¶ä¾¿ç¬ºç??é»?认é¢?è?²ã??åº?该æ?¯å??å?­è¿?å?¶ HTML è§?è??æ ¼å¼?ï¼?å¦?â??#30FF50â??ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:6
-msgid "Default font color for new sticky notes. This should be in html hex specification, for example \"#000000\"."
+msgid ""
+"Default font color for new sticky notes. This should be in html hex "
+"specification, for example \"#000000\"."
 msgstr "æ?°ç½®é¡¶ä¾¿ç¬ºç??é»?认å­?ä½?é¢?è?²ã??åº?该æ?¯å??å?­è¿?å?¶ HTML è§?è??æ ¼å¼?ï¼?å¦?â??#000000â??ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:7
@@ -3373,7 +3386,9 @@ msgid "Default font for new notes"
 msgstr "æ?°ä¾¿ç¬ºç??é»?认å­?ä½?"
 
 #: ../stickynotes/stickynotes.schemas.in.h:8
-msgid "Default font for new sticky notes. This should be a Pango Font Name, for example \"Sans Italic 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/stickynotes.schemas.in.h:9
@@ -3397,15 +3412,21 @@ msgid "Empty notes are always deleted without confirmation."
 msgstr "空便笺å?¨å? é?¤å??æ?»æ?¯ä¸?å? ç¡®è®¤ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:14
-msgid "If this option is disabled, a custom color can be used as the default color for all sticky notes."
+msgid ""
+"If this option is disabled, a custom color can be used as the default color "
+"for all sticky notes."
 msgstr "å¦?æ??ç¦?ç?¨äº?æ­¤é??项ï¼?å°?ä¼?使ç?¨è?ªå®?ä¹?é¢?è?²ä½?为å?¨é?¨ç½®é¡¶ä¾¿ç¬ºç??é»?认é¢?è?²ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:15
-msgid "If this option is disabled, a custom font can be used as the default font for all sticky notes."
+msgid ""
+"If this option is disabled, a custom font can be used as the default font "
+"for all sticky notes."
 msgstr "å¦?æ??ç¦?ç?¨äº?æ­¤é??项ï¼?å°?ä¼?使ç?¨è?ªå®?ä¹?å­?ä½?ä½?为å?¨é?¨ç½®é¡¶ä¾¿ç¬ºç??é»?认å­?ä½?ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:16
-msgid "If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored."
+msgid ""
+"If this option is enabled, the custom colors and fonts that have been "
+"assigned to individual notes will be ignored."
 msgstr "å¦?æ??ç¦?ç?¨äº?æ­¤é??项ï¼?å°?忽ç?¥æ??å®?ç»?å??个便笺ç??è?ªå®?ä¹?é¢?è?²å??å­?ä½?ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:17
@@ -3413,7 +3434,9 @@ msgid "Specifies whether the sticky notes are locked (non-editable) or not."
 msgstr "æ??å®?置顶便笺æ?¯å?¦è¢«é??å®?(æ? æ³?ç¼?è¾?)ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:18
-msgid "Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not."
+msgid ""
+"Specifies whether the sticky notes are visible on ALL workspaces on the "
+"desktop, or not."
 msgstr "æ??å®?置顶便笺æ?¯å?¦å?¨æ??æ??å·¥ä½?空é?´ä¸­å?¯è§?ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:19
@@ -3440,13 +3463,13 @@ msgstr "��使�系��认��"
 msgid "Whether to use the default system font"
 msgstr "��使�系��认��"
 
-#: ../stickynotes/stickynotes_applet.c:577
+#: ../stickynotes/stickynotes_applet.c:580
 #, c-format
 msgid "%d note"
 msgid_plural "%d notes"
 msgstr[0] "%d 个便笺"
 
-#: ../stickynotes/stickynotes_applet.c:578
+#: ../stickynotes/stickynotes_applet.c:581
 msgid "Show sticky notes"
 msgstr "�示置顶便笺"
 
@@ -3463,12 +3486,11 @@ msgid "Trash"
 msgstr "å??æ?¶ç«?"
 
 #: ../trashapplet/GNOME_Panel_TrashApplet.xml.h:2
-#: ../trashapplet/src/trash-empty.c:348
+#: ../trashapplet/src/trash-empty.c:351
 msgid "_Empty Trash"
 msgstr "æ¸?空å??æ?¶ç«?(_E)"
 
 #: ../trashapplet/GNOME_Panel_TrashApplet.xml.h:4
-#| msgid "_Open %s"
 msgid "_Open Trash"
 msgstr "æ??å¼?å??æ?¶ç«?(_O)"
 
@@ -3492,8 +3514,12 @@ msgstr ""
 "%s"
 
 #: ../trashapplet/src/trashapplet.c:427
-msgid "A GNOME trash bin that lives in your panel. You can use it to view the trash or drag and drop items into the trash."
-msgstr "ä½?äº?æ?¨é?¢æ?¿ä¸?ç?? GNOME å??æ?¶ç«?ã??æ?¨å?¯ä»¥ä½¿ç?¨å®?æ?¥ç??å??æ?¶ç«?ï¼?æ??è??å°?项ç?®æ??æ?³è?³å??æ?¶ç«?中ã??"
+msgid ""
+"A GNOME trash bin that lives in your panel. You can use it to view the trash "
+"or drag and drop items into the trash."
+msgstr ""
+"ä½?äº?æ?¨é?¢æ?¿ä¸?ç?? GNOME å??æ?¶ç«?ã??æ?¨å?¯ä»¥ä½¿ç?¨å®?æ?¥ç??å??æ?¶ç«?ï¼?æ??è??å°?项ç?®æ??æ?³è?³å??æ?¶ç«?"
+"中ã??"
 
 #: ../trashapplet/src/trashapplet.c:452
 msgid "Delete Immediately?"
@@ -3504,61 +3530,123 @@ msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr "æ? æ³?å°?项ç?®ç§»è?³å??æ?¶ç«?ï¼?æ?¨æ?³è¦?ç«?å?³å? é?¤å??ï¼?"
 
 #: ../trashapplet/src/trashapplet.c:487
-msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr "æ? æ³?å°?æ??äº?项ç?®ç§»è?³å??æ?¶ç«?ï¼?æ?¨æ?³è¦?ç«?å?³å? é?¤è¿?äº?项ç?®å??ï¼?"
 
 #: ../trashapplet/src/trashapplet.c:614
 msgid "Trash Applet"
 msgstr "å??æ?¶ç«?å°?ç¨?åº?"
 
+#. Translators: the %s in this string should be read as %d.
 #: ../trashapplet/src/trash-empty.c:81
 #, c-format
 msgid "Removing item %s of %s"
 msgstr "正���第%s项��%s项"
 
-#: ../trashapplet/src/trash-empty.c:106
+#. Translators: %s is a file name
+#: ../trashapplet/src/trash-empty.c:107
 #, c-format
-msgid "<i>Removing: %s</i>"
-msgstr "<i>正����%s</i>"
+msgid "Removing: %s"
+msgstr "正����%s"
 
-#: ../trashapplet/src/trash-empty.c:327
+#: ../trashapplet/src/trash-empty.c:330
 msgid "Empty all of the items from the trash?"
 msgstr "æ¸?空å??æ?¶ç«?中ç??å?¨é?¨é¡¹ç?®å??ï¼?"
 
-#: ../trashapplet/src/trash-empty.c:334
-msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "å¦?æ??æ?¨é??æ?©æ¸?空å??æ?¶ç«?ï¼?å?¶ä¸­ç??项ç?®å°?被永ä¹?å? é?¤ã??请注æ??ï¼?æ?¨è¿?å?¯ä»¥å??个å? é?¤å?¶ä¸­ç??项ç?®ã??"
+#: ../trashapplet/src/trash-empty.c:337
+msgid ""
+"If you choose to empty the trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"å¦?æ??æ?¨é??æ?©æ¸?空å??æ?¶ç«?ï¼?å?¶ä¸­ç??项ç?®å°?被永ä¹?å? é?¤ã??请注æ??ï¼?æ?¨è¿?å?¯ä»¥å??个å? é?¤å?¶ä¸­ç??"
+"项ç?®ã??"
 
 #: ../trashapplet/trashapplet-empty-progress.ui.h:1
-msgid "<b>From:</b>"
-msgstr "<b>���</b>"
+msgid "Emptying the Trash"
+msgstr "æ¸?空å??æ?¶ç«?"
 
 #: ../trashapplet/trashapplet-empty-progress.ui.h:2
-msgid "<big><b>Emptying the Trash</b></big>"
-msgstr "<big><b>æ¸?空å??æ?¶ç«?</b></big>"
+msgid "From:"
+msgstr "ä»?ï¼?"
 
-#: ../trashapplet/trashapplet-empty-progress.ui.h:3
-msgid "Emptying the Trash"
-msgstr "æ¸?空å??æ?¶ç«?"
+#~ msgid "<b>Appearance</b>"
+#~ msgstr "<b>��</b>"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Colors</b>"
+#~ msgstr "<b>��</b>"
+
+#~ msgid "<b>Size</b>"
+#~ msgstr "<b>大�</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Root password required</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">��根����</span>"
+
+#~ msgid ""
+#~ "<b>Delete all sticky notes?</b>\n"
+#~ "\n"
+#~ "This cannot be undone."
+#~ msgstr ""
+#~ "<b>����记�贴�</b>\n"
+#~ "\n"
+#~ "å°?ä¸?å?»ä¸?å¤?è¿?å?¦ã??"
+
+#~ msgid ""
+#~ "<b>Delete this sticky note?</b>\n"
+#~ "\n"
+#~ "This cannot be undone."
+#~ msgstr ""
+#~ "<b>��该记�贴�</b>\n"
+#~ "\n"
+#~ "å°?ä¸?å?»ä¸?å¤?è¿?å?¦ã??"
+
+#~ msgid "<b>Properties</b>"
+#~ msgstr "<b>å±?æ?§</b>"
+
+#~ msgid "_Delete Note..."
+#~ msgstr "��便笺(_D)..."
+
+#~ msgid "_Lock Note"
+#~ msgstr "é??å®?便笺(_L)"
+
+#~ msgid "<b>From:</b>"
+#~ msgstr "<b>���</b>"
+
+#~ msgid "<big><b>Emptying the Trash</b></big>"
+#~ msgstr "<big><b>æ¸?空å??æ?¶ç«?</b></big>"
 
 #~ msgid "_Open"
 #~ msgstr "æ??å¼?(_O)"
+
 #~ msgid "Using GStreamer 0.8."
 #~ msgstr "使ç?¨ GStreamer 0.8ã??"
+
 #~ msgid "-"
 #~ msgstr "-"
+
 #~ msgid "+"
 #~ msgstr "+"
+
 #~ msgid "Graph color for PLIP network activity"
 #~ msgstr "PLIP ��活��形��"
+
 #~ msgid "Graph color for SLIP network activity"
 #~ msgstr "SLIP ��活��形��"
+
 #~ msgid "_SLIP"
 #~ msgstr "_SLIP"
+
 #~ msgid "PL_IP"
 #~ msgstr "PL_IP"
+
 #~ msgid "_Ethernet"
 #~ msgstr "以太�(_E)"
+
 #~ msgid "Othe_r"
 #~ msgstr "��(_R)"
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]