[gnome-applets] Update Simplified Chinese translations.

[Eleanor Chen <eleanorc src gnome org>]

commit bd893eb9bb60b8fb652c8d6696acda34d465fd40
Author: Eleanor Chen <chenyueg gmail com>
Date:   Mon Jul 26 23:16:24 2010 +0800

    Update Simplified Chinese translations.

 po/zh_CN.po |  550 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 257 insertions(+), 293 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dbf60c9..91170ca 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,11 +10,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"applets&component=general\n"
-"POT-Creation-Date: 2010-07-20 08:11+0000\n"
-"PO-Revision-Date: 2010-07-24 14:10+0800\n"
-"Last-Translator: è??è¿?强 <wzssyqa gmail com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-applets&component=general\n";
+"POT-Creation-Date: 2010-07-25 12:10+0000\n"
+"PO-Revision-Date: 2010-07-26 23:06+0800\n"
+"Last-Translator: Eleanor Chen <chenyueg gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,10 +25,12 @@ msgstr ""
 #: ../charpick/GNOME_CharpickerApplet.xml.h:1
 #: ../cpufreq/GNOME_CPUFreqApplet.xml.h:1
 #: ../drivemount/GNOME_DriveMountApplet.xml.h:1
-#: ../geyes/GNOME_GeyesApplet.xml.h:1 ../gweather/GNOME_GWeatherApplet.xml.h:1
+#: ../geyes/GNOME_GeyesApplet.xml.h:1
+#: ../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
@@ -41,9 +42,11 @@ msgstr "��(_A)"
 #: ../charpick/GNOME_CharpickerApplet.xml.h:2
 #: ../cpufreq/GNOME_CPUFreqApplet.xml.h:2
 #: ../drivemount/GNOME_DriveMountApplet.xml.h:2
-#: ../geyes/GNOME_GeyesApplet.xml.h:2 ../gweather/GNOME_GWeatherApplet.xml.h:3
+#: ../geyes/GNOME_GeyesApplet.xml.h:2
+#: ../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
@@ -79,13 +82,19 @@ 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:611 ../cpufreq/src/cpufreq-applet.c:617
-#: ../drivemount/drivemount.c:117 ../geyes/geyes.c:197
-#: ../gweather/gweather-about.c:55 ../invest-applet/invest/about.py:29
-#: ../mini-commander/src/about.c:54 ../mixer/applet.c:1437
-#: ../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:617
+#: ../drivemount/drivemount.c:117
+#: ../geyes/geyes.c:197
+#: ../gweather/gweather-about.c:55
+#: ../invest-applet/invest/about.py:29
+#: ../mini-commander/src/about.c:54
+#: ../mixer/applet.c:1437
+#: ../modemlights/modem-applet.c:1025
+#: ../multiload/main.c:62
+#: ../stickynotes/stickynotes_applet_callbacks.c:421
 #: ../trashapplet/src/trashapplet.c:432
 msgid "translator-credits"
 msgstr ""
@@ -103,16 +112,20 @@ 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:472 ../accessx-status/applet.c:512
+#: ../accessx-status/applet.c:472
+#: ../accessx-status/applet.c:512
 msgid "a"
 msgstr "a"
 
-#: ../accessx-status/applet.c:985 ../accessx-status/applet.c:1059
-#: ../accessx-status/applet.c:1128 ../accessx-status/applet.c:1336
+#: ../accessx-status/applet.c:985
+#: ../accessx-status/applet.c:1059
+#: ../accessx-status/applet.c:1128
+#: ../accessx-status/applet.c:1336
 msgid "AccessX Status"
 msgstr "AccessX ç?¶æ??"
 
-#: ../accessx-status/applet.c:986 ../accessx-status/applet.c:1129
+#: ../accessx-status/applet.c:986
+#: ../accessx-status/applet.c:1129
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "æ?¾ç¤ºä½¿ç?¨è¾?å?©å??è?½æ?¶é?®ç??ç??ç?¶æ??ã??"
 
@@ -134,7 +147,8 @@ 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 "ç?µæ± ç?µé??ç??è§?å?¨"
 
@@ -149,7 +163,8 @@ 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
@@ -213,12 +228,14 @@ 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] "å??é??"
@@ -234,11 +251,13 @@ 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 "ç?µé??æ??示"
 
