[gnome-applets] [l10n]Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 17beccdb1a85a6b81f9b522dc3c482ba6d04f1d7
Author: ben <benbenhappy2008 gmail com>
Date:   Thu Mar 3 19:55:34 2011 +0000

    [l10n]Update Simplified Chinese translation.

 po/zh_CN.po | 1404 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 738 insertions(+), 666 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 91170ca..014e00a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,74 +7,22 @@
 # Liu Songhe <jackliu9999 263 net>, 2003.
 # ç??é?²(Gan Lu) <rhythm gan gmail com>, 2009.
 # YunQiang Su <wzssyqa gmail com>, 2010.
+# ben <benbenhappy2008 gmail com>, 2011.
 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-25 12:10+0000\n"
-"PO-Revision-Date: 2010-07-26 23:06+0800\n"
-"Last-Translator: Eleanor Chen <chenyueg gmail com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"applets&component=general\n"
+"POT-Creation-Date: 2011-02-26 12:45+0000\n"
+"PO-Revision-Date: 2011-03-03 19:54+0000\n"
+"Last-Translator: ben <benbenhappy2008 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../accessx-status/GNOME_AccessxApplet.xml.h:1
-#: ../battstat/GNOME_BattstatApplet.xml.h:1
-#: ../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
-#: ../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
-#: ../multiload/GNOME_MultiloadApplet.xml.h:1
-#: ../stickynotes/GNOME_StickyNotesApplet.xml.h:2
-#: ../trashapplet/GNOME_Panel_TrashApplet.xml.h:1
-msgid "_About"
-msgstr "��(_A)"
-
-#: ../accessx-status/GNOME_AccessxApplet.xml.h:2
-#: ../battstat/GNOME_BattstatApplet.xml.h:2
-#: ../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
-#: ../mini-commander/src/GNOME_MiniCommanderApplet.xml.h:2
-#: ../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
-msgid "_Help"
-msgstr "帮�(_H)"
-
-#: ../accessx-status/GNOME_AccessxApplet.xml.h:3
-msgid "_Keyboard Accessibility Preferences"
-msgstr "é?®ç??è¾?å?©å??è?½é¦?é??项(_K)"
-
-#: ../accessx-status/GNOME_AccessxStatusApplet.server.in.in.h:1
-msgid "AccessX Status Applet Factory"
-msgstr "AccessX ç?¶æ??å°?ç¨?åº?å·¥å??"
-
-#: ../accessx-status/GNOME_AccessxStatusApplet.server.in.in.h:2
-#: ../accessx-status/applet.c:1333
-msgid "Keyboard Accessibility Status"
-msgstr "é?®ç??è¾?å?©å??è?½ç?¶æ??"
-
-#: ../accessx-status/GNOME_AccessxStatusApplet.server.in.in.h:3
-msgid "Keyboard Accessibility Status Applet Factory"
-msgstr "é?®ç??è¾?å?©å??è?½ç?¶æ??å°?ç¨?åº?å·¥å??"
-
-#: ../accessx-status/GNOME_AccessxStatusApplet.server.in.in.h:4
-msgid "Shows the status of keyboard accessibility features"
-msgstr "æ?¾ç¤ºé?®ç??è¾?å?©å??è?½ç?¹æ?§ç??ç?¶æ??"
-
-#: ../accessx-status/applet.c:137
+#: ../accessx-status/applet.c:139
 msgid "Shows the state of AccessX features such as latched modifiers"
 msgstr "æ?¾ç¤º AccessX ç?¹æ?§ç??ç?¶æ??ï¼?å¦?æ??é??修饰"
 
@@ -82,140 +30,158 @@ 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:421
-#: ../trashapplet/src/trashapplet.c:432
+#: ../accessx-status/applet.c:144 ../battstat/battstat_applet.c:1203
+#: ../charpick/charpick.c:612 ../cpufreq/src/cpufreq-applet.c:611
+#: ../drivemount/drivemount.c:106 ../geyes/geyes.c:153
+#: ../gweather/gweather-about.c:55 ../invest-applet/invest/about.py:29
+#: ../mini-commander/src/about.c:53 ../mixer/applet.c:1466
+#: ../modemlights/modem-applet.c:1023 ../multiload/main.c:61
+#: ../stickynotes/stickynotes_applet_callbacks.c:383
+#: ../trashapplet/src/trashapplet.c:431
 msgid "translator-credits"
 msgstr ""
 "å¼?æº?软件å?½é??å??ç®?ä½?中æ??ç»?(http://i18n.linux.net.cn)\n"
 "ç??é?²(Gan Lu) <rhythm gan gmail com>"
 
-#: ../accessx-status/applet.c:168
+#: ../accessx-status/applet.c:169
 #, c-format
 msgid "There was an error launching the help viewer: %s"
 msgstr "è°?ç?¨å¸®å?©æ?¥ç??å?¨æ?¶å?ºé??ï¼?%s"
 
-#: ../accessx-status/applet.c:218
+#: ../accessx-status/applet.c:201
+msgid "Open the keyboard preferences dialog"
+msgstr "è°?ç?¨é?®ç??é¦?é??项对è¯?æ¡?"
+
+#: ../accessx-status/applet.c:219
 #, c-format
 msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "è°?ç?¨é?®ç??é¦?é??项对è¯?æ¡?æ?¶å?ºé??ï¼?%s"
 
+#: ../accessx-status/applet.c:238
+msgid "_Keyboard Accessibility Preferences"
+msgstr "é?®ç??è¾?å?©å??è?½é¦?é??项(_K)"
+
+#: ../accessx-status/applet.c:241 ../battstat/battstat_applet.c:64
+#: ../charpick/charpick.c:719 ../cpufreq/src/cpufreq-applet.c:126
+#: ../drivemount/drivemount.c:144 ../geyes/geyes.c:318
+#: ../gweather/gweather-applet.c:124
+#: ../invest-applet/data/Invest_Applet.xml.h:2
+#: ../mini-commander/src/mini-commander_applet.c:56 ../mixer/applet.c:386
+#: ../modemlights/modem-applet.c:151 ../multiload/main.c:465
+#: ../stickynotes/stickynotes_applet.c:45 ../trashapplet/src/trashapplet.c:75
+msgid "_Help"
+msgstr "帮�(_H)"
+
+#: ../accessx-status/applet.c:244 ../battstat/battstat_applet.c:67
+#: ../charpick/charpick.c:722 ../cpufreq/src/cpufreq-applet.c:129
+#: ../drivemount/drivemount.c:147 ../geyes/geyes.c:321
+#: ../gweather/gweather-applet.c:127
+#: ../invest-applet/data/Invest_Applet.xml.h:1
+#: ../mini-commander/src/mini-commander_applet.c:59 ../mixer/applet.c:389
+#: ../modemlights/modem-applet.c:154 ../multiload/main.c:468
+#: ../stickynotes/stickynotes_applet.c:48 ../trashapplet/src/trashapplet.c:78
+msgid "_About"
+msgstr "��(_A)"
+
 #. 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:468 ../accessx-status/applet.c:508
 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:981 ../accessx-status/applet.c:1055
+#: ../accessx-status/applet.c:1124 ../accessx-status/applet.c:1290
 msgid "AccessX Status"
 msgstr "AccessX ç?¶æ??"
 
-#: ../accessx-status/applet.c:986
-#: ../accessx-status/applet.c:1129
+#: ../accessx-status/applet.c:982 ../accessx-status/applet.c:1125
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "æ?¾ç¤ºä½¿ç?¨è¾?å?©å??è?½æ?¶é?®ç??ç??ç?¶æ??ã??"
 
-#: ../accessx-status/applet.c:1021
+#: ../accessx-status/applet.c:1017
 msgid "XKB Extension is not enabled"
 msgstr "XKB �����"
 
-#: ../accessx-status/applet.c:1026
+#: ../accessx-status/applet.c:1022
 msgid "Unknown error"
 msgstr "æ?ªç?¥é??误"
 
-#: ../accessx-status/applet.c:1034
+#: ../accessx-status/applet.c:1030
 #, c-format
 msgid "Error: %s"
 msgstr "é??误ï¼?%s"
 
-#: ../accessx-status/applet.c:1338
+#: ../accessx-status/applet.c:1287
+#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2
+msgid "Keyboard Accessibility Status"
+msgstr "é?®ç??è¾?å?©å??è?½ç?¶æ??"
+
+#: ../accessx-status/applet.c:1292
 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
-msgid "Battery Charge Monitor"
-msgstr "ç?µæ± ç?µé??ç??è§?å?¨"
+#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:1
+msgid "AccessX Status Applet Factory"
+msgstr "AccessX ç?¶æ??å°?ç¨?åº?å·¥å??"
 
-#: ../battstat/GNOME_BattstatApplet.server.in.in.h:2
-msgid "Battstat Factory"
-msgstr "ç?µæ± ç?¶æ??å·¥å??"
+#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3
+msgid "Keyboard Accessibility Status Applet Factory"
+msgstr "é?®ç??è¾?å?©å??è?½ç?¶æ??å°?ç¨?åº?å·¥å??"
 
-#: ../battstat/GNOME_BattstatApplet.server.in.in.h:3
-#: ../battstat/battstat_applet.c:1664
-msgid "Monitor a laptop's remaining power"
-msgstr "ç??è§?ç¬?è®°æ?¬è®¡ç®?æ?ºç?µæ± ç??å?©ä½?ç?µé??"
+#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:4
+msgid "Shows the status of keyboard accessibility features"
+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
-#: ../gweather/GNOME_GWeatherApplet.xml.h:4
-#: ../invest-applet/data/Invest_Applet.xml.h:2
-#: ../mini-commander/src/GNOME_MiniCommanderApplet.xml.h:3
-#: ../mixer/GNOME_MixerApplet.xml.h:5
-#: ../multiload/GNOME_MultiloadApplet.xml.h:4
-#: ../stickynotes/GNOME_StickyNotesApplet.xml.h:7
+#: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:716
+#: ../cpufreq/src/cpufreq-applet.c:123 ../geyes/geyes.c:315
+#: ../gweather/gweather-applet.c:121
+#: ../invest-applet/data/Invest_Applet.xml.h:3
+#: ../mini-commander/src/mini-commander_applet.c:53 ../mixer/applet.c:392
+#: ../multiload/main.c:459 ../stickynotes/stickynotes_applet.c:42
 msgid "_Preferences"
 msgstr "é¦?é??项(_P)"
 
-#: ../battstat/battstat_applet.c:67
+#: ../battstat/battstat_applet.c:72
 msgid "System is running on AC power"
 msgstr "系�正使�交�����"
 
-#: ../battstat/battstat_applet.c:68
+#: ../battstat/battstat_applet.c:73
 msgid "System is running on battery power"
 msgstr "ç³»ç»?正使ç?¨ç?µæ± è¿?è¡?"
 
-#: ../battstat/battstat_applet.c:370
+#: ../battstat/battstat_applet.c:339
 #, c-format
 msgid "Battery charged (%d%%)"
 msgstr "ç?µæ± å·²å??满 (%d%%)"
 
-#: ../battstat/battstat_applet.c:372
+#: ../battstat/battstat_applet.c:341
 #, c-format
 msgid "Unknown time (%d%%) remaining"
 msgstr "������ (%d%%)"
 
-#: ../battstat/battstat_applet.c:374
+#: ../battstat/battstat_applet.c:343
 #, c-format
 msgid "Unknown time (%d%%) until charged"
 msgstr "å?©ä½?å??ç?µæ?¶é?´æ?ªç?¥ (%d%%)"
 
-#: ../battstat/battstat_applet.c:379
+#: ../battstat/battstat_applet.c:348
 #, c-format
 msgid "%d minute (%d%%) remaining"
 msgid_plural "%d minutes (%d%%) remaining"
 msgstr[0] "è¿?å?© %d å??é?? (%d%%)"
 
