[gnome-applets/gnome-3-6] Update Chinese simplified translation

[Wylmer Wang <wylmerwang src gnome org>]

commit 1baef271cbb1b6e25258eb0c61ebf28251dfb26c
Author: Wylmer Wang <wantinghard gmail com>
Date:   Sun Jan 12 19:57:47 2014 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 2797 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 1393 insertions(+), 1404 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eb6a2d9..614b776 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,19 +8,23 @@
 # 甘露(Gan Lu) <rhythm gan gmail com>, 2009.
 # YunQiang Su <wzssyqa gmail com>, 2010.
 # ben <benbenhappy2008 gmail com>, 2011.
+# michaeljayt <michaeljayt gmail com>, 2013.
+#
 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: 2011-02-26 12:45+0000\n"
-"PO-Revision-Date: 2011-03-19 02:36+0000\n"
-"Last-Translator: ben <benbenhappy2008 gmail com>\n"
+"applets&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-12-18 19:53+0000\n"
+"PO-Revision-Date: 2014-01-12 19:57+0800\n"
+"Last-Translator: michaeljayt <michaeljayt gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language: zh_CN\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"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../accessx-status/applet.c:139
 msgid "Shows the state of AccessX features such as latched modifiers"
@@ -34,7 +38,7 @@ msgstr "显示 AccessX 特性的状态，如插销修饰"
 #: ../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
+#: ../mini-commander/src/about.c:53 ../mixer/applet.c:1424
 #: ../modemlights/modem-applet.c:1023 ../multiload/main.c:61
 #: ../stickynotes/stickynotes_applet_callbacks.c:383
 #: ../trashapplet/src/trashapplet.c:431
@@ -65,8 +69,7 @@ msgstr "键盘辅助功能首选项(_K)"
 #: ../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
+#: ../mini-commander/src/mini-commander_applet.c:56 ../mixer/applet.c:381
 #: ../modemlights/modem-applet.c:151 ../multiload/main.c:465
 #: ../stickynotes/stickynotes_applet.c:45 ../trashapplet/src/trashapplet.c:75
 msgid "_Help"
@@ -76,8 +79,7 @@ msgstr "帮助(_H)"
 #: ../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
+#: ../mini-commander/src/mini-commander_applet.c:59 ../mixer/applet.c:384
 #: ../modemlights/modem-applet.c:154 ../multiload/main.c:468
 #: ../stickynotes/stickynotes_applet.c:48 ../trashapplet/src/trashapplet.c:78
 msgid "_About"
@@ -111,7 +113,7 @@ msgid "Error: %s"
 msgstr "错误：%s"
 
 #: ../accessx-status/applet.c:1287
-#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2
+#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3
 msgid "Keyboard Accessibility Status"
 msgstr "键盘辅助功能状态"
 
@@ -123,7 +125,7 @@ msgstr "显示键盘辅助功能特性的当前状态"
 msgid "AccessX Status Applet Factory"
 msgstr "AccessX 状态小程序工厂"
 
-#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3
+#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2
 msgid "Keyboard Accessibility Status Applet Factory"
 msgstr "键盘辅助功能状态小程序工厂"
 
@@ -134,8 +136,7 @@ msgstr "显示键盘辅助功能特性的状态"
 #: ../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
+#: ../mini-commander/src/mini-commander_applet.c:53 ../mixer/applet.c:387
 #: ../multiload/main.c:459 ../stickynotes/stickynotes_applet.c:42
 msgid "_Preferences"
 msgstr "首选项(_P)"
@@ -283,7 +284,7 @@ msgstr "不可用"
 
 #: ../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
+#: ../gweather/gweather-pref.c:617 ../mini-commander/src/preferences.c:366
 #: ../stickynotes/stickynotes_applet_callbacks.c:349
 #: ../stickynotes/stickynotes_applet_callbacks.c:565
 #: ../trashapplet/src/trashapplet.c:398
@@ -306,7 +307,7 @@ 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
+#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2
 msgid "Battery Charge Monitor"
 msgstr "ç”µæ± ç”µé‡ç›‘è§†å™¨"
 
@@ -316,54 +317,54 @@ msgid "Monitor a laptop's remaining power"
 msgstr "ç›‘è§†ç¬”è®°æœ¬è®¡ç®—æœºç”µæ± çš„å‰©ä½™ç”µé‡"
 
 #: ../battstat/battstat_applet.ui.h:1
-msgid "(shows single image for status and charge)"
-msgstr "(çŠ¶æ€åŠç”µé‡æ˜¾ç¤ºä¸ºå•å¼ å›¾ç‰‡)"
+msgid "Battery Charge Monitor Preferences"
+msgstr "ç”µæ± ç”µé‡ç›‘è§†å™¨é¦–é€‰é¡¹"
 
 #: ../battstat/battstat_applet.ui.h:2
-msgid "(two images: one for status, one for charge)"
-msgstr "(ä¸¤å¼ å›¾ç‰‡ï¼šä¸€ä¸ºçŠ¶æ€ï¼ŒäºŒä¸ºç”µé‡)"
-
-#: ../battstat/battstat_applet.ui.h:3
 msgid "Appearance"
 msgstr "外观"
 
+#: ../battstat/battstat_applet.ui.h:3
+msgid "_Compact view"
+msgstr "紧缩视图(_C)"
+
 #: ../battstat/battstat_applet.ui.h:4
-msgid "Battery Charge Monitor Preferences"
-msgstr "ç”µæ± ç”µé‡ç›‘è§†å™¨é¦–é€‰é¡¹"
+msgid "(shows single image for status and charge)"
+msgstr "(çŠ¶æ€åŠç”µé‡æ˜¾ç¤ºä¸ºå•å¼ å›¾ç‰‡)"
 
 #: ../battstat/battstat_applet.ui.h:5
-msgid "Notifications"
-msgstr "通知"
+msgid "_Expanded view"
+msgstr "展开视图(_E)"
 
 #: ../battstat/battstat_applet.ui.h:6
-msgid "Show _percentage remaining"
-msgstr "显示剩余百分比(_P)"
+msgid "(two images: one for status, one for charge)"
+msgstr "(ä¸¤å¼ å›¾ç‰‡ï¼šä¸€ä¸ºçŠ¶æ€ï¼ŒäºŒä¸ºç”µé‡)"
 
 #: ../battstat/battstat_applet.ui.h:7
-msgid "Show _time remaining"
-msgstr "显示剩余时间(_T)"
+msgid "_Show time/percentage:"
+msgstr "显示时间/百分比(_S)："
 
 #: ../battstat/battstat_applet.ui.h:8
-msgid "_Compact view"
-msgstr "紧缩视图(_C)"
+msgid "Show _time remaining"
+msgstr "显示剩余时间(_T)"
 
 #: ../battstat/battstat_applet.ui.h:9
-msgid "_Expanded view"
-msgstr "展开视图(_E)"
+msgid "Show _percentage remaining"
+msgstr "显示剩余百分比(_P)"
 
 #: ../battstat/battstat_applet.ui.h:10
-msgid "_Notify when battery is fully recharged"
-msgstr "å½“ç”µæ± å·²å……æ»¡æ—¶é€šçŸ¥(_N)"
-
-#: ../battstat/battstat_applet.ui.h:11
-msgid "_Show time/percentage:"
-msgstr "显示时间/百分比(_S)："
+msgid "Notifications"
+msgstr "通知"
 
 #. TRANSLATOR: This is the beginning of the sentence 'Warn when battery charge drops to: [XX] 
percent/minutes remaining'
-#: ../battstat/battstat_applet.ui.h:13
+#: ../battstat/battstat_applet.ui.h:12
 msgid "_Warn when battery charge drops to:"
 msgstr "è­¦å‘Šå½“ç”µæ± ç”µé‡ä¸‹é™åˆ°(_W)："
 
+#: ../battstat/battstat_applet.ui.h:13
+msgid "_Notify when battery is fully recharged"
+msgstr "å½“ç”µæ± å·²å……æ»¡æ—¶é€šçŸ¥(_N)"
+
 #: ../battstat/battstat-hal.c:343 ../battstat/battstat-hal.c:368
 msgid "HAL error"
 msgstr "HAL 错误"
@@ -382,84 +383,84 @@ msgid "Unable to initialise HAL: %s: %s"
 msgstr "æ— æ³•åˆå§‹åŒ– HAL：%s：%s"
 
 #: ../battstat/battstat.schemas.in.h:1
-msgid "0 for no label, 1 for percentage and 2 for time remaining."
-msgstr "0 ä»£è¡¨æ— æ ‡ç­¾ï¼Œ1 代表百分比，2 代表剩余时间"
+msgid "Red value level"
+msgstr "红色值级别"
 
 #: ../battstat/battstat.schemas.in.h:2
-msgid "Beep for warnings"
-msgstr "警告响铃"
+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:3
-msgid "Beep when displaying a warning."
-msgstr "显示警告时响铃"
+msgid "Warn on low time rather than low percentage"
+msgstr "æ ¹æ®å‰©ä½™æ—¶é—´è€Œéžå‰©ä½™ç™¾åˆ†æ¯”ç»™å‡ºè­¦å‘Š"
 
 #: ../battstat/battstat.schemas.in.h:4
-msgid "Drain from top"
-msgstr "从上耗电"
+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:5
-msgid "Full Battery Notification"
-msgstr "满电量通知"
-
-#: ../battstat/battstat.schemas.in.h:6
 msgid "Low Battery Notification"
 msgstr "低电量通知"
 
+#: ../battstat/battstat.schemas.in.h:6
+msgid "Notify user when the battery is low."
+msgstr "å½“ç”µæ± ç”µé‡ä½Žæ—¶é€šçŸ¥ç”¨æˆ·"
+
 #: ../battstat/battstat.schemas.in.h:7
-msgid "Notify user when the battery is full."
-msgstr "å½“ç”µæ± å……æ»¡ç”µæ—¶é€šçŸ¥ç”¨æˆ·"
+msgid "Full Battery Notification"
+msgstr "满电量通知"
 
 #: ../battstat/battstat.schemas.in.h:8
-msgid "Notify user when the battery is low."
-msgstr "å½“ç”µæ± ç”µé‡ä½Žæ—¶é€šçŸ¥ç”¨æˆ·"
+msgid "Notify user when the battery is full."
+msgstr "å½“ç”µæ± å……æ»¡ç”µæ—¶é€šçŸ¥ç”¨æˆ·"
 
 #: ../battstat/battstat.schemas.in.h:9
-msgid "Red value level"
-msgstr "红色值级别"
+msgid "Beep for warnings"
+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."
-msgstr "æ˜¾ç¤ºç”µæ± ç”µé‡ï¼Œä»Žç”µæ± çš„ä¸Šæ–¹æµèµ°ã€‚ä»…åœ¨ä¼ ç»Ÿç”µæ± è§†å›¾ä¸­å®žçŽ°ã€‚"
+msgid "Beep when displaying a warning."
+msgstr "显示警告时响铃"
 
 #: ../battstat/battstat.schemas.in.h:11
-msgid "Show the horizontal battery"
-msgstr "显示水平电量"
+msgid "Drain from top"
+msgstr "从上耗电"
 
 #: ../battstat/battstat.schemas.in.h:12
-msgid "Show the time/percent label"
-msgstr "显示时间/ç™¾åˆ†æ¯”æ ‡ç­¾"
+msgid ""
+"Show the battery meter draining from the top of the battery. Only "
+"implemented for traditional battery view."
+msgstr "æ˜¾ç¤ºç”µæ± ç”µé‡ï¼Œä»Žç”µæ± çš„ä¸Šæ–¹æµèµ°ã€‚ä»…åœ¨ä¼ ç»Ÿç”µæ± è§†å›¾ä¸­å®žçŽ°ã€‚"
 
 #: ../battstat/battstat.schemas.in.h:13
-msgid "Show the traditional, horizontal battery on the panel."
-msgstr "åœ¨é¢æ¿ä¸Šæ˜¾ç¤ºä¼ ç»Ÿçš„æ°´å¹³ç”µæ± "
+msgid "Upright (small) battery"
+msgstr "ç«–ç›´çš„å°ç”µæ± "
 
 #: ../battstat/battstat.schemas.in.h:14
 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."
-msgstr "å½“ç”µé‡ä½ŽäºŽæ­¤çº§åˆ«æ—¶ï¼Œç”µæ± æ˜¾ç¤ºä¸ºçº¢è‰²ï¼ŒåŒæ—¶ä¹Ÿä¼šæ˜¾ç¤ºä½Žç”µé‡è­¦å‘Šã€‚"
+msgid "Show the horizontal battery"
+msgstr "显示水平电量"
 
 #: ../battstat/battstat.schemas.in.h:16
-msgid "Upright (small) battery"
-msgstr "ç«–ç›´çš„å°ç”µæ± "
+msgid "Show the traditional, horizontal battery on the panel."
+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."
-msgstr "使用 red_value 中定义的值作为显示警告对话框的剩余时间，而非剩余百分比"
+msgid "Show the time/percent label"
+msgstr "显示时间/ç™¾åˆ†æ¯”æ ‡ç­¾"
 
 #: ../battstat/battstat.schemas.in.h:18
-msgid "Warn on low time rather than low percentage"
-msgstr "æ ¹æ®å‰©ä½™æ—¶é—´è€Œéžå‰©ä½™ç™¾åˆ†æ¯”ç»™å‡ºè­¦å‘Š"
+msgid "0 for no label, 1 for percentage and 2 for time remaining."
+msgstr "0 ä»£è¡¨æ— æ ‡ç­¾ï¼Œ1 代表百分比，2 代表剩余时间"
 
-#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2
+#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1
 msgid "Battstat Factory"
 msgstr "ç”µæ± çŠ¶æ€å·¥åŽ‚"
 
@@ -484,13 +485,13 @@ msgid "Battery Status Utility"
 msgstr "ç”µæ± çŠ¶æ€å·¥å…·"
 
 #: ../battstat/sounds/battstat_applet.soundlist.in.h:2
-msgid "Battery fully re-charged"
-msgstr "ç”µæ± å·²å……æ»¡"
-
-#: ../battstat/sounds/battstat_applet.soundlist.in.h:3
 msgid "Battery power low"
 msgstr "ç”µæ± ç”µé‡ä½Ž"
 
+#: ../battstat/sounds/battstat_applet.soundlist.in.h:3
+msgid "Battery fully re-charged"
+msgstr "ç”µæ± å·²å……æ»¡"
+
 #: ../charpick/charpick.c:438
 msgid "Available palettes"
 msgstr "可用的字符板"
@@ -521,7 +522,7 @@ msgstr ""
 "GNOME é¢æ¿å°ç¨‹åºï¼Œç”¨äºŽé€‰æ‹©é‚£äº›åœ¨ä½ çš„é”®ç›˜ä¸Šæ‰¾ä¸åˆ°çš„å­—ç¬¦ã€‚ä»¥ GNU GPL 发布。"
 
 #: ../charpick/charpick.c:745 ../charpick/charpick.c:759
-#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2
 #: ../charpick/properties.c:451
 msgid "Character Palette"
 msgstr "字符板"
@@ -532,28 +533,28 @@ msgid "Insert characters"
 msgstr "插入字符"
 
 #: ../charpick/charpick.schemas.in.h:1
+msgid "DEPRECATED - Characters shown on applet startup"
+msgstr "不推荐 - 小程序启动时显示的字符"
+
+#: ../charpick/charpick.schemas.in.h:2
 msgid "Characters shown on applet startup"
 msgstr "小程序启动时显示的字符"
 
-#: ../charpick/charpick.schemas.in.h:2
-msgid "DEPRECATED - Characters shown on applet startup"
-msgstr "不推荐 - 小程序启动时显示的字符"
+#: ../charpick/charpick.schemas.in.h:3
+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/charpick.schemas.in.h:3 ../charpick/properties.c:378
+#: ../charpick/charpick.schemas.in.h:4 ../charpick/properties.c:378
 msgid "List of available palettes"
 msgstr "可用字符板列表"
 
-#: ../charpick/charpick.schemas.in.h:4
+#: ../charpick/charpick.schemas.in.h:5
 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."
-msgstr "小程序上次使用时用户所选的字符串。此字符串将会在用户启动小程序时显示。"
-
-#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
 msgid "Charpicker Applet Factory"
 msgstr "字符拾取小程序工厂"
 
@@ -618,15 +619,21 @@ msgid "Character Palette Preferences"
 msgstr "字符板首选项"
 
 #: ../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 "CPU to Monitor"
+msgstr "CPU 到监视器"
 
 #: ../cpufreq/cpufreq-applet.schemas.in.h:2
 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:3
