Update Simplified Chinese translation.

1 files changed, 161 insertions, 165 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 75773c7db..dbf60c98f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,16 +5,17 @@
 # Xiong Jiang <jxiong@offtopic.org>, 2003.
 # Funda Wang <fundawang@linux.net.cn>, 2003.
 # Liu Songhe <jackliu9999@263.net>, 2003.
-# 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2009
+# 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2009.
+# YunQiang Su <wzssyqa@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-applets\n"
+"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: 2009-11-28 00:12+0000\n"
-"PO-Revision-Date: 2009-11-28 13:35+0800\n"
+"POT-Creation-Date: 2010-07-20 08:11+0000\n"
+"PO-Revision-Date: 2010-07-24 14:10+0800\n"
 "Last-Translator: 苏运强 <wzssyqa@gmail.com>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,9 +26,7 @@ msgstr ""
 #: ../charpick/GNOME_CharpickerApplet.xml.h:1
 #: ../cpufreq/GNOME_CPUFreqApplet.xml.h:1
 #: ../drivemount/GNOME_DriveMountApplet.xml.h:1
-#: ../geyes/GNOME_GeyesApplet.xml.h:1
-#: ../gswitchit/GNOME_GSwitchItApplet.xml.h:4
-#: ../gweather/GNOME_GWeatherApplet.xml.h:1
+#: ../geyes/GNOME_GeyesApplet.xml.h:1 ../gweather/GNOME_GWeatherApplet.xml.h:1
 #: ../invest-applet/data/Invest_Applet.xml.h:1
 #: ../mini-commander/src/GNOME_MiniCommanderApplet.xml.h:1
 #: ../mixer/GNOME_MixerApplet.xml.h:2 ../modemlights/GNOME_ModemLights.xml.h:1
@@ -42,9 +41,7 @@ msgstr "关于(_A)"
 #: ../charpick/GNOME_CharpickerApplet.xml.h:2
 #: ../cpufreq/GNOME_CPUFreqApplet.xml.h:2
 #: ../drivemount/GNOME_DriveMountApplet.xml.h:2
-#: ../geyes/GNOME_GeyesApplet.xml.h:2
-#: ../gswitchit/GNOME_GSwitchItApplet.xml.h:6
-#: ../gweather/GNOME_GWeatherApplet.xml.h:3
+#: ../geyes/GNOME_GeyesApplet.xml.h:2 ../gweather/GNOME_GWeatherApplet.xml.h:3
 #: ../mini-commander/src/GNOME_MiniCommanderApplet.xml.h:2
 #: ../mixer/GNOME_MixerApplet.xml.h:3 ../modemlights/GNOME_ModemLights.xml.h:4
 #: ../multiload/GNOME_MultiloadApplet.xml.h:2
@@ -62,7 +59,7 @@ msgid "AccessX Status Applet Factory"
 msgstr "AccessX 状态小程序工厂"
 
 #: ../accessx-status/GNOME_AccessxStatusApplet.server.in.in.h:2
-#: ../accessx-status/applet.c:1322
+#: ../accessx-status/applet.c:1333
 msgid "Keyboard Accessibility Status"
 msgstr "键盘辅助功能状态"
 
@@ -83,12 +80,12 @@ msgstr "显示 AccessX 特性的状态，如插销修饰"
 #. translators: These appear in the About dialog, usual format applies.
 #. "documenters",        documenters,
 #: ../accessx-status/applet.c:142 ../battstat/battstat_applet.c:1246