@@ -250,10 +269,8 @@ 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
@@ -300,11 +317,15 @@ msgstr "ç?µæ± ç?¶æ??æ?ªç?¥"
 msgid "N/A"
 msgstr "���"
 
-#: ../battstat/battstat_applet.c:1193 ../drivemount/drivemount.c:142
-#: ../geyes/geyes.c:348 ../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
+#: ../battstat/battstat_applet.c:1193
+#: ../drivemount/drivemount.c:142
+#: ../geyes/geyes.c:348
+#: ../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:386
+#: ../stickynotes/stickynotes_applet_callbacks.c:603
 #: ../trashapplet/src/trashapplet.c:398
 #, c-format
 msgid "There was an error displaying help: %s"
@@ -373,7 +394,8 @@ msgstr "æ?¾ç¤ºæ?¶é?´/ç?¾å??æ¯?(_S)ï¼?"
 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 é??误"
 
@@ -427,9 +449,7 @@ 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
@@ -449,9 +469,7 @@ 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
@@ -459,9 +477,7 @@ 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
@@ -497,7 +513,8 @@ msgid "Battery power low"
 msgstr "ç?µæ± ç?µé??ä½?"
 
 #: ../charpick/GNOME_CharpickerApplet.server.in.in.h:1
-#: ../charpick/charpick.c:741 ../charpick/charpick.c:753
+#: ../charpick/charpick.c:741
+#: ../charpick/charpick.c:753
 #: ../charpick/properties.c:452
 msgid "Character Palette"
 msgstr "�符�"
@@ -534,11 +551,8 @@ msgid "insert special character %s"
 msgstr "æ??å?¥ç?¹æ®?å­?符 %s"
 
 #: ../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 å??å¸?ã??"
+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"
@@ -548,7 +562,8 @@ 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 "å?¯ç?¨å­?符æ?¿å??表"
 
@@ -557,9 +572,7 @@ 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
@@ -623,7 +636,8 @@ msgid "Character Palette Preferences"
 msgstr "å­?符æ?¿é¦?é??项"
 
 #: ../cpufreq/GNOME_CPUFreqApplet.server.in.in.h:1
-#: ../cpufreq/src/cpufreq-applet.c:949 ../cpufreq/src/cpufreq-applet.c:1005
+#: ../cpufreq/src/cpufreq-applet.c:949
+#: ../cpufreq/src/cpufreq-applet.c:1005
 msgid "CPU Frequency Scaling Monitor"
 msgstr "CPU é¢?ç??è??å?´ç??è§?å?¨"
 
@@ -632,21 +646,12 @@ 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"
@@ -657,9 +662,7 @@ 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
@@ -698,7 +701,8 @@ msgstr "��(_A)"
 msgid "_Monitored CPU:"
 msgstr "ç??è§?中ç?? CPU(_M)ï¼?"
 
-#: ../cpufreq/src/cpufreq-applet.c:584 ../cpufreq/src/cpufreq-prefs.c:478
+#: ../cpufreq/src/cpufreq-applet.c:584
+#: ../cpufreq/src/cpufreq-prefs.c:478
 msgid "Could not open help document"
 msgstr "æ? æ³?æ??å¼?帮å?©æ??æ¡£"
 
@@ -735,12 +739,8 @@ 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"
@@ -751,7 +751,8 @@ 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 "ç£?ç??æ??è½½è??"
 
@@ -767,7 +768,8 @@ msgstr "ç?¨äº?驱å?¨å?¨æ??è½½å°?ç¨?åº?ç??å·¥å??"
 msgid "Mount local disks and devices"
 msgstr "å? è½½æ?¬å?°ç£?ç??å??设å¤?"
 
-#: ../drivemount/drive-button.c:342 ../drivemount/drive-button.c:355
+#: ../drivemount/drive-button.c:342
+#: ../drivemount/drive-button.c:355
 msgid "(mounted)"
 msgstr "(å·²æ??è½½)"
 
@@ -824,8 +826,10 @@ msgstr "æ¯?次ç?¶æ??æ?´æ?°ä¹?é?´ç­?å¾?ç??ç§?æ?°"
 msgid "A set of eyeballs for your panel"
 msgstr "ç?¨äº?æ?¨é?¢æ?¿ç??ä¸?ç»?ç?¼ç??"
 