+msgid "Mode to show cpu usage"
+msgstr "显示 CPU 的模式"
+
+#: ../cpufreq/cpufreq-applet.schemas.in.h:4
+msgid ""
 "A 0 value means to show the applet in graphic mode (pixmap only), 1 to show "
 "the applet in text mode (not to show the pixmap) and 2 to show the applet in "
 "graphic and text mode."
@@ -634,55 +641,49 @@ msgstr ""
 "0 值意味着以图形方式显示小程序，1 意味着以文字方式显示小程序，2 意味着同时显"
 "示图形和文本。"
 
-#: ../cpufreq/cpufreq-applet.schemas.in.h:3
-msgid "CPU to Monitor"
-msgstr "CPU 到监视器"
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:4
-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."
-msgstr "设置要监视的 CPUã€‚åœ¨å•å¤„ç†å™¨ç³»ç»Ÿä¸­ï¼Œæ‚¨æ— éœ€è¿›è¡Œæ›´æ”¹ã€‚"
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:6
 msgid "The type of text to display (if the text is enabled)."
 msgstr "要显示的文本类型(若启用了文本的话)。"
 
+#: ../cpufreq/cpufreq-applet.schemas.in.h:6
+msgid ""
+"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 "
+"to show percentage instead of frequency."
+msgstr ""
+"0 值意味着显示 CPU 频率，1 意味着显示频率和单位，2 意味着显示为百分比而非频"
+"率。"
+
 #: ../cpufreq/cpufreq-preferences.ui.h:1
 msgid "CPU Frequency Monitor Preferences"
 msgstr "CPU 频率监视器首选项"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:2
-msgid "Display Settings"
-msgstr "显示设置"
-
-#: ../cpufreq/cpufreq-preferences.ui.h:3
 msgid "Monitor Settings"
 msgstr "显示器设置"
 
+#: ../cpufreq/cpufreq-preferences.ui.h:3
+msgid "_Monitored CPU:"
+msgstr "监视中的 CPU(_M)："
+
 #: ../cpufreq/cpufreq-preferences.ui.h:4
-msgid "Show CPU frequency as _frequency"
-msgstr "显示 CPU 频率为频率(_F)"
+msgid "Display Settings"
+msgstr "显示设置"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:5
-msgid "Show CPU frequency as _percentage"
-msgstr "显示 CPU 频率为百分比"
+msgid "_Appearance:"
+msgstr "外观(_A)"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:6
-msgid "Show frequency _units"
-msgstr "显示频率单位(_U)"
+msgid "Show CPU frequency as _frequency"
+msgstr "显示 CPU 频率为频率(_F)"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:7
-msgid "_Appearance:"
-msgstr "外观(_A)"
+msgid "Show frequency _units"
+msgstr "显示频率单位(_U)"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:8
-msgid "_Monitored CPU:"
-msgstr "监视中的 CPU(_M)："
+msgid "Show CPU frequency as _percentage"
+msgstr "显示 CPU 频率为百分比"
 
 #: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:1
 #: ../cpufreq/src/cpufreq-applet.c:944 ../cpufreq/src/cpufreq-applet.c:1003
@@ -717,7 +718,7 @@ msgstr "文本"
 msgid "Graphic and Text"
 msgstr "图形和文本"
 
-#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:117
+#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:121
 msgid "Frequency Scaling Unsupported"
 msgstr "频率调节不支持"
 
@@ -753,38 +754,38 @@ msgstr "(已挂载)"
 msgid "(not mounted)"
 msgstr "(未挂载)"
 
-#: ../drivemount/drive-button.c:566
+#: ../drivemount/drive-button.c:562
 msgid "Cannot start Nautilus File Manager"
 msgstr "æ— æ³•å¯åŠ¨ Nautilus 文件管理器"
 
-#: ../drivemount/drive-button.c:573
+#: ../drivemount/drive-button.c:569
 msgid "Could not find Nautilus"
 msgstr "未找到 Nautilus"
 
-#: ../drivemount/drive-button.c:897
+#: ../drivemount/drive-button.c:893
 msgid "_Play DVD"
 msgstr "播放 DVD(_P)"
 
-#: ../drivemount/drive-button.c:901
+#: ../drivemount/drive-button.c:897
 msgid "_Play CD"
 msgstr "播放 CD(_P)"
 
-#: ../drivemount/drive-button.c:904
+#: ../drivemount/drive-button.c:900
 #, c-format
 msgid "_Open %s"
 msgstr "打开 %s(_O)"
 
-#: ../drivemount/drive-button.c:913
+#: ../drivemount/drive-button.c:908
 #, c-format
 msgid "Un_mount %s"
 msgstr "卸载 %s(_M)"
 
-#: ../drivemount/drive-button.c:920
+#: ../drivemount/drive-button.c:914
 #, c-format
 msgid "_Mount %s"
 msgstr "挂载 %s(_M)"
 
-#: ../drivemount/drive-button.c:928
+#: ../drivemount/drive-button.c:922
 #, c-format
 msgid "_Eject %s"
 msgstr "弹出 %s(_E)"
@@ -794,7 +795,7 @@ 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
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3
 msgid "Disk Mounter"
 msgstr "磁盘挂载者"
 
@@ -806,11 +807,11 @@ msgstr "检查挂载点状态的间隔"
 msgid "Time in seconds between status updates"
 msgstr "每次状态更新之间等待的秒数"
 
-#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1
 msgid "Drive Mount Applet Factory"
 msgstr "驱动器挂载小程序工厂"
 
-#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2
 msgid "Factory for drive mount applet"
 msgstr "用于驱动器挂载小程序的工厂"
 
@@ -836,13 +837,13 @@ 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/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3
+msgid "A set of eyeballs for your panel"
+msgstr "用于您面板的一组眼球"
+
 #: ../geyes/themes.c:127
 msgid "Can not launch the eyes applet."
 msgstr "æ— æ³•è°ƒç”¨ eyes 小程序。"
@@ -863,622 +864,6 @@ msgstr "主题"
 msgid "_Select a theme:"
 msgstr "选择主题(_S)："
 
-#: ../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
-msgid "Alt+Shift changes layout."
-msgstr "Alt+Shift 更改布局。"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:3
-msgid "Arabic keymap"
-msgstr "é˜¿æ‹‰ä¼¯è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:4
-msgid "Armenian"
-msgstr "亚美尼亚语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:5
-msgid "Basque"
-msgstr "巴斯克语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:6
-msgid "Belgian"
-msgstr "比利时语"
-
-#: ../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
-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
-msgid "Both Shift keys together change layout."
-msgstr "同时按下两个 Shift 键更改布局。"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:10
-msgid "Brazil Portuguese keymap"
-msgstr "å·´è¥¿è‘¡è„ç‰™è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:11
-msgid "Bulgarian Cyrillic"
-msgstr "ä¿åŠ åˆ©äºšè¥¿é‡Œå°”æ–‡"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:12
-msgid "Bulgarian keymap"
-msgstr "ä¿åŠ åˆ©äºšè¯­é”®ç›˜æ˜ å°„"
-
-#: ../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
-msgid "Control+Shift changes layout."
-msgstr "Ctrl+Shift 更改布局。"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:15
-msgid "Czech keymap"
-msgstr "æ·å…‹é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:16
-msgid "Danish keymap"
-msgstr "ä¸¹éº¦è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:17
-msgid "Dutch keymap"
-msgstr "è·å…°è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:18
-msgid "English keymap"
-msgstr "è‹±è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:19
-msgid "Estonian keymap"
-msgstr "çˆ±æ²™å°¼äºšè¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:20
-msgid "Finnish keymap"
-msgstr "èŠ¬å…°è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:21
-msgid "French Swiss"
-msgstr "瑞士法语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:22
-msgid "French Swiss keymap"
-msgstr "ç‘žå£«æ³•è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:23
-msgid "French keymap"
-msgstr "æ³•è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:24
-msgid "French-Canadian 105-key"
-msgstr "åŠ æ‹¿å¤§æ³•è¯­ 105 é”®"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:25
-msgid "GB 102-key"
-msgstr "GB 102 é”®"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:26
-msgid "GB 105-key"
-msgstr "GB 105 é”®"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:27 ../gkb-new/xmodmap.sun/base.xml.in.h:27
-msgid "Generic Keyboard"
-msgstr "通用键盘"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:28
-msgid "Georgian Latin"
-msgstr "æ ¼é²å‰äºšæ‹‰ä¸è¯­"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:29
-msgid "Georgian Russian layout"
-msgstr "æ ¼é²å‰äºšä¿„è¯­å¸ƒå±€"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:30
-msgid "Georgian keymap"
-msgstr "æ ¼é²å‰äºšè¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:31
-msgid "German"
-msgstr "德语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:32
-msgid "German Swiss with Euro"
-msgstr "瑞士和欧洲德语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:33
-msgid "German keymap"
-msgstr "å¾·è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:34
-msgid "Greek keymap"
-msgstr "å¸Œè…Šè¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:35
-msgid "Hebrew keymap"
-msgstr "å¸Œä¼¯æ¥è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:36
-msgid "Hungarian 101-key latin 1"
-msgstr "匈牙利语 101 键拉丁 1"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:37
-msgid "Hungarian 101-key latin 2"
-msgstr "匈牙利语 101 键拉丁 2"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:38
-msgid "Hungarian 105-key latin 1"
-msgstr "匈牙利语 105 键拉丁 1"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:39
-msgid "Hungarian 105-key latin 2"
-msgstr "匈牙利语 105 键拉丁 2"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:40
-msgid "Hungarian PC/AT 101 keyboard"
-msgstr "匈牙利语 PC/AT 101 键盘"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:41
-msgid "Hungarian latin1"
-msgstr "匈牙利语拉丁 1"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:42
-msgid "Icelandic keymap"
-msgstr "å†°å²›è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:43
-msgid "Italian keymap"
-msgstr "æ„å¤§åˆ©è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:44
-msgid "Japanese keymap"
-msgstr "æ—¥è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:45
-msgid "Lao keymap"
-msgstr "è€æŒè¯­é”®ç›˜æ˜ å°„"
-
-#: ../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
-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
-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
-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
-msgid "Left Win-key changes layout."
-msgstr "左 Windows 键更改布局。"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:51
-msgid "Lithuanian keymap"
-msgstr "ç«‹é™¶å®›è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:52
-msgid "Macedonian"
-msgstr "马其顿语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:53 ../gkb-new/xmodmap.sun/base.xml.in.h:48
-msgid "Menu key changes layout."
-msgstr "菜单键更改布局。"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:54
-msgid "Mongolian alt keymap"
-msgstr "蒙古语 alt é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:55
-msgid "Mongolian keymap"
-msgstr "è’™å¤è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:56
-msgid "Mongolian phonetic keymap"
-msgstr "è’™å¤è¯­è¯­éŸ³é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:57
-msgid "Norwegian"
-msgstr "挪威语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:58
-msgid "Plain Russian keymap"
-msgstr "ç®€å•ä¿„è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:59
-msgid "Polish"
-msgstr "波兰语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:60
-msgid "Polish deadkeys"
-msgstr "波兰语哑键"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:61
-msgid "Portugal"
-msgstr "葡萄牙"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:62
-msgid "Portugal Deadkeys"
-msgstr "葡萄牙语哑键"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:63
-msgid "Portuguese keymap"
-msgstr "è‘¡è„ç‰™è¯­é”®ç›˜æ˜ å°„"
-
-#: ../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
-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
-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
-msgid "Right Win-key changes layout."
-msgstr "右 Windows 键更改布局。"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:68
-msgid "Russian Cyrillic"
-msgstr "俄国西里尔文"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:69
-msgid "Russian keymap"
-msgstr "ä¿„è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:70
-msgid "Serbian keymap"
-msgstr "å¡žå°”ç»´äºšè¯­é”®ç›˜æ˜ å°„"
-
-#: ../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 更改布局。"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:72
-msgid "Slovak keymap"
-msgstr "æ–¯æ´›ä¼å…‹è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:73
-msgid "Slovenian"
-msgstr "斯洛文尼亚语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:74
-msgid "Slovenian keymap"
-msgstr "æ–¯æ´›æ–‡å°¼äºšè¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:75
-msgid "Spanish keymap"
-msgstr "è¥¿ç­ç‰™è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:76
-msgid "Sun (!not PC!) type5 Hungarian latin 2"
-msgstr "Sun (!非 PC!) type5 匈牙利语拉丁 2"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:77
-msgid "Swedish"
-msgstr "瑞典语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:78
-msgid "Swedish keymap"
-msgstr "ç‘žå…¸è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:79
-msgid "Swiss keymap"
-msgstr "ç‘žå£«é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:80
-msgid "Thai"
-msgstr "泰语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:81
-msgid "Thai Kedmanee"
-msgstr "泰国凯德曼尼语"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:82
-msgid "Thai keymap"
-msgstr "æ³°è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:83
-msgid "Turkish \"F\" keyboard"
-msgstr "土耳其语“F”键盘"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:84
-msgid "Turkish \"Q\" keyboard"
-msgstr "土耳其语“Q”键盘"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:85
-msgid "Turkish keymap"
-msgstr "åœŸè€³å…¶è¯­é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:86
-msgid "UK 105-key"
-msgstr "UK 105 é”®"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:87
-msgid "UK PC/AT keyboard"
-msgstr "英国 PC/AT 键盘"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:88
-msgid "US 101-key keyboard"
-msgstr "UK 101 键键盘"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:89
-msgid "US 105-key keyboard (with windows keys)"
-msgstr "美国 105 键键盘(带有 Windows 键)"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:90
-msgid "US 84-key"
-msgstr "美国 84 键"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:91
-msgid "US DEC 450"
-msgstr "美国 DEC 450"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:92
-msgid "US IBM RS/6000"
-msgstr "美国 IBM RS/6000"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:93
-msgid "US International"
-msgstr "美国国际"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:94
-msgid "US Macintosh"
-msgstr "美国麦金托什"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:95
-msgid "US PC/AT 101 keyboard"
-msgstr "美国 PC/AT 101 键盘"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:96
-msgid "US Silicon Graphics 101-key"
-msgstr "美国 Silicon Graphics 101 键"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:97
-msgid "US Sun type5"
-msgstr "美国 Sun type5"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:3
-msgid "Armenian Sun keymap"
-msgstr "亚美尼亚语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:4
-msgid "Azerbaijani Turkish Sun keymap"
-msgstr "阿塞拜疆土耳其语土耳其 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:5
-msgid "Belarusian Sun keymap"
-msgstr "白俄罗斯语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:9
-msgid "Brazil Portuguese Sun USB keymap"
-msgstr "巴西葡萄牙语 Sun USB é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:10
-msgid "Brazil Portuguese Sun keymap"
-msgstr "巴西葡萄牙语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:11
-msgid "British Sun Type-4 keymap"
-msgstr "英国 Sun Type-4 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:12
-msgid "British Sun USB keymap"
-msgstr "英国 Sun USB é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:13
-msgid "British Sun keymap"
-msgstr "英国 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:14
-msgid "Bulgarian Sun keymap"
-msgstr "ä¿åŠ åˆ©äºšè¯­ Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:15
-msgid "Canadian Sun keymap"
-msgstr "åŠ æ‹¿å¤§ Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:18
-msgid "Czech Sun keymap"
-msgstr "捷克 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:19
-msgid "Danish Sun Type-4 keymap"
-msgstr "丹麦语 Sun Type-4 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:20
-msgid "Danish Sun USB keymap"
-msgstr "丹麦语 Sun USB é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:21
-msgid "Danish Sun keymap"
-msgstr "丹麦语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:22
-msgid "Dutch Sun keymap"
-msgstr "荷兰语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:23
-msgid "Estonian Sun keymap"
-msgstr "爱沙尼亚语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:24
-msgid "Finnish Sun keymap"
-msgstr "芬兰语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:25
-msgid "French Sun USB keymap"
-msgstr "法语 Sun USB é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:26
-msgid "French Sun keymap"
-msgstr "法语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:28
-msgid "German Sun Type-4 keymap"
-msgstr "德语 Sun Type-4 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:29
-msgid "German Sun USB keymap"
-msgstr "德语 Sun USB é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:30
-msgid "German Sun keymap"
-msgstr "德语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:31
-msgid "Hebrew Sun keymap"
-msgstr "希伯来语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:32
-msgid "Hungarian latin2 Sun keymap"
-msgstr "匈牙利语拉丁 2 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:33
-msgid "Hungarian type5 latin 1 keymap"
-msgstr "匈牙利语 type5 拉丁 1 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:34
-msgid "Icelandic Sun keymap"
-msgstr "冰岛语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:35
-msgid "Italian Sun Type-4 keymap"
-msgstr "意大利语 Sun Type-4 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:36
-msgid "Italian Sun USB keymap"
-msgstr "意大利语 Sun USB é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:37
-msgid "Italian Sun keymap"
-msgstr "意大利语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:38
-msgid "Japanese Sun Type-4 keymap"
-msgstr "日语 Sun Type-4 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:39
-msgid "Japanese Sun keymap"
-msgstr "日语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:40
-msgid "Latvian Sun keymap"
-msgstr "拉脱维亚 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:46
-msgid "Lithuanian Sun keymap"
-msgstr "立陶宛语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:47
-msgid "Macedonian Sun keymap"
-msgstr "马其顿语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:49
-msgid "Norwegian Sun keymap"
-msgstr "挪威语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:50
-msgid "Polish Sun keymap"
-msgstr "波兰语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:51
-msgid "Portuguese Sun Type-4 keymap"
-msgstr "葡萄牙语 Sun Type-4 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:52
-msgid "Portuguese Sun keymap"
-msgstr "葡萄牙语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:57
-msgid "Romanian Sun keymap"
-msgstr "罗马尼亚语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:58
-msgid "Russian Sun keymap"
-msgstr "俄语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:59
-msgid "Serbian Sun standard keymap"
-msgstr "塞尔维亚语 Sun æ ‡å‡†é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:61
-msgid "Slovak Sun keymap"
-msgstr "斯洛伐克语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:62
-msgid "Slovenian Sun keymap"
-msgstr "斯洛文尼亚语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:63
-msgid "Spanish Sun Type-4 keymap"
-msgstr "西班牙语 Sun Type-4 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:64
-msgid "Spanish Sun USB keymap"
-msgstr "西班牙语 Sun USB é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:65
-msgid "Spanish Sun keymap"
-msgstr "西班牙语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:66
-msgid "Swedish Sun Type-4 keymap"
-msgstr "瑞典语 Sun Type-4 é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:67
-msgid "Swedish Sun USB keymap"
-msgstr "瑞典语 Sun USB é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:68
-msgid "Swedish Sun keymap"
-msgstr "瑞典语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:69
-msgid "Swiss German Sun keymap"
-msgstr "瑞士德语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:70
-msgid "Thai Sun keymap"
-msgstr "泰语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:71
-msgid "Turkish Sun keymap"
-msgstr "土耳其语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:72
-msgid "US Sun Type-4 keymap"
-msgstr "美国 Sun Type-4 键盘"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:73
-msgid "US Sun USB keymap"
-msgstr "美国 Sun USB 键盘"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:74
-msgid "US Sun type5 keymap"
-msgstr "美国 Sun type5 键盘"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:75
-msgid "Ukrainian Sun keymap"
-msgstr "乌克兰语 Sun é”®ç›˜æ˜ å°„"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:76
-msgid "Vietnamese Sun keymap"
-msgstr "越南语 Sun é”®ç›˜æ˜ å°„"
-
 #: ../gweather/gweather-about.c:50
 msgid "© 1999-2005 by S. Papadimitriou and others"
 msgstr "(c)1999-2005 S. Papadimitriou 和其他人"