-#: ../charpick/charpick.c:611 ../cpufreq/src/cpufreq-applet.c:611
-#: ../drivemount/drivemount.c:117 ../geyes/geyes.c:195
-#: ../gswitchit/gswitchit-applet.c:465 ../gweather/gweather-about.c:55
-#: ../invest-applet/invest/about.py:32 ../mini-commander/src/about.c:54
-#: ../mixer/applet.c:1430 ../modemlights/modem-applet.c:1025
-#: ../multiload/main.c:62 ../stickynotes/stickynotes_applet_callbacks.c:384
+#: ../charpick/charpick.c:611 ../cpufreq/src/cpufreq-applet.c:617
+#: ../drivemount/drivemount.c:117 ../geyes/geyes.c:197
+#: ../gweather/gweather-about.c:55 ../invest-applet/invest/about.py:29
+#: ../mini-commander/src/about.c:54 ../mixer/applet.c:1437
+#: ../modemlights/modem-applet.c:1025 ../multiload/main.c:62
+#: ../stickynotes/stickynotes_applet_callbacks.c:384
 #: ../trashapplet/src/trashapplet.c:432
 msgid "translator-credits"
 msgstr ""
@@ -106,33 +103,33 @@ msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "调用键盘首选项对话框时出错：%s"
 
 #. Note to translators: the first letter of the alphabet, not the indefinite article
-#: ../accessx-status/applet.c:468 ../accessx-status/applet.c:506
+#: ../accessx-status/applet.c:472 ../accessx-status/applet.c:512
 msgid "a"
 msgstr "a"
 
-#: ../accessx-status/applet.c:975 ../accessx-status/applet.c:1048
-#: ../accessx-status/applet.c:1117 ../accessx-status/applet.c:1325
+#: ../accessx-status/applet.c:985 ../accessx-status/applet.c:1059
+#: ../accessx-status/applet.c:1128 ../accessx-status/applet.c:1336
 msgid "AccessX Status"
 msgstr "AccessX 状态"
 
-#: ../accessx-status/applet.c:976 ../accessx-status/applet.c:1118
+#: ../accessx-status/applet.c:986 ../accessx-status/applet.c:1129
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "显示使用辅助功能时键盘的状态。"
 
-#: ../accessx-status/applet.c:1010
+#: ../accessx-status/applet.c:1021
 msgid "XKB Extension is not enabled"
 msgstr "XKB 扩展未启用"
 
-#: ../accessx-status/applet.c:1015
+#: ../accessx-status/applet.c:1026
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../accessx-status/applet.c:1023
+#: ../accessx-status/applet.c:1034
 #, c-format
 msgid "Error: %s"
 msgstr "错误：%s"
 
-#: ../accessx-status/applet.c:1327
+#: ../accessx-status/applet.c:1338
 msgid "Displays current state of keyboard accessibility features"
 msgstr "显示键盘辅助功能特性的当前状态"
 
@@ -304,7 +301,7 @@ msgid "N/A"
 msgstr "不可用"
 
 #: ../battstat/battstat_applet.c:1193 ../drivemount/drivemount.c:142
-#: ../geyes/geyes.c:346 ../geyes/themes.c:244 ../gweather/gweather-applet.c:72
+#: ../geyes/geyes.c:348 ../geyes/themes.c:244 ../gweather/gweather-applet.c:72
 #: ../gweather/gweather-pref.c:748 ../mini-commander/src/preferences.c:366
 #: ../stickynotes/stickynotes_applet_callbacks.c:349
 #: ../stickynotes/stickynotes_applet_callbacks.c:559
@@ -626,7 +623,7 @@ msgid "Character Palette Preferences"
 msgstr "字符板首选项"
 
 #: ../cpufreq/GNOME_CPUFreqApplet.server.in.in.h:1
-#: ../cpufreq/src/cpufreq-applet.c:943 ../cpufreq/src/cpufreq-applet.c:999
+#: ../cpufreq/src/cpufreq-applet.c:949 ../cpufreq/src/cpufreq-applet.c:1005
 msgid "CPU Frequency Scaling Monitor"
 msgstr "CPU 频率范围监视器"
 
@@ -701,15 +698,15 @@ msgstr "外观(_A)"
 msgid "_Monitored CPU:"
 msgstr "监视中的 CPU(_M)："
 