-#: ../battstat/battstat_applet.c:384
+#: ../battstat/battstat_applet.c:353
 #, c-format
 msgid "%d minute until charged (%d%%)"
 msgid_plural "%d minutes until charged (%d%%)"
 msgstr[0] "离å??满è¿?å?© %d å??é?? (%d%%)"
 
-#: ../battstat/battstat_applet.c:390
+#: ../battstat/battstat_applet.c:359
 #, c-format
 msgid "%d hour (%d%%) remaining"
 msgid_plural "%d hours (%d%%) remaining"
 msgstr[0] "è¿?å?© %d å°?æ?¶ (%d%%)"
 
-#: ../battstat/battstat_applet.c:395
+#: ../battstat/battstat_applet.c:364
 #, c-format
 msgid "%d hour until charged (%d%%)"
 msgid_plural "%d hours until charged (%d%%)"
@@ -223,60 +189,58 @@ msgstr[0] "离å??满è¿?å?© %d å°?æ?¶ (%d%%)"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:402
+#: ../battstat/battstat_applet.c:371
 #, c-format
 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:372 ../battstat/battstat_applet.c:379
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ?¶"
 
-#: ../battstat/battstat_applet.c:404
-#: ../battstat/battstat_applet.c:411
+#: ../battstat/battstat_applet.c:373 ../battstat/battstat_applet.c:380
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:409
+#: ../battstat/battstat_applet.c:378
 #, c-format
 msgid "%d %s %d %s until charged (%d%%)"
 msgstr "离å??满è¿?å?© %d %s %d %s (%d%%)"
 
-#: ../battstat/battstat_applet.c:423
+#: ../battstat/battstat_applet.c:392
 msgid "Battery Monitor"
 msgstr "ç?µæ± ç??è§?å?¨"
 
-#: ../battstat/battstat_applet.c:433
-#: ../battstat/battstat_applet.c:493
+#: ../battstat/battstat_applet.c:402 ../battstat/battstat_applet.c:461
 msgid "Your battery is now fully recharged"
 msgstr "æ?¨ç??ç?µæ± ç?°å·²å??满ç?µ"
 
-#: ../battstat/battstat_applet.c:469
-#: ../battstat/battstat_applet.c:625
+#: ../battstat/battstat_applet.c:438 ../battstat/battstat_applet.c:593
 msgid "Battery Notice"
 msgstr "ç?µé??æ??示"
 
 #. we don't know the remaining time
-#: ../battstat/battstat_applet.c:570
+#: ../battstat/battstat_applet.c:538
 #, c-format
 msgid "You have %d%% of your total battery capacity remaining."
 msgstr "æ?¨ç??ç?µæ± 容é??è¿?å?© %d%%ã??"
 
-#: ../battstat/battstat_applet.c:576
+#: ../battstat/battstat_applet.c:544
 #, 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
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop does not support suspend.
-#: ../battstat/battstat_applet.c:588
+#: ../battstat/battstat_applet.c:556
 msgid ""
 "To avoid losing your work:\n"
 " â?¢ plug your laptop into external power, or\n"
@@ -289,7 +253,7 @@ msgstr ""
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop supports suspend.
-#: ../battstat/battstat_applet.c:596
+#: ../battstat/battstat_applet.c:564
 msgid ""
 "To avoid losing your work:\n"
 " â?¢ suspend your laptop to save power,\n"
@@ -301,50 +265,56 @@ msgstr ""
 " * å°?æ?¨ç??ç¬?è®°æ?¬ç?µè??æ?¥å?¥å¤?é?¨ç?µæº?ï¼?\n"
 " * æ??è??ä¿?å­?æ??档并å?³é?­æ?¨ç??ç¬?è®°æ?¬ç?µè??ã??"
 
-#: ../battstat/battstat_applet.c:604
+#: ../battstat/battstat_applet.c:572
 msgid "Your battery is running low"
 msgstr "æ?¨ç??ç?µæ± ç?µé??ä¸?足"
 
-#: ../battstat/battstat_applet.c:701
+#: ../battstat/battstat_applet.c:667
 msgid "No battery present"
 msgstr "ä¸?å­?å?¨ç?µæ± "
 
-#: ../battstat/battstat_applet.c:704
+#: ../battstat/battstat_applet.c:670
 msgid "Battery status unknown"
 msgstr "ç?µæ± ç?¶æ??æ?ªç?¥"
 
-#: ../battstat/battstat_applet.c:863
+#: ../battstat/battstat_applet.c:850
 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:386
-#: ../stickynotes/stickynotes_applet_callbacks.c:603
+#: ../battstat/battstat_applet.c:1150 ../drivemount/drivemount.c:132
+#: ../geyes/geyes.c:303 ../geyes/themes.c:242 ../gweather/gweather-applet.c:70
+#: ../gweather/gweather-pref.c:746 ../mini-commander/src/preferences.c:366
+#: ../stickynotes/stickynotes_applet_callbacks.c:349
+#: ../stickynotes/stickynotes_applet_callbacks.c:565
 #: ../trashapplet/src/trashapplet.c:398
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "æ?¾ç¤ºå¸®å?©æ?¶å??ç??é??误ï¼?%s"
 
-#: ../battstat/battstat_applet.c:1233
+#: ../battstat/battstat_applet.c:1190
 msgid "This utility shows the status of your laptop battery."
 msgstr "该工å?·æ?¾ç¤ºæ?¨ç??ç¬?è®°æ?¬ç?µè??ç?µæ± ç??ç?¶æ??ã??"
 
 #. true
-#: ../battstat/battstat_applet.c:1235
+#: ../battstat/battstat_applet.c:1192
 msgid "HAL backend enabled."
 msgstr "HAL å??端已å?¯ç?¨ã??"
 
 #. false
-#: ../battstat/battstat_applet.c:1236
+#: ../battstat/battstat_applet.c:1193
 msgid "Legacy (non-HAL) backend enabled."
 msgstr "ä¼ ç»?(é?? HAL)å??端已å?¯ç?¨ã??"
 
+#: ../battstat/battstat_applet.c:1569 ../battstat/battstat_applet.c:1622
+#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1
+msgid "Battery Charge Monitor"
+msgstr "ç?µæ± ç?µé??ç??è§?å?¨"
+
+#: ../battstat/battstat_applet.c:1623
+#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:3
+msgid "Monitor a laptop's remaining power"
+msgstr "ç??è§?ç¬?è®°æ?¬è®¡ç®?æ?ºç?µæ± ç??å?©ä½?ç?µé??"
+
 #: ../battstat/battstat_applet.ui.h:1
 msgid "(shows single image for status and charge)"
 msgstr "(ç?¶æ??å??ç?µé??æ?¾ç¤ºä¸ºå??å¼ å?¾ç??)"
@@ -394,8 +364,7 @@ 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 é??误"
 
@@ -449,7 +418,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
@@ -469,7 +440,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
@@ -477,18 +450,24 @@ 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
 msgid "Warn on low time rather than low percentage"
 msgstr "æ ¹æ?®å?©ä½?æ?¶é?´è??é??å?©ä½?ç?¾å??æ¯?ç»?å?ºè­¦å??"
 
+#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2
+msgid "Battstat Factory"
+msgstr "ç?µæ± ç?¶æ??å·¥å??"
+
 #. TRANSLATOR: this is a selectable item in a drop-down menu to end
 #. * this sentence:
 #. *   "Warn when battery charge drops to: [XX] percent".
 #.
-#: ../battstat/properties.c:315
+#: ../battstat/properties.c:314
 msgid "Percent"
 msgstr "% æ?¶æ??é??æ??"
 
@@ -496,7 +475,7 @@ msgstr "% æ?¶æ??é??æ??"
 #. * this sentence:
 #. *   "Warn when battery charge drops to: [XX] minutes remaining"
 #.
-#: ../battstat/properties.c:321
+#: ../battstat/properties.c:320
 msgid "Minutes Remaining"
 msgstr "å??é??æ?¶æ??é??æ??"
 
@@ -512,23 +491,7 @@ msgstr "ç?µæ± å·²å??满"
 msgid "Battery power low"
 msgstr "ç?µæ± ç?µé??ä½?"
 
-#: ../charpick/GNOME_CharpickerApplet.server.in.in.h:1
-#: ../charpick/charpick.c:741
-#: ../charpick/charpick.c:753
-#: ../charpick/properties.c:452
-msgid "Character Palette"
-msgstr "�符�"
-
-#: ../charpick/GNOME_CharpickerApplet.server.in.in.h:2
-msgid "Charpicker Applet Factory"
-msgstr "å­?符æ?¾å??å°?ç¨?åº?å·¥å??"
-
-#: ../charpick/GNOME_CharpickerApplet.server.in.in.h:3
-#: ../charpick/charpick.c:741
-msgid "Insert characters"
-msgstr "æ??å?¥å­?符"
-
-#: ../charpick/charpick.c:436
+#: ../charpick/charpick.c:438
 msgid "Available palettes"
 msgstr "å?¯ç?¨ç??å­?符æ?¿"
 
@@ -536,23 +499,37 @@ msgstr "å?¯ç?¨ç??å­?符æ?¿"
 #. *             hopefully, the name of the unicode character has already
 #. *             been translated.
 #.
-#: ../charpick/charpick.c:483
+#: ../charpick/charpick.c:485
 #, c-format
 msgid "Insert \"%s\""
 msgstr "æ??å?¥â??%sâ??"
 
-#: ../charpick/charpick.c:486
+#: ../charpick/charpick.c:488
 msgid "Insert special character"
 msgstr "æ??å?¥ç?¹æ®?å­?符"
 
-#: ../charpick/charpick.c:490
+#: ../charpick/charpick.c:492
 #, c-format
 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 å??å¸?ã??"
+#: ../charpick/charpick.c:607
+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:745 ../charpick/charpick.c:759
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
+#: ../charpick/properties.c:451
+msgid "Character Palette"
+msgstr "�符�"
+
+#: ../charpick/charpick.c:745
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:3
+msgid "Insert characters"
+msgstr "æ??å?¥å­?符"
 
 #: ../charpick/charpick.schemas.in.h:1
 msgid "Characters shown on applet startup"
@@ -562,8 +539,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:378
 msgid "List of available palettes"
 msgstr "å?¯ç?¨å­?符æ?¿å??表"
 
@@ -572,86 +548,91 @@ 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/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2
+msgid "Charpicker Applet Factory"
+msgstr "å­?符æ?¾å??å°?ç¨?åº?å·¥å??"
+
 #: ../charpick/properties.c:28
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../charpick/properties.c:117
+#: ../charpick/properties.c:116
 msgid "_Palette:"
 msgstr "�符�(_P)�"
 
-#: ../charpick/properties.c:125
+#: ../charpick/properties.c:124
 msgid "Palette entry"
 msgstr "�符�项"
 
-#: ../charpick/properties.c:126
+#: ../charpick/properties.c:125
 msgid "Modify a palette by adding or removing characters"
 msgstr "æ·»å? /å? é?¤å­?符æ?¥ä¿®æ?¹å­?符æ?¿"
 
-#: ../charpick/properties.c:240
+#: ../charpick/properties.c:239
 msgid "Add Palette"
 msgstr "æ·»å? å­?符æ?¿"
 
-#: ../charpick/properties.c:277
+#: ../charpick/properties.c:276
 msgid "Edit Palette"
 msgstr "���符�"
 
-#: ../charpick/properties.c:378
+#: ../charpick/properties.c:377
 msgid "Palettes list"
 msgstr "å­?符æ?¿å??表"
 
-#: ../charpick/properties.c:457
+#: ../charpick/properties.c:456
 msgid "_Palettes:"
 msgstr "�符�(_P)�"
 
-#: ../charpick/properties.c:473
+#: ../charpick/properties.c:472
 msgid "Add button"
 msgstr "æ·»å? æ??é?®"
 