@@ -1491,24 +876,24 @@ msgstr "用于监视本地天气情况的面板小程序。"
 msgid "_Details"
 msgstr "细节(_D)"
 
-#: ../gweather/gweather-applet.c:118 ../gweather/gweather-dialog.c:215
+#: ../gweather/gweather-applet.c:118 ../gweather/gweather-dialog.c:157
 msgid "_Update"
 msgstr "æ›´æ–°(_U)"
 
-#: ../gweather/gweather-applet.c:329
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4
+#: ../gweather/gweather-applet.c:318
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
 msgid "Weather Report"
 msgstr "气象报告"
 
-#: ../gweather/gweather-applet.c:347 ../gweather/gweather-applet.c:351
+#: ../gweather/gweather-applet.c:336 ../gweather/gweather-applet.c:340
 msgid "GNOME Weather"
 msgstr "GNOME 天气"
 
-#: ../gweather/gweather-applet.c:452
+#: ../gweather/gweather-applet.c:439
 msgid "Weather Forecast"
 msgstr "天气预报"
 
-#: ../gweather/gweather-applet.c:464
+#: ../gweather/gweather-applet.c:451
 #, c-format
 msgid ""
 "City: %s\n"
@@ -1519,137 +904,138 @@ msgstr ""
 "天气：%s\n"
 "温度：%s"
 
-#: ../gweather/gweather-applet.c:513
+#: ../gweather/gweather-applet.c:500
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../gweather/gweather-dialog.c:213
+#: ../gweather/gweather-dialog.c:155
 msgid "Details"
 msgstr "细节"
 
-#: ../gweather/gweather-dialog.c:255
+#: ../gweather/gweather-dialog.c:196
 msgid "City:"
 msgstr "城市："
 
-#: ../gweather/gweather-dialog.c:263
+#: ../gweather/gweather-dialog.c:204
 msgid "Last update:"
 msgstr "上次更新："
 
-#: ../gweather/gweather-dialog.c:271
+#: ../gweather/gweather-dialog.c:212
 msgid "Conditions:"
 msgstr "状况："
 
-#: ../gweather/gweather-dialog.c:279
+#: ../gweather/gweather-dialog.c:220
 msgid "Sky:"
 msgstr "天空："
 
-#: ../gweather/gweather-dialog.c:287
+#: ../gweather/gweather-dialog.c:228
 msgid "Temperature:"
 msgstr "温度："
 
-#: ../gweather/gweather-dialog.c:295
+#: ../gweather/gweather-dialog.c:236
 msgid "Feels like:"
 msgstr "体感："
 
-#: ../gweather/gweather-dialog.c:303
+#: ../gweather/gweather-dialog.c:244
 msgid "Dew point:"
 msgstr "露点："
 
-#: ../gweather/gweather-dialog.c:311
+#: ../gweather/gweather-dialog.c:252
 msgid "Relative humidity:"
 msgstr "相对湿度："
 
-#: ../gweather/gweather-dialog.c:319
+#: ../gweather/gweather-dialog.c:260
 msgid "Wind:"
 msgstr "风："
 
-#: ../gweather/gweather-dialog.c:327
+#: ../gweather/gweather-dialog.c:268
 msgid "Pressure:"
 msgstr "气压："
 
-#: ../gweather/gweather-dialog.c:335
+#: ../gweather/gweather-dialog.c:276
 msgid "Visibility:"
 msgstr "能见度："
 
-#: ../gweather/gweather-dialog.c:343
+#: ../gweather/gweather-dialog.c:284
 msgid "Sunrise:"
 msgstr "日出："
 
-#: ../gweather/gweather-dialog.c:351
+#: ../gweather/gweather-dialog.c:292
 msgid "Sunset:"
 msgstr "日落："
 
-#: ../gweather/gweather-dialog.c:485
+#: ../gweather/gweather-dialog.c:426
 msgid "Current Conditions"
 msgstr "当前状况"
 
-#: ../gweather/gweather-dialog.c:502
+#: ../gweather/gweather-dialog.c:441
 msgid "Forecast Report"
 msgstr "预报"
 
-#: ../gweather/gweather-dialog.c:502
+#: ../gweather/gweather-dialog.c:441
 msgid "See the ForeCast Details"
 msgstr "查看预报详情"
 
-#: ../gweather/gweather-dialog.c:512
+#: ../gweather/gweather-dialog.c:451
 msgid "Forecast"
 msgstr "预报"
 
-#: ../gweather/gweather-dialog.c:520
+#: ../gweather/gweather-dialog.c:457
 msgid "Radar Map"
 msgstr "雷达图"
 
-#: ../gweather/gweather-dialog.c:551
+#. XXX: weather.com? is this an advert?
+#: ../gweather/gweather-dialog.c:489
 msgid "_Visit Weather.com"
 msgstr "浏览 Weather.com(_V)"
 
-#: ../gweather/gweather-dialog.c:552
+#: ../gweather/gweather-dialog.c:490
 msgid "Visit Weather.com"
 msgstr "浏览 Weather.com"
 
-#: ../gweather/gweather-dialog.c:552
+#: ../gweather/gweather-dialog.c:490
 msgid "Click to Enter Weather.com"
 msgstr "点击进入 Weather.com"
 
-#: ../gweather/gweather-dialog.c:637
+#: ../gweather/gweather-dialog.c:573
 msgid "Forecast not currently available for this location."
 msgstr "此地点目前没有预报。"
 
 #. Accessible Name and Description for the components in Preference Dialog
-#: ../gweather/gweather-pref.c:171
+#: ../gweather/gweather-pref.c:130
 msgid "Location view"
 msgstr "位置视图"
 
-#: ../gweather/gweather-pref.c:171
+#: ../gweather/gweather-pref.c:130
 msgid "Select Location from the list"
 msgstr "从列表中选择位置"
 
-#: ../gweather/gweather-pref.c:172
+#: ../gweather/gweather-pref.c:131
 msgid "Update spin button"
 msgstr "更新旋转按钮"
 
-#: ../gweather/gweather-pref.c:172
+#: ../gweather/gweather-pref.c:131
 msgid "Spinbutton for updating"
 msgstr "用于更新的旋转按钮"
 
-#: ../gweather/gweather-pref.c:173
+#: ../gweather/gweather-pref.c:132
 msgid "Address Entry"
 msgstr "地址项"
 
-#: ../gweather/gweather-pref.c:173
+#: ../gweather/gweather-pref.c:132
 msgid "Enter the URL"
 msgstr "输入 URL"
 
-#: ../gweather/gweather-pref.c:315
+#: ../gweather/gweather-pref.c:298
 msgid ""
 "Failed to load the Locations XML database.  Please report this as a bug."
 msgstr "装入位置 XML 数据库失败。请报告此错误。"
 
-#: ../gweather/gweather-pref.c:805
+#: ../gweather/gweather-pref.c:676
 msgid "Weather Preferences"
 msgstr "天气首选项"
 
-#: ../gweather/gweather-pref.c:836 ../gweather/gweather-pref.c:1021
+#: ../gweather/gweather-pref.c:707 ../gweather/gweather-pref.c:868
 msgid "_Automatically update every:"
 msgstr "自动更新的间隔(_A)："
 
@@ -1657,477 +1043,612 @@ msgstr "自动更新的间隔(_A)："
 #. * Units settings page.
 #.
 #. Temperature Unit
-#: ../gweather/gweather-pref.c:849
+#: ../gweather/gweather-pref.c:718
 msgid "_Temperature unit:"
 msgstr "温度单位(_T)："
 
-#: ../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:859
+#: ../gweather/gweather-pref.c:727
 msgid "Kelvin"
 msgstr "开尔文"
 
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../gweather/gweather-pref.c:861
+#: ../gweather/gweather-pref.c:729
 msgid "Celsius"
 msgstr "摄氏度"
 
-#: ../gweather/gweather-pref.c:862
+#: ../gweather/gweather-pref.c:730
 msgid "Fahrenheit"
 msgstr "华氏度"
 
 #. Speed Unit
-#: ../gweather/gweather-pref.c:869
+#: ../gweather/gweather-pref.c:734
 msgid "_Wind speed unit:"
 msgstr "风速单位(_W)："
 
 #. TRANSLATOR: The wind speed unit "meters per second"
-#: ../gweather/gweather-pref.c:880
+#: ../gweather/gweather-pref.c:744
 msgid "m/s"
 msgstr "m/s"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../gweather/gweather-pref.c:882
+#: ../gweather/gweather-pref.c:746
 msgid "km/h"
 msgstr "km/h"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../gweather/gweather-pref.c:884
+#: ../gweather/gweather-pref.c:748
 msgid "mph"
 msgstr "mph"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../gweather/gweather-pref.c:886
+#: ../gweather/gweather-pref.c:750
 msgid "knots"
 msgstr "节"
 
-#: ../gweather/gweather-pref.c:888
+#: ../gweather/gweather-pref.c:752
 msgid "Beaufort scale"
 msgstr "蒲福级"
 
 #. Pressure Unit
-#: ../gweather/gweather-pref.c:895
+#: ../gweather/gweather-pref.c:756
 msgid "_Pressure unit:"
 msgstr "气压单位(_P)："
 
 #. TRANSLATOR: The pressure unit "kiloPascals"
-#: ../gweather/gweather-pref.c:906
+#: ../gweather/gweather-pref.c:766
 msgid "kPa"
 msgstr "千帕"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../gweather/gweather-pref.c:908
+#: ../gweather/gweather-pref.c:768
 msgid "hPa"
 msgstr "百帕"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../gweather/gweather-pref.c:910
+#: ../gweather/gweather-pref.c:770
 msgid "mb"
 msgstr "mb"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../gweather/gweather-pref.c:912
+#: ../gweather/gweather-pref.c:772
 msgid "mmHg"
 msgstr "mmHg"
 
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../gweather/gweather-pref.c:914
+#: ../gweather/gweather-pref.c:774
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../gweather/gweather-pref.c:916
+#: ../gweather/gweather-pref.c:776
 msgid "atm"
 msgstr "大气压"
 
 #. Distance Unit
-#: ../gweather/gweather-pref.c:923
+#: ../gweather/gweather-pref.c:780
 msgid "_Visibility unit:"
 msgstr "能见度单位(_V)："
 
 #. TRANSLATOR: The distance unit "meters"
-#: ../gweather/gweather-pref.c:934
+#: ../gweather/gweather-pref.c:790
 msgid "meters"
 msgstr "ç±³"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../gweather/gweather-pref.c:936
+#: ../gweather/gweather-pref.c:792
 msgid "km"
 msgstr "千米"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../gweather/gweather-pref.c:938
+#: ../gweather/gweather-pref.c:794
 msgid "miles"
 msgstr "英里"
 
-#: ../gweather/gweather-pref.c:972
+#: ../gweather/gweather-pref.c:825
 msgid "Enable _radar map"
 msgstr "启用雷达图(_R)"
 
-#: ../gweather/gweather-pref.c:986
+#: ../gweather/gweather-pref.c:837
 msgid "Use _custom address for radar map"
 msgstr "对雷达图使用自定义地址(_C)"
 
-#: ../gweather/gweather-pref.c:1003
+#: ../gweather/gweather-pref.c:852
 msgid "A_ddress:"
 msgstr "地址(_D)："
 
-#: ../gweather/gweather-pref.c:1017
+#: ../gweather/gweather-pref.c:864
 msgid "Update"
 msgstr "æ›´æ–°"
 
-#: ../gweather/gweather-pref.c:1041
+#: ../gweather/gweather-pref.c:888
 msgid "minutes"
 msgstr "分钟"
 
-#: ../gweather/gweather-pref.c:1057
+#: ../gweather/gweather-pref.c:900
 msgid "Display"
 msgstr "显示"
 
-#: ../gweather/gweather-pref.c:1072
-#: ../mini-commander/src/mini-commander.ui.h:9
+#: ../gweather/gweather-pref.c:915
+#: ../mini-commander/src/mini-commander.ui.h:12
 msgid "General"
 msgstr "常规"
 
-#: ../gweather/gweather-pref.c:1085
+#: ../gweather/gweather-pref.c:928
 msgid "_Select a location:"
 msgstr "选择位置(_S)："
 
-#: ../gweather/gweather-pref.c:1110
+#: ../gweather/gweather-pref.c:953
 msgid "_Find:"
 msgstr "查找(_F)："
 
-#: ../gweather/gweather-pref.c:1117
+#: ../gweather/gweather-pref.c:960
 msgid "Find _Next"
 msgstr "查找下一个(_N)"
 
-#: ../gweather/gweather-pref.c:1139
+#: ../gweather/gweather-pref.c:978
 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.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "自动更新数据"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:2
+msgid ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
+msgstr "决定小程序是否自动更新天气数据。"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "æ›´æ–°é—´éš”"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "自动更新之间相隔的秒数"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:5
+msgid "Display radar map"
+msgstr "显示雷达图"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:6
+msgid "Fetch a radar map on each update."
+msgstr "每次更新时获取雷达图。"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:7
+msgid "Show notification"
+msgstr "显示通知"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:8
+msgid "Show notifications for critical weather conditions"
+msgstr "显示恶劣天气条件的预警通知"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:9
+msgid "Show detailed forecast"
+msgstr "显示详细预报"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:10
+msgid "If true, additional details about weather will be downloaded and shown."
+msgstr "如果为 true，将下载并显示额外的天气信息细节。"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1
 msgid "Gweather Applet Factory"
 msgstr "Gweather 小程序工厂"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2