-#: ../cpufreq/src/cpufreq-applet.c:578 ../cpufreq/src/cpufreq-prefs.c:478
+#: ../cpufreq/src/cpufreq-applet.c:584 ../cpufreq/src/cpufreq-prefs.c:478
 msgid "Could not open help document"
 msgstr "无法打开帮助文档"
 
-#: ../cpufreq/src/cpufreq-applet.c:606
+#: ../cpufreq/src/cpufreq-applet.c:612
 msgid "This utility shows the current CPU Frequency Scaling."
 msgstr "此工具显示目前的 CPU 频率范围。"
 
-#: ../cpufreq/src/cpufreq-applet.c:1000
+#: ../cpufreq/src/cpufreq-applet.c:1006
 msgid "This utility shows the current CPU Frequency"
 msgstr "此工具显示 CPU 目前的频率"
 
@@ -770,43 +767,43 @@ msgstr "用于驱动器挂载小程序的工厂"
 msgid "Mount local disks and devices"
 msgstr "加载本地磁盘和设备"
 
-#: ../drivemount/drive-button.c:338 ../drivemount/drive-button.c:351
+#: ../drivemount/drive-button.c:342 ../drivemount/drive-button.c:355
 msgid "(mounted)"
 msgstr "(已挂载)"
 
-#: ../drivemount/drive-button.c:340
+#: ../drivemount/drive-button.c:344
 msgid "(not mounted)"
 msgstr "(未挂载)"
 
-#: ../drivemount/drive-button.c:552
+#: ../drivemount/drive-button.c:556
 #, c-format
 msgid "Cannot execute '%s'"
 msgstr "无法执行“%s”"
 
-#: ../drivemount/drive-button.c:871
+#: ../drivemount/drive-button.c:879
 msgid "_Play DVD"
 msgstr "播放 DVD(_P)"
 
-#: ../drivemount/drive-button.c:875
+#: ../drivemount/drive-button.c:883
 msgid "_Play CD"
 msgstr "播放 CD(_P)"
 
-#: ../drivemount/drive-button.c:878
+#: ../drivemount/drive-button.c:886
 #, c-format
 msgid "_Open %s"
 msgstr "打开 %s(_O)"
 
-#: ../drivemount/drive-button.c:887
+#: ../drivemount/drive-button.c:895
 #, c-format
 msgid "Un_mount %s"
 msgstr "卸载 %s(_M)"
 
-#: ../drivemount/drive-button.c:894
+#: ../drivemount/drive-button.c:902
 #, c-format
 msgid "_Mount %s"
 msgstr "挂载 %s(_M)"
 
-#: ../drivemount/drive-button.c:902
+#: ../drivemount/drive-button.c:910
 #, c-format
 msgid "_Eject %s"
 msgstr "弹出 %s(_E)"
@@ -827,8 +824,8 @@ msgstr "每次状态更新之间等待的秒数"
 msgid "A set of eyeballs for your panel"
 msgstr "用于您面板的一组眼球"
 
-#: ../geyes/GNOME_GeyesApplet.server.in.in.h:2 ../geyes/geyes.c:385
-#: ../geyes/geyes.c:415 ../geyes/geyes.c:417
+#: ../geyes/GNOME_GeyesApplet.server.in.in.h:2 ../geyes/geyes.c:387
+#: ../geyes/geyes.c:417 ../geyes/geyes.c:419
 msgid "Eyes"
 msgstr "Eyes"
 
@@ -836,11 +833,11 @@ msgstr "Eyes"
 msgid "Geyes Applet Factory"
 msgstr "Geyes 小程序工厂"
 
-#: ../geyes/geyes.c:190
+#: ../geyes/geyes.c:192
 msgid "A goofy set of eyes for the GNOME panel. They follow your mouse."
 msgstr "用于 GNOME 面板的一组愚蠢的眼球。它们会盯着您的鼠标。"
 
-#: ../geyes/geyes.c:418
+#: ../geyes/geyes.c:420
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "一双凝视着鼠标指针方向的眼睛"
 