-#: ../geyes/GNOME_GeyesApplet.server.in.in.h:2 ../geyes/geyes.c:387
-#: ../geyes/geyes.c:417 ../geyes/geyes.c:419
+#: ../geyes/GNOME_GeyesApplet.server.in.in.h:2
+#: ../geyes/geyes.c:387
+#: ../geyes/geyes.c:417
+#: ../geyes/geyes.c:419
 msgid "Eyes"
 msgstr "Eyes"
 
@@ -865,11 +869,13 @@ 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 æ?´æ?¹å¸?å±?ã??"
 
@@ -889,15 +895,18 @@ 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 é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -913,11 +922,13 @@ 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 æ?´æ?¹å¸?å±?ã??"
 
@@ -969,7 +980,8 @@ 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 "é??ç?¨é?®ç??"
 
@@ -1045,23 +1057,28 @@ 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 é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1073,7 +1090,8 @@ 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 "è??å??é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1117,19 +1135,23 @@ 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 é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1145,7 +1167,8 @@ 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 æ?´æ?¹å¸?å±?ã??"
 
@@ -1485,7 +1508,8 @@ msgstr "è¶?å??语 Sun é?®ç??æ? å°?"
 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)"
 
@@ -1514,7 +1538,8 @@ msgstr "(c)1999-2005 S. Papadimitriou å??å?¶ä»?人"
 msgid "A panel application for monitoring local weather conditions."
 msgstr "ç?¨äº?ç??è§?æ?¬å?°å¤©æ°?æ??å?µç??é?¢æ?¿å°?ç¨?åº?ã??"
 
-#: ../gweather/gweather-applet.c:342 ../gweather/gweather-applet.c:346
+#: ../gweather/gweather-applet.c:342
+#: ../gweather/gweather-applet.c:346
 msgid "GNOME Weather"
 msgstr "GNOME 天�"
 
@@ -1655,15 +1680,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:807
 msgid "Weather Preferences"
 msgstr "天æ°?é¦?é??项"
 
-#: ../gweather/gweather-pref.c:839 ../gweather/gweather-pref.c:1024
+#: ../gweather/gweather-pref.c:839
+#: ../gweather/gweather-pref.c:1024
 msgid "_Automatically update every:"
 msgstr "è?ªå?¨æ?´æ?°ç??é?´é??(_A)ï¼?"
 
@@ -1675,8 +1700,10 @@ msgstr "è?ªå?¨æ?´æ?°ç??é?´é??(_A)ï¼?"
 msgid "_Temperature unit:"
 msgstr "温度å??ä½?(_T)ï¼?"
 
-#: ../gweather/gweather-pref.c:861 ../gweather/gweather-pref.c:881
-#: ../gweather/gweather-pref.c:907 ../gweather/gweather-pref.c:935
+#: ../gweather/gweather-pref.c:861
+#: ../gweather/gweather-pref.c:881
+#: ../gweather/gweather-pref.c:907
+#: ../gweather/gweather-pref.c:935
 msgid "Default"
 msgstr "�认�"
 
@@ -2016,9 +2043,7 @@ 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:156
@@ -2070,7 +2095,8 @@ msgstr "æ±?ç??"
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "æ??èµ?å°?ç¨?åº?æ? æ³?è¿?æ?¥å?° Yahoo! è´¢ç»?"
 
-#: ../invest-applet/invest/quotes.py:133 ../invest-applet/invest/quotes.py:162
+#: ../invest-applet/invest/quotes.py:133
+#: ../invest-applet/invest/quotes.py:162
 #, python-format
 msgid "Updated at %s"
 msgstr "� %s ��"
@@ -2084,7 +2110,6 @@ msgstr "å¹³å??å??å?? %s"
 #. 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 for a particular currency. i.e. How much money would be earned if 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:161
 #, python-format
-#| msgid "Positions balance: %+.2f"
 msgid "Positions balance: %s %s (%s)"
 msgstr "å??ä½?平衡ï¼?%s %s (%s)"
 
@@ -2138,11 +2163,8 @@ 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:345
 msgid "No items in history"