+msgid "Factory for creating the weather applet."
+msgstr "用于创建天气小程序的工厂。"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4
 msgid "Monitor the current weather conditions, and forecasts"
 msgstr "当前气象条件和气象预报监视器"
 
-#: ../invest-applet/data/Invest_Applet.server.in.in.h:1
+#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:1
+msgid "Invest Applet Factory"
+msgstr "Invest 小程序工厂"
+
+#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:2
+msgid "Factory for creating the invest applet."
+msgstr "用于创建 invest 小程序的工厂。"
+
+#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:3
 #: ../invest-applet/invest/about.py:17
 msgid "Invest"
 msgstr "投资"
 
-#: ../invest-applet/data/Invest_Applet.server.in.in.h:2
+#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:4
 #: ../invest-applet/invest/about.py:20
 msgid "Track your invested money."
 msgstr "跟踪您的投资。"
 
-#: ../invest-applet/data/Invest_Applet.xml.h:4
-msgid "_Refresh"
-msgstr "刷新(_R)"
-
 #: ../invest-applet/data/financialchart.ui.h:1
-msgid "1 Year"
-msgstr "一年"
+#: ../invest-applet/invest/chart.py:112
+msgid "Financial Chart"
+msgstr "金融图表"
 
 #: ../invest-applet/data/financialchart.ui.h:2
-msgid "10"
-msgstr "10"
+msgid "_Ticker symbol: "
+msgstr "股票行情自动收录器符号(_T)："
 
 #: ../invest-applet/data/financialchart.ui.h:3
-msgid "100"
-msgstr "100"
+msgid "Auto _refresh"
+msgstr "自动刷新(_R)"
 
 #: ../invest-applet/data/financialchart.ui.h:4
-msgid "20"
-msgstr "20"
+msgid "Today"
+msgstr "今天"
 
 #: ../invest-applet/data/financialchart.ui.h:5
-msgid "200"
-msgstr "200"
+msgid "5 Days"
+msgstr "五天"
 
 #: ../invest-applet/data/financialchart.ui.h:6
 msgid "3 Months"
 msgstr "三个月"
 
 #: ../invest-applet/data/financialchart.ui.h:7
-msgid "5"
-msgstr "5"
+msgid "6 Months"
+msgstr "六个月"
 
 #: ../invest-applet/data/financialchart.ui.h:8
-msgid "5 Days"
-msgstr "五天"
+msgid "1 Year"
+msgstr "一年"
 
 #: ../invest-applet/data/financialchart.ui.h:9
 msgid "5 Years"
 msgstr "5å¹´"
 
 #: ../invest-applet/data/financialchart.ui.h:10
-msgid "50"
-msgstr "50"
+msgid "Maximum"
+msgstr "最大"
 
 #: ../invest-applet/data/financialchart.ui.h:11
-msgid "6 Months"
-msgstr "六个月"
-
-#: ../invest-applet/data/financialchart.ui.h:12
-msgid "Auto _refresh"
-msgstr "自动刷新(_R)"
-
-#. 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 "布林线"
+msgid "_Graph style: "
+msgstr "å›¾å½¢é£Žæ ¼(_G)："
 
-#: ../invest-applet/data/financialchart.ui.h:15
-msgid "Downloading chart from <b>Yahoo!</b>"
-msgstr "正在从 <b>Yahoo!</b> 下载图表"
+#. see http://biz.yahoo.com/charts/guide11.html and http://en.wikipedia.org/wiki/Moving_average
+#: ../invest-applet/data/financialchart.ui.h:13
+msgid "Moving average: "
+msgstr "移动平均线："
 
 #. 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
+#: ../invest-applet/data/financialchart.ui.h:15
 msgid "Exponential moving average: "
 msgstr "æŒ‡æ•°å¹³å‡æ•°æŒ‡æ ‡ï¼š"
 
-#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator
+#: ../invest-applet/data/financialchart.ui.h:16
+msgid "5"
+msgstr "5"
+
+#: ../invest-applet/data/financialchart.ui.h:17
+msgid "10"
+msgstr "10"
+
+#: ../invest-applet/data/financialchart.ui.h:18
+msgid "20"
+msgstr "20"
+
 #: ../invest-applet/data/financialchart.ui.h:19
-msgid "Fast stoch"
-msgstr "快随机指数"
+msgid "50"
+msgstr "50"
 
 #: ../invest-applet/data/financialchart.ui.h:20
-#: ../invest-applet/invest/chart.py:107
-msgid "Financial Chart"
-msgstr "金融图表"
+msgid "100"
+msgstr "100"
 
-#. 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:21
+msgid "200"
+msgstr "200"
 
-#. 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"
+#. see http://en.wikipedia.org/wiki/Technical_analysis#Overlays
+#: ../invest-applet/data/financialchart.ui.h:23
+msgid "Overlays: "
+msgstr "é‡å¤å ä½æ®µï¼š"
 
-#. 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"
+#. 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:25
+msgid "Bollinger"
+msgstr "布林线"
 
+#. 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:27
-msgid "Maximum"
-msgstr "最大"
+msgid "SAR"
+msgstr "SAR"
 
-#. see http://biz.yahoo.com/charts/guide11.html and http://en.wikipedia.org/wiki/Moving_average
+#. 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:29
-msgid "Moving average: "
-msgstr "移动平均线："
+msgid "Splits"
+msgstr "配股"
 
-#. see http://en.wikipedia.org/wiki/Technical_analysis#Overlays
+#. 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:31
-msgid "Overlays: "
-msgstr "é‡å¤å ä½æ®µï¼š"
+msgid "Volumes"
+msgstr "音量"
 
-#. Please keep this term short. For its meaning, see 
http://en.wikipedia.org/wiki/Rate_of_change_%28technical_analysis%29
+#. 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:33
-msgid "ROC"
-msgstr "ROC"
+msgid "Indicators: "
+msgstr "指示器："
 
 #. 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"
 
-#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide16.html and 
http://en.wikipedia.org/wiki/Parabolic_SAR
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29
 #: ../invest-applet/data/financialchart.ui.h:37
-msgid "SAR"
-msgstr "SAR"
+msgid "Vol"
+msgstr "成交量"
 
-#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Money_flow_index
 #: ../invest-applet/data/financialchart.ui.h:39
-msgid "Slow stoch"
-msgstr "慢随机指数"
+msgid "MFI"
+msgstr "MFI"
 
-#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide6.html and 
http://en.wikipedia.org/wiki/Stock_split
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator
 #: ../invest-applet/data/financialchart.ui.h:41
-msgid "Splits"
-msgstr "配股"
-
-#: ../invest-applet/data/financialchart.ui.h:42
-msgid "Today"
-msgstr "今天"
-
-#. 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 "成交量"
+msgid "Slow stoch"
+msgstr "慢随机指数"
 
 #. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29
-#: ../invest-applet/data/financialchart.ui.h:46
+#: ../invest-applet/data/financialchart.ui.h:43
 msgid "Vol+MA"
 msgstr "Vol+MA"
 
-#. 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 "音量"
+#. 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:45
+msgid "ROC"
+msgstr "ROC"
+
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator
+#: ../invest-applet/data/financialchart.ui.h:47
+msgid "Fast stoch"
+msgstr "快随机指数"
 
 #. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Williams_%25R
-#: ../invest-applet/data/financialchart.ui.h:51
+#: ../invest-applet/data/financialchart.ui.h:50
 #, no-c-format
 msgid "W%R"
 msgstr "W%R"
 
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/MACD
 #: ../invest-applet/data/financialchart.ui.h:52
-msgid "_Graph style: "
-msgstr "å›¾å½¢é£Žæ ¼(_G)："
+msgid "MACD"
+msgstr "MACD"
 
 #: ../invest-applet/data/financialchart.ui.h:53
+msgid "Line"
+msgstr "线"
+
+#: ../invest-applet/data/financialchart.ui.h:54
+msgid "Bar"
+msgstr "柱状"
+
+#: ../invest-applet/data/financialchart.ui.h:55
+msgid "Candle"
+msgstr "蜡烛"
+
+#: ../invest-applet/data/financialchart.ui.h:56
+msgid "Scale: "
+msgstr "刻度："
+
+#: ../invest-applet/data/financialchart.ui.h:57
+msgid "Linear"
+msgstr "线性"
+
+#: ../invest-applet/data/financialchart.ui.h:58
+msgid "Logarithmic"
+msgstr "对数"
+
+#: ../invest-applet/data/financialchart.ui.h:59
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../invest-applet/data/financialchart.ui.h:54
-msgid "_Ticker symbol: "
-msgstr "股票行情自动收录器符号(_T)："
+#: ../invest-applet/data/financialchart.ui.h:60
+msgid "Downloading chart from <b>Yahoo!</b>"
+msgstr "正在从 <b>Yahoo!</b> 下载图表"
 
 #: ../invest-applet/data/prefs-dialog.ui.h:1
+msgid "Invest Preferences"
+msgstr "投资 首选项"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:2
+msgid "label"
+msgstr "æ ‡ç­¾"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:3
+msgid "Stocks"
+msgstr "股票"
+
+#. Instead of adding a single stock to the list of stocks, the 'Add Group' button adds a group (kind of a 
sub folder) to which numerous stocks can be added. A group here refers to a group of stocks.
+#: ../invest-applet/data/prefs-dialog.ui.h:5
+msgctxt " "
+msgid "Add Group"
+msgstr "æ·»åŠ ç¾¤ç»„"
+
+#. An index value (for instance the NASDAQ Composite) is based on a number of stocks. This option allows to 
also show the quotes of the stocks an index is based on.
+#: ../invest-applet/data/prefs-dialog.ui.h:7
+msgid "Show stocks of index values"
+msgstr "显示指数计算依据的股票"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:8
 msgid ""
-"<i><small><b>Note:</b> Quotes are delayed at least 15 minutes.\n"
-"<b>Source: </b> Yahoo!</small></i>"
+"An index value, for instance the <i>NASDAQ Composite</i> (^IXIC), is based "
+"on a number of stocks. This option allows to also show the quotes of the "
+"<i><b>stocks</b></i> an index is based on."
 msgstr ""
-"<i><small><b>注意：</b> 报价延迟了至少 15 分钟。\n"
-"<b>来源：</b> Yahoo!</small></i>"
+"指数，如 <i>NASDAQ Composite</i>(纳斯达克综合指数)是基于若干支股票得到的。此"
+"选项可以同时显示某项指数是基于哪些<i><b>股票</b></i>报价得出的。"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:3
+#: ../invest-applet/data/prefs-dialog.ui.h:9
+msgid "Hide charts in quotes list"
+msgstr "在引用列表中隐藏图表"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:10
+msgid ""
+"A small chart image is shown next to each quote. The retrieval of each chart "
+"image causes network traffic. Hiding charts reduces the network bandwidth "
+"demand significantly."
+msgstr ""
+"在每条报价旁边会显示一个小图。获取这些图表会消耗网络流量。隐藏这些图表会大大"
+"å‡å°‘ç½‘ç»œå¸¦å®½å ç”¨ã€‚"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:11
+msgid ""
+"<i><small><b>Source:</b> <a href=\"http://finance.yahoo.com/\";>Yahoo! "
+"Finance</a> (at least 15 minutes delayed)</small></i>"
+msgstr ""
+"<i><small><b>源：</b> <a href=\"http://finance.yahoo.com/\";>Yahoo! 财经</a> "
+"(至少延迟 15 分钟)</small></i>"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:12
 msgid "Currency"
 msgstr "货币"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:4
-msgid "Invest Preferences"
-msgstr "投资 首选项"
+#: ../invest-applet/data/prefs-dialog.ui.h:13
+msgid ""
+"Type the target currency to which all stock quotes will be converted to."
+msgstr "è¯·è¾“å…¥è¦å°†æ‰€æœ‰è‚¡ç¥¨æŠ¥ä»·è½¬æ¢æˆçš„ç›®æ ‡è´§å¸ã€‚"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:5
-msgid "Stocks"
-msgstr "股票"
+#. name, stock_id, label, accellerator, tooltip, callback
+#: ../invest-applet/invest/applet.py:24
+msgid "About"
+msgstr "关于"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:6
-msgid "label"
-msgstr "æ ‡ç­¾"
+#: ../invest-applet/invest/applet.py:25
+msgid "Help"
+msgstr "帮助"
+
+#: ../invest-applet/invest/applet.py:26
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../invest-applet/invest/applet.py:27
+msgid "Refresh"
+msgstr "刷新"
 
 #. a) We aren't configured yet
-#: ../invest-applet/invest/applet.py:50
+#: ../invest-applet/invest/applet.py:60
 msgid "<b>You have not entered any stock information yet</b>"
 msgstr "<b>ä½ è¿˜æ²¡æœ‰è¾“å…¥ä»»ä½•è‚¡ç¥¨ä¿¡æ¯</b>"
 
-#: ../invest-applet/invest/applet.py:55
+#: ../invest-applet/invest/applet.py:65
 msgid "<b>No stock quotes are currently available</b>"
 msgstr "<b>目前没有股票报价</b>"
 
-#: ../invest-applet/invest/applet.py:56
+#: ../invest-applet/invest/applet.py:66
 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
+#: ../invest-applet/invest/chart.py:161
 #, python-format
 msgid "Financial Chart - %s"
 msgstr "金融图表 - %s"
 
-#: ../invest-applet/invest/chart.py:223
+#: ../invest-applet/invest/chart.py:228
 msgid "Opening Chart"
 msgstr "打开图表"
 
-#: ../invest-applet/invest/chart.py:238
+#: ../invest-applet/invest/chart.py:243
 msgid "Chart downloaded"
 msgstr "图表已下载"
 
-#: ../invest-applet/invest/chart.py:240
+#: ../invest-applet/invest/chart.py:245
 msgid "Chart could not be downloaded"
 msgstr "æ— æ³•ä¸‹è½½å›¾è¡¨"
 
-#: ../invest-applet/invest/invest-applet.py:41
-msgid "Invest Applet"
-msgstr "投资小程序"
-
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Symbol"
 msgstr "ä»£ç "
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Label"
 msgstr "æ ‡ç­¾"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Amount"
 msgstr "总量"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Price"
 msgstr "ä»·æ ¼"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Commission"
 msgstr "交易"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Currency Rate"
 msgstr "汇率"
 
-#: ../invest-applet/invest/quotes.py:131
+#: ../invest-applet/invest/preferences.py:244
+msgid "Stock Group"
+msgstr "股票组"
+
+#. translators: Asks the user to confirm deletion of a group of stocks
+#: ../invest-applet/invest/preferences.py:269
+msgid "Delete entire stock group?"
+msgstr "åˆ é™¤æ•´ä¸ªè‚¡ç¥¨ç»„ï¼Ÿ"
+
+#. translators: stocks can be grouped together into a "stock group".
+#. The user wants to delete a group, but the group still contains stocks.
+#. By deleting the group, also all stocks will be removed from configuration
+#: ../invest-applet/invest/preferences.py:277
+msgid ""
+"This removes all stocks contained in this stock group!\n"
+"Do you really want to remove this stock group?"
+msgstr ""
+"这将移除此股票组中包含的所有股票！\n"
+"您真的想移除此股票组吗？"
+
+#: ../invest-applet/invest/quotes.py:284
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "æŠ•èµ„å°ç¨‹åºæ— æ³•è¿žæŽ¥åˆ° Yahoo! 财经"
 
-#. 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:153
+#: ../invest-applet/invest/quotes.py:327
 #, 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:162
+#: ../invest-applet/invest/quotes.py:336
 #, python-format
 msgid "Positions balance: %s %s (%s)"
 msgstr "坐位平衡：%s %s (%s)"
 
+#: ../invest-applet/invest/quotes.py:338
+#, python-format
+msgid "Updated at %s"
+msgstr "于 %s 更新"
+
 #. model: SYMBOL, LABEL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB
 #. Translators: these words all refer to a stock. Last is short
 #. for "last price". Gain is referring to the gain since the
 #. stock was purchased.
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Ticker"
 msgstr "股票行情自动收录器"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Last"
 msgstr "最近"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Change %"
 msgstr "变动 %"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Chart"
 msgstr "图表"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Gain"
 msgstr "收益"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Gain %"
 msgstr "收益百分比"
 
@@ -2146,20 +1667,20 @@ msgid ""
 msgstr ""
 "æ­¤ GNOME å°ç¨‹åºåœ¨é¢æ¿ä¸­æ·»åŠ ä¸€ä¸ªå‘½ä»¤è¡Œã€‚å®ƒæ”¯æŒå‘½ä»¤è¡¥å…¨ã€å‘½ä»¤åŽ†å²å’Œå¯æ›´æ”¹çš„å®ã€‚"
 