@@ -1484,61 +1481,6 @@ msgstr "乌克兰语 Sun 键盘映射"
 msgid "Vietnamese Sun keymap"
 msgstr "越南语 Sun 键盘映射"
 
-#: ../gswitchit/GNOME_GSwitchItApplet.xml.h:1
-msgid "Keyboard _Preferences"
-msgstr "键盘首选项(_P)"
-
-#: ../gswitchit/GNOME_GSwitchItApplet.xml.h:2
-msgid "Pl_ugins"
-msgstr "插件(_U)"
-
-#: ../gswitchit/GNOME_GSwitchItApplet.xml.h:3
-msgid "Show Current _Layout"
-msgstr "显示当前布局(_L)"
-
-#: ../gswitchit/GNOME_GSwitchItApplet.xml.h:5
-msgid "_Groups"
-msgstr "群组(_G)"
-
-#: ../gswitchit/GNOME_KeyboardApplet.server.in.in.h:1
-#: ../gswitchit/gswitchit-applet.c:590
-msgid "Keyboard Indicator"
-msgstr "键盘标识器"
-
-#: ../gswitchit/GNOME_KeyboardApplet.server.in.in.h:2
-msgid "Keyboard applet factory"
-msgstr "键盘小程序工厂"
-
-#: ../gswitchit/GNOME_KeyboardApplet.server.in.in.h:3
-msgid "Keyboard layout indicator"
-msgstr "键盘布局标识器"
-
-#: ../gswitchit/gswitchit-applet.c:240
-msgid "Unknown"
-msgstr "未知"
-
-#: ../gswitchit/gswitchit-applet.c:311
-#, c-format
-msgid "Keyboard Layout \"%s\""
-msgstr "键盘布局“%s”"
-
-#: ../gswitchit/gswitchit-applet.c:471
-msgid "Copyright (c) Sergey V. Udaltsov 1999-2004"
-msgstr "版权 (c) Sergey V. Oudaltsov 1999-2004"
-
-#: ../gswitchit/gswitchit-applet.c:474
-msgid "Keyboard layout indicator applet for GNOME"
-msgstr "GNOME 的键盘布局标识器小程序"
-
-#: ../gswitchit/gswitchit-applet.c:610
-#, c-format
-msgid "Keyboard Indicator (%s)"
-msgstr "键盘标识器(%s)"
-
-#: ../gswitchit/gswitchit.ui.h:1
-msgid "Keyboard Layout"
-msgstr "键盘布局"
-
 #: ../gweather/GNOME_GWeatherApplet.xml.h:2
 msgid "_Details"
 msgstr "细节(_D)"
@@ -1881,12 +1823,12 @@ msgid "Location"
 msgstr "位置"
 
 #: ../invest-applet/data/Invest_Applet.server.in.in.h:1
-#: ../invest-applet/invest/about.py:20
+#: ../invest-applet/invest/about.py:17
 msgid "Invest"
 msgstr "投资"
 
 #: ../invest-applet/data/Invest_Applet.server.in.in.h:2
-#: ../invest-applet/invest/about.py:23
+#: ../invest-applet/invest/about.py:20
 msgid "Track your invested money."
 msgstr "跟踪您的投资。"
 
@@ -2049,14 +1991,18 @@ msgstr ""
 "<b>来源：</b> Yahoo!</small></i>"
 
 #: ../invest-applet/data/prefs-dialog.ui.h:3
+msgid "Currency"
+msgstr "货币"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:4
 msgid "Invest Preferences"
 msgstr "投资 首选项"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:4
+#: ../invest-applet/data/prefs-dialog.ui.h:5
 msgid "Stocks"
 msgstr "股票"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:5
+#: ../invest-applet/data/prefs-dialog.ui.h:6
 msgid "label"
 msgstr "标签"
 