-#: ../charpick/properties.c:474
+#: ../charpick/properties.c:473
 msgid "Click to add a new palette"
 msgstr "å??å?»ä»¥æ·»å? æ?°å­?符æ?¿"
 
-#: ../charpick/properties.c:481
+#: ../charpick/properties.c:480
 msgid "Edit button"
 msgstr "ç¼?è¾?æ??é?®"
 
-#: ../charpick/properties.c:482
+#: ../charpick/properties.c:481
 msgid "Click to edit the selected palette"
 msgstr "å??å?»ä»¥ç¼?è¾?é??中å­?符æ?¿"
 
-#: ../charpick/properties.c:489
+#: ../charpick/properties.c:488
 msgid "Delete button"
 msgstr "å? é?¤æ??é?®"
 
-#: ../charpick/properties.c:490
+#: ../charpick/properties.c:489
 msgid "Click to delete the selected palette"
 msgstr "å??å?»ä»¥å? é?¤é??中å­?符æ?¿"
 
-#: ../charpick/properties.c:542
+#: ../charpick/properties.c:540
 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
-msgid "CPU Frequency Scaling Monitor"
-msgstr "CPU é¢?ç??è??å?´ç??è§?å?¨"
-
-#: ../cpufreq/GNOME_CPUFreqApplet.server.in.in.h:2
-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"
@@ -662,7 +643,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
@@ -701,16 +684,24 @@ msgstr "��(_A)"
 msgid "_Monitored CPU:"
 msgstr "ç??è§?中ç?? CPU(_M)ï¼?"
 
-#: ../cpufreq/src/cpufreq-applet.c:584
-#: ../cpufreq/src/cpufreq-prefs.c:478
+#: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:1
+#: ../cpufreq/src/cpufreq-applet.c:944 ../cpufreq/src/cpufreq-applet.c:1003
+msgid "CPU Frequency Scaling Monitor"
+msgstr "CPU é¢?ç??è??å?´ç??è§?å?¨"
+
+#: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:2
+msgid "Monitor the CPU Frequency Scaling"
+msgstr "ç??è§? CPU é¢?ç??è??å?´"
+
+#: ../cpufreq/src/cpufreq-applet.c:579 ../cpufreq/src/cpufreq-prefs.c:478
 msgid "Could not open help document"
 msgstr "æ? æ³?æ??å¼?帮å?©æ??æ¡£"
 
-#: ../cpufreq/src/cpufreq-applet.c:612
+#: ../cpufreq/src/cpufreq-applet.c:606
 msgid "This utility shows the current CPU Frequency Scaling."
 msgstr "此工å?·æ?¾ç¤ºç?®å??ç?? CPU é¢?ç??è??å?´ã??"
 
-#: ../cpufreq/src/cpufreq-applet.c:1006
+#: ../cpufreq/src/cpufreq-applet.c:1004
 msgid "This utility shows the current CPU Frequency"
 msgstr "此工å?·æ?¾ç¤º CPU ç?®å??ç??é¢?ç??"
 
@@ -739,8 +730,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"
@@ -750,26 +745,7 @@ msgstr "æ?´æ?¹ CPU é¢?ç??è??å?´"
 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
-msgid "Disk Mounter"
-msgstr "ç£?ç??æ??è½½è??"
-
-#: ../drivemount/GNOME_DriveMountApplet.server.in.in.h:2
-msgid "Drive Mount Applet Factory"
-msgstr "驱å?¨å?¨æ??è½½å°?ç¨?åº?å·¥å??"
-
-#: ../drivemount/GNOME_DriveMountApplet.server.in.in.h:3
-msgid "Factory for drive mount applet"
-msgstr "ç?¨äº?驱å?¨å?¨æ??è½½å°?ç¨?åº?ç??å·¥å??"
-
-#: ../drivemount/GNOME_DriveMountApplet.server.in.in.h:4
-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 "(å·²æ??è½½)"
 
@@ -777,43 +753,51 @@ msgstr "(å·²æ??è½½)"
 msgid "(not mounted)"
 msgstr "(æ?ªæ??è½½)"
 
-#: ../drivemount/drive-button.c:556
-#, c-format
-msgid "Cannot execute '%s'"
-msgstr "æ? æ³?æ?§è¡?â??%sâ??"
+#: ../drivemount/drive-button.c:566
+msgid "Cannot start Nautilus File Manager"
+msgstr "æ? æ³?å?¯å?¨ Nautilus æ??件管ç??å?¨"
+
+#: ../drivemount/drive-button.c:573
+msgid "Could not find Nautilus"
+msgstr "��� Nautilus"
 
-#: ../drivemount/drive-button.c:879
+#: ../drivemount/drive-button.c:897
 msgid "_Play DVD"
 msgstr "æ?­æ?¾ DVD(_P)"
 
-#: ../drivemount/drive-button.c:883
+#: ../drivemount/drive-button.c:901
 msgid "_Play CD"
 msgstr "æ?­æ?¾ CD(_P)"
 
-#: ../drivemount/drive-button.c:886
+#: ../drivemount/drive-button.c:904
 #, c-format
 msgid "_Open %s"
 msgstr "æ??å¼? %s(_O)"
 
-#: ../drivemount/drive-button.c:895
+#: ../drivemount/drive-button.c:913
 #, c-format
 msgid "Un_mount %s"
 msgstr "�载 %s(_M)"
 
-#: ../drivemount/drive-button.c:902
+#: ../drivemount/drive-button.c:920
 #, c-format
 msgid "_Mount %s"
 msgstr "æ??è½½ %s(_M)"
 
-#: ../drivemount/drive-button.c:910
+#: ../drivemount/drive-button.c:928
 #, c-format
 msgid "_Eject %s"
 msgstr "弹� %s(_E)"
 
-#: ../drivemount/drivemount.c:114
+#: ../drivemount/drivemount.c:103
 msgid "Applet for mounting and unmounting block volumes."
 msgstr "ç?¨äº?æ??è½½å??å?¸è½½å??设å¤?ç??å°?ç¨?åº?ã??"
 
+#: ../drivemount/drivemount.c:164 ../drivemount/drivemount.c:201
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1
+msgid "Disk Mounter"
+msgstr "ç£?ç??æ??è½½è??"
+
 #: ../drivemount/drivemount.schemas.in.h:1
 msgid "Interval timeout to check mount point status"
 msgstr "æ£?æ?¥æ??è½½ç?¹ç?¶æ??ç??é?´é??"
@@ -822,26 +806,28 @@ msgstr "æ£?æ?¥æ??è½½ç?¹ç?¶æ??ç??é?´é??"
 msgid "Time in seconds between status updates"
 msgstr "æ¯?次ç?¶æ??æ?´æ?°ä¹?é?´ç­?å¾?ç??ç§?æ?°"
 
-#: ../geyes/GNOME_GeyesApplet.server.in.in.h:1
-msgid "A set of eyeballs for your panel"
-msgstr "ç?¨äº?æ?¨é?¢æ?¿ç??ä¸?ç»?ç?¼ç??"
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2
+msgid "Drive Mount Applet Factory"
+msgstr "驱å?¨å?¨æ??è½½å°?ç¨?åº?å·¥å??"
 
-#: ../geyes/GNOME_GeyesApplet.server.in.in.h:2
-#: ../geyes/geyes.c:387
-#: ../geyes/geyes.c:417
-#: ../geyes/geyes.c:419
-msgid "Eyes"
-msgstr "Eyes"
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3
+msgid "Factory for drive mount applet"
+msgstr "ç?¨äº?驱å?¨å?¨æ??è½½å°?ç¨?åº?ç??å·¥å??"
 
-#: ../geyes/GNOME_GeyesApplet.server.in.in.h:3
-msgid "Geyes Applet Factory"
-msgstr "Geyes å°?ç¨?åº?å·¥å??"
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:4
+msgid "Mount local disks and devices"
+msgstr "å? è½½æ?¬å?°ç£?ç??å??设å¤?"
 
-#: ../geyes/geyes.c:192
+#: ../geyes/geyes.c:148
 msgid "A goofy set of eyes for the GNOME panel. They follow your mouse."
 msgstr "ç?¨äº? GNOME é?¢æ?¿ç??ä¸?ç»?æ??è ¢ç??ç?¼ç??ã??å®?们ä¼?ç?¯ç??æ?¨ç??é¼ æ ?ã??"
 
-#: ../geyes/geyes.c:420
+#: ../geyes/geyes.c:348 ../geyes/geyes.c:379 ../geyes/geyes.c:381
+#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:2
+msgid "Eyes"
+msgstr "Eyes"
+
+#: ../geyes/geyes.c:382
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "ä¸?å??å??è§?ç??é¼ æ ?æ??é??æ?¹å??ç??ç?¼ç??"
 
@@ -849,6 +835,14 @@ msgstr "ä¸?å??å??è§?ç??é¼ æ ?æ??é??æ?¹å??ç??ç?¼ç??"
 msgid "Directory in which the theme is located"
 msgstr "主é¢?æ??å?¨ç??ç?®å½?"
 
+#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1
+msgid "A set of eyeballs for your panel"
+msgstr "ç?¨äº?æ?¨é?¢æ?¿ç??ä¸?ç»?ç?¼ç??"
+
+#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3
+msgid "Geyes Applet Factory"
+msgstr "Geyes å°?ç¨?åº?å·¥å??"
+
 #: ../geyes/themes.c:127
 msgid "Can not launch the eyes applet."
 msgstr "æ? æ³?è°?ç?¨ eyes å°?ç¨?åº?ã??"
@@ -857,25 +851,23 @@ msgstr "æ? æ³?è°?ç?¨ eyes å°?ç¨?åº?ã??"
 msgid "There was a fatal error while trying to load the theme."
 msgstr "è¯?å?¾è£?å?¥ä¸»é¢?æ?¶å??ç??äº?严é??é??误ã??"
 
-#: ../geyes/themes.c:304
+#: ../geyes/themes.c:301
 msgid "Geyes Preferences"
 msgstr "Geyes é¦?é??项"
 
-#: ../geyes/themes.c:338
+#: ../geyes/themes.c:334
 msgid "Themes"
 msgstr "主�"
 
-#: ../geyes/themes.c:359
+#: ../geyes/themes.c:355
 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 æ?´æ?¹å¸?å±?ã??"
 
@@ -895,18 +887,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 é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -922,13 +911,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 æ?´æ?¹å¸?å±?ã??"
 
@@ -980,8 +967,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 "é??ç?¨é?®ç??"
 
@@ -1057,28 +1043,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 é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1090,8 +1071,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 "è??å??é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1135,23 +1115,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 é?®æ?´æ?¹å¸?å±?ã??"
 
@@ -1167,8 +1143,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 æ?´æ?¹å¸?å±?ã??"
 
@@ -1504,50 +1479,36 @@ msgstr "ä¹?å??å?°è¯­ Sun é?®ç??æ? å°?"
 msgid "Vietnamese Sun keymap"
 msgstr "è¶?å??语 Sun é?®ç??æ? å°?"
 
-#: ../gweather/GNOME_GWeatherApplet.xml.h:2
+#: ../gweather/gweather-about.c:50
+msgid "© 1999-2005 by S. Papadimitriou and others"
+msgstr "(c)1999-2005 S. Papadimitriou å??å?¶ä»?人"
+
+#: ../gweather/gweather-about.c:51
+msgid "A panel application for monitoring local weather conditions."
+msgstr "ç?¨äº?ç??è§?æ?¬å?°å¤©æ°?æ??å?µç??é?¢æ?¿å°?ç¨?åº?ã??"
+
+#: ../gweather/gweather-applet.c:115
 msgid "_Details"
 msgstr "ç»?è??(_D)"
 