-#: ../mini-commander/src/command_line.c:345
+#: ../mini-commander/src/command_line.c:362
 msgid "No items in history"
 msgstr "åŽ†å²ä¸­æ— é¡¹ç›®"
 
 #. build file select dialog
-#: ../mini-commander/src/command_line.c:469
+#: ../mini-commander/src/command_line.c:488
 msgid "Start program"
 msgstr "启动程序"
 
-#: ../mini-commander/src/command_line.c:522
+#: ../mini-commander/src/command_line.c:541
 msgid "Command line"
 msgstr "命令行"
 
-#: ../mini-commander/src/command_line.c:523
+#: ../mini-commander/src/command_line.c:542
 msgid "Type a command here and Gnome will execute it for you"
 msgstr "在此键入命令让 GNOME 执行"
 
@@ -2199,181 +1720,197 @@ msgid "Error syncing config data: %s"
 msgstr "同步配置数据时出错：%s"
 
 #: ../mini-commander/src/mini-commander-global.schemas.in.h:1
-msgid "List of GConfValue entries containing strings for the macro commands."
-msgstr "列出包含宏命令字符串的 GConfValue 项。"
+#: ../mini-commander/src/mini-commander.schemas.in.h:26
+msgid "Macro pattern list"
+msgstr "宏模式列表"
 
 #: ../mini-commander/src/mini-commander-global.schemas.in.h:2
 msgid "List of GConfValue entries containing strings for the macro patterns."
 msgstr "列出包含宏模式字符串的 GConfValue 项。"
 
 #: ../mini-commander/src/mini-commander-global.schemas.in.h:3
-#: ../mini-commander/src/mini-commander.schemas.in.h:10
+#: ../mini-commander/src/mini-commander.schemas.in.h:28
 msgid "Macro command list"
 msgstr "宏命令列表"
 
 #: ../mini-commander/src/mini-commander-global.schemas.in.h:4
-#: ../mini-commander/src/mini-commander.schemas.in.h:11
-msgid "Macro pattern list"
-msgstr "宏模式列表"
+msgid "List of GConfValue entries containing strings for the macro commands."
+msgstr "列出包含宏命令字符串的 GConfValue 项。"
 
 #: ../mini-commander/src/mini-commander.ui.h:1
-msgid "Add New Macro"
-msgstr "æ·»åŠ æ–°å®"
+msgid "Command Line Preferences"
+msgstr "命令行首选项"
 
 #: ../mini-commander/src/mini-commander.ui.h:2
 msgid "Auto Completion"
 msgstr "自动完成"
 
 #: ../mini-commander/src/mini-commander.ui.h:3
-msgid "Co_mmand:"
-msgstr "命令(_M)："
+msgid "E_nable history-based auto completion"
+msgstr "启用基于历史的自动补全(_N)"
 
-#: ../mini-commander/src/mini-commander.ui.h:4 ../multiload/properties.c:569
-msgid "Colors"
-msgstr "颜色"
+#: ../mini-commander/src/mini-commander.ui.h:4
+msgid "Size"
+msgstr "大小"
 
 #: ../mini-commander/src/mini-commander.ui.h:5
-msgid "Command Line Preferences"
-msgstr "命令行首选项"
+#: ../stickynotes/stickynotes.ui.h:19
+msgid "_Width:"
+msgstr "宽度(_W)："
 
-#: ../mini-commander/src/mini-commander.ui.h:6
-msgid "Command line _background:"
-msgstr "命令行背景(_B)："
+#: ../mini-commander/src/mini-commander.ui.h:6 ../multiload/properties.c:524
+msgid "pixels"
+msgstr "åƒç´ "
 
-#: ../mini-commander/src/mini-commander.ui.h:7
-msgid "Command line _foreground:"
-msgstr "命令行前景(_F)："
+#: ../mini-commander/src/mini-commander.ui.h:7 ../multiload/properties.c:569
+msgid "Colors"
+msgstr "颜色"
 
 #: ../mini-commander/src/mini-commander.ui.h:8
-msgid "E_nable history-based auto completion"
-msgstr "启用基于历史的自动补全(_N)"
+msgid "_Use default theme colors"
+msgstr "使用默认主题颜色(_U)"
+
+#: ../mini-commander/src/mini-commander.ui.h:9
+msgid "Command line _foreground:"
+msgstr "命令行前景(_F)："
 
 #: ../mini-commander/src/mini-commander.ui.h:10
-msgid "Macros"
-msgstr "宏"
+msgid "Command line _background:"
+msgstr "命令行背景(_B)："
 
 #: ../mini-commander/src/mini-commander.ui.h:11
 msgid "Pick a color"
 msgstr "选择一种颜色"
 
-#: ../mini-commander/src/mini-commander.ui.h:12
-msgid "Size"
-msgstr "大小"
-
 #: ../mini-commander/src/mini-commander.ui.h:13
+msgid "_Macros:"
+msgstr "宏(_M)："
+
+#: ../mini-commander/src/mini-commander.ui.h:14
 msgid "_Add Macro..."
 msgstr "æ·»åŠ å®(_A)..."
 
-#: ../mini-commander/src/mini-commander.ui.h:14
+#: ../mini-commander/src/mini-commander.ui.h:15
 msgid "_Delete Macro"
 msgstr "åˆ é™¤å®(_D)"
 
-#: ../mini-commander/src/mini-commander.ui.h:15
-msgid "_Macros:"
-msgstr "宏(_M)："
-
 #: ../mini-commander/src/mini-commander.ui.h:16
-msgid "_Pattern:"
-msgstr "图案(_P)："
+msgid "Macros"
+msgstr "宏"
 
 #: ../mini-commander/src/mini-commander.ui.h:17
-msgid "_Use default theme colors"
-msgstr "使用默认主题颜色(_U)"
+msgid "Add New Macro"
+msgstr "æ·»åŠ æ–°å®"
 
 #: ../mini-commander/src/mini-commander.ui.h:18
-#: ../stickynotes/stickynotes.ui.h:46
-msgid "_Width:"
-msgstr "宽度(_W)："
+msgid "_Pattern:"
+msgstr "图案(_P)："
 
-#: ../mini-commander/src/mini-commander.ui.h:19 ../multiload/properties.c:524
-msgid "pixels"
-msgstr "åƒç´ "
+#: ../mini-commander/src/mini-commander.ui.h:19
+msgid "Co_mmand:"
+msgstr "命令(_M)："
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:1
-msgid "Attempt to autocomplete a command from the history of commands entered."
-msgstr "è¯•å›¾æ ¹æ®è¾“å…¥çš„å‘½ä»¤åŽ†å²è‡ªåŠ¨ä¸å…¨å‘½ä»¤ã€‚"
+msgid "Show handle"
+msgstr "显示手柄"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:2
-msgid "Background color, blue component"
-msgstr "背景颜色，蓝色分量"
+msgid "Show a handle so the applet can be detached from the panel."
+msgstr "æ˜¾ç¤ºæ‰‹æŸ„ï¼Œè¿™æ ·å°ç¨‹åºå°±èƒ½ä»Žé¢æ¿ä¸­æ¼‚ç§»å‡ºæ¥ã€‚"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:3
-msgid "Background color, green component"
-msgstr "背景颜色，绿色分量"
+msgid "Show frame"
+msgstr "显示边框"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:4
-msgid "Background color, red component"
-msgstr "背景颜色，红色分量"
+msgid "Show a frame surrounding the applet."
+msgstr "在小程序周围显示边框。"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:5
-msgid "Foreground color, blue component"
-msgstr "前景颜色，蓝色分量"
+msgid "Perform history autocompletion"
+msgstr "执行历史的自动补全"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:6
-msgid "Foreground color, green component"
-msgstr "前景颜色，绿色分量"
+msgid "Attempt to autocomplete a command from the history of commands entered."
+msgstr "è¯•å›¾æ ¹æ®è¾“å…¥çš„å‘½ä»¤åŽ†å²è‡ªåŠ¨ä¸å…¨å‘½ä»¤ã€‚"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:7
-msgid "Foreground color, red component"
-msgstr "前景颜色，红色分量"
+msgid "Width"
+msgstr "宽度"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:8
-msgid "History list"
-msgstr "历史列表"
+msgid "Width of the applet"
+msgstr "小程序的宽度"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:9
-msgid "List of GConfValue entries containing strings for history entries."
-msgstr "列出包含历史项字符串的 GConfValue 项。"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:12
 msgid "Not used anymore"
 msgstr "不再使用"
 
+#: ../mini-commander/src/mini-commander.schemas.in.h:10
+msgid "Use the default theme colors"
+msgstr "使用默认主题颜色"
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:11
+msgid "Use theme colors instead of custom ones."
+msgstr "使用主题颜色，而非自定义颜色。"
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:12
+msgid "Foreground color, red component"
+msgstr "前景颜色，红色分量"
+
 #: ../mini-commander/src/mini-commander.schemas.in.h:13
-msgid "Perform history autocompletion"
-msgstr "执行历史的自动补全"
+msgid "The red component of the foreground color."
+msgstr "前景色的红色分量。"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:14
-msgid "Show a frame surrounding the applet."
-msgstr "在小程序周围显示边框。"
+msgid "Foreground color, green component"
+msgstr "前景颜色，绿色分量"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:15
-msgid "Show a handle so the applet can be detached from the panel."
-msgstr "æ˜¾ç¤ºæ‰‹æŸ„ï¼Œè¿™æ ·å°ç¨‹åºå°±èƒ½ä»Žé¢æ¿ä¸­æ¼‚ç§»å‡ºæ¥ã€‚"
+msgid "The green component of the foreground color."
+msgstr "前景色的绿色分量。"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:16
-msgid "Show frame"
-msgstr "显示边框"
+msgid "Foreground color, blue component"
+msgstr "前景颜色，蓝色分量"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:17
-msgid "Show handle"
-msgstr "显示手柄"
+msgid "The blue component of the foreground color."
+msgstr "前景色的蓝色分量。"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:18
-msgid "The blue component of the background color."
-msgstr "背景色的蓝色分量。"
+msgid "Background color, red component"
+msgstr "背景颜色，红色分量"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:19
-msgid "The blue component of the foreground color."
-msgstr "前景色的蓝色分量。"
+msgid "The red component of the background color."
+msgstr "背景色的红色分量。"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:20
-msgid "The green component of the background color."
-msgstr "背景色的绿色分量。"
+msgid "Background color, green component"
+msgstr "背景颜色，绿色分量"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:21
-msgid "The green component of the foreground color."
-msgstr "前景色的绿色分量。"
+msgid "The green component of the background color."
+msgstr "背景色的绿色分量。"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:22
-msgid "The red component of the background color."
-msgstr "背景色的红色分量。"
+msgid "Background color, blue component"
+msgstr "背景颜色，蓝色分量"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:23
-msgid "The red component of the foreground color."
-msgstr "前景色的红色分量。"
+msgid "The blue component of the background color."
+msgstr "背景色的蓝色分量。"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:24
+msgid "History list"
+msgstr "历史列表"
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:25
+msgid "List of GConfValue entries containing strings for history entries."
+msgstr "列出包含历史项字符串的 GConfValue 项。"
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:27
 msgid ""
 "This per-applet key is deprecated in favour of the global key, /schemas/apps/"
 "mini-commander-global/macro_patterns."
@@ -2381,22 +1918,6 @@ msgstr ""
 "不推荐设置此单个程序的键，而应该设置全局键，/schemas/apps/mini-commander-"
 "global/macro_patterns。"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:25
-msgid "Use the default theme colors"
-msgstr "使用默认主题颜色"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:26
-msgid "Use theme colors instead of custom ones."
-msgstr "使用主题颜色，而非自定义颜色。"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:27
-msgid "Width"
-msgstr "宽度"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:28
-msgid "Width of the applet"
-msgstr "小程序的宽度"
-
 #: ../mini-commander/src/mini-commander_applet.c:242
 #: ../mini-commander/src/mini-commander_applet.c:246
 msgid "Browser"
@@ -2419,27 +1940,27 @@ msgstr "单击此按钮查看以前的命令的列表"
 msgid "Command line has been disabled by your system administrator"
 msgstr "命令行已经被您的系统管理员禁用"
 
-#: ../mini-commander/src/mini-commander_applet.c:361
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1
+#: ../mini-commander/src/mini-commander_applet.c:360
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
 msgid "Command Line"
 msgstr "命令行"
 
-#: ../mini-commander/src/mini-commander_applet.c:407
+#: ../mini-commander/src/mini-commander_applet.c:406
 msgid "Mini-Commander applet"
 msgstr "小型命令行小程序"
 
-#: ../mini-commander/src/mini-commander_applet.c:408
+#: ../mini-commander/src/mini-commander_applet.c:407
 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
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1
 msgid "MiniCommander Applet Factory"
 msgstr "小型命令行小程序工厂"
 
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3
+msgid "Mini-Commander"
+msgstr "小型命令行小程序"
+
 #: ../mini-commander/src/preferences.c:401
 msgid "You must specify a pattern"
 msgstr "您必须指定一个模式"
@@ -2456,33 +1977,34 @@ msgstr "您必须指定一个命令"
 msgid "You may not specify duplicate patterns"
 msgstr "您不能指定重复的模式"
 
-#: ../mini-commander/src/preferences.c:773
+#: ../mini-commander/src/preferences.c:779
 msgid "Pattern"
 msgstr "图案"
 
-#: ../mini-commander/src/preferences.c:783
+#: ../mini-commander/src/preferences.c:789
 msgid "Command"
 msgstr "命令"
 
-#: ../mixer/applet.c:184
+#: ../mixer/applet.c:179
 msgid "Volume Applet"
 msgstr "音量小程序"
 
 #. tooltip over applet
-#: ../mixer/applet.c:200 ../mixer/applet.c:221 ../null_applet/null_applet.c:55
-#: ../null_applet/null_applet.c:57
+#: ../mixer/applet.c:195 ../mixer/applet.c:216
+#: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:1
+#: ../null_applet/null_applet.c:55 ../null_applet/null_applet.c:57
 msgid "Volume Control"
 msgstr "音量控制"
 
-#: ../mixer/applet.c:383
+#: ../mixer/applet.c:378
 msgid "_Open Volume Control"
 msgstr "打开音量控制(_O)"
 
-#: ../mixer/applet.c:397
+#: ../mixer/applet.c:392
 msgid "Mu_te"
 msgstr "静音(_T)"
 
-#: ../mixer/applet.c:563
+#: ../mixer/applet.c:558
 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 "
@@ -2491,7 +2013,7 @@ msgstr ""
 "éŸ³é‡æŽ§åˆ¶æ‰¾ä¸åˆ°è¦æŽ§åˆ¶çš„ä»»ä½•å…ƒç´ å’Œ/或设备。这意味着您可能没有安装正确的 "
 "GStreamer 插件，或者您没有配置好声卡。"
 
-#: ../mixer/applet.c:567
+#: ../mixer/applet.c:562
 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."
@@ -2499,12 +2021,12 @@ msgstr ""
 "å¦‚æžœæ‚¨æƒ³è¦ä»Žé¢æ¿ä¸­åˆ é™¤éŸ³é‡æŽ§åˆ¶ï¼Œå¯ä»¥ç”¨å³é”®å•å‡»é¢æ¿ä¸Šçš„æ‰¬å£°å™¨æŒ‰é’®ï¼Œç„¶åŽä»Žèœå•"
 "ä¸­é€‰æ‹©â€œä»Žé¢æ¿åˆ é™¤â€ã€‚"
 
-#: ../mixer/applet.c:753
+#: ../mixer/applet.c:745
 #, c-format
 msgid "Failed to start Volume Control: %s"
 msgstr "启动音量控制失败：%s"
 
-#: ../mixer/applet.c:1202
+#: ../mixer/applet.c:1160
 #, c-format
 msgid "%s: muted"
 msgstr "%s：已静音"
@@ -2513,29 +2035,29 @@ msgstr "%s：已静音"
 #. * to mark as a translation, but anyway. The string is a list of
 #. * selected tracks, the number is the volume in percent. You
 #. * most likely want to keep this as-is.
-#: ../mixer/applet.c:1208
+#: ../mixer/applet.c:1166
 #, c-format
 msgid "%s: %d%%"
 msgstr "%s：%d%%"
 
-#: ../mixer/applet.c:1444
+#: ../mixer/applet.c:1402
 #, c-format
 msgid "Failed to display help: %s"
 msgstr "显示帮助失败：%s"
 
-#: ../mixer/applet.c:1457
+#: ../mixer/applet.c:1415
 msgid "Volume control for your GNOME Panel."
 msgstr "从 GNOME 面板上进行音量控制。"
 