@@ -2096,72 +2042,77 @@ msgstr "无法下载图表"
 msgid "Invest Applet"
 msgstr "投资小程序"
 
-#: ../invest-applet/invest/preferences.py:24
+#: ../invest-applet/invest/preferences.py:30
 msgid "Symbol"
 msgstr "代码"
 
-#: ../invest-applet/invest/preferences.py:24
+#: ../invest-applet/invest/preferences.py:30
 msgid "Label"
 msgstr "标签"
 
-#: ../invest-applet/invest/preferences.py:24
+#: ../invest-applet/invest/preferences.py:30
 msgid "Amount"
 msgstr "总量"
 
-#: ../invest-applet/invest/preferences.py:24
+#: ../invest-applet/invest/preferences.py:30
 msgid "Price"
 msgstr "价格"
 
-#: ../invest-applet/invest/preferences.py:24
+#: ../invest-applet/invest/preferences.py:30
 msgid "Commission"
 msgstr "交易"
 
-#: ../invest-applet/invest/quotes.py:92
+#: ../invest-applet/invest/preferences.py:30
+msgid "Currency Rate"
+msgstr "汇率"
+
+#: ../invest-applet/invest/quotes.py:131
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "投资小程序无法连接到 Yahoo! 财经"
 
-#: ../invest-applet/invest/quotes.py:94 ../invest-applet/invest/quotes.py:107
+#: ../invest-applet/invest/quotes.py:133 ../invest-applet/invest/quotes.py:162
 #, python-format
 msgid "Updated at %s"
 msgstr "于 %s 更新"
 
-#. Translators: This is share-market jargon. It is the percentage change in the price of a stock. The %% gets changed to a single percent sign and the %+.2f gets replaced with the value of the change.
-#: ../invest-applet/invest/quotes.py:103
+#. Translators: This is share-market jargon. It is the average percentage change of all stock prices. The %s gets replaced with the string value of the change (localized), including the percent sign.
+#: ../invest-applet/invest/quotes.py:152
 #, python-format
-msgid "Quotes average change %%: %+.2f%%"
-msgstr "报价平均变化 %%: %+.2f%%"
+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. i.e. How much money would be earned if they were sold right now.
-#: ../invest-applet/invest/quotes.py:106
+#. Translators: This is share-market jargon. It refers to the total difference between the current price and purchase price for all the shares put together for a particular currency. i.e. How much money would be earned if they were sold right now. The first string is the change value, the second the currency, and the third value is the percentage of the change, formatted using user's locale.
+#: ../invest-applet/invest/quotes.py:161
 #, python-format
-msgid "Positions balance: %+.2f"
-msgstr "坐位平衡：%+.2f"
+#| msgid "Positions balance: %+.2f"
+msgid "Positions balance: %s %s (%s)"
+msgstr "坐位平衡：%s %s (%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:53
+#: ../invest-applet/invest/widgets.py:51
 msgid "Ticker"
 msgstr "股票行情自动收录器"
 
-#: ../invest-applet/invest/widgets.py:53
+#: ../invest-applet/invest/widgets.py:51
 msgid "Last"
 msgstr "最近"
 
-#: ../invest-applet/invest/widgets.py:53
+#: ../invest-applet/invest/widgets.py:51
 msgid "Change %"
 msgstr "变动 %"
 
-#: ../invest-applet/invest/widgets.py:53
+#: ../invest-applet/invest/widgets.py:51
 msgid "Chart"
 msgstr "图表"
 
-#: ../invest-applet/invest/widgets.py:53
+#: ../invest-applet/invest/widgets.py:51
 msgid "Gain"
 msgstr "收益"
 
-#: ../invest-applet/invest/widgets.py:53
+#: ../invest-applet/invest/widgets.py:51
 msgid "Gain %"
 msgstr "收益百分比"
 
@@ -2328,7 +2279,7 @@ msgid "_Use default theme colors"
 msgstr "使用默认主题颜色(_U)"
 
 #: ../mini-commander/src/mini-commander.ui.h:18