-#: ../gweather/GNOME_GWeatherApplet.xml.h:5
-#: ../gweather/gweather-dialog.c:215
+#: ../gweather/gweather-applet.c:118 ../gweather/gweather-dialog.c:215
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
-#: ../gweather/GNOME_GWeatherApplet_Factory.server.in.in.h:1
-msgid "Factory for creating the weather applet."
-msgstr "ç?¨äº?å??建天æ°?å°?ç¨?åº?ç??å·¥å??ã??"
-
-#: ../gweather/GNOME_GWeatherApplet_Factory.server.in.in.h:2
-msgid "Gweather Applet Factory"
-msgstr "Gweather å°?ç¨?åº?å·¥å??"
-
-#: ../gweather/GNOME_GWeatherApplet_Factory.server.in.in.h:3
-msgid "Monitor the current weather conditions, and forecasts"
-msgstr "å½?å??æ°?象æ?¡ä»¶å??æ°?象é¢?æ?¥ç??è§?å?¨"
-
-#: ../gweather/GNOME_GWeatherApplet_Factory.server.in.in.h:4
-#: ../gweather/gweather-applet.c:324
+#: ../gweather/gweather-applet.c:329
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4
 msgid "Weather Report"
 msgstr "æ°?象æ?¥å??"
 
-#: ../gweather/gweather-about.c:50
-msgid "© 1999-2005 by S. Papadimitriou and others"
-msgstr "(c)1999-2005 S. Papadimitriou å??å?¶ä»?人"
-
-#: ../gweather/gweather-about.c:51
-msgid "A panel application for monitoring local weather conditions."
-msgstr "ç?¨äº?ç??è§?æ?¬å?°å¤©æ°?æ??å?µç??é?¢æ?¿å°?ç¨?åº?ã??"
-
-#: ../gweather/gweather-applet.c:342
-#: ../gweather/gweather-applet.c:346
+#: ../gweather/gweather-applet.c:347 ../gweather/gweather-applet.c:351
 msgid "GNOME Weather"
 msgstr "GNOME 天�"
 
-#: ../gweather/gweather-applet.c:447
+#: ../gweather/gweather-applet.c:452
 msgid "Weather Forecast"
 msgstr "天���"
 
-#: ../gweather/gweather-applet.c:459
+#: ../gweather/gweather-applet.c:464
 #, c-format
 msgid ""
 "City: %s\n"
@@ -1558,7 +1519,7 @@ msgstr ""
 "天��%s\n"
 "温度�%s"
 
-#: ../gweather/gweather-applet.c:509
+#: ../gweather/gweather-applet.c:513
 msgid "Updating..."
 msgstr "正���..."
 
@@ -1566,91 +1527,91 @@ msgstr "正���..."
 msgid "Details"
 msgstr "ç»?è??"
 
-#: ../gweather/gweather-dialog.c:256
+#: ../gweather/gweather-dialog.c:255
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
-#: ../gweather/gweather-dialog.c:264
+#: ../gweather/gweather-dialog.c:263
 msgid "Last update:"
 msgstr "�次���"
 
-#: ../gweather/gweather-dialog.c:272
+#: ../gweather/gweather-dialog.c:271
 msgid "Conditions:"
 msgstr "���"
 
-#: ../gweather/gweather-dialog.c:280
+#: ../gweather/gweather-dialog.c:279
 msgid "Sky:"
 msgstr "天空�"
 
-#: ../gweather/gweather-dialog.c:288
+#: ../gweather/gweather-dialog.c:287
 msgid "Temperature:"
 msgstr "温度�"
 
-#: ../gweather/gweather-dialog.c:296
+#: ../gweather/gweather-dialog.c:295
 msgid "Feels like:"
 msgstr "ä½?æ??ï¼?"
 
-#: ../gweather/gweather-dialog.c:304
+#: ../gweather/gweather-dialog.c:303
 msgid "Dew point:"
 msgstr "���"
 
-#: ../gweather/gweather-dialog.c:312
+#: ../gweather/gweather-dialog.c:311
 msgid "Relative humidity:"
 msgstr "�对湿度�"
 
-#: ../gweather/gweather-dialog.c:320
+#: ../gweather/gweather-dialog.c:319
 msgid "Wind:"
 msgstr "��"
 
-#: ../gweather/gweather-dialog.c:328
+#: ../gweather/gweather-dialog.c:327
 msgid "Pressure:"
 msgstr "æ°?å??ï¼?"
 
-#: ../gweather/gweather-dialog.c:336
+#: ../gweather/gweather-dialog.c:335
 msgid "Visibility:"
 msgstr "��度�"
 
-#: ../gweather/gweather-dialog.c:344
+#: ../gweather/gweather-dialog.c:343
 msgid "Sunrise:"
 msgstr "���"
 
-#: ../gweather/gweather-dialog.c:352
+#: ../gweather/gweather-dialog.c:351
 msgid "Sunset:"
 msgstr "���"
 
-#: ../gweather/gweather-dialog.c:486
+#: ../gweather/gweather-dialog.c:485
 msgid "Current Conditions"
 msgstr "å½?å??ç?¶å?µ"
 
-#: ../gweather/gweather-dialog.c:503
+#: ../gweather/gweather-dialog.c:502
 msgid "Forecast Report"
 msgstr "��"
 
-#: ../gweather/gweather-dialog.c:503
+#: ../gweather/gweather-dialog.c:502
 msgid "See the ForeCast Details"
 msgstr "æ?¥ç??é¢?æ?¥è¯¦æ??"
 
-#: ../gweather/gweather-dialog.c:513
+#: ../gweather/gweather-dialog.c:512
 msgid "Forecast"
 msgstr "��"
 
-#: ../gweather/gweather-dialog.c:521
+#: ../gweather/gweather-dialog.c:520
 msgid "Radar Map"
 msgstr "�达�"
 
-#: ../gweather/gweather-dialog.c:552
+#: ../gweather/gweather-dialog.c:551
 msgid "_Visit Weather.com"
 msgstr "�� Weather.com(_V)"
 
-#: ../gweather/gweather-dialog.c:553
+#: ../gweather/gweather-dialog.c:552
 msgid "Visit Weather.com"
 msgstr "�� Weather.com"
 
-#: ../gweather/gweather-dialog.c:553
+#: ../gweather/gweather-dialog.c:552
 msgid "Click to Enter Weather.com"
 msgstr "���� Weather.com"
 
-#: ../gweather/gweather-dialog.c:638
+#: ../gweather/gweather-dialog.c:637
 msgid "Forecast not currently available for this location."
 msgstr "æ­¤å?°ç?¹ç?®å??没æ??é¢?æ?¥ã??"
 
@@ -1679,16 +1640,16 @@ msgstr "å?°å??项"
 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."
+#: ../gweather/gweather-pref.c:315
+msgid ""
+"Failed to load the Locations XML database.  Please report this as a bug."
 msgstr "è£?å?¥ä½?ç½® XML æ?°æ?®åº?失败ã??请æ?¥å??æ­¤é??误ã??"
 
-#: ../gweather/gweather-pref.c:807
+#: ../gweather/gweather-pref.c:805
 msgid "Weather Preferences"
 msgstr "天æ°?é¦?é??项"
 
-#: ../gweather/gweather-pref.c:839
-#: ../gweather/gweather-pref.c:1024
+#: ../gweather/gweather-pref.c:836 ../gweather/gweather-pref.c:1021
 msgid "_Automatically update every:"
 msgstr "è?ªå?¨æ?´æ?°ç??é?´é??(_A)ï¼?"
 
@@ -1696,159 +1657,169 @@ msgstr "è?ªå?¨æ?´æ?°ç??é?´é??(_A)ï¼?"
 #. * Units settings page.
 #.
 #. Temperature Unit
-#: ../gweather/gweather-pref.c:852
+#: ../gweather/gweather-pref.c:849
 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:858 ../gweather/gweather-pref.c:878
+#: ../gweather/gweather-pref.c:904 ../gweather/gweather-pref.c:932
 msgid "Default"
 msgstr "�认�"
 
-#: ../gweather/gweather-pref.c:862
+#: ../gweather/gweather-pref.c:859
 msgid "Kelvin"
 msgstr "å¼?å°?æ??"
 
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../gweather/gweather-pref.c:864
+#: ../gweather/gweather-pref.c:861
 msgid "Celsius"
 msgstr "æ??æ°?度"
 
-#: ../gweather/gweather-pref.c:865
+#: ../gweather/gweather-pref.c:862
 msgid "Fahrenheit"
 msgstr "å??æ°?度"
 
 #. Speed Unit
-#: ../gweather/gweather-pref.c:872
+#: ../gweather/gweather-pref.c:869
 msgid "_Wind speed unit:"
 msgstr "é£?é??å??ä½?(_W)ï¼?"
 
 #. TRANSLATOR: The wind speed unit "meters per second"
-#: ../gweather/gweather-pref.c:883
+#: ../gweather/gweather-pref.c:880
 msgid "m/s"
 msgstr "m/s"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../gweather/gweather-pref.c:885
+#: ../gweather/gweather-pref.c:882
 msgid "km/h"
 msgstr "km/h"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../gweather/gweather-pref.c:887
+#: ../gweather/gweather-pref.c:884
 msgid "mph"
 msgstr "mph"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../gweather/gweather-pref.c:889
+#: ../gweather/gweather-pref.c:886
 msgid "knots"
 msgstr "è??"
 
-#: ../gweather/gweather-pref.c:891
+#: ../gweather/gweather-pref.c:888
 msgid "Beaufort scale"
 msgstr "��级"
 
 #. Pressure Unit
-#: ../gweather/gweather-pref.c:898
+#: ../gweather/gweather-pref.c:895
 msgid "_Pressure unit:"
 msgstr "æ°?å??å??ä½?(_P)ï¼?"
 
 #. TRANSLATOR: The pressure unit "kiloPascals"
-#: ../gweather/gweather-pref.c:909
+#: ../gweather/gweather-pref.c:906
 msgid "kPa"
 msgstr "å??å¸?"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../gweather/gweather-pref.c:911
+#: ../gweather/gweather-pref.c:908
 msgid "hPa"
 msgstr "��"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../gweather/gweather-pref.c:913
+#: ../gweather/gweather-pref.c:910
 msgid "mb"
 msgstr "mb"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../gweather/gweather-pref.c:915
+#: ../gweather/gweather-pref.c:912
 msgid "mmHg"
 msgstr "mmHg"
 
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../gweather/gweather-pref.c:917
+#: ../gweather/gweather-pref.c:914
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../gweather/gweather-pref.c:919
+#: ../gweather/gweather-pref.c:916
 msgid "atm"
 msgstr "大æ°?å??"
 
 #. Distance Unit
-#: ../gweather/gweather-pref.c:926
+#: ../gweather/gweather-pref.c:923
 msgid "_Visibility unit:"
 msgstr "è?½è§?度å??ä½?(_V)ï¼?"
 
 #. TRANSLATOR: The distance unit "meters"
-#: ../gweather/gweather-pref.c:937
+#: ../gweather/gweather-pref.c:934
 msgid "meters"
 msgstr "ç±³"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../gweather/gweather-pref.c:939
+#: ../gweather/gweather-pref.c:936
 msgid "km"
 msgstr "å??ç±³"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../gweather/gweather-pref.c:941
+#: ../gweather/gweather-pref.c:938
 msgid "miles"
 msgstr "è?±é??"
 
-#: ../gweather/gweather-pref.c:975
+#: ../gweather/gweather-pref.c:972
 msgid "Enable _radar map"
 msgstr "���达�(_R)"
 
-#: ../gweather/gweather-pref.c:989
+#: ../gweather/gweather-pref.c:986
 msgid "Use _custom address for radar map"
 msgstr "对é?·è¾¾å?¾ä½¿ç?¨è?ªå®?ä¹?å?°å??(_C)"
 