-#: ../mixer/applet.c:1458
+#: ../mixer/applet.c:1416
 msgid "Using GStreamer 0.10."
 msgstr "使用 GStreamer 0.10。"
 
-#: ../mixer/dock.c:218
+#: ../mixer/dock.c:219
 msgid "Mute"
 msgstr "静音"
 
-#: ../mixer/dock.c:224
+#: ../mixer/dock.c:225
 msgid "Volume Control..."
 msgstr "音量控制..."
 
@@ -2556,12 +2078,16 @@ msgstr "保存静音状态"
 msgid "Saved volume to restore on startup"
 msgstr "保存音量以便在启动时恢复"
 
+#: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:2
+msgid "Adjust the sound volume"
+msgstr "调整音量"
+
 #. make window look cute
 #: ../mixer/preferences.c:90
 msgid "Volume Control Preferences"
 msgstr "音量控制首选项"
 
-#: ../mixer/preferences.c:103
+#: ../mixer/preferences.c:102
 msgid "Select the device and track to control."
 msgstr "选择要控制的设备和轨道。"
 
@@ -2573,12 +2099,12 @@ msgstr "激活(_A)"
 msgid "_Deactivate"
 msgstr "æ–­å¼€(_D)"
 
-#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:43
+#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:4
 msgid "_Properties"
 msgstr "属性(_P)"
 
 #: ../modemlights/modem-applet.c:184
-#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
+#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
 msgid "Modem Monitor"
 msgstr "调制解调器监视器"
 
@@ -2648,22 +2174,22 @@ msgid "Applet for activating and monitoring a dial-up network connection."
 msgstr "激活并监视拨号网络连接的小程序。"
 
 #: ../modemlights/modemlights.ui.h:1
-msgid "Connecting with Internet Service Provider"
-msgstr "正在连接互联网服务提供商"
-
-#: ../modemlights/modemlights.ui.h:2
 msgid "Enter password"
 msgstr "è¾“å…¥å¯†ç "
 
+#: ../modemlights/modemlights.ui.h:2
+msgid "Root password required"
+msgstr "需要 root 口令"
+
 #: ../modemlights/modemlights.ui.h:3
 msgid "Password:"
 msgstr "å¯†ç ï¼š"
 
 #: ../modemlights/modemlights.ui.h:4
-msgid "Root password required"
-msgstr "需要 root 口令"
+msgid "Connecting with Internet Service Provider"
+msgstr "正在连接互联网服务提供商"
 
-#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
+#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
 msgid "Activate and monitor a dial-up network connection"
 msgstr "激活并监视拨号网络连接"
 
@@ -2776,131 +2302,131 @@ msgid "_Open System Monitor"
 msgstr "打开系统监视器(_O)"
 
 #: ../multiload/main.c:490
-#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
 msgid "System Monitor"
 msgstr "系统监视器"
 
 #: ../multiload/multiload.schemas.in.h:1
-msgid "Applet refresh rate in milliseconds"
-msgstr "小程序的刷新率，以毫秒计"
+msgid "Enable CPU load graph"
+msgstr "启用 CPU 负责图形"
 
 #: ../multiload/multiload.schemas.in.h:2
-msgid "Background color for disk load graph"
-msgstr "磁盘负载图形的背景颜色"
+msgid "Enable memory load graph"
+msgstr "启用内存负载图形"
 
 #: ../multiload/multiload.schemas.in.h:3
-msgid "CPU graph background color"
-msgstr "CPU 图形背景色"
+msgid "Enable network load graph"
+msgstr "启用网络负载图形"
 
 #: ../multiload/multiload.schemas.in.h:4
-msgid "Enable CPU load graph"
-msgstr "启用 CPU 负责图形"
+msgid "Enable swap load graph"
+msgstr "启用交换负载图形"
 
 #: ../multiload/multiload.schemas.in.h:5
-msgid "Enable disk load graph"
-msgstr "启用磁盘负载图形"
-
-#: ../multiload/multiload.schemas.in.h:6
 msgid "Enable load average graph"
 msgstr "启用平均负载图形"
 
+#: ../multiload/multiload.schemas.in.h:6
+msgid "Enable disk load graph"
+msgstr "启用磁盘负载图形"
+
 #: ../multiload/multiload.schemas.in.h:7
-msgid "Enable memory load graph"
-msgstr "启用内存负载图形"
+msgid "Applet refresh rate in milliseconds"
+msgstr "小程序的刷新率，以毫秒计"
 
 #: ../multiload/multiload.schemas.in.h:8
-msgid "Enable network load graph"
-msgstr "启用网络负载图形"
+msgid "Graph size"
+msgstr "图形大小"
 
 #: ../multiload/multiload.schemas.in.h: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."
 msgstr "对于水平面板，就是图像的宽度。对于垂直面板，就是图像的高度。"
 
+#: ../multiload/multiload.schemas.in.h:10
+msgid "Graph color for user-related CPU activity"
+msgstr "用户相关 CPU 活动的图形颜色"
+
 #: ../multiload/multiload.schemas.in.h:11
-msgid "Graph color for buffer memory"
-msgstr "缓冲内存的图形颜色"
+msgid "Graph color for system-related CPU activity"
+msgstr "系统相关 CPU 活动的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:12
-msgid "Graph color for cached memory"
-msgstr "缓存内存的图形颜色"
+msgid "Graph color for nice-related CPU activity"
+msgstr "优先级相关 CPU 活动的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:13
-msgid "Graph color for disk read"
-msgstr "磁盘读取的图形颜色"
+msgid "Graph color for iowait related CPU activity"
+msgstr "优先级相关 CPU 活动的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:14
-msgid "Graph color for disk write"
-msgstr "磁盘写入的图形颜色"
+msgid "CPU graph background color"
+msgstr "CPU 图形背景色"
 
 #: ../multiload/multiload.schemas.in.h:15
-msgid "Graph color for input network activity"
-msgstr "网络输入活动的图形颜色"
+msgid "Graph color for user-related memory usage"
+msgstr "用户相关内存使用的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:16
-msgid "Graph color for iowait related CPU activity"
-msgstr "优先级相关 CPU 活动的图形颜色"
+msgid "Graph color for shared memory"
+msgstr "共享内存的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:17
-msgid "Graph color for load average"
-msgstr "平均负载的图形颜色"
+msgid "Graph color for buffer memory"
+msgstr "缓冲内存的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:18
-msgid "Graph color for loopback network usage"
-msgstr "网络回送活动的图形颜色"
+msgid "Graph color for cached memory"
+msgstr "缓存内存的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:19
-msgid "Graph color for nice-related CPU activity"
-msgstr "优先级相关 CPU 活动的图形颜色"
+msgid "Memory graph background color"
+msgstr "内存图形背景色"
 
 #: ../multiload/multiload.schemas.in.h:20
-msgid "Graph color for output network activity"
-msgstr "网络输出活动的图形颜色"
+msgid "Graph color for input network activity"
+msgstr "网络输入活动的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:21
-msgid "Graph color for shared memory"
-msgstr "共享内存的图形颜色"
+msgid "Graph color for output network activity"
+msgstr "网络输出活动的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:22
-msgid "Graph color for system-related CPU activity"
-msgstr "系统相关 CPU 活动的图形颜色"
+msgid "Graph color for loopback network usage"
+msgstr "网络回送活动的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:23
-msgid "Graph color for user-related CPU activity"
-msgstr "用户相关 CPU 活动的图形颜色"
+msgid "Network graph background color"
+msgstr "网络图形背景色"
 
 #: ../multiload/multiload.schemas.in.h:24
-msgid "Graph color for user-related memory usage"
-msgstr "用户相关内存使用的图形颜色"
-
-#: ../multiload/multiload.schemas.in.h:25
 msgid "Graph color for user-related swap usage"
 msgstr "用户相关交换使用的图形颜色"
 
+#: ../multiload/multiload.schemas.in.h:25
+msgid "Swap graph background color"
+msgstr "交换图形背景色"
+
 #: ../multiload/multiload.schemas.in.h:26
-msgid "Graph size"
-msgstr "图形大小"
+msgid "Graph color for load average"
+msgstr "平均负载的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:27
 msgid "Load graph background color"
 msgstr "负载图形背景色"
 
 #: ../multiload/multiload.schemas.in.h:28
-msgid "Memory graph background color"
-msgstr "内存图形背景色"
+msgid "Graph color for disk read"
+msgstr "磁盘读取的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:29
-msgid "Network graph background color"
-msgstr "网络图形背景色"
+msgid "Graph color for disk write"
+msgstr "磁盘写入的图形颜色"
 
 #: ../multiload/multiload.schemas.in.h:30
-msgid "Swap graph background color"
-msgstr "交换图形背景色"
+msgid "Background color for disk load graph"
+msgstr "磁盘负载图形的背景颜色"
 
 #: ../multiload/multiload.schemas.in.h:31
 msgid "The desktop description file to execute as the system monitor"
@@ -2911,7 +2437,7 @@ msgstr "可执行系统监视器的桌面描述文件"
 msgid "%s/s"
 msgstr "%s/s"
 
-#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
 msgid "A system load indicator"
 msgstr "系统负载指示器"
 
@@ -3048,54 +2574,6 @@ msgstr "写入(_W)"
 msgid "System Monitor Preferences"
 msgstr "系统监视器首选项"
 
-#: ../null_applet/GNOME_CDPlayerApplet.server.in.h:1
-msgid "CD Player (Deprecated)"
-msgstr "CD 播放机首选项(不再使用)"
-
-#: ../null_applet/GNOME_CDPlayerApplet.server.in.h:2
-msgid "Panel applet for playing audio CDs"
-msgstr "用于播放音乐 CD 的面板小程序"
-
-#: ../null_applet/GNOME_MailcheckApplet_Factory.server.in.h:1
-msgid "Alert you when new mail arrives"
-msgstr "提醒您新邮件到达"
-
-#: ../null_applet/GNOME_MailcheckApplet_Factory.server.in.h:2
-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 "音量控制(已摒弃)"
-
-#: ../null_applet/GNOME_NullApplet_Factory.server.in.in.h:1
-msgid "Factory for deprecating applets"
-msgstr "不再使用的小程序的工厂"
-
-#: ../null_applet/GNOME_NullApplet_Factory.server.in.in.h:2
-msgid "Null Applet Factory"
-msgstr "空小程序工厂"
-
-#: ../null_applet/GNOME_Panel_WirelessApplet.server.in.h:1
-msgid "Monitor the quality of a wireless network link"
-msgstr "ç›‘è§†æ— çº¿ç½‘ç»œé“¾è·¯çš„ä¿¡å·è´¨é‡"
-
-#: ../null_applet/GNOME_Panel_WirelessApplet.server.in.h:2
-msgid "Wireless Link Monitor"
-msgstr "æ— çº¿ç½‘ç»œé“¾è·¯ç›‘è§†å™¨"
-
-#: ../null_applet/GNOME_KeyboardApplet.server.in.h:1
-msgid "Keyboard Indicator (Deprecated)"
-msgstr "é”®ç›˜æ ‡è¯†å™¨(已废弃)"
-
-#: ../null_applet/GNOME_KeyboardApplet.server.in.h:2
-msgid "Keyboard layout indicator"
-msgstr "é”®ç›˜å¸ƒå±€æ ‡è¯†å™¨"
-
 #: ../null_applet/null_applet.c:51
 msgid "Inbox Monitor"
 msgstr "收件箱监视器"
@@ -3135,8 +2613,8 @@ msgid "Tomboy (transparent upgrade from stickynotes)"
 msgstr "阿帖(从置顶便笺的透明升级)"
 
 #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1
-msgid "Create, view, and manage sticky notes on the desktop"
-msgstr "在桌面上创建、查看和管理置顶便笺"
+msgid "Sticky Notes Applet Factory"
+msgstr "置顶便笺小程序工厂"
 
 #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2
 #: ../stickynotes/stickynotes_applet.c:146
@@ -3145,8 +2623,8 @@ msgid "Sticky Notes"
 msgstr "置顶便笺"
 
 #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3
-msgid "Sticky Notes Applet Factory"
-msgstr "置顶便笺小程序工厂"
+msgid "Create, view, and manage sticky notes on the desktop"
+msgstr "在桌面上创建、查看和管理置顶便笺"
 
 #: ../stickynotes/stickynotes.c:630
 msgid "This note is locked."
@@ -3156,306 +2634,306 @@ msgstr "此便笺已锁定。"
 msgid "This note is unlocked."
 msgstr "此便笺未锁定。"
 
-#: ../stickynotes/stickynotes.ui.h:1
-msgid "Behavior"
-msgstr "行为"
+#: ../stickynotes/stickynotes.ui.h:1 ../stickynotes/stickynotes_applet.c:33
+msgid "_New Note"
+msgstr "新建便笺(_N)"
 
 #: ../stickynotes/stickynotes.ui.h:2
-msgid "Choose a base color to use for all sticky notes"
-msgstr "为全部记事贴选择某个基本颜色"
+msgid "_Delete Note..."
+msgstr "åˆ é™¤ä¾¿ç¬º(_D)..."
 
 #: ../stickynotes/stickynotes.ui.h:3
-msgid "Choose a color for the note"
-msgstr "为便笺选择某个颜色"
-
-#: ../stickynotes/stickynotes.ui.h:4
-msgid "Choose a font for the note"
-msgstr "为便笺选择某个字体"
+msgid "_Lock Note"
+msgstr "锁定便笺(_L)"
 
 #: ../stickynotes/stickynotes.ui.h:5
-msgid "Choose a font to use for all sticky notes"
-msgstr "为全部记事贴选择一个要使用的字体"
+msgid "Sticky Notes Preferences"
+msgstr "记事贴首选项"
 
 #: ../stickynotes/stickynotes.ui.h:6
-msgid "Choose if notes are visible on all workspaces"
-msgstr "选择是否便笺在所有工作区均可见"
+msgid "Default Note Properties"
+msgstr "默认便笺属性"
 
 #: ../stickynotes/stickynotes.ui.h:7
-msgid "Choose if the default style is forced on all notes"
-msgstr "é€‰æ‹©æ˜¯å¦å¼ºåˆ¶å¯¹å…¨éƒ¨ä¾¿ç¬ºä½¿ç”¨é»˜è®¤é£Žæ ¼"
+msgid "Choose a font to use for all sticky notes"
+msgstr "为全部记事贴选择一个要使用的字体"
 
 #: ../stickynotes/stickynotes.ui.h:8
-msgid "Choose whether to hide all notes when selecting on the desktop"
-msgstr "在选择桌面时选择是否隐藏所有提示"
+msgid "Pick a default sticky note font"
+msgstr "挑选一个默认的记事贴字体"
 
 #: ../stickynotes/stickynotes.ui.h:9
-msgid "Close note"
-msgstr "关闭便笺"
+msgid "_Font:"
+msgstr "字体(_F)："
 
 #: ../stickynotes/stickynotes.ui.h:10
-msgid "Default Note Properties"
-msgstr "默认便笺属性"
+msgid "Use fo_nt from the system theme"
+msgstr "使用系统主题字体(_N)"
 
 #: ../stickynotes/stickynotes.ui.h:11
-msgid "Delete all sticky notes?"
-msgstr "åˆ é™¤æ‰€æœ‰çš„ç½®é¡¶ä¾¿ç­¾ï¼Ÿ"
+msgid "Note C_olor:"
+msgstr "便笺颜色(_O)："
 
 #: ../stickynotes/stickynotes.ui.h:12
-msgid "Delete this sticky note?"
-msgstr "åˆ é™¤æ­¤ç½®é¡¶ä¾¿ç­¾ï¼Ÿ"
+msgid "Font Co_lor:"
+msgstr "字体颜色(_L)："
 
 #: ../stickynotes/stickynotes.ui.h:13
-msgid "Font C_olor:"
-msgstr "字体颜色(_O)："
+msgid "Choose a base color to use for all sticky notes"
+msgstr "为全部记事贴选择某个基本颜色"
 
 #: ../stickynotes/stickynotes.ui.h:14
-msgid "Font Co_lor:"
-msgstr "字体颜色(_L)："
+msgid "Pick a default sticky note color"
+msgstr "为记事贴挑选默认颜色"
 
 #: ../stickynotes/stickynotes.ui.h:15
-msgid "Force _default color and font on notes"
-msgstr "强制对全部便笺使用默认颜色和字体(_D)"
+msgid "Use co_lor from the system theme"
+msgstr "使用系统主题颜色(_L)"
 
 #: ../stickynotes/stickynotes.ui.h:16