-#: ../stickynotes/stickynotes.ui.h:40
+#: ../stickynotes/stickynotes.ui.h:44
 msgid "_Width:"
 msgstr "宽度(_W)："
 
@@ -2504,8 +2455,8 @@ msgid "Adjust the sound volume"
 msgstr "调整音量"
 
 #. tooltip over applet
-#: ../mixer/GNOME_MixerApplet.server.in.in.h:2 ../mixer/applet.c:203
-#: ../mixer/applet.c:224 ../null_applet/null_applet.c:44
+#: ../mixer/GNOME_MixerApplet.server.in.in.h:2 ../mixer/applet.c:206
+#: ../mixer/applet.c:227 ../null_applet/null_applet.c:44
 #: ../null_applet/null_applet.c:46
 msgid "Volume Control"
 msgstr "音量控制"
@@ -2518,11 +2469,11 @@ msgstr "静音(_T)"
 msgid "_Open Volume Control"
 msgstr "打开音量控制(_O)"
 
-#: ../mixer/applet.c:187
+#: ../mixer/applet.c:190
 msgid "Volume Applet"
 msgstr "音量小程序"
 
-#: ../mixer/applet.c:542
+#: ../mixer/applet.c:545
 msgid ""
 "The volume control did not find any elements and/or devices to control. This "
 "means either that you don't have the right GStreamer plugins installed, or "
@@ -2531,7 +2482,7 @@ msgstr ""
 "音量控制找不到要控制的任何元素和/或设备。这意味着您可能没有安装正确的 "
 "GStreamer 插件，或者您没有配置好声卡。"
 
-#: ../mixer/applet.c:546
+#: ../mixer/applet.c:549
 msgid ""
 "You can remove the volume control from the panel by right-clicking the "
 "speaker icon on the panel and selecting \"Remove From Panel\" from the menu."
@@ -2539,12 +2490,12 @@ msgstr ""
 "如果您想要从面板中删除音量控制，可以用右键单击面板上的扬声器按钮，然后从菜单"
 "中选择“从面板删除”。"
 
-#: ../mixer/applet.c:714
+#: ../mixer/applet.c:721
 #, c-format
 msgid "Failed to start Volume Control: %s"
 msgstr "启动音量控制失败：%s"
 
-#: ../mixer/applet.c:1164
+#: ../mixer/applet.c:1171
 #, c-format
 msgid "%s: muted"
 msgstr "%s：已静音"
@@ -2553,21 +2504,21 @@ msgstr "%s：已静音"
 #. * to mark as a translation, but anyway. The string is a list of
 #. * selected tracks, the number is the volume in percent. You
 #. * most likely want to keep this as-is.
-#: ../mixer/applet.c:1170
+#: ../mixer/applet.c:1177
 #, c-format
 msgid "%s: %d%%"
 msgstr "%s：%d%%"
 
-#: ../mixer/applet.c:1408
+#: ../mixer/applet.c:1415
 #, c-format
 msgid "Failed to display help: %s"
 msgstr "显示帮助失败：%s"
 
-#: ../mixer/applet.c:1421
+#: ../mixer/applet.c:1428
 msgid "Volume control for your GNOME Panel."
 msgstr "从 GNOME 面板上进行音量控制。"
 
-#: ../mixer/applet.c:1422
+#: ../mixer/applet.c:1429
 msgid "Using GStreamer 0.10."
 msgstr "使用 GStreamer 0.10。"
 
@@ -2622,7 +2573,7 @@ msgstr "激活(_A)"
 msgid "_Deactivate"
 msgstr "断开(_D)"
 
-#: ../modemlights/GNOME_ModemLights.xml.h:5
+#: ../modemlights/GNOME_ModemLights.xml.h:5 ../stickynotes/stickynotes.ui.h:41
 msgid "_Properties"
 msgstr "属性(_P)"
 