-#: ../gweather/gweather-pref.c:1006
+#: ../gweather/gweather-pref.c:1003
 msgid "A_ddress:"
 msgstr "å?°å??(_D)ï¼?"
 
-#: ../gweather/gweather-pref.c:1020
+#: ../gweather/gweather-pref.c:1017
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../gweather/gweather-pref.c:1044
+#: ../gweather/gweather-pref.c:1041
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../gweather/gweather-pref.c:1060
+#: ../gweather/gweather-pref.c:1057
 msgid "Display"
 msgstr "�示"
 
-#: ../gweather/gweather-pref.c:1075
+#: ../gweather/gweather-pref.c:1072
 #: ../mini-commander/src/mini-commander.ui.h:9
 msgid "General"
 msgstr "常�"
 
-#: ../gweather/gweather-pref.c:1088
+#: ../gweather/gweather-pref.c:1085
 msgid "_Select a location:"
 msgstr "é??æ?©ä½?ç½®(_S)ï¼?"
 
-#: ../gweather/gweather-pref.c:1113
+#: ../gweather/gweather-pref.c:1110
 msgid "_Find:"
 msgstr "��(_F)�"
 
-#: ../gweather/gweather-pref.c:1120
+#: ../gweather/gweather-pref.c:1117
 msgid "Find _Next"
 msgstr "����个(_N)"
 
-#: ../gweather/gweather-pref.c:1142
+#: ../gweather/gweather-pref.c:1139
 msgid "Location"
 msgstr "ä½?ç½®"
 
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1
+msgid "Factory for creating the weather applet."
+msgstr "ç?¨äº?å??建天æ°?å°?ç¨?åº?ç??å·¥å??ã??"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2
+msgid "Gweather Applet Factory"
+msgstr "Gweather å°?ç¨?åº?å·¥å??"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
+msgid "Monitor the current weather conditions, and forecasts"
+msgstr "å½?å??æ°?象æ?¡ä»¶å??æ°?象é¢?æ?¥ç??è§?å?¨"
+
 #: ../invest-applet/data/Invest_Applet.server.in.in.h:1
 #: ../invest-applet/invest/about.py:17
 msgid "Invest"
@@ -1859,7 +1830,7 @@ msgstr "æ??èµ?"
 msgid "Track your invested money."
 msgstr "è·?踪æ?¨ç??æ??èµ?ã??"
 
-#: ../invest-applet/data/Invest_Applet.xml.h:3
+#: ../invest-applet/data/Invest_Applet.xml.h:4
 msgid "_Refresh"
 msgstr "å?·æ?°(_R)"
 
@@ -1911,101 +1882,118 @@ msgstr "å?­ä¸ªæ??"
 msgid "Auto _refresh"
 msgstr "����(_R)"
 
-#: ../invest-applet/data/financialchart.ui.h:13
+#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide13.html and http://en.wikipedia.org/wiki/Bollinger_bands
+#: ../invest-applet/data/financialchart.ui.h:14
 msgid "Bollinger"
 msgstr "å¸?æ??线"
 
-#: ../invest-applet/data/financialchart.ui.h:14
+#: ../invest-applet/data/financialchart.ui.h:15
 msgid "Downloading chart from <b>Yahoo!</b>"
 msgstr "正�� <b>Yahoo!</b> �载�表"
 
-#: ../invest-applet/data/financialchart.ui.h:15
+#. see http://biz.yahoo.com/charts/guide12.html and http://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average
+#: ../invest-applet/data/financialchart.ui.h:17
 msgid "Exponential moving average: "
 msgstr "æ??æ?°å¹³å??æ?°æ??æ ?ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:16
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator
+#: ../invest-applet/data/financialchart.ui.h:19
 msgid "Fast stoch"
 msgstr "å¿«é??æ?ºæ??æ?°"
 
-#: ../invest-applet/data/financialchart.ui.h:17
+#: ../invest-applet/data/financialchart.ui.h:20
 #: ../invest-applet/invest/chart.py:107
 msgid "Financial Chart"
 msgstr "é??è??å?¾è¡¨"
 
-#: ../invest-applet/data/financialchart.ui.h:18
+#. see http://biz.yahoo.com/charts/guide10.html and http://en.wikipedia.org/wiki/Technical_indicator#Charting_terms_and_indicators
+#: ../invest-applet/data/financialchart.ui.h:22
 msgid "Indicators: "
 msgstr "æ??示å?¨ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:19
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/MACD
+#: ../invest-applet/data/financialchart.ui.h:24
 msgid "MACD"
 msgstr "MACD"
 
-#: ../invest-applet/data/financialchart.ui.h:20
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Money_flow_index
+#: ../invest-applet/data/financialchart.ui.h:26
 msgid "MFI"
 msgstr "MFI"
 
-#: ../invest-applet/data/financialchart.ui.h:21
+#: ../invest-applet/data/financialchart.ui.h:27
 msgid "Maximum"
 msgstr "æ??大"
 
-#: ../invest-applet/data/financialchart.ui.h:22
+#. see http://biz.yahoo.com/charts/guide11.html and http://en.wikipedia.org/wiki/Moving_average
+#: ../invest-applet/data/financialchart.ui.h:29
 msgid "Moving average: "
 msgstr "移å?¨å¹³å??线ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:23
+#. see http://en.wikipedia.org/wiki/Technical_analysis#Overlays
+#: ../invest-applet/data/financialchart.ui.h:31
 msgid "Overlays: "
 msgstr "é??å¤?å? ä½?段ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:24
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Rate_of_change_%28technical_analysis%29
+#: ../invest-applet/data/financialchart.ui.h:33
 msgid "ROC"
 msgstr "ROC"
 
-#: ../invest-applet/data/financialchart.ui.h:25
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Relative_Strength_Index
+#: ../invest-applet/data/financialchart.ui.h:35
 msgid "RSI"
 msgstr "RSI"
 
-#: ../invest-applet/data/financialchart.ui.h:26
+#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide16.html and http://en.wikipedia.org/wiki/Parabolic_SAR
+#: ../invest-applet/data/financialchart.ui.h:37
 msgid "SAR"
 msgstr "SAR"
 
-#: ../invest-applet/data/financialchart.ui.h:27
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator
+#: ../invest-applet/data/financialchart.ui.h:39
 msgid "Slow stoch"
 msgstr "æ?¢é??æ?ºæ??æ?°"
 
-#: ../invest-applet/data/financialchart.ui.h:28
+#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide6.html and http://en.wikipedia.org/wiki/Stock_split
+#: ../invest-applet/data/financialchart.ui.h:41
 msgid "Splits"
 msgstr "é??è?¡"
 
-#: ../invest-applet/data/financialchart.ui.h:29
+#: ../invest-applet/data/financialchart.ui.h:42
 msgid "Today"
 msgstr "�天"
 
-#: ../invest-applet/data/financialchart.ui.h:30
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29
+#: ../invest-applet/data/financialchart.ui.h:44
 msgid "Vol"
 msgstr "æ??交é??"
 
-#: ../invest-applet/data/financialchart.ui.h:31
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29
+#: ../invest-applet/data/financialchart.ui.h:46
 msgid "Vol+MA"
 msgstr "Vol+MA"
 
-#: ../invest-applet/data/financialchart.ui.h:32
+#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide20.html and http://en.wikipedia.org/wiki/Volume_%28finance%29
+#: ../invest-applet/data/financialchart.ui.h:48
 msgid "Volumes"
 msgstr "é?³é??"
 
-#: ../invest-applet/data/financialchart.ui.h:34
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Williams_%25R
+#: ../invest-applet/data/financialchart.ui.h:51
 #, no-c-format
 msgid "W%R"
 msgstr "W%R"
 
-#: ../invest-applet/data/financialchart.ui.h:35
+#: ../invest-applet/data/financialchart.ui.h:52
 msgid "_Graph style: "
 msgstr "å?¾å½¢é£?æ ¼(_G)ï¼?"
 
-#: ../invest-applet/data/financialchart.ui.h:36
+#: ../invest-applet/data/financialchart.ui.h:53
 msgid "_Options"
 msgstr "é??项(_O)"
 
-#: ../invest-applet/data/financialchart.ui.h:37
+#: ../invest-applet/data/financialchart.ui.h:54
 msgid "_Ticker symbol: "
 msgstr "è?¡ç¥¨è¡?æ??è?ªå?¨æ?¶å½?å?¨ç¬¦å?·(_T)ï¼?"
 
@@ -2034,16 +2022,18 @@ msgid "label"
 msgstr "æ ?ç­¾"
 
 #. a) We aren't configured yet
-#: ../invest-applet/invest/applet.py:49
+#: ../invest-applet/invest/applet.py:50
 msgid "<b>You have not entered any stock information yet</b>"
 msgstr "<b>ä½ è¿?没æ??è¾?å?¥ä»»ä½?è?¡ç¥¨ä¿¡æ?¯</b>"
 
-#: ../invest-applet/invest/applet.py:54
+#: ../invest-applet/invest/applet.py:55
 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."
+#: ../invest-applet/invest/applet.py:56
+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
@@ -2067,27 +2057,27 @@ msgstr "æ? æ³?ä¸?è½½å?¾è¡¨"
 msgid "Invest Applet"
 msgstr "æ??èµ?å°?ç¨?åº?"
 
-#: ../invest-applet/invest/preferences.py:30
+#: ../invest-applet/invest/preferences.py:31
 msgid "Symbol"
 msgstr "代ç ?"
 
-#: ../invest-applet/invest/preferences.py:30
+#: ../invest-applet/invest/preferences.py:31
 msgid "Label"
 msgstr "æ ?ç­¾"
 
-#: ../invest-applet/invest/preferences.py:30
+#: ../invest-applet/invest/preferences.py:31
 msgid "Amount"
 msgstr "æ?»é??"
 
-#: ../invest-applet/invest/preferences.py:30
+#: ../invest-applet/invest/preferences.py:31
 msgid "Price"
 msgstr "ä»·æ ¼"
 
-#: ../invest-applet/invest/preferences.py:30
+#: ../invest-applet/invest/preferences.py:31
 msgid "Commission"
 msgstr "交æ??"
 
-#: ../invest-applet/invest/preferences.py:30
+#: ../invest-applet/invest/preferences.py:31
 msgid "Currency Rate"
 msgstr "æ±?ç??"
 
@@ -2095,20 +2085,20 @@ msgstr "æ±?ç??"
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "æ??èµ?å°?ç¨?åº?æ? æ³?è¿?æ?¥å?° Yahoo! è´¢ç»?"
 
-#: ../invest-applet/invest/quotes.py:133
-#: ../invest-applet/invest/quotes.py:162
+#. Translators: %s is an hour (%H:%M)
+#: ../invest-applet/invest/quotes.py:134 ../invest-applet/invest/quotes.py:163
 #, python-format
 msgid "Updated at %s"
 msgstr "� %s ��"
 
 #. Translators: This is share-market jargon. It is the average percentage change of all stock prices. The %s gets replaced with the string value of the change (localized), including the percent sign.
-#: ../invest-applet/invest/quotes.py:152
+#: ../invest-applet/invest/quotes.py:153
 #, python-format
 msgid "Average change: %s"
 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
+#: ../invest-applet/invest/quotes.py:162
 #, python-format
 msgid "Positions balance: %s %s (%s)"
 msgstr "å??ä½?平衡ï¼?%s %s (%s)"
@@ -2149,22 +2139,12 @@ msgstr "æ¡?é?¢æ ?(è¿·ä½ æ??æ?¥å®?)"
 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:355