-msgid "H_eight:"
-msgstr "高度(_E)："
+msgid "Specify the default height (in pixels) of new notes"
+msgstr "指定新便笺的默认高度(ä»¥åƒç´ ä¸ºå•ä½)"
 
 #: ../stickynotes/stickynotes.ui.h:17
-msgid "Hide notes when the des_ktop is clicked on"
-msgstr "在桌面被选择时隐藏提示(_K)"
+msgid "Specify the default width (in pixels) of new notes"
+msgstr "指定新便笺的默认宽度(ä»¥åƒç´ ä¸ºå•ä½)"
 
 #: ../stickynotes/stickynotes.ui.h:18
-msgid "Lock/Unlock note"
-msgstr "锁定/解除锁定便笺"
-
-#: ../stickynotes/stickynotes.ui.h:19
-msgid "Note C_olor:"
-msgstr "便笺颜色(_O)："
+msgid "H_eight:"
+msgstr "高度(_E)："
 
 #: ../stickynotes/stickynotes.ui.h:20
-msgid "Note _Color:"
-msgstr "便笺颜色(_C)："
+msgid "Behavior"
+msgstr "行为"
 
 #: ../stickynotes/stickynotes.ui.h:21
-msgid "Pick a color for the sticky note"
-msgstr "为记事贴挑选某个颜色"
+msgid "Hide notes when the des_ktop is clicked on"
+msgstr "在桌面被选择时隐藏提示(_K)"
 
 #: ../stickynotes/stickynotes.ui.h:22
-msgid "Pick a default sticky note color"
-msgstr "为记事贴挑选默认颜色"
+msgid "Choose whether to hide all notes when selecting on the desktop"
+msgstr "在选择桌面时选择是否隐藏所有提示"
 
 #: ../stickynotes/stickynotes.ui.h:23
-msgid "Pick a default sticky note font"
-msgstr "挑选一个默认的记事贴字体"
+msgid "Force _default color and font on notes"
+msgstr "强制对全部便笺使用默认颜色和字体(_D)"
 
 #: ../stickynotes/stickynotes.ui.h:24
-msgid "Pick a font for the sticky note"
-msgstr "为该记事贴挑选一个字体"
+msgid "Choose if the default style is forced on all notes"
+msgstr "é€‰æ‹©æ˜¯å¦å¼ºåˆ¶å¯¹å…¨éƒ¨ä¾¿ç¬ºä½¿ç”¨é»˜è®¤é£Žæ ¼"
 
 #: ../stickynotes/stickynotes.ui.h:25
-msgid "Properties"
-msgstr "属性"
+msgid "_Put notes on all workspaces"
+msgstr "将便笺放置在所有工作区(_P)"
 
 #: ../stickynotes/stickynotes.ui.h:26
-msgid "Resize note"
-msgstr "调整便笺大小"
+msgid "Choose if notes are visible on all workspaces"
+msgstr "选择是否便笺在所有工作区均可见"
 
 #: ../stickynotes/stickynotes.ui.h:27
-msgid "Specify a title for the note"
-msgstr "ä¸ºè®°äº‹è´´æŒ‡å®šæŸä¸ªæ ‡é¢˜"
+msgid "Delete this sticky note?"
+msgstr "åˆ é™¤æ­¤ç½®é¡¶ä¾¿ç­¾ï¼Ÿ"
 
 #: ../stickynotes/stickynotes.ui.h:28
-msgid "Specify the default height (in pixels) of new notes"
-msgstr "指定新便笺的默认高度(ä»¥åƒç´ ä¸ºå•ä½)"
+msgid "This cannot be undone."
+msgstr "这不能撤销。"
 
 #: ../stickynotes/stickynotes.ui.h:29
-msgid "Specify the default width (in pixels) of new notes"
-msgstr "指定新便笺的默认宽度(ä»¥åƒç´ ä¸ºå•ä½)"
+msgid "Delete all sticky notes?"
+msgstr "åˆ é™¤æ‰€æœ‰çš„ç½®é¡¶ä¾¿ç­¾ï¼Ÿ"
 
 #: ../stickynotes/stickynotes.ui.h:30
-msgid "Sticky Note"
-msgstr "记事贴"
+msgid "_Delete All"
+msgstr "å…¨éƒ¨åˆ é™¤(_D)"
 
 #: ../stickynotes/stickynotes.ui.h:31
-msgid "Sticky Note Properties"
-msgstr "记事贴属性"
+msgid "Sticky Note"
+msgstr "记事贴"
 
 #: ../stickynotes/stickynotes.ui.h:32
-msgid "Sticky Notes Preferences"
-msgstr "记事贴首选项"
+msgid "Lock/Unlock note"
+msgstr "锁定/解除锁定便笺"
 
 #: ../stickynotes/stickynotes.ui.h:33
-msgid "This cannot be undone."
-msgstr "这不能撤销。"
+msgid "Close note"
+msgstr "关闭便笺"
 
 #: ../stickynotes/stickynotes.ui.h:34
-msgid "Use co_lor from the system theme"
-msgstr "使用系统主题颜色(_L)"
+msgid "Resize note"
+msgstr "调整便笺大小"
 
 #: ../stickynotes/stickynotes.ui.h:35
-msgid "Use default co_lor"
-msgstr "使用默认颜色(_L)"
+msgid "Sticky Note Properties"
+msgstr "记事贴属性"
 
 #: ../stickynotes/stickynotes.ui.h:36
-msgid "Use default fo_nt"
-msgstr "使用默认字体(_N)"
+msgid "Properties"
+msgstr "属性"
 
 #: ../stickynotes/stickynotes.ui.h:37
-msgid "Use fo_nt from the system theme"
-msgstr "使用系统主题字体(_N)"
+msgid "Choose a font for the note"
+msgstr "为便笺选择某个字体"
 
 #: ../stickynotes/stickynotes.ui.h:38
-msgid "_Delete All"
-msgstr "å…¨éƒ¨åˆ é™¤(_D)"
+msgid "Pick a font for the sticky note"
+msgstr "为该记事贴挑选一个字体"
 
 #: ../stickynotes/stickynotes.ui.h:39
-msgid "_Delete Note..."
-msgstr "åˆ é™¤ä¾¿ç¬º(_D)..."
+msgid "Use default fo_nt"
+msgstr "使用默认字体(_N)"
 
 #: ../stickynotes/stickynotes.ui.h:40
-msgid "_Font:"
-msgstr "字体(_F)："
+msgid "Choose a color for the note"
+msgstr "为便笺选择某个颜色"
 
 #: ../stickynotes/stickynotes.ui.h:41
-msgid "_Lock Note"
-msgstr "锁定便笺(_L)"
+msgid "Pick a color for the sticky note"
+msgstr "为记事贴挑选某个颜色"
 
-#: ../stickynotes/stickynotes.ui.h:42 ../stickynotes/stickynotes_applet.c:33
-msgid "_New Note"
-msgstr "新建便笺(_N)"
+#: ../stickynotes/stickynotes.ui.h:42
+msgid "Note _Color:"
+msgstr "便笺颜色(_C)："
+
+#: ../stickynotes/stickynotes.ui.h:43
+msgid "Font C_olor:"
+msgstr "字体颜色(_O)："
 
 #: ../stickynotes/stickynotes.ui.h:44
-msgid "_Put notes on all workspaces"
-msgstr "将便笺放置在所有工作区(_P)"
+msgid "Use default co_lor"
+msgstr "使用默认颜色(_L)"
 
 #: ../stickynotes/stickynotes.ui.h:45
+msgid "Specify a title for the note"
+msgstr "ä¸ºè®°äº‹è´´æŒ‡å®šæŸä¸ªæ ‡é¢˜"
+
+#: ../stickynotes/stickynotes.ui.h:46
 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 "Default width for new notes"
+msgstr "新便笺的默认宽度"
 
 #: ../stickynotes/stickynotes.schemas.in.h:2
-msgid "Date format of note's title"
-msgstr "ä¾¿ç¬ºæ ‡é¢˜çš„æ—¥æœŸæ ¼å¼"
+msgid "Default width for new sticky notes in pixels."
+msgstr "ä»¥åƒç´ ä¸ºå•ä½çš„æ–°ç½®é¡¶ä¾¿ç¬ºé»˜è®¤å®½åº¦ã€‚"
 
 #: ../stickynotes/stickynotes.schemas.in.h:3
-msgid "Default color for font"
-msgstr "字体的默认颜色"
+msgid "Default height for new notes"
+msgstr "新便笺的默认高度"
 
 #: ../stickynotes/stickynotes.schemas.in.h:4
+msgid "Default height for new sticky notes in pixels."
+msgstr "ä»¥åƒç´ ä¸ºå•ä½çš„æ–°ç½®é¡¶ä¾¿ç¬ºçš„é»˜è®¤é«˜åº¦ã€‚"
+
+#: ../stickynotes/stickynotes.schemas.in.h:5
 msgid "Default color for new notes"
 msgstr "新便笺的默认颜色"
 
-#: ../stickynotes/stickynotes.schemas.in.h:5
+#: ../stickynotes/stickynotes.schemas.in.h:6
 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
+#: ../stickynotes/stickynotes.schemas.in.h:7
+msgid "Default color for font"
+msgstr "字体的默认颜色"
+
+#: ../stickynotes/stickynotes.schemas.in.h:8
 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
+#: ../stickynotes/stickynotes.schemas.in.h:9
 msgid "Default font for new notes"
 msgstr "新便笺的默认字体"
 
-#: ../stickynotes/stickynotes.schemas.in.h:8
+#: ../stickynotes/stickynotes.schemas.in.h:10
 msgid ""
 "Default font for new sticky notes. This should be a Pango Font Name, for "
 "example \"Sans Italic 10\"."
 msgstr "新置顶便笺的默认字体。应该是 Pango 字体名称，如“Sans Italic 10”。"
 
-#: ../stickynotes/stickynotes.schemas.in.h:9
-msgid "Default height for new notes"
-msgstr "新便笺的默认高度"
-
-#: ../stickynotes/stickynotes.schemas.in.h:10
-msgid "Default height for new sticky notes in pixels."
-msgstr "ä»¥åƒç´ ä¸ºå•ä½çš„æ–°ç½®é¡¶ä¾¿ç¬ºçš„é»˜è®¤é«˜åº¦ã€‚"
-
 #: ../stickynotes/stickynotes.schemas.in.h:11
-msgid "Default width for new notes"
-msgstr "新便笺的默认宽度"
+msgid "Sticky notes' workspace stickyness"
+msgstr "置顶便笺的工作区置顶属性"
 
 #: ../stickynotes/stickynotes.schemas.in.h:12
-msgid "Default width for new sticky notes in pixels."
-msgstr "ä»¥åƒç´ ä¸ºå•ä½çš„æ–°ç½®é¡¶ä¾¿ç¬ºé»˜è®¤å®½åº¦ã€‚"
+msgid ""
+"Specifies whether the sticky notes are visible on ALL workspaces on the "
+"desktop, or not."
+msgstr "指定置顶便笺是否在所有工作空间中可见。"
 
 #: ../stickynotes/stickynotes.schemas.in.h:13
-msgid "Empty notes are always deleted without confirmation."
-msgstr "ç©ºä¾¿ç¬ºåœ¨åˆ é™¤å‰æ€»æ˜¯ä¸åŠ ç¡®è®¤ã€‚"
+msgid "Sticky notes' locked state"
+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."
-msgstr "如果禁用了此选项，将会使用自定义颜色作为全部置顶便笺的默认颜色。"
+msgid "Specifies whether the sticky notes are locked (non-editable) or not."
+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."
-msgstr "如果禁用了此选项，将会使用自定义字体作为全部置顶便笺的默认字体。"
+msgid "Date format of note's title"
+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."
-msgstr "如果启用此选项，以任何方式选择桌面都将自动隐藏提示。"
+"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:17
-msgid ""
-"If this option is enabled, the custom colors and fonts that have been "
-"assigned to individual notes will be ignored."
-msgstr "如果禁用了此选项，将忽略指定给单个便笺的自定义颜色和字体。"
+msgid "Whether to use the default system color"
+msgstr "是否使用系统默认颜色"
 
 #: ../stickynotes/stickynotes.schemas.in.h:18
-msgid "Specifies whether the sticky notes are locked (non-editable) or not."
-msgstr "指定置顶便笺是否被锁定(æ— æ³•ç¼–è¾‘)。"
+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:19
-msgid ""
-"Specifies whether the sticky notes are visible on ALL workspaces on the "
-"desktop, or not."
-msgstr "指定置顶便笺是否在所有工作空间中可见。"
+msgid "Whether to use the default system font"
+msgstr "是否使用系统默认字体"
 
 #: ../stickynotes/stickynotes.schemas.in.h:20
-msgid "Sticky notes' locked state"
-msgstr "置顶便笺的锁定状态"
+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:21
-msgid "Sticky notes' workspace stickyness"
-msgstr "置顶便笺的工作区置顶属性"
+msgid "Whether to force the default color and font on all notes"
+msgstr "是否强制对全部便笺使用默认颜色和字体"
 
 #: ../stickynotes/stickynotes.schemas.in.h:22
-msgid "Whether to ask for confirmation when deleting a note"
-msgstr "åˆ é™¤ä¾¿ç¬ºå‰æ˜¯å¦è¯·æ±‚ç¡®è®¤"
+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:23
-msgid "Whether to force the default color and font on all notes"
-msgstr "是否强制对全部便笺使用默认颜色和字体"
-
-#: ../stickynotes/stickynotes.schemas.in.h:24
 msgid "Whether to hide all notes when the desktop is selected"
 msgstr "在选择桌面时是否隐藏所有提示"
 
+#: ../stickynotes/stickynotes.schemas.in.h:24
+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:25
-msgid "Whether to use the default system color"
-msgstr "是否使用系统默认颜色"
+msgid "Whether to ask for confirmation when deleting a note"
+msgstr "åˆ é™¤ä¾¿ç¬ºå‰æ˜¯å¦è¯·æ±‚ç¡®è®¤"
 
 #: ../stickynotes/stickynotes.schemas.in.h:26
-msgid "Whether to use the default system font"
-msgstr "是否使用系统默认字体"
+msgid "Empty notes are always deleted without confirmation."
+msgstr "ç©ºä¾¿ç¬ºåœ¨åˆ é™¤å‰æ€»æ˜¯ä¸åŠ ç¡®è®¤ã€‚"
 
 #: ../stickynotes/stickynotes_applet.c:36
 msgid "Hi_de Notes"
@@ -3484,13 +2962,13 @@ msgid "Sticky Notes for the GNOME Desktop Environment"
 msgstr "用于 GNOME 桌面环境的置顶便笺"
 
 #: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
-msgid "Go to Trash"
-msgstr "转到回收站"
-
-#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
 msgid "Trash"
 msgstr "回收站"
 
+#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
+msgid "Go to Trash"
+msgstr "转到回收站"
+
 #: ../trashapplet/src/trashapplet.c:69 ../trashapplet/src/trash-empty.c:343
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
@@ -3511,6 +2989,9 @@ msgstr "å›žæ”¶ç«™ä¸­æ— é¡¹ç›®"
 
 #: ../trashapplet/src/trashapplet.c:377
 #, c-format
+#| msgid ""
+#| "Error while spawning Nautilus:\n"
+#| "%s"
 msgid ""
 "Error while spawning nautilus:\n"
 "%s"
@@ -3575,6 +3056,517 @@ msgstr "清空回收站"
 msgid "From:"
 msgstr "从："
 