@@ -2712,7 +2663,7 @@ msgid "A system load indicator"
 msgstr "系统负载指示器"
 
 #: ../multiload/GNOME_MultiLoadApplet_Factory.server.in.in.h:2
-#: ../multiload/main.c:496
+#: ../multiload/main.c:460
 msgid "System Monitor"
 msgstr "系统监视器"
 
@@ -2733,34 +2684,34 @@ msgstr ""
 msgid "There was an error executing '%s': %s"
 msgstr "执行“%s”时发生错误：%s"
 
-#: ../multiload/main.c:288 ../multiload/properties.c:596
+#: ../multiload/main.c:255 ../multiload/properties.c:596
 msgid "Processor"
 msgstr "处理器"
 
-#: ../multiload/main.c:290 ../multiload/properties.c:604
+#: ../multiload/main.c:257 ../multiload/properties.c:604
 msgid "Memory"
 msgstr "内存"
 
-#: ../multiload/main.c:292 ../multiload/properties.c:612
+#: ../multiload/main.c:259 ../multiload/properties.c:612
 msgid "Network"
 msgstr "网络"
 
-#: ../multiload/main.c:294 ../multiload/properties.c:619
+#: ../multiload/main.c:261 ../multiload/properties.c:619
 msgid "Swap Space"
 msgstr "交换空间"
 
-#: ../multiload/main.c:296 ../multiload/main.c:378
+#: ../multiload/main.c:263 ../multiload/main.c:342
 msgid "Load Average"
 msgstr "负载均值"
 
-#: ../multiload/main.c:298
+#: ../multiload/main.c:265
 msgid "Disk"
 msgstr "磁盘"
 
 #. xgettext: use and cache are > 1 most of the time,
 #. please assume that they always are.
 #.
-#: ../multiload/main.c:317
+#: ../multiload/main.c:281
 #, c-format
 msgid ""
 "%s:\n"
@@ -2771,13 +2722,13 @@ msgstr ""
 "程序使用了 %u%%\n"
 "系统缓存使用了%u%%"
 
-#: ../multiload/main.c:325
+#: ../multiload/main.c:289
 #, c-format
 msgid "The system load average is %0.02f"
 msgstr "系统平均负载为 %0.02f"
 
 #. xgettext: same as in graphic tab of g-s-m
-#: ../multiload/main.c:333
+#: ../multiload/main.c:297
 #, c-format
 msgid ""
 "%s:\n"
@@ -2788,7 +2739,7 @@ msgstr ""
 "正在接收 %s\n"
 "正在发送 %s"
 
-#: ../multiload/main.c:349
+#: ../multiload/main.c:313
 #, c-format
 msgid ""
 "%s:\n"
@@ -2800,23 +2751,23 @@ msgstr[0] ""
 "%s：\n"
 "已使用 %u%%"
 
-#: ../multiload/main.c:374
+#: ../multiload/main.c:338
 msgid "CPU Load"
 msgstr "CPU 负载"
 
-#: ../multiload/main.c:375
+#: ../multiload/main.c:339
 msgid "Memory Load"
 msgstr "内存用量"
 
-#: ../multiload/main.c:376
+#: ../multiload/main.c:340
 msgid "Net Load"
 msgstr "网络负载"
 
-#: ../multiload/main.c:377
+#: ../multiload/main.c:341
 msgid "Swap Load"
 msgstr "交换区负载"
 
-#: ../multiload/main.c:379
+#: ../multiload/main.c:343
 msgid "Disk Load"
 msgstr "磁盘负载"
 
@@ -3120,6 +3071,14 @@ msgstr "监视无线网络链路的信号质量"
 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:40
 msgid "Inbox Monitor"
 msgstr "收件箱监视器"
@@ -3128,21 +3087,25 @@ msgstr "收件箱监视器"
 msgid "CD Player"
 msgstr "CD 播放器"
 