-msgid "Command Line"
-msgstr "�令�"
-
-#: ../mini-commander/src/GNOME_MiniCommanderApplet.server.in.in.h:2
-msgid "Mini-Commander"
-msgstr "å°?å??å?½ä»¤è¡?å°?ç¨?åº?"
-
-#: ../mini-commander/src/GNOME_MiniCommanderApplet.server.in.in.h:3
-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 å°?ç¨?åº?å?¨é?¢æ?¿ä¸­æ·»å? ä¸?个å?½ä»¤è¡?ã??å®?æ?¯æ??å?½ä»¤è¡¥å?¨ã??å?½ä»¤å??å?²å??å?¯æ?´æ?¹ç??å®?ã??"
+#: ../mini-commander/src/about.c:48
+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"
@@ -2248,8 +2228,7 @@ 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:569
 msgid "Colors"
 msgstr "��"
 
@@ -2306,8 +2285,7 @@ msgstr "使��认主���(_U)"
 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:524
 msgid "pixels"
 msgstr "å??ç´ "
 
@@ -2396,8 +2374,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"
@@ -2415,36 +2397,49 @@ msgstr "宽度"
 msgid "Width of the applet"
 msgstr "å°?ç¨?åº?ç??宽度"
 
-#: ../mini-commander/src/mini-commander_applet.c:238
 #: ../mini-commander/src/mini-commander_applet.c:242
+#: ../mini-commander/src/mini-commander_applet.c:246
 msgid "Browser"
 msgstr "���"
 
-#: ../mini-commander/src/mini-commander_applet.c:243
+#: ../mini-commander/src/mini-commander_applet.c:247
 msgid "Click this button to start the browser"
 msgstr "å??å?»æ­¤æ??é?®å?¯å?¨æµ?è§?å?¨"
 
-#: ../mini-commander/src/mini-commander_applet.c:256
 #: ../mini-commander/src/mini-commander_applet.c:260
+#: ../mini-commander/src/mini-commander_applet.c:264
 msgid "History"
 msgstr "å??å?²"
 
-#: ../mini-commander/src/mini-commander_applet.c:261
+#: ../mini-commander/src/mini-commander_applet.c:265
 msgid "Click this button for the list of previous commands"
 msgstr "å??å?»æ­¤æ??é?®æ?¥ç??以å??ç??å?½ä»¤ç??å??表"
 
-#: ../mini-commander/src/mini-commander_applet.c:340
+#: ../mini-commander/src/mini-commander_applet.c:346
 msgid "Command line has been disabled by your system administrator"
 msgstr "å?½ä»¤è¡?å·²ç»?被æ?¨ç??ç³»ç»?管ç??å??ç¦?ç?¨"
 
-#: ../mini-commander/src/mini-commander_applet.c:402
+#: ../mini-commander/src/mini-commander_applet.c:361
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1
+msgid "Command Line"
+msgstr "�令�"
+
+#: ../mini-commander/src/mini-commander_applet.c:407
 msgid "Mini-Commander applet"
 msgstr "å°?å??å?½ä»¤è¡?å°?ç¨?åº?"
 
-#: ../mini-commander/src/mini-commander_applet.c:403
+#: ../mini-commander/src/mini-commander_applet.c:408
 msgid "This applet adds a command line to the panel"
 msgstr "æ­¤å°?ç¨?åº?å?¨é?¢æ?¿ä¸?æ·»å? ä¸?个å?½ä»¤è¡?å·¥å?·"
 
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
+msgid "Mini-Commander"
+msgstr "å°?å??å?½ä»¤è¡?å°?ç¨?åº?"
+
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3
+msgid "MiniCommander Applet Factory"
+msgstr "å°?å??å?½ä»¤è¡?å°?ç¨?åº?å·¥å??"
+
 #: ../mini-commander/src/preferences.c:401
 msgid "You must specify a pattern"
 msgstr "æ?¨å¿?é¡»æ??å®?ä¸?个模å¼?"
@@ -2469,46 +2464,47 @@ msgstr "��"
 msgid "Command"
 msgstr "�令"
 
-#: ../mixer/GNOME_MixerApplet.server.in.in.h:1
-#: ../null_applet/GNOME_MixerApplet.server.in.h:1
-msgid "Adjust the sound volume"
-msgstr "è°?æ?´é?³é??"
+#: ../mixer/applet.c:184
+msgid "Volume Applet"
+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
-#: ../null_applet/null_applet.c:46
+#: ../mixer/applet.c:200 ../mixer/applet.c:221 ../null_applet/null_applet.c:55
+#: ../null_applet/null_applet.c:57
 msgid "Volume Control"
 msgstr "é?³é??æ?§å?¶"
 
-#: ../mixer/GNOME_MixerApplet.xml.h:1
-msgid "Mu_te"
-msgstr "é??é?³(_T)"
-
-#: ../mixer/GNOME_MixerApplet.xml.h:4
+#: ../mixer/applet.c:383
 msgid "_Open Volume Control"
 msgstr "æ??å¼?é?³é??æ?§å?¶(_O)"
 
-#: ../mixer/applet.c:190
-msgid "Volume Applet"
-msgstr "é?³é??å°?ç¨?åº?"
+#: ../mixer/applet.c:397
+msgid "Mu_te"
+msgstr "é??é?³(_T)"
 
-#: ../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 æ??件ï¼?æ??è??æ?¨æ²¡æ??é??置好声å?¡ã??"
+#: ../mixer/applet.c:563
+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 "å¦?æ??æ?¨æ?³è¦?ä»?é?¢æ?¿ä¸­å? é?¤é?³é??æ?§å?¶ï¼?å?¯ä»¥ç?¨å?³é?®å??å?»é?¢æ?¿ä¸?ç??æ?¬å£°å?¨æ??é?®ï¼?ç?¶å??ä»?è??å??中é??æ?©â??ä»?é?¢æ?¿å? é?¤â??ã??"
+#: ../mixer/applet.c:567
+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
+#: ../mixer/applet.c:753
 #, c-format
 msgid "Failed to start Volume Control: %s"
 msgstr "å?¯å?¨é?³é??æ?§å?¶å¤±è´¥ï¼?%s"
 
-#: ../mixer/applet.c:1171
+#: ../mixer/applet.c:1202
 #, c-format
 msgid "%s: muted"
 msgstr "%sï¼?å·²é??é?³"
@@ -2517,21 +2513,21 @@ 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:1177
+#: ../mixer/applet.c:1208
 #, c-format
 msgid "%s: %d%%"
 msgstr "%sï¼?%d%%"
 
-#: ../mixer/applet.c:1415
+#: ../mixer/applet.c:1444
 #, c-format
 msgid "Failed to display help: %s"
 msgstr "�示帮�失败�%s"
 
-#: ../mixer/applet.c:1428
+#: ../mixer/applet.c:1457
 msgid "Volume control for your GNOME Panel."
 msgstr "ä»? GNOME é?¢æ?¿ä¸?è¿?è¡?é?³é??æ?§å?¶ã??"
 
-#: ../mixer/applet.c:1429
+#: ../mixer/applet.c:1458
 msgid "Using GStreamer 0.10."
 msgstr "使ç?¨ GStreamer 0.10ã??"
 
@@ -2569,82 +2565,85 @@ msgstr "é?³é??æ?§å?¶é¦?é??项"
 msgid "Select the device and track to control."
 msgstr "é??æ?©è¦?æ?§å?¶ç??设å¤?å??轨é??ã??"
 
-#: ../modemlights/GNOME_ModemLights.server.in.in.h:1
-msgid "Activate and monitor a dial-up network connection"
-msgstr "æ¿?活并ç??è§?æ?¨å?·ç½?ç»?è¿?æ?¥"
-
-#: ../modemlights/GNOME_ModemLights.server.in.in.h:2
-#: ../modemlights/modem-applet.c:178
-msgid "Modem Monitor"
-msgstr "è°?å?¶è§£è°?å?¨ç??è§?å?¨"
-
-#: ../modemlights/GNOME_ModemLights.xml.h:2
+#: ../modemlights/modem-applet.c:142
 msgid "_Activate"
 msgstr "æ¿?æ´»(_A)"
 
-#: ../modemlights/GNOME_ModemLights.xml.h:3
+#: ../modemlights/modem-applet.c:145
 msgid "_Deactivate"
 msgstr "æ?­å¼?(_D)"
 
-#: ../modemlights/GNOME_ModemLights.xml.h:5
-#: ../stickynotes/stickynotes.ui.h:43
+#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:43
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
-#: ../modemlights/modem-applet.c:708
+#: ../modemlights/modem-applet.c:184
+#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
+msgid "Modem Monitor"
+msgstr "è°?å?¶è§£è°?å?¨ç??è§?å?¨"
+
+#: ../modemlights/modem-applet.c:710
 msgid "Connection active, but could not get connection time"
 msgstr "è¿?æ?¥å·²é??ï¼?ä½?æ? æ³?è?·å¾?è¿?æ?¥æ?¶é?´"
 
-#: ../modemlights/modem-applet.c:724
+#: ../modemlights/modem-applet.c:726
 #, c-format
 msgid "Time connected: %.1d:%.2d"
 msgstr "å·²è¿?æ?¥ç??æ?¶é?´ï¼?%.1d:%.2d"
 
-#: ../modemlights/modem-applet.c:728
+#: ../modemlights/modem-applet.c:730
 msgid "Not connected"
 msgstr "���"
 
-#: ../modemlights/modem-applet.c:750
-msgid "To connect to your Internet service provider, you need administrator privileges"
+#: ../modemlights/modem-applet.c:752
+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"
+#: ../modemlights/modem-applet.c:753
+msgid ""
+"To disconnect from your Internet service provider, you need administrator "
+"privileges"
 msgstr "è¦?ä»?æ?¨ç?? ISP æ?­å¼?è¿?æ?¥ï¼?æ?¨é??è¦?æ??管ç??å??æ??é??"
 
-#: ../modemlights/modem-applet.c:826
+#: ../modemlights/modem-applet.c:828
 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"
+#: ../modemlights/modem-applet.c:830
+msgid ""
+"Check that you have typed it correctly and that you haven't activated the "
+"\"caps lock\" key"
 msgstr "请æ£?æ?¥æ?¨è¾?å?¥ç??å??容æ?¯å?¦æ­£ç¡®ï¼?è??ä¸?æ?¨æ²¡æ??æ??ä¸?â??Caps Lockâ??é?®"
 
-#: ../modemlights/modem-applet.c:930
+#: ../modemlights/modem-applet.c:932
 msgid "Do you want to connect?"
 msgstr "ä½ æ?³è¿?æ?¥å??ï¼?"
 
-#: ../modemlights/modem-applet.c:931
+#: ../modemlights/modem-applet.c:933
 msgid "Do you want to disconnect?"
 msgstr "ä½ æ?³æ?­å¼?è¿?æ?¥å??ï¼?"
 
-#: ../modemlights/modem-applet.c:940
+#: ../modemlights/modem-applet.c:942
 msgid "C_onnect"
 msgstr "è¿?æ?¥(_O)"
 
-#: ../modemlights/modem-applet.c:940
+#: ../modemlights/modem-applet.c:942
 msgid "_Disconnect"
 msgstr "æ?­å¼?(_D)"
 
-#: ../modemlights/modem-applet.c:996
+#: ../modemlights/modem-applet.c:995
 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"
+#: ../modemlights/modem-applet.c:997
+msgid ""
+"Check that it's installed in the correct path and that it has the correct "
+"permissions"
 msgstr "请æ£?æ?¥è¯¥å·¥å?·æ?¯å?¦å·²ç»?å®?è£?å?¨æ­£ç¡®è·¯å¾?中ï¼?æ??é??æ?¯å?¦æ­£ç¡®"
 
-#: ../modemlights/modem-applet.c:1022
+#: ../modemlights/modem-applet.c:1020
 msgid "Applet for activating and monitoring a dial-up network connection."
 msgstr "æ¿?活并ç??è§?æ?¨å?·ç½?ç»?è¿?æ?¥ç??å°?ç¨?åº?ã??"
 