+#~ msgid "upower backend enabled."
+#~ msgstr "upower 后端已启用。"
+
+#~ msgid "Alt+Control changes layout."
+#~ msgstr "Alt+Ctrl 更改布局。"
+
+#~ msgid "Alt+Shift changes layout."
+#~ msgstr "Alt+Shift 更改布局。"
+
+#~ msgid "Arabic keymap"
+#~ msgstr "é˜¿æ‹‰ä¼¯è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Armenian"
+#~ msgstr "亚美尼亚语"
+
+#~ msgid "Basque"
+#~ msgstr "巴斯克语"
+
+#~ msgid "Belgian"
+#~ msgstr "比利时语"
+
+#~ msgid "Both Alt keys together change layout."
+#~ msgstr "同时按下两个 Alt 键更改布局。"
+
+#~ msgid "Both Ctrl keys together change layout."
+#~ msgstr "同时按下两个 Ctrl 键更改布局。"
+
+#~ msgid "Both Shift keys together change layout."
+#~ msgstr "同时按下两个 Shift 键更改布局。"
+
+#~ msgid "Brazil Portuguese keymap"
+#~ msgstr "å·´è¥¿è‘¡è„ç‰™è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Bulgarian Cyrillic"
+#~ msgstr "ä¿åŠ åˆ©äºšè¥¿é‡Œå°”æ–‡"
+
+#~ msgid "Bulgarian keymap"
+#~ msgstr "ä¿åŠ åˆ©äºšè¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "CapsLock 键更改布局。"
+
+#~ msgid "Control+Shift changes layout."
+#~ msgstr "Ctrl+Shift 更改布局。"
+
+#~ msgid "Czech keymap"
+#~ msgstr "æ·å…‹é”®ç›˜æ˜ å°„"
+
+#~ msgid "Danish keymap"
+#~ msgstr "ä¸¹éº¦è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Dutch keymap"
+#~ msgstr "è·å…°è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "English keymap"
+#~ msgstr "è‹±è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Estonian keymap"
+#~ msgstr "çˆ±æ²™å°¼äºšè¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Finnish keymap"
+#~ msgstr "èŠ¬å…°è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "French Swiss"
+#~ msgstr "瑞士法语"
+
+#~ msgid "French Swiss keymap"
+#~ msgstr "ç‘žå£«æ³•è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "French keymap"
+#~ msgstr "æ³•è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "French-Canadian 105-key"
+#~ msgstr "åŠ æ‹¿å¤§æ³•è¯­ 105 é”®"
+
+#~ msgid "GB 102-key"
+#~ msgstr "GB 102 é”®"
+
+#~ msgid "GB 105-key"
+#~ msgstr "GB 105 é”®"
+
+#~ msgid "Generic Keyboard"
+#~ msgstr "通用键盘"
+
+#~ msgid "Georgian Latin"
+#~ msgstr "æ ¼é²å‰äºšæ‹‰ä¸è¯­"
+
+#~ msgid "Georgian Russian layout"
+#~ msgstr "æ ¼é²å‰äºšä¿„è¯­å¸ƒå±€"
+
+#~ msgid "Georgian keymap"
+#~ msgstr "æ ¼é²å‰äºšè¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "German"
+#~ msgstr "德语"
+
+#~ msgid "German Swiss with Euro"
+#~ msgstr "瑞士和欧洲德语"
+
+#~ msgid "German keymap"
+#~ msgstr "å¾·è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Greek keymap"
+#~ msgstr "å¸Œè…Šè¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Hebrew keymap"
+#~ msgstr "å¸Œä¼¯æ¥è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Hungarian 101-key latin 1"
+#~ msgstr "匈牙利语 101 键拉丁 1"
+
+#~ msgid "Hungarian 101-key latin 2"
+#~ msgstr "匈牙利语 101 键拉丁 2"
+
+#~ msgid "Hungarian 105-key latin 1"
+#~ msgstr "匈牙利语 105 键拉丁 1"
+
+#~ msgid "Hungarian 105-key latin 2"
+#~ msgstr "匈牙利语 105 键拉丁 2"
+
+#~ msgid "Hungarian PC/AT 101 keyboard"
+#~ msgstr "匈牙利语 PC/AT 101 键盘"
+
+#~ msgid "Hungarian latin1"
+#~ msgstr "匈牙利语拉丁 1"
+
+#~ msgid "Icelandic keymap"
+#~ msgstr "å†°å²›è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Italian keymap"
+#~ msgstr "æ„å¤§åˆ©è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Japanese keymap"
+#~ msgstr "æ—¥è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Lao keymap"
+#~ msgstr "è€æŒè¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Layout shift behavior"
+#~ msgstr "布局切换行为"
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "左 Alt 键更改布局。"
+
+#~ msgid "Left Ctrl key changes group."
+#~ msgstr "左 Ctrl 键更改布局。"
+
+#~ msgid "Left Shift key changes group."
+#~ msgstr "左 Shift 键更改布局。"
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "左 Windows 键更改布局。"
+
+#~ msgid "Lithuanian keymap"
+#~ msgstr "ç«‹é™¶å®›è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Macedonian"
+#~ msgstr "马其顿语"
+
+#~ msgid "Menu key changes layout."
+#~ msgstr "菜单键更改布局。"
+
+#~ msgid "Mongolian alt keymap"
+#~ msgstr "蒙古语 alt é”®ç›˜æ˜ å°„"
+
+#~ msgid "Mongolian keymap"
+#~ msgstr "è’™å¤è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Mongolian phonetic keymap"
+#~ msgstr "è’™å¤è¯­è¯­éŸ³é”®ç›˜æ˜ å°„"
+
+#~ msgid "Norwegian"
+#~ msgstr "挪威语"
+
+#~ msgid "Plain Russian keymap"
+#~ msgstr "ç®€å•ä¿„è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Polish"
+#~ msgstr "波兰语"
+
+#~ msgid "Polish deadkeys"
+#~ msgstr "波兰语哑键"
+
+#~ msgid "Portugal"
+#~ msgstr "葡萄牙"
+
+#~ msgid "Portugal Deadkeys"
+#~ msgstr "葡萄牙语哑键"
+
+#~ msgid "Portuguese keymap"
+#~ msgstr "è‘¡è„ç‰™è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "右 Alt 键更改布局。"
+
+#~ msgid "Right Ctrl key changes group."
+#~ msgstr "右 Ctrl 键更改布局。"
+
+#~ msgid "Right Shift key changes group."
+#~ msgstr "右 Shift 键更改布局。"
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "右 Windows 键更改布局。"
+
+#~ msgid "Russian Cyrillic"
+#~ msgstr "俄国西里尔文"
+
+#~ msgid "Russian keymap"
+#~ msgstr "ä¿„è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Serbian keymap"
+#~ msgstr "å¡žå°”ç»´äºšè¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Shift+CapsLock 更改布局。"
+
+#~ msgid "Slovak keymap"
+#~ msgstr "æ–¯æ´›ä¼å…‹è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Slovenian"
+#~ msgstr "斯洛文尼亚语"
+
+#~ msgid "Slovenian keymap"
+#~ msgstr "æ–¯æ´›æ–‡å°¼äºšè¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Spanish keymap"
+#~ msgstr "è¥¿ç­ç‰™è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Sun (!not PC!) type5 Hungarian latin 2"
+#~ msgstr "Sun (!非 PC!) type5 匈牙利语拉丁 2"
+
+#~ msgid "Swedish"
+#~ msgstr "瑞典语"
+
+#~ msgid "Swedish keymap"
+#~ msgstr "ç‘žå…¸è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Swiss keymap"
+#~ msgstr "ç‘žå£«é”®ç›˜æ˜ å°„"
+
+#~ msgid "Thai"
+#~ msgstr "泰语"
+
+#~ msgid "Thai Kedmanee"
+#~ msgstr "泰国凯德曼尼语"
+
+#~ msgid "Thai keymap"
+#~ msgstr "æ³°è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "Turkish \"F\" keyboard"
+#~ msgstr "土耳其语“F”键盘"
+
+#~ msgid "Turkish \"Q\" keyboard"
+#~ msgstr "土耳其语“Q”键盘"
+
+#~ msgid "Turkish keymap"
+#~ msgstr "åœŸè€³å…¶è¯­é”®ç›˜æ˜ å°„"
+
+#~ msgid "UK 105-key"
+#~ msgstr "UK 105 é”®"
+
+#~ msgid "UK PC/AT keyboard"
+#~ msgstr "英国 PC/AT 键盘"
+
+#~ msgid "US 101-key keyboard"
+#~ msgstr "UK 101 键键盘"
+
+#~ msgid "US 105-key keyboard (with windows keys)"
+#~ msgstr "美国 105 键键盘(带有 Windows 键)"
+
+#~ msgid "US 84-key"
+#~ msgstr "美国 84 键"
+
+#~ msgid "US DEC 450"
+#~ msgstr "美国 DEC 450"
+
+#~ msgid "US IBM RS/6000"
+#~ msgstr "美国 IBM RS/6000"
+
+#~ msgid "US International"
+#~ msgstr "美国国际"
+
+#~ msgid "US Macintosh"
+#~ msgstr "美国麦金托什"
+
+#~ msgid "US PC/AT 101 keyboard"
+#~ msgstr "美国 PC/AT 101 键盘"
+
+#~ msgid "US Silicon Graphics 101-key"
+#~ msgstr "美国 Silicon Graphics 101 键"
+
+#~ msgid "US Sun type5"
+#~ msgstr "美国 Sun type5"
+
+#~ msgid "Armenian Sun keymap"
+#~ msgstr "亚美尼亚语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Azerbaijani Turkish Sun keymap"
+#~ msgstr "阿塞拜疆土耳其语土耳其 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Belarusian Sun keymap"
+#~ msgstr "白俄罗斯语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Brazil Portuguese Sun USB keymap"
+#~ msgstr "巴西葡萄牙语 Sun USB é”®ç›˜æ˜ å°„"
+
+#~ msgid "Brazil Portuguese Sun keymap"
+#~ msgstr "巴西葡萄牙语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "British Sun Type-4 keymap"
+#~ msgstr "英国 Sun Type-4 é”®ç›˜æ˜ å°„"
+
+#~ msgid "British Sun USB keymap"
+#~ msgstr "英国 Sun USB é”®ç›˜æ˜ å°„"
+
+#~ msgid "British Sun keymap"
+#~ msgstr "英国 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Bulgarian Sun keymap"
+#~ msgstr "ä¿åŠ åˆ©äºšè¯­ Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Canadian Sun keymap"
+#~ msgstr "åŠ æ‹¿å¤§ Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Czech Sun keymap"
+#~ msgstr "捷克 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Danish Sun Type-4 keymap"
+#~ msgstr "丹麦语 Sun Type-4 é”®ç›˜æ˜ å°„"
+
+#~ msgid "Danish Sun USB keymap"
+#~ msgstr "丹麦语 Sun USB é”®ç›˜æ˜ å°„"
+
+#~ msgid "Danish Sun keymap"
+#~ msgstr "丹麦语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Dutch Sun keymap"
+#~ msgstr "荷兰语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Estonian Sun keymap"
+#~ msgstr "爱沙尼亚语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Finnish Sun keymap"
+#~ msgstr "芬兰语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "French Sun USB keymap"
+#~ msgstr "法语 Sun USB é”®ç›˜æ˜ å°„"
+
+#~ msgid "French Sun keymap"
+#~ msgstr "法语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "German Sun Type-4 keymap"
+#~ msgstr "德语 Sun Type-4 é”®ç›˜æ˜ å°„"
+
+#~ msgid "German Sun USB keymap"
+#~ msgstr "德语 Sun USB é”®ç›˜æ˜ å°„"
+
+#~ msgid "German Sun keymap"
+#~ msgstr "德语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Hebrew Sun keymap"
+#~ msgstr "希伯来语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Hungarian latin2 Sun keymap"
+#~ msgstr "匈牙利语拉丁 2 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Hungarian type5 latin 1 keymap"
+#~ msgstr "匈牙利语 type5 拉丁 1 é”®ç›˜æ˜ å°„"
+
+#~ msgid "Icelandic Sun keymap"
+#~ msgstr "冰岛语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Italian Sun Type-4 keymap"
+#~ msgstr "意大利语 Sun Type-4 é”®ç›˜æ˜ å°„"
+
+#~ msgid "Italian Sun USB keymap"
+#~ msgstr "意大利语 Sun USB é”®ç›˜æ˜ å°„"
+
+#~ msgid "Italian Sun keymap"
+#~ msgstr "意大利语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Japanese Sun Type-4 keymap"
+#~ msgstr "日语 Sun Type-4 é”®ç›˜æ˜ å°„"
+
+#~ msgid "Japanese Sun keymap"
+#~ msgstr "日语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Latvian Sun keymap"
+#~ msgstr "拉脱维亚 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Lithuanian Sun keymap"
+#~ msgstr "立陶宛语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Macedonian Sun keymap"
+#~ msgstr "马其顿语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Norwegian Sun keymap"
+#~ msgstr "挪威语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Polish Sun keymap"
+#~ msgstr "波兰语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Portuguese Sun Type-4 keymap"
+#~ msgstr "葡萄牙语 Sun Type-4 é”®ç›˜æ˜ å°„"
+
+#~ msgid "Portuguese Sun keymap"
+#~ msgstr "葡萄牙语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Romanian Sun keymap"
+#~ msgstr "罗马尼亚语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Russian Sun keymap"
+#~ msgstr "俄语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Serbian Sun standard keymap"
+#~ msgstr "塞尔维亚语 Sun æ ‡å‡†é”®ç›˜æ˜ å°„"
+
+#~ msgid "Slovak Sun keymap"
+#~ msgstr "斯洛伐克语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Slovenian Sun keymap"
+#~ msgstr "斯洛文尼亚语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Spanish Sun Type-4 keymap"
+#~ msgstr "西班牙语 Sun Type-4 é”®ç›˜æ˜ å°„"
+
+#~ msgid "Spanish Sun USB keymap"
+#~ msgstr "西班牙语 Sun USB é”®ç›˜æ˜ å°„"
+
+#~ msgid "Spanish Sun keymap"
+#~ msgstr "西班牙语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Swedish Sun Type-4 keymap"
+#~ msgstr "瑞典语 Sun Type-4 é”®ç›˜æ˜ å°„"
+
+#~ msgid "Swedish Sun USB keymap"
+#~ msgstr "瑞典语 Sun USB é”®ç›˜æ˜ å°„"
+
+#~ msgid "Swedish Sun keymap"
+#~ msgstr "瑞典语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Swiss German Sun keymap"
+#~ msgstr "瑞士德语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Thai Sun keymap"
+#~ msgstr "泰语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Turkish Sun keymap"
+#~ msgstr "土耳其语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "US Sun Type-4 keymap"
+#~ msgstr "美国 Sun Type-4 键盘"
+
+#~ msgid "US Sun USB keymap"
+#~ msgstr "美国 Sun USB 键盘"
+
+#~ msgid "US Sun type5 keymap"
+#~ msgstr "美国 Sun type5 键盘"
+
+#~ msgid "Ukrainian Sun keymap"
+#~ msgstr "乌克兰语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Vietnamese Sun keymap"
+#~ msgstr "越南语 Sun é”®ç›˜æ˜ å°„"
+
+#~ msgid "Default"
+#~ msgstr "默认值"
+
+#~ msgid ""
+#~ "<i><small><b>Note:</b> Quotes are delayed at least 15 minutes.\n"
+#~ "<b>Source: </b> Yahoo!</small></i>"
+#~ msgstr ""
+#~ "<i><small><b>注意：</b> 报价延迟了至少 15 分钟。\n"
+#~ "<b>来源：</b> Yahoo!</small></i>"
+
+#~ msgid "Invest Applet"
+#~ msgstr "投资小程序"
+
+#~ msgid "CD Player (Deprecated)"
+#~ msgstr "CD 播放机首选项(不再使用)"
+
+#~ msgid "Panel applet for playing audio CDs"
+#~ msgstr "用于播放音乐 CD 的面板小程序"
+
+#~ msgid "Alert you when new mail arrives"
+#~ msgstr "提醒您新邮件到达"
+
+#~ msgid "Inbox Monitor (Deprecated)"
+#~ msgstr "收件箱监视器(不再使用)"
+
+#~ msgid "Volume Control (Deprecated)"
+#~ msgstr "音量控制(已摒弃)"
+
+#~ msgid "Factory for deprecating applets"
+#~ msgstr "不再使用的小程序的工厂"
+
+#~ msgid "Null Applet Factory"
+#~ msgstr "空小程序工厂"
+
+#~ msgid "Monitor the quality of a wireless network link"
+#~ msgstr "ç›‘è§†æ— çº¿ç½‘ç»œé“¾è·¯çš„ä¿¡å·è´¨é‡"
+
+#~ msgid "Wireless Link Monitor"
+#~ msgstr "æ— çº¿ç½‘ç»œé“¾è·¯ç›‘è§†å™¨"
+
+#~ msgid "Keyboard Indicator (Deprecated)"
+#~ msgstr "é”®ç›˜æ ‡è¯†å™¨(已废弃)"
+
+#~ msgid "Keyboard layout indicator"
+#~ msgstr "é”®ç›˜å¸ƒå±€æ ‡è¯†å™¨"
+
 #~ msgid "Cannot execute '%s'"
 #~ msgstr "æ— æ³•æ‰§è¡Œâ€œ%s”"
 
@@ -3587,9 +3579,6 @@ msgstr "从："
 #~ msgid "Show Current _Layout"
 #~ msgstr "显示当前布局(_L)"
 
-#~ msgid "_Groups"
-#~ msgstr "群组(_G)"
-
 #~ msgid "Keyboard applet factory"
 #~ msgstr "键盘小程序工厂"