-#: ../null_applet/null_applet.c:149
+#: ../null_applet/null_applet.c:48
+msgid "Keyboard Indicator"
+msgstr "键盘标识器"
+
+#: ../null_applet/null_applet.c:151
 msgid "Some panel items are no longer available"
 msgstr "某些面板项不再可用"
 
-#: ../null_applet/null_applet.c:150
+#: ../null_applet/null_applet.c:152
 msgid ""
 "One or more panel items (also referred to as applets) are no longer "
 "available in the GNOME desktop."
 msgstr "一个或多个面板项(也称为小程序)不再包含于 GNOME 桌面中。"
 
-#: ../null_applet/null_applet.c:152
+#: ../null_applet/null_applet.c:154
 msgid "These items will now be removed from your configuration:"
 msgstr "这些项目将会从您的配置中删除："
 
-#: ../null_applet/null_applet.c:155
+#: ../null_applet/null_applet.c:157
 msgid "You will not receive this message again."
 msgstr "您将不会再收到此消息。"
 
@@ -3181,6 +3144,7 @@ msgid "_Lock Notes"
 msgstr "锁定便笺(_L)"
 
 #: ../stickynotes/GNOME_StickyNotesApplet.xml.h:6
+#: ../stickynotes/stickynotes.ui.h:40
 msgid "_New Note"
 msgstr "新建便笺(_N)"
 
@@ -3337,14 +3301,22 @@ msgid "_Delete All"
 msgstr "全部删除(_D)"
 
 #: ../stickynotes/stickynotes.ui.h:37
+msgid "_Delete Note..."
+msgstr "删除便笺(_D)..."
+
+#: ../stickynotes/stickynotes.ui.h:38
 msgid "_Font:"
 msgstr "字体(_F)："
 
-#: ../stickynotes/stickynotes.ui.h:38
+#: ../stickynotes/stickynotes.ui.h:39
+msgid "_Lock Note"
+msgstr "锁定便笺(_L)"
+
+#: ../stickynotes/stickynotes.ui.h:42
 msgid "_Put notes on all workspaces"
 msgstr "将便笺放置在所有工作区(_P)"
 
-#: ../stickynotes/stickynotes.ui.h:39
+#: ../stickynotes/stickynotes.ui.h:43
 msgid "_Title:"
 msgstr "标题(_T)："
 
@@ -3570,6 +3542,36 @@ msgstr "清空回收站"
 msgid "From:"
 msgstr "从："
 
+#~ msgid "Keyboard _Preferences"
+#~ msgstr "键盘首选项(_P)"
+
+#~ msgid "Pl_ugins"
+#~ msgstr "插件(_U)"
+
+#~ msgid "Show Current _Layout"
+#~ msgstr "显示当前布局(_L)"
+
+#~ msgid "_Groups"
+#~ msgstr "群组(_G)"
+
+#~ msgid "Keyboard applet factory"
+#~ msgstr "键盘小程序工厂"
+
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgid "Keyboard Layout \"%s\""
+#~ msgstr "键盘布局“%s”"
+
+#~ msgid "Copyright (c) Sergey V. Udaltsov 1999-2004"
+#~ msgstr "版权 (c) Sergey V. Oudaltsov 1999-2004"
+
+#~ msgid "Keyboard layout indicator applet for GNOME"
+#~ msgstr "GNOME 的键盘布局标识器小程序"
+
+#~ msgid "Keyboard Layout"
+#~ msgstr "键盘布局"
+
 #~ msgid "<b>Appearance</b>"
 #~ msgstr "<b>外观</b>"
 
@@ -3609,12 +3611,6 @@ msgstr "从："
 #~ msgid "<b>Properties</b>"
 #~ msgstr "<b>属性</b>"
 
-#~ msgid "_Delete Note..."
-#~ msgstr "删除便笺(_D)..."
-
-#~ msgid "_Lock Note"
-#~ msgstr "锁定便笺(_L)"
-
 #~ msgid "<b>From:</b>"
 #~ msgstr "<b>来自：</b>"