@@ -2226,7 +2248,8 @@ msgstr "è?ªå?¨å®?æ??"
 msgid "Co_mmand:"
 msgstr "�令(_M)�"
 
-#: ../mini-commander/src/mini-commander.ui.h:4 ../multiload/properties.c:571
+#: ../mini-commander/src/mini-commander.ui.h:4
+#: ../multiload/properties.c:571
 msgid "Colors"
 msgstr "��"
 
@@ -2279,11 +2302,12 @@ msgid "_Use default theme colors"
 msgstr "使��认主���(_U)"
 
 #: ../mini-commander/src/mini-commander.ui.h:18
-#: ../stickynotes/stickynotes.ui.h:44
+#: ../stickynotes/stickynotes.ui.h:46
 msgid "_Width:"
 msgstr "宽度(_W)�"
 
-#: ../mini-commander/src/mini-commander.ui.h:19 ../multiload/properties.c:526
+#: ../mini-commander/src/mini-commander.ui.h:19
+#: ../multiload/properties.c:526
 msgid "pixels"
 msgstr "å??ç´ "
 
@@ -2372,12 +2396,8 @@ 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"
@@ -2455,8 +2475,10 @@ msgid "Adjust the sound volume"
 msgstr "è°?æ?´é?³é??"
 
 #. tooltip over applet
-#: ../mixer/GNOME_MixerApplet.server.in.in.h:2 ../mixer/applet.c:206
-#: ../mixer/applet.c:227 ../null_applet/null_applet.c:44
+#: ../mixer/GNOME_MixerApplet.server.in.in.h:2
+#: ../mixer/applet.c:206
+#: ../mixer/applet.c:227
+#: ../null_applet/null_applet.c:44
 #: ../null_applet/null_applet.c:46
 msgid "Volume Control"
 msgstr "é?³é??æ?§å?¶"
@@ -2474,21 +2496,12 @@ msgid "Volume Applet"
 msgstr "é?³é??å°?ç¨?åº?"
 
 #: ../mixer/applet.c:545
-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 æ??件ï¼?æ??è??æ?¨æ²¡æ??é??置好声å?¡ã??"
+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:549
-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 ""
-"å¦?æ??æ?¨æ?³è¦?ä»?é?¢æ?¿ä¸­å? é?¤é?³é??æ?§å?¶ï¼?å?¯ä»¥ç?¨å?³é?®å??å?»é?¢æ?¿ä¸?ç??æ?¬å£°å?¨æ??é?®ï¼?ç?¶å??ä»?è??å??"
-"中é??æ?©â??ä»?é?¢æ?¿å? é?¤â??ã??"
+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:721
 #, c-format
@@ -2573,7 +2586,8 @@ msgstr "æ¿?æ´»(_A)"
 msgid "_Deactivate"
 msgstr "æ?­å¼?(_D)"
 
-#: ../modemlights/GNOME_ModemLights.xml.h:5 ../stickynotes/stickynotes.ui.h:41
+#: ../modemlights/GNOME_ModemLights.xml.h:5
+#: ../stickynotes/stickynotes.ui.h:43
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
@@ -2591,15 +2605,11 @@ 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
@@ -2607,9 +2617,7 @@ 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
@@ -2633,9 +2641,7 @@ 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
@@ -2672,35 +2678,36 @@ 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:255 ../multiload/properties.c:596
+#: ../multiload/main.c:255
+#: ../multiload/properties.c:596
 msgid "Processor"
 msgstr "å¤?ç??å?¨"
 
-#: ../multiload/main.c:257 ../multiload/properties.c:604
+#: ../multiload/main.c:257
+#: ../multiload/properties.c:604
 msgid "Memory"
 msgstr "å??å­?"
 
-#: ../multiload/main.c:259 ../multiload/properties.c:612
+#: ../multiload/main.c:259
+#: ../multiload/properties.c:612
 msgid "Network"
 msgstr "ç½?ç»?"
 
-#: ../multiload/main.c:261 ../multiload/properties.c:619
+#: ../multiload/main.c:261
+#: ../multiload/properties.c:619
 msgid "Swap Space"
 msgstr "交�空�"
 