@@ -2664,61 +2663,55 @@ msgstr "å¯?ç ?ï¼?"
 msgid "Root password required"
 msgstr "é??è¦? root å?£ä»¤"
 
-#: ../multiload/GNOME_MultiLoadApplet_Factory.server.in.in.h:1
-msgid "A system load indicator"
-msgstr "ç³»ç»?è´?è½½æ??示å?¨"
-
-#: ../multiload/GNOME_MultiLoadApplet_Factory.server.in.in.h:2
-#: ../multiload/main.c:460
-msgid "System Monitor"
-msgstr "ç³»ç»?ç??è§?å?¨"
+#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
+msgid "Activate and monitor a dial-up network connection"
+msgstr "æ¿?活并ç??è§?æ?¨å?·ç½?ç»?è¿?æ?¥"
 
-#: ../multiload/GNOME_MultiloadApplet.xml.h:3
-msgid "_Open System Monitor"
-msgstr "æ??å¼?ç³»ç»?ç??è§?å?¨(_O)"
+#: ../multiload/main.c:56
+msgid ""
+"A system load monitor capable of displaying graphs for CPU, ram, and swap "
+"space use, plus network traffic."
+msgstr ""
+"ä¸?个è?½å¤?以å?¾å½¢æ?¹å¼?æ?¾ç¤º CPUã??å??å­?ã??对æ?¢æ??件使ç?¨æ??å?µï¼?以å??ç½?ç»?æµ?é??ç??ç³»ç»?ç??è§?"
+"å?¨ã??"
 
-#: ../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ã??å??å­?ã??对æ?¢æ??件使ç?¨æ??å?µï¼?以å??ç½?ç»?æµ?é??ç??ç³»ç»?ç??è§?å?¨ã??"
+#: ../multiload/main.c:129
+msgid "Start system-monitor"
+msgstr "å?¯å?¨ç³»ç»?ç??è§?å?¨"
 
-#: ../multiload/main.c:126
+#: ../multiload/main.c:150
 #, c-format
 msgid "There was an error executing '%s': %s"
 msgstr "æ?§è¡?â??%sâ??æ?¶å??ç??é??误ï¼?%s"
 
-#: ../multiload/main.c:255
-#: ../multiload/properties.c:596
+#: ../multiload/main.c:278 ../multiload/properties.c:594
 msgid "Processor"
 msgstr "å¤?ç??å?¨"
 
-#: ../multiload/main.c:257
-#: ../multiload/properties.c:604
+#: ../multiload/main.c:280 ../multiload/properties.c:602
 msgid "Memory"
 msgstr "å??å­?"
 
-#: ../multiload/main.c:259
-#: ../multiload/properties.c:612
+#: ../multiload/main.c:282 ../multiload/properties.c:610
 msgid "Network"
 msgstr "ç½?ç»?"
 
-#: ../multiload/main.c:261
-#: ../multiload/properties.c:619
+#: ../multiload/main.c:284 ../multiload/properties.c:617
 msgid "Swap Space"
 msgstr "交�空�"
 
-#: ../multiload/main.c:263
-#: ../multiload/main.c:342
+#: ../multiload/main.c:286 ../multiload/main.c:365
 msgid "Load Average"
 msgstr "è´?è½½å??å?¼"
 
-#: ../multiload/main.c:265
+#: ../multiload/main.c:288
 msgid "Disk"
 msgstr "ç£?ç??"
 
 #. xgettext: use and cache are > 1 most of the time,
 #. please assume that they always are.
 #.
-#: ../multiload/main.c:281
+#: ../multiload/main.c:304
 #, c-format
 msgid ""
 "%s:\n"
@@ -2729,13 +2722,13 @@ msgstr ""
 "��使�� %u%%\n"
 "系���使��%u%%"
 
-#: ../multiload/main.c:289
+#: ../multiload/main.c:312
 #, c-format
 msgid "The system load average is %0.02f"
 msgstr "ç³»ç»?å¹³å??è´?载为 %0.02f"
 
 #. xgettext: same as in graphic tab of g-s-m
-#: ../multiload/main.c:297
+#: ../multiload/main.c:320
 #, c-format
 msgid ""
 "%s:\n"
@@ -2746,7 +2739,7 @@ msgstr ""
 "正��� %s\n"
 "æ­£å?¨å??é?? %s"
 
-#: ../multiload/main.c:313
+#: ../multiload/main.c:336
 #, c-format
 msgid ""
 "%s:\n"
@@ -2758,26 +2751,35 @@ msgstr[0] ""
 "%sï¼?\n"
 "已使� %u%%"
 
-#: ../multiload/main.c:338
+#: ../multiload/main.c:361
 msgid "CPU Load"
 msgstr "CPU è´?è½½"
 
-#: ../multiload/main.c:339
+#: ../multiload/main.c:362
 msgid "Memory Load"
 msgstr "å??å­?ç?¨é??"
 
-#: ../multiload/main.c:340
+#: ../multiload/main.c:363
 msgid "Net Load"
 msgstr "ç½?ç»?è´?è½½"
 
-#: ../multiload/main.c:341
+#: ../multiload/main.c:364
 msgid "Swap Load"
 msgstr "交���载"
 
-#: ../multiload/main.c:343
+#: ../multiload/main.c:366
 msgid "Disk Load"
 msgstr "ç£?ç??è´?è½½"
 
+#: ../multiload/main.c:462
+msgid "_Open System Monitor"
+msgstr "æ??å¼?ç³»ç»?ç??è§?å?¨(_O)"
+
+#: ../multiload/main.c:490
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
+msgid "System Monitor"
+msgstr "ç³»ç»?ç??è§?å?¨"
+
 #: ../multiload/multiload.schemas.in.h:1
 msgid "Applet refresh rate in milliseconds"
 msgstr "å°?ç¨?åº?ç??å?·æ?°ç??ï¼?以毫ç§?计"
@@ -2815,7 +2817,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
@@ -2907,138 +2911,140 @@ msgstr "å?¯æ?§è¡?ç³»ç»?ç??è§?å?¨ç??æ¡?é?¢æ??è¿°æ??件"
 msgid "%s/s"
 msgstr "%s/s"
 
-#: ../multiload/properties.c:357
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
+msgid "A system load indicator"
+msgstr "ç³»ç»?è´?è½½æ??示å?¨"
+
+#: ../multiload/properties.c:355
 msgid "Monitored Resources"
 msgstr "å·²ç??è§?ç??èµ?æº?"
 
-#: ../multiload/properties.c:382
+#: ../multiload/properties.c:380
 msgid "_Processor"
 msgstr "å¤?ç??å?¨(_P)"
 
-#: ../multiload/properties.c:395
+#: ../multiload/properties.c:393
 msgid "_Memory"
 msgstr "å??å­?(_M)"
 
-#: ../multiload/properties.c:408
+#: ../multiload/properties.c:406
 msgid "_Network"
 msgstr "ç½?ç»?(_N)"
 
-#: ../multiload/properties.c:421
+#: ../multiload/properties.c:419
 msgid "S_wap Space"
 msgstr "交�空�(_W)"
 
-#: ../multiload/properties.c:434
+#: ../multiload/properties.c:432
 msgid "_Load"
 msgstr "è´?è½½(_L)"
 
-#: ../multiload/properties.c:447
+#: ../multiload/properties.c:445
 msgid "_Harddisk"
 msgstr "硬ç??(_H)"
 
-#: ../multiload/properties.c:463
+#: ../multiload/properties.c:461
 msgid "Options"
 msgstr "é??项"
 
-#: ../multiload/properties.c:493
+#: ../multiload/properties.c:491
 msgid "System m_onitor width: "
 msgstr "ç³»ç»?ç??è§?å?¨å®½åº¦(_O)ï¼?"
 
-#: ../multiload/properties.c:495
+#: ../multiload/properties.c:493
 msgid "System m_onitor height: "
 msgstr "ç³»ç»?ç??è§?å?¨é«?度(_O)ï¼?"
 
-#: ../multiload/properties.c:534
+#: ../multiload/properties.c:532
 msgid "Sys_tem monitor update interval: "
 msgstr "ç³»ç»?ç??è§?å?¨æ?´æ?°é?´é??(_T)ï¼?"
 
-#: ../multiload/properties.c:560
+#: ../multiload/properties.c:558
 msgid "milliseconds"
 msgstr "毫�"
 
-#: ../multiload/properties.c:598
-#: ../multiload/properties.c:606
+#: ../multiload/properties.c:596 ../multiload/properties.c:604
 msgid "_User"
 msgstr "��(_U)"
 
-#: ../multiload/properties.c:599
+#: ../multiload/properties.c:597
 msgid "S_ystem"
 msgstr "系�(_Y)"
 
-#: ../multiload/properties.c:600
+#: ../multiload/properties.c:598
 msgid "N_ice"
 msgstr "ä¼?å??级(_I)"
 
-#: ../multiload/properties.c:601
+#: ../multiload/properties.c:599
 msgid "I_OWait"
 msgstr "IO ç­?å??(_O)"
 
-#: ../multiload/properties.c:602
+#: ../multiload/properties.c:600
 msgid "I_dle"
 msgstr "�置(_D)"
 
-#: ../multiload/properties.c:607
+#: ../multiload/properties.c:605
 msgid "Sh_ared"
 msgstr "�享(_A)"
 
-#: ../multiload/properties.c:608
+#: ../multiload/properties.c:606
 msgid "_Buffers"
 msgstr "ç¼?å?²(_B)"
 
-#: ../multiload/properties.c:609
+#: ../multiload/properties.c:607
 msgid "Cach_ed"
 msgstr "ç¼?å­?(_E)"
 
-#: ../multiload/properties.c:610
+#: ../multiload/properties.c:608
 msgid "F_ree"
 msgstr "空�(_R)"
 
-#: ../multiload/properties.c:614
+#: ../multiload/properties.c:612
 msgid "_In"
 msgstr "è¿?(_I)"
 
-#: ../multiload/properties.c:615
+#: ../multiload/properties.c:613
 msgid "_Out"
 msgstr "å?º(_O)"
 
-#: ../multiload/properties.c:616
+#: ../multiload/properties.c:614
 msgid "_Local"
 msgstr "��(_L)"
 
-#: ../multiload/properties.c:617
-#: ../multiload/properties.c:627
-#: ../multiload/properties.c:633
+#: ../multiload/properties.c:615 ../multiload/properties.c:625
+#: ../multiload/properties.c:631
 msgid "_Background"
 msgstr "è??æ?¯(_B)"
 
-#: ../multiload/properties.c:621
+#: ../multiload/properties.c:619
 msgid "_Used"
 msgstr "已�(_U)"
 
-#: ../multiload/properties.c:622
+#: ../multiload/properties.c:620
 msgid "_Free"
 msgstr "空�(_F)"
 
-#: ../multiload/properties.c:624
+#: ../multiload/properties.c:622
 msgid "Load"
 msgstr "è´?è½½"
 
-#: ../multiload/properties.c:626
+#: ../multiload/properties.c:624
 msgid "_Average"
 msgstr "å??å?¼(_A)"
 
-#: ../multiload/properties.c:629
+#: ../multiload/properties.c:627
 msgid "Harddisk"
 msgstr "硬ç??"
 
-#: ../multiload/properties.c:631
+#: ../multiload/properties.c:629
 msgid "_Read"
 msgstr "读å??(_R)"
 
-#: ../multiload/properties.c:632
+#: ../multiload/properties.c:630
 msgid "_Write"
 msgstr "å??å?¥(_W)"
 
-#: ../multiload/properties.c:658
+#: ../multiload/properties.c:655
 msgid "System Monitor Preferences"
 msgstr "ç³»ç»?ç??è§?å?¨é¦?é??项"
 