-#: ../multiload/main.c:263 ../multiload/main.c:342
+#: ../multiload/main.c:263
+#: ../multiload/main.c:342
 msgid "Load Average"
 msgstr "è´?è½½å??å?¼"
 
@@ -2808,9 +2815,7 @@ 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
@@ -2950,7 +2955,8 @@ msgstr "ç³»ç»?ç??è§?å?¨æ?´æ?°é?´é??(_T)ï¼?"
 msgid "milliseconds"
 msgstr "毫�"
 
-#: ../multiload/properties.c:598 ../multiload/properties.c:606
+#: ../multiload/properties.c:598
+#: ../multiload/properties.c:606
 msgid "_User"
 msgstr "��(_U)"
 
@@ -2998,7 +3004,8 @@ 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)"
@@ -3096,9 +3103,7 @@ 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."
+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
@@ -3123,7 +3128,7 @@ msgstr "å?¨æ¡?é?¢ä¸?å??建ã??æ?¥ç??å??管ç??置顶便笺"
 
 #: ../stickynotes/GNOME_StickyNotesApplet.server.in.in.h:2
 #: ../stickynotes/stickynotes_applet.c:130
-#: ../stickynotes/stickynotes_applet.c:402
+#: ../stickynotes/stickynotes_applet.c:407
 msgid "Sticky Notes"
 msgstr "置顶便笺"
 
@@ -3144,7 +3149,7 @@ msgid "_Lock Notes"
 msgstr "é??å®?便笺(_L)"
 
 #: ../stickynotes/GNOME_StickyNotesApplet.xml.h:6
-#: ../stickynotes/stickynotes.ui.h:40
+#: ../stickynotes/stickynotes.ui.h:42
 msgid "_New Note"
 msgstr "�建便笺(_N)"
 
@@ -3185,149 +3190,152 @@ msgid "Choose if the default style is forced on all notes"
 msgstr "é??æ?©æ?¯å?¦å¼ºå?¶å¯¹å?¨é?¨ä¾¿ç¬ºä½¿ç?¨é»?认é£?æ ¼"
 
 #: ../stickynotes/stickynotes.ui.h:8
+msgid "Choose whether to hide all notes when selecting on the desktop"
+msgstr "å?¨é??æ?©æ¡?é?¢æ?¶é??æ?©æ?¯å?¦é??è??æ??æ??æ??示"
+
+#: ../stickynotes/stickynotes.ui.h:9
 msgid "Close note"
 msgstr "��便笺"
 
-#: ../stickynotes/stickynotes.ui.h:9
+#: ../stickynotes/stickynotes.ui.h:10
 msgid "Default Note Properties"
 msgstr "�认便笺��"
 
-#: ../stickynotes/stickynotes.ui.h:10
+#: ../stickynotes/stickynotes.ui.h:11
 msgid "Delete all sticky notes?"
 msgstr "å? é?¤æ??æ??ç??置顶便签ï¼?"
 
-#: ../stickynotes/stickynotes.ui.h:11
+#: ../stickynotes/stickynotes.ui.h:12
 msgid "Delete this sticky note?"
 msgstr "å? é?¤æ­¤ç½®é¡¶ä¾¿ç­¾ï¼?"
 
-#: ../stickynotes/stickynotes.ui.h:12
+#: ../stickynotes/stickynotes.ui.h:13
 msgid "Font C_olor:"
 msgstr "����(_O)�"
 
-#: ../stickynotes/stickynotes.ui.h:13
+#: ../stickynotes/stickynotes.ui.h:14
 msgid "Font Co_lor:"
 msgstr "����(_L)�"
 
-#: ../stickynotes/stickynotes.ui.h:14
+#: ../stickynotes/stickynotes.ui.h:15
 msgid "Force _default color and font on notes"
 msgstr "强å?¶å¯¹å?¨é?¨ä¾¿ç¬ºä½¿ç?¨é»?认é¢?è?²å??å­?ä½?(_D)"
 
-#: ../stickynotes/stickynotes.ui.h:15
+#: ../stickynotes/stickynotes.ui.h:16
 msgid "H_eight:"
 msgstr "�度(_E)�"
 