@@ -3058,6 +3064,10 @@ msgstr "æ??é??æ?¨æ?°é?®ä»¶å?°è¾¾"
 msgid "Inbox Monitor (Deprecated)"
 msgstr "æ?¶ä»¶ç®±ç??è§?å?¨(ä¸?å??使ç?¨)"
 
+#: ../null_applet/GNOME_MixerApplet.server.in.h:1
+msgid "Adjust the sound volume"
+msgstr "è°?æ?´é?³é??"
+
 #: ../null_applet/GNOME_MixerApplet.server.in.h:2
 msgid "Volume Control (Deprecated)"
 msgstr "é?³é??æ?§å?¶(å·²æ??å¼?)"
@@ -3086,31 +3096,33 @@ msgstr "é?®ç??æ ?è¯?å?¨(å·²åº?å¼?)"
 msgid "Keyboard layout indicator"
 msgstr "é?®ç??å¸?å±?æ ?è¯?å?¨"
 
-#: ../null_applet/null_applet.c:40
+#: ../null_applet/null_applet.c:51
 msgid "Inbox Monitor"
 msgstr "æ?¶ä»¶ç®±ç??è§?å?¨"
 
-#: ../null_applet/null_applet.c:42
+#: ../null_applet/null_applet.c:53
 msgid "CD Player"
 msgstr "CD ���"
 
-#: ../null_applet/null_applet.c:48
+#: ../null_applet/null_applet.c:59
 msgid "Keyboard Indicator"
 msgstr "é?®ç??æ ?è¯?å?¨"
 
-#: ../null_applet/null_applet.c:151
+#: ../null_applet/null_applet.c:157
 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:158
+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:160
 msgid "These items will now be removed from your configuration:"
 msgstr "è¿?äº?项ç?®å°?ä¼?ä»?æ?¨ç??é??置中å? é?¤ï¼?"
 
-#: ../null_applet/null_applet.c:157
+#: ../null_applet/null_applet.c:163
 msgid "You will not receive this message again."
 msgstr "æ?¨å°?ä¸?ä¼?å??æ?¶å?°æ­¤æ¶?æ?¯ã??"
 
@@ -3122,42 +3134,25 @@ msgstr "��"
 msgid "Tomboy (transparent upgrade from stickynotes)"
 msgstr "é?¿å¸?(ä»?置顶便笺ç??é??æ??å??级)"
 
-#: ../stickynotes/GNOME_StickyNotesApplet.server.in.in.h:1
+#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1
 msgid "Create, view, and manage sticky notes on the desktop"
 msgstr "å?¨æ¡?é?¢ä¸?å??建ã??æ?¥ç??å??管ç??置顶便笺"
 
-#: ../stickynotes/GNOME_StickyNotesApplet.server.in.in.h:2
-#: ../stickynotes/stickynotes_applet.c:130
-#: ../stickynotes/stickynotes_applet.c:407
+#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2
+#: ../stickynotes/stickynotes_applet.c:146
+#: ../stickynotes/stickynotes_applet.c:427
 msgid "Sticky Notes"
 msgstr "置顶便笺"
 
-#: ../stickynotes/GNOME_StickyNotesApplet.server.in.in.h:3
+#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3
 msgid "Sticky Notes Applet Factory"
 msgstr "置顶便笺å°?ç¨?åº?å·¥å??"
 
-#: ../stickynotes/GNOME_StickyNotesApplet.xml.h:1
-msgid "Hi_de Notes"
-msgstr "é??è??便笺(_D)"
-
-#: ../stickynotes/GNOME_StickyNotesApplet.xml.h:3
-msgid "_Delete Notes"
-msgstr "å? é?¤ä¾¿ç¬º(_D)"
-
-#: ../stickynotes/GNOME_StickyNotesApplet.xml.h:5
-msgid "_Lock Notes"
-msgstr "é??å®?便笺(_L)"
-
-#: ../stickynotes/GNOME_StickyNotesApplet.xml.h:6
-#: ../stickynotes/stickynotes.ui.h:42
-msgid "_New Note"
-msgstr "�建便笺(_N)"
-
-#: ../stickynotes/stickynotes.c:635
+#: ../stickynotes/stickynotes.c:630
 msgid "This note is locked."
 msgstr "此便笺已é??å®?ã??"
 
-#: ../stickynotes/stickynotes.c:639
+#: ../stickynotes/stickynotes.c:634
 msgid "This note is unlocked."
 msgstr "此便笺æ?ªé??å®?ã??"
 
@@ -3325,6 +3320,10 @@ msgstr "å­?ä½?(_F)ï¼?"
 msgid "_Lock Note"
 msgstr "é??å®?便笺(_L)"
 
+#: ../stickynotes/stickynotes.ui.h:42 ../stickynotes/stickynotes_applet.c:33
+msgid "_New Note"
+msgstr "�建便笺(_N)"
+
 #: ../stickynotes/stickynotes.ui.h:44
 msgid "_Put notes on all workspaces"
 msgstr "å°?便笺æ?¾ç½®å?¨æ??æ??å·¥ä½?å?º(_P)"
@@ -3334,8 +3333,13 @@ 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"
@@ -3350,11 +3354,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
@@ -3362,7 +3370,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
@@ -3386,19 +3396,27 @@ 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, selecting the desktop in any way will automatically hide all the open notes."
+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."
+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
@@ -3406,7 +3424,9 @@ msgid "Specifies whether the sticky notes are locked (non-editable) or not."
 msgstr "æ??å®?置顶便笺æ?¯å?¦è¢«é??å®?(æ? æ³?ç¼?è¾?)ã??"
 
 #: ../stickynotes/stickynotes.schemas.in.h:19
-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:20
@@ -3437,48 +3457,59 @@ msgstr "��使�系��认��"
 msgid "Whether to use the default system font"
 msgstr "��使�系��认��"
 
-#: ../stickynotes/stickynotes_applet.c:590
+#: ../stickynotes/stickynotes_applet.c:36
+msgid "Hi_de Notes"
+msgstr "é??è??便笺(_D)"
+
+#: ../stickynotes/stickynotes_applet.c:39
+msgid "_Delete Notes"
+msgstr "å? é?¤ä¾¿ç¬º(_D)"
+
+#: ../stickynotes/stickynotes_applet.c:55
+msgid "_Lock Notes"
+msgstr "é??å®?便笺(_L)"
+
+#: ../stickynotes/stickynotes_applet.c:620
 #, c-format
 msgid "%d note"
 msgid_plural "%d notes"
 msgstr[0] "%d 个便笺"
 
-#: ../stickynotes/stickynotes_applet.c:591
+#: ../stickynotes/stickynotes_applet.c:621
 msgid "Show sticky notes"
 msgstr "�示置顶便笺"
 
-#: ../stickynotes/stickynotes_applet_callbacks.c:417
+#: ../stickynotes/stickynotes_applet_callbacks.c:379
 msgid "Sticky Notes for the GNOME Desktop Environment"
 msgstr "ç?¨äº? GNOME æ¡?é?¢ç?¯å¢?ç??置顶便笺"
 
-#: ../trashapplet/GNOME_Panel_TrashApplet.server.in.in.h:1
+#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
 msgid "Go to Trash"
 msgstr "转å?°å??æ?¶ç«?"
 
-#: ../trashapplet/GNOME_Panel_TrashApplet.server.in.in.h:2
+#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
 msgid "Trash"
 msgstr "å??æ?¶ç«?"
 
-#: ../trashapplet/GNOME_Panel_TrashApplet.xml.h:2
-#: ../trashapplet/src/trash-empty.c:351
+#: ../trashapplet/src/trashapplet.c:69 ../trashapplet/src/trash-empty.c:343
 msgid "_Empty Trash"
 msgstr "æ¸?空å??æ?¶ç«?(_E)"
 
-#: ../trashapplet/GNOME_Panel_TrashApplet.xml.h:4
+#: ../trashapplet/src/trashapplet.c:72
 msgid "_Open Trash"
 msgstr "æ??å¼?å??æ?¶ç«?(_O)"
 
-#: ../trashapplet/src/trashapplet.c:124
+#: ../trashapplet/src/trashapplet.c:128
 #, c-format
 msgid "%d Item in Trash"
 msgid_plural "%d Items in Trash"
 msgstr[0] "å??æ?¶ç«?中æ?? %d 项"
 
-#: ../trashapplet/src/trashapplet.c:132
+#: ../trashapplet/src/trashapplet.c:136
 msgid "No Items in Trash"
 msgstr "å??æ?¶ç«?中æ? 项ç?®"
 
-#: ../trashapplet/src/trashapplet.c:376
+#: ../trashapplet/src/trashapplet.c:377
 #, c-format
 msgid ""
 "Error while spawning nautilus:\n"
@@ -3487,45 +3518,54 @@ msgstr ""
 "è°?ç?¨ Nautilus å?ºé??ï¼?\n"
 "%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 å??æ?¶ç«?ã??æ?¨å?¯ä»¥ä½¿ç?¨å®?æ?¥ç??å??æ?¶ç«?ï¼?æ??è??å°?项ç?®æ??æ?³è?³å??æ?¶ç«?中ã??"
+#: ../trashapplet/src/trashapplet.c:426
+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
+#: ../trashapplet/src/trashapplet.c:451
 msgid "Delete Immediately?"
 msgstr "ç«?å?³å? é?¤å??ï¼?"
 
-#: ../trashapplet/src/trashapplet.c:482
+#: ../trashapplet/src/trashapplet.c:480
 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?"
+#: ../trashapplet/src/trashapplet.c:485
+msgid ""
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr "æ? æ³?å°?æ??äº?项ç?®ç§»è?³å??æ?¶ç«?ï¼?æ?¨æ?³è¦?ç«?å?³å? é?¤è¿?äº?项ç?®å??ï¼?"
 
-#: ../trashapplet/src/trashapplet.c:614
+#: ../trashapplet/src/trashapplet.c:615
 msgid "Trash Applet"
 msgstr "å??æ?¶ç«?å°?ç¨?åº?"
 
 #. Translators: the %s in this string should be read as %d.
-#: ../trashapplet/src/trash-empty.c:81
+#: ../trashapplet/src/trash-empty.c:73
 #, c-format
 msgid "Removing item %s of %s"
 msgstr "æ­£å?¨å? é?¤ç¬¬%s项ï¼?å?±%s项"
 
 #. Translators: %s is a file name
-#: ../trashapplet/src/trash-empty.c:107
+#: ../trashapplet/src/trash-empty.c:99
 #, c-format
 msgid "Removing: %s"
 msgstr "æ­£å?¨å? é?¤ï¼?%s"
 
-#: ../trashapplet/src/trash-empty.c:330
+#: ../trashapplet/src/trash-empty.c:322
 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 "å¦?æ??æ?¨é??æ?©æ¸?空å??æ?¶ç«?ï¼?å?¶ä¸­ç??项ç?®å°?被永ä¹?å? é?¤ã??请注æ??ï¼?æ?¨è¿?å?¯ä»¥å??个å? é?¤å?¶ä¸­ç??项ç?®ã??"
+#: ../trashapplet/src/trash-empty.c:329
+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"
@@ -3535,38 +3575,57 @@ msgstr "æ¸?空å??æ?¶ç«?"
 msgid "From:"
 msgstr "ä»?ï¼?"
 
+#~ msgid "Cannot execute '%s'"
+#~ msgstr "æ? æ³?æ?§è¡?â??%sâ??"
+
 #~ 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"
@@ -3575,6 +3634,7 @@ msgstr "ä»?ï¼?"
 #~ "<b>å? é?¤å?¨é?¨è®°äº?è´´ï¼?</b>\n"
 #~ "\n"
 #~ "å°?ä¸?å?»ä¸?å¤?è¿?å?¦ã??"
+
 #~ msgid ""
 #~ "<b>Delete this sticky note?</b>\n"
 #~ "\n"
@@ -3583,30 +3643,42 @@ 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)"
-