-#: ../stickynotes/stickynotes.ui.h:16
+#: ../stickynotes/stickynotes.ui.h:17
+msgid "Hide notes when the des_ktop is clicked on"
+msgstr "å?¨æ¡?é?¢è¢«é??æ?©æ?¶é??è??æ??示(_K)"
+
+#: ../stickynotes/stickynotes.ui.h:18
 msgid "Lock/Unlock note"
 msgstr "é??å®?/解é?¤é??å®?便笺"
 
-#: ../stickynotes/stickynotes.ui.h:17
+#: ../stickynotes/stickynotes.ui.h:19
 msgid "Note C_olor:"
 msgstr "便笺��(_O)�"
 
-#: ../stickynotes/stickynotes.ui.h:18
+#: ../stickynotes/stickynotes.ui.h:20
 msgid "Note _Color:"
 msgstr "便笺��(_C)�"
 
-#: ../stickynotes/stickynotes.ui.h:19
+#: ../stickynotes/stickynotes.ui.h:21
 msgid "Pick a color for the sticky note"
 msgstr "为记äº?è´´æ??é??æ??个é¢?è?²"
 
-#: ../stickynotes/stickynotes.ui.h:20
+#: ../stickynotes/stickynotes.ui.h:22
 msgid "Pick a default sticky note color"
 msgstr "为记äº?è´´æ??é??é»?认é¢?è?²"
 
-#: ../stickynotes/stickynotes.ui.h:21
+#: ../stickynotes/stickynotes.ui.h:23
 msgid "Pick a default sticky note font"
 msgstr "æ??é??ä¸?个é»?认ç??è®°äº?è´´å­?ä½?"
 
-#: ../stickynotes/stickynotes.ui.h:22
+#: ../stickynotes/stickynotes.ui.h:24
 msgid "Pick a font for the sticky note"
 msgstr "为该记äº?è´´æ??é??ä¸?个å­?ä½?"
 
-#: ../stickynotes/stickynotes.ui.h:23
+#: ../stickynotes/stickynotes.ui.h:25
 msgid "Properties"
 msgstr "å±?æ?§"
 
-#: ../stickynotes/stickynotes.ui.h:24
+#: ../stickynotes/stickynotes.ui.h:26
 msgid "Resize note"
 msgstr "��便笺大�"
 
-#: ../stickynotes/stickynotes.ui.h:25
+#: ../stickynotes/stickynotes.ui.h:27
 msgid "Specify a title for the note"
 msgstr "为记äº?è´´æ??å®?æ??个æ ?é¢?"
 
-#: ../stickynotes/stickynotes.ui.h:26
+#: ../stickynotes/stickynotes.ui.h:28
 msgid "Specify the default height (in pixels) of new notes"
 msgstr "æ??å®?æ?°ä¾¿ç¬ºç??é»?认é«?度(以å??ç´ ä¸ºå??ä½?)"
 
-#: ../stickynotes/stickynotes.ui.h:27
+#: ../stickynotes/stickynotes.ui.h:29
 msgid "Specify the default width (in pixels) of new notes"
 msgstr "æ??å®?æ?°ä¾¿ç¬ºç??é»?认宽度(以å??ç´ ä¸ºå??ä½?)"
 
-#: ../stickynotes/stickynotes.ui.h:28
+#: ../stickynotes/stickynotes.ui.h:30
 msgid "Sticky Note"
 msgstr "记�贴"
 
-#: ../stickynotes/stickynotes.ui.h:29
+#: ../stickynotes/stickynotes.ui.h:31
 msgid "Sticky Note Properties"
 msgstr "记�贴��"
 
-#: ../stickynotes/stickynotes.ui.h:30
+#: ../stickynotes/stickynotes.ui.h:32
 msgid "Sticky Notes Preferences"
 msgstr "è®°äº?è´´é¦?é??项"
 
-#: ../stickynotes/stickynotes.ui.h:31
+#: ../stickynotes/stickynotes.ui.h:33
 msgid "This cannot be undone."
 msgstr "è¿?ä¸?è?½æ?¤é??ã??"
 
-#: ../stickynotes/stickynotes.ui.h:32
+#: ../stickynotes/stickynotes.ui.h:34
 msgid "Use co_lor from the system theme"
 msgstr "使�系�主���(_L)"
 
-#: ../stickynotes/stickynotes.ui.h:33
+#: ../stickynotes/stickynotes.ui.h:35
 msgid "Use default co_lor"
 msgstr "使��认��(_L)"
 
-#: ../stickynotes/stickynotes.ui.h:34
+#: ../stickynotes/stickynotes.ui.h:36
 msgid "Use default fo_nt"
 msgstr "使��认��(_N)"
 
-#: ../stickynotes/stickynotes.ui.h:35
+#: ../stickynotes/stickynotes.ui.h:37
 msgid "Use fo_nt from the system theme"
 msgstr "使�系�主���(_N)"
 
-#: ../stickynotes/stickynotes.ui.h:36
+#: ../stickynotes/stickynotes.ui.h:38
 msgid "_Delete All"
 msgstr "å?¨é?¨å? é?¤(_D)"
 
-#: ../stickynotes/stickynotes.ui.h:37
+#: ../stickynotes/stickynotes.ui.h:39
 msgid "_Delete Note..."
 msgstr "å? é?¤ä¾¿ç¬º(_D)..."
 
-#: ../stickynotes/stickynotes.ui.h:38
+#: ../stickynotes/stickynotes.ui.h:40
 msgid "_Font:"
 msgstr "å­?ä½?(_F)ï¼?"
 
-#: ../stickynotes/stickynotes.ui.h:39
+#: ../stickynotes/stickynotes.ui.h:41
 msgid "_Lock Note"
 msgstr "é??å®?便笺(_L)"
 
-#: ../stickynotes/stickynotes.ui.h:42
+#: ../stickynotes/stickynotes.ui.h:44
 msgid "_Put notes on all workspaces"
 msgstr "å°?便笺æ?¾ç½®å?¨æ??æ??å·¥ä½?å?º(_P)"
 
-#: ../stickynotes/stickynotes.ui.h:43
+#: ../stickynotes/stickynotes.ui.h:45
 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"
@@ -3342,15 +3350,11 @@ 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
@@ -3358,9 +3362,7 @@ 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
@@ -3384,68 +3386,68 @@ 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."
-msgstr "å¦?æ??ç¦?ç?¨äº?æ­¤é??项ï¼?å°?忽ç?¥æ??å®?ç»?å??个便笺ç??è?ªå®?ä¹?é¢?è?²å??å­?ä½?ã??"
+msgid "If this option is enabled, selecting the desktop in any way will automatically hide all the open notes."
+msgstr "å¦?æ??å?¯ç?¨æ­¤é??项ï¼?以任ä½?æ?¹å¼?é??æ?©æ¡?é?¢é?½å°?è?ªå?¨é??è??æ??示ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:17
+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:18
 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."
+#: ../stickynotes/stickynotes.schemas.in.h:19
+msgid "Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not."
 msgstr "æ??å®?置顶便笺æ?¯å?¦å?¨æ??æ??å·¥ä½?空é?´ä¸­å?¯è§?ã??"
 
-#: ../stickynotes/stickynotes.schemas.in.h:19
+#: ../stickynotes/stickynotes.schemas.in.h:20
 msgid "Sticky notes' locked state"
 msgstr "置顶便笺ç??é??å®?ç?¶æ??"
 
-#: ../stickynotes/stickynotes.schemas.in.h:20
+#: ../stickynotes/stickynotes.schemas.in.h:21
 msgid "Sticky notes' workspace stickyness"
 msgstr "置顶便笺ç??å·¥ä½?å?ºç½®é¡¶å±?æ?§"
 
-#: ../stickynotes/stickynotes.schemas.in.h:21
+#: ../stickynotes/stickynotes.schemas.in.h:22
 msgid "Whether to ask for confirmation when deleting a note"
 msgstr "å? é?¤ä¾¿ç¬ºå??æ?¯å?¦è¯·æ±?确认"
 
-#: ../stickynotes/stickynotes.schemas.in.h:22
+#: ../stickynotes/stickynotes.schemas.in.h:23
 msgid "Whether to force the default color and font on all notes"
 msgstr "æ?¯å?¦å¼ºå?¶å¯¹å?¨é?¨ä¾¿ç¬ºä½¿ç?¨é»?认é¢?è?²å??å­?ä½?"
 
-#: ../stickynotes/stickynotes.schemas.in.h:23
+#: ../stickynotes/stickynotes.schemas.in.h:24
+msgid "Whether to hide all notes when the desktop is selected"
+msgstr "å?¨é??æ?©æ¡?é?¢æ?¶æ?¯å?¦é??è??æ??æ??æ??示"
+
+#: ../stickynotes/stickynotes.schemas.in.h:25
 msgid "Whether to use the default system color"
 msgstr "��使�系��认��"
 
-#: ../stickynotes/stickynotes.schemas.in.h:24
+#: ../stickynotes/stickynotes.schemas.in.h:26
 msgid "Whether to use the default system font"
 msgstr "��使�系��认��"
 
-#: ../stickynotes/stickynotes_applet.c:580
+#: ../stickynotes/stickynotes_applet.c:590
 #, c-format
 msgid "%d note"
 msgid_plural "%d notes"
 msgstr[0] "%d 个便笺"
 
-#: ../stickynotes/stickynotes_applet.c:581
+#: ../stickynotes/stickynotes_applet.c:591
 msgid "Show sticky notes"
 msgstr "�示置顶便笺"
 
-#: ../stickynotes/stickynotes_applet_callbacks.c:380
+#: ../stickynotes/stickynotes_applet_callbacks.c:417
 msgid "Sticky Notes for the GNOME Desktop Environment"
 msgstr "ç?¨äº? GNOME æ¡?é?¢ç?¯å¢?ç??置顶便笺"
 
@@ -3486,12 +3488,8 @@ 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?"
@@ -3502,8 +3500,7 @@ 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
@@ -3527,12 +3524,8 @@ msgid "Empty all of the items from the trash?"
 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 ""
-"å¦?æ??æ?¨é??æ?©æ¸?空å??æ?¶ç«?ï¼?å?¶ä¸­ç??项ç?®å°?被永ä¹?å? é?¤ã??请注æ??ï¼?æ?¨è¿?å?¯ä»¥å??个å? é?¤å?¶ä¸­ç??"
-"项ç?®ã??"
+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 "Emptying the Trash"
@@ -3544,52 +3537,36 @@ msgstr "ä»?ï¼?"
 
 #~ msgid "Keyboard _Preferences"
 #~ msgstr "é?®ç??é¦?é??项(_P)"
-
 #~ msgid "Pl_ugins"
 #~ msgstr "æ??件(_U)"
-
 #~ msgid "Show Current _Layout"
 #~ msgstr "æ?¾ç¤ºå½?å??å¸?å±?(_L)"
-
 #~ msgid "_Groups"
 #~ msgstr "群�(_G)"
-
 #~ msgid "Keyboard applet factory"
 #~ msgstr "é?®ç??å°?ç¨?åº?å·¥å??"
-
 #~ msgid "Unknown"
 #~ msgstr "��"
-
 #~ msgid "Keyboard Layout \"%s\""
 #~ msgstr "é?®ç??å¸?å±?â??%sâ??"
-
 #~ msgid "Copyright (c) Sergey V. Udaltsov 1999-2004"
 #~ msgstr "ç??æ?? (c) Sergey V. Oudaltsov 1999-2004"
-
 #~ msgid "Keyboard layout indicator applet for GNOME"
 #~ msgstr "GNOME ç??é?®ç??å¸?å±?æ ?è¯?å?¨å°?ç¨?åº?"
-
 #~ msgid "Keyboard Layout"
 #~ 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"
@@ -3598,7 +3575,6 @@ msgstr "ä»?ï¼?"
 #~ "<b>å? é?¤å?¨é?¨è®°äº?è´´ï¼?</b>\n"
 #~ "\n"
 #~ "å°?ä¸?å?»ä¸?å¤?è¿?å?¦ã??"
-
 #~ msgid ""
 #~ "<b>Delete this sticky note?</b>\n"
 #~ "\n"
@@ -3607,42 +3583,30 @@ msgstr "ä»?ï¼?"
 #~ "<b>å? é?¤è¯¥è®°äº?è´´ï¼?</b>\n"
 #~ "\n"
 #~ "å°?ä¸?å?»ä¸?å¤?è¿?å?¦ã??"
-
 #~ msgid "<b>Properties</b>"
 #~ msgstr "<b>å±?æ?§</b>"
-
 #~ 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)"
+