diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0d36398e4..bcb20b07a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,21 +1,22 @@
 # Chinese (China) translation for gnome-shell.
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-shell package.
-# Ray Wang <raywang@gnome.org>, 2009.
 # jiero <lililjlj@gmail.com>, 2010.
 # Aron Xu <aronxu@gnome.org>, 2010.
 # Jessica Ban <bancage@gmail.com>, 2010.
 # YunQiang Su <wzssyqa@gmail.com>, 2010.
 # zhang ping <zhangping159@gmail.com>, 2010.
 # 指冷玉笙寒 (dhyang) <dhyang555@gmail.com>, 2010
+# Ray Wang <raywang@gnome.org>, 2009, 2011.
+# Aron Xu <aronxu@gnome.org>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-12-23 17:30+0000\n"
-"PO-Revision-Date: 2010-12-25 20:54+0800\n"
+"POT-Creation-Date: 2011-02-13 21:59+0000\n"
+"PO-Revision-Date: 2011-02-14 19:39+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -32,14 +33,6 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "窗口管理和应用程序启动"
 
-#: ../data/gnome-shell-clock-preferences.desktop.in.in.h:1
-msgid "Clock"
-msgstr "时钟"
-
-#: ../data/gnome-shell-clock-preferences.desktop.in.in.h:2
-msgid "Customize the panel clock"
-msgstr "自定义面板时钟"
-
 #: ../data/org.gnome.shell.gschema.xml.in.h:1
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
@@ -47,56 +40,45 @@ msgid ""
 msgstr "允许使用 Alt-F2 对话框访问内部调试和监视工具。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:2
-msgid "Custom format of the clock"
-msgstr "自定义面板时钟格式"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:3
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr "启用从 Alt-F2 调用对开发者和测试者有用的内部工具"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:4
+#: ../data/org.gnome.shell.gschema.xml.in.h:3
 msgid "File extension used for storing the screencast"
 msgstr "存储屏幕录像的文件扩展名"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:5
+#: ../data/org.gnome.shell.gschema.xml.in.h:4
 msgid "Framerate used for recording screencasts."
 msgstr "屏幕录像的帧率。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:6
+#: ../data/org.gnome.shell.gschema.xml.in.h:5
 msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
 "should not be loaded."
 msgstr "GNOME Shell 扩展有一个 uuid 属性，此键列出了不应该加载的扩展。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:7
+#: ../data/org.gnome.shell.gschema.xml.in.h:6
 msgid "History for command (Alt-F2) dialog"
 msgstr "命令对话框(Alt-F2)的历史记录"
 
+#: ../data/org.gnome.shell.gschema.xml.in.h:7
+msgid "If true, display date in the clock, in addition to time."
+msgstr "如果为真，在时钟中显示日期以及时间。"
+
 #: ../data/org.gnome.shell.gschema.xml.in.h:8
-msgid "Hour format"
-msgstr "小时格式"
+msgid "If true, display seconds in time."
+msgstr "如果为真，在时间上显示秒数。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:9
-msgid ""
-"If true and format is either \"12-hour\" or \"24-hour\", display date in the "
-"clock, in addition to time."
-msgstr "如果为真并且格式为 12 时制或 24 时制，在时钟中显示日期以及时间。"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:10
-msgid ""
-"If true and format is either \"12-hour\" or \"24-hour\", display seconds in "
-"time."
-msgstr "如果为真并且格式为 12 时制或 24 时制，在时钟中显示秒。"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
 msgid "If true, display the ISO week date in the calendar."
 msgstr "如果为真，在日历中显示 ISO 周日期。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid "List of desktop file IDs for favorite applications"
 msgstr "收藏夹中的应用程序的 desktop 文件 ID 的列表"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#, fuzzy, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -105,7 +87,9 @@ msgid ""
 "pipeline can also take care of its own output - this might be used to send "
 "the output to an icecast server via shout2send or similar. When unset or set "
 "to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
+"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
+"at the optimal thread count on the system."
 msgstr ""
 "设置 GStreamer 管道用来编码录音。它遵循 gst-launch 的语法。该管道应当有一个未"
 "连接的 sink 衬垫(pad)，录制的视频就是在此录制的。该管道一般还会有一个未连接"
@@ -114,25 +98,25 @@ msgstr ""
 "器。当管道未被设置或者设置为空值时，默认的管道将被启用。其值当前"
 "为“videorate ! theoraenc ! oggmux”并记录为 Ogg Theora 格式。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show date in clock"
 msgstr "显示日期"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show the week date in the calendar"
 msgstr "在日历中显示星期"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show time with seconds"
 msgstr "显示秒"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr "符合这些标示的应用程序将显示在收藏区中。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -141,17 +125,17 @@ msgstr ""
 "录制的屏幕录像的文件名将是根据当前时间得到的独特值，并使用这个扩展名。录制另"
 "外一个不同容器格式的录像时，它应该被更改。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
 msgstr "GNOME Shell 的屏幕录像程序录制的屏幕录像的帧率，以 帧/秒 为格式。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "用于编码屏幕录像的 GStreamer 管线"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -162,223 +146,59 @@ msgstr ""
 "时，此数据将保持私密，您可能因为隐私原因想要禁用此项。请注意，这么做，并不会"
 "移除已经保存的数据。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:22
-msgid ""
-"This key specifies the format used by the panel clock when the format key is "
-"set to \"custom\". You can use conversion specifiers understood by strftime"
-"() to obtain a specific format. See the strftime() manual for more "
-"information."
-msgstr ""
-"格式(format)键设置“custom”(自定义)时，这个键指定面板时钟的格式。您可以使用可"
-"以被 strftime() 理解的转义符获取特定的格式。请查看 strftime() 的文档获取更多"
-"信息。"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
-msgid ""
-"This key specifies the hour format used by the panel clock. Possible values "
-"are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to \"unix\", "
-"the clock will display time in seconds since Epoch, i.e. 1970-01-01. If set "
-"to \"custom\", the clock will display time according to the format specified "
-"in the custom_format key. Note that if set to either \"unix\" or \"custom\", "
-"the show_date and show_seconds keys are ignored."
-msgstr ""
-"此键指定面板时钟使用的时间格式。可能的值为 \"12-hour\"、\"24-hour\"、\"unix"
-"\" 和 \"custom\"。如果设为 unix，时钟将显示从 Epoch(也就是 1970-1-1 UTC)开始"
-"的秒数。如果设为 \"custom\"，时钟将根据在 custom_format 键中设定的格式规则显"
-"示时间。注意，如果设置为 \"unix\" 或 \"custom\"，show_date 和 show_seconds 键"
-"将被忽略。"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Uuids of extensions to disable"
 msgstr "要禁用的扩展的 uuid"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Whether to collect stats about applications usage"
 msgstr "是否收集应用程序的使用情况"
 
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
-msgid "Clip the crosshairs at the center"
-msgstr "将十字夹在中间"
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
+msgid "disabled OpenSearch providers"
+msgstr "已禁用的 OpenSearch 提供商"
 
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2
-msgid "Color of the crosshairs"
-msgstr "十字的颜色"
+#: ../js/misc/util.js:86
+msgid "Command not found"
+msgstr "命令未找到"
 
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:3
-msgid ""
-"Determines the length of the vertical and horizontal lines that make up the "
-"crosshairs."
-msgstr "确定组成十字的水平线和竖直线的长度。"
+#. Replace "Error invoking GLib.shell_parse_argv: " with
+#. something nicer
+#: ../js/misc/util.js:113
+msgid "Could not parse command:"
+msgstr "不能解析命令："
 
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:4
-msgid ""
-"Determines the position of the magnified mouse image within the magnified "
-"view and how it reacts to system mouse movement. The values are - none: no "
-"mouse tracking; - centered: the mouse image is displayed at the center of "
-"the zoom region (which also represents the point under the system mouse) and "
-"the magnified contents are scrolled as the system mouse moves; - "
-"proportional: the position of the magnified mouse in the zoom region is "
-"proportionally the same as the position of the system mouse on screen; - "
-"push: when the magnified mouse intersects a boundary of the zoom region, the "
-"contents are scrolled into view."
-msgstr ""
-"确定放大了的鼠标图像在放大了的视图中的的位置，以及如何对系统鼠标的移动做出反"
-"馈。可用的值有 - none：鼠标不跟踪；- centered：鼠标图像显示在放大区域的中心"
-"(这也表示系统鼠标下的点)，而且放大的内容也随着系统鼠标的移动而滚动；- "
-"proportional：放大区域中，放大的鼠标的位置和系统鼠标在屏幕上的位置成比例相同"
-"(数学上的“相似”)；- push：当放大的鼠标与放大区域的边界相交时，将内容滚动进视"
-"图。"
+#: ../js/misc/util.js:135
+msgid "No such application"
+msgstr "没有此应用程序"
 
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:5
-msgid ""
-"Determines the transparency of the crosshairs, from fully opaque to fully "
-"transparent."
-msgstr "确定十字线的透明度，从全遮蔽到全透明。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:6
-msgid ""
-"Determines whether the crosshairs intersect the magnified mouse sprite, or "
-"are clipped such that the ends of the horizontal and vertical lines surround "
-"the mouse image."
-msgstr "确定十字是和放大的光标精灵交叉，还是固定来让水平和竖直线环绕鼠标形象。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7
-msgid "Enable lens mode"
-msgstr "启用透镜模式"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:8
-msgid ""
-"Enables/disables display of crosshairs centered on the magnified mouse "
-"sprite."
-msgstr "启用或禁用穿过放大的鼠标精灵的十字。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:9
-msgid ""
-"For centered mouse tracking, when the system pointer is at or near the edge "
-"of the screen, the magnified contents continue to scroll such that the "
-"screen edge moves into the magnified view."
-msgstr ""
-"对于居中的鼠标跟踪，当系统指针位于或者接近屏幕的边缘时，放大的内容继续滚动，"
-"以便让屏幕边缘移动到放大的视图。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:10
-msgid "Length of the crosshairs"
-msgstr "十字长度"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:11
-msgid "Magnification factor"
-msgstr "放大因子"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:12
-msgid "Mouse Tracking Mode"
-msgstr "鼠标跟随模式"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:13
-msgid "Opacity of the crosshairs"
-msgstr "十字的不透明度"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:14
-msgid "Screen position"
-msgstr "屏幕位置"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:15
-msgid "Scroll magnified contents beyond the edges of the desktop"
-msgstr "在桌面边界以外滚动放大内容"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16
-msgid "Show or hide crosshairs"
-msgstr "显示或隐藏十字线"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17
-msgid "Show or hide the magnifier"
-msgstr "显示或隐藏放大镜"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18
-msgid "Show or hide the magnifier and all of its zoom regions."
-msgstr "显示或隐藏放大镜及其全部放大区域。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19
-msgid ""
-"The color of the the vertical and horizontal lines that make up the "
-"crosshairs."
-msgstr "组成十字的水平线和竖直线的颜色。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:20
-msgid ""
-"The magnified view either fills the entire screen, or occupies the top-half, "
-"bottom-half, left-half, or right-half of the screen."
-msgstr "放大的视图是充满整个屏幕还是占据屏幕的顶半部、底半部、左半部或右半部。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:21
-msgid ""
-"The power of the magnification. A value of 1.0 means no magnification. A "
-"value of 2.0 doubles the size."
-msgstr "边长的放大倍数。1.0 表示不放大，2.0 表示将长度增倍。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:22
-msgid "Thickness of the crosshairs"
-msgstr "十字的厚度"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:23
-msgid ""
-"Whether the magnified view should be centered over the location of the "
-"system mouse and move with it."
-msgstr "放大的视图是否以系统鼠标为中心放置并且随之移动。"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:24
-msgid "Width of the vertical and horizontal lines that make up the crosshairs."
-msgstr "组成十字的水平和竖直线的宽度。"
-
-#: ../data/clock-preferences.ui.h:1
-msgid "Clock Format"
-msgstr "时钟格式"
-
-#: ../data/clock-preferences.ui.h:2
-msgid "Clock Preferences"
-msgstr "时钟首选项"
-
-#: ../data/clock-preferences.ui.h:3
-msgid "Panel Display"
-msgstr "面板显示"
-
-#: ../data/clock-preferences.ui.h:4
-msgid "Show seco_nds"
-msgstr "显示秒(_N)"
-
-#: ../data/clock-preferences.ui.h:5
-msgid "Show the _date"
-msgstr "显示日期(_D)"
-
-#: ../data/clock-preferences.ui.h:6
-msgid "_12 hour format"
-msgstr "_12 时格式"
-
-#: ../data/clock-preferences.ui.h:7
-msgid "_24 hour format"
-msgstr "_24 小时格式"
+#: ../js/misc/util.js:148
+#, c-format
+msgid "Execution of '%s' failed:"
+msgstr "运行“%s”失败："
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:155
+#: ../js/ui/appDisplay.js:174
 msgid "All"
 msgstr "全部"
 
-#: ../js/ui/appDisplay.js:236
+#: ../js/ui/appDisplay.js:261
 msgid "APPLICATIONS"
 msgstr "应用程序"
 
-#: ../js/ui/appDisplay.js:266
+#: ../js/ui/appDisplay.js:291
 msgid "PREFERENCES"
 msgstr "首选项"
 
-#: ../js/ui/appDisplay.js:563
+#: ../js/ui/appDisplay.js:592
 msgid "New Window"
 msgstr "新窗口"
 
-#: ../js/ui/appDisplay.js:567
+#: ../js/ui/appDisplay.js:596
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: ../js/ui/appDisplay.js:568
+#: ../js/ui/appDisplay.js:597
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
@@ -392,126 +212,358 @@ msgstr "%s 已经添加到了您的收藏夹。"
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"
 
-#: ../js/ui/dash.js:27
+#. Translators: Shown in calendar event list for all day events
+#. * Keep it short, best if you can use less then 10 characters
+#.
+#: ../js/ui/calendar.js:65
+msgctxt "event list time"
+msgid "All Day"
+msgstr "全天"
+
+#. Translators: Shown in calendar event list, if 24h format
+#: ../js/ui/calendar.js:70
+#, fuzzy
+msgctxt "event list time"
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. Transators: Shown in calendar event list, if 12h format
+#: ../js/ui/calendar.js:77
+#, fuzzy
+msgctxt "event list time"
+msgid "%l:%M %p"
+msgstr "%a %l:%M %p"
+
+#. Translators: Calendar grid abbreviation for Sunday.
+#. *
+#. * NOTE: These grid abbreviations are always shown together
+#. * and in order, e.g. "S M T W T F S".
+#.
+#: ../js/ui/calendar.js:117
+msgctxt "grid sunday"
+msgid "S"
+msgstr "六"
+
+#. Translators: Calendar grid abbreviation for Monday
+#: ../js/ui/calendar.js:119
+msgctxt "grid monday"
+msgid "M"
+msgstr "一"
+
+#. Translators: Calendar grid abbreviation for Tuesday
+#: ../js/ui/calendar.js:121
+msgctxt "grid tuesday"
+msgid "T"
+msgstr "二"
+
+#. Translators: Calendar grid abbreviation for Wednesday
+#: ../js/ui/calendar.js:123
+msgctxt "grid wednesday"
+msgid "W"
+msgstr "三"
+
+#. Translators: Calendar grid abbreviation for Thursday
+#: ../js/ui/calendar.js:125
+msgctxt "grid thursday"
+msgid "T"
+msgstr "四"
+
+#. Translators: Calendar grid abbreviation for Friday
+#: ../js/ui/calendar.js:127
+msgctxt "grid friday"
+msgid "F"
+msgstr "五"
+
+#. Translators: Calendar grid abbreviation for Saturday
+#: ../js/ui/calendar.js:129
+msgctxt "grid saturday"
+msgid "S"
+msgstr "六"
+
+#. Translators: Event list abbreviation for Sunday.
+#. *
+#. * NOTE: These list abbreviations are normally not shown together
+#. * so they need to be unique (e.g. Tuesday and Thursday cannot
+#. * both be 'T').
+#.
+#: ../js/ui/calendar.js:142
+msgctxt "list sunday"
+msgid "Su"
+msgstr "星期日"
+
+#. Translators: Event list abbreviation for Monday
+#: ../js/ui/calendar.js:144
+msgctxt "list monday"
+msgid "M"
+msgstr "星期一"
+
+#. Translators: Event list abbreviation for Tuesday
+#: ../js/ui/calendar.js:146
+msgctxt "list tuesday"
+msgid "T"
+msgstr "星期二"
+
+#. Translators: Event list abbreviation for Wednesday
+#: ../js/ui/calendar.js:148
+msgctxt "list wednesday"
+msgid "W"
+msgstr "星期三"
+
+#. Translators: Event list abbreviation for Thursday
+#: ../js/ui/calendar.js:150
+msgctxt "list thursday"
+msgid "Th"
+msgstr "星期四"
+
+#. Translators: Event list abbreviation for Friday
+#: ../js/ui/calendar.js:152
+msgctxt "list friday"
+msgid "F"
+msgstr "星期五"
+
+#. Translators: Event list abbreviation for Saturday
+#: ../js/ui/calendar.js:154
+msgctxt "list saturday"
+msgid "S"
+msgstr "星期六"
+
+#. Translators: Text to show if there are no events
+#: ../js/ui/calendar.js:701
+msgid "Nothing Scheduled"
+msgstr "无计划"
+
+#. Translators: Shown on calendar heading when selected day occurs on current year
+#: ../js/ui/calendar.js:717
+msgctxt "calendar heading"
+msgid "%A, %B %d"
+msgstr "%-m月%-d日%A"
+
+#. Translators: Shown on calendar heading when selected day occurs on different year
+#: ../js/ui/calendar.js:720
+msgctxt "calendar heading"
+msgid "%A, %B %d, %Y"
+msgstr "%-Y年%-m月%-d日%A"
+
+#: ../js/ui/calendar.js:730
+msgid "Today"
+msgstr "今天"
+
+#: ../js/ui/calendar.js:734
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../js/ui/calendar.js:743
+msgid "This week"
+msgstr "本周"
+
+#: ../js/ui/calendar.js:751
+msgid "Next week"
+msgstr "下周"
+
+#: ../js/ui/dash.js:174
 msgid "Remove"
 msgstr "移除"
 
-#: ../js/ui/docDisplay.js:494
-msgid "RECENT ITEMS"
-msgstr "最近的项目"
+#: ../js/ui/dateMenu.js:91
+msgid "Date and Time Settings"
+msgstr "日期和时间设置"
 
-#: ../js/ui/lookingGlass.js:552
-msgid "No extensions installed"
-msgstr "未安装扩展"
-
-#: ../js/ui/lookingGlass.js:589
-msgid "Enabled"
-msgstr "启用"
-
-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
-msgid "Disabled"
-msgstr "禁用"
-
-#: ../js/ui/lookingGlass.js:593
-msgid "Error"
-msgstr "错误"
-
-#: ../js/ui/lookingGlass.js:595
-msgid "Out of date"
-msgstr "过时"
-
-#: ../js/ui/lookingGlass.js:620
-msgid "View Source"
-msgstr "查看源"
-
-#: ../js/ui/lookingGlass.js:626
-msgid "Web Page"
-msgstr "网页"
-
-#: ../js/ui/overview.js:96
-msgid "Undo"
-msgstr "撤销"
-
-#: ../js/ui/overview.js:158
-msgid "Windows"
-msgstr "窗口"
-
-#: ../js/ui/overview.js:161
-msgid "Applications"
-msgstr "应用程序"
-
-#. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:474
-#, c-format
-msgid "Quit %s"
-msgstr "退出 %s"
-
-#: ../js/ui/panel.js:499
-msgid "Preferences"
-msgstr "首选项"
+#: ../js/ui/dateMenu.js:110
+msgid "Open Calendar"
+msgstr "打开日历"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:585
+#: ../js/ui/dateMenu.js:149
 msgid "%a %b %e, %R:%S"
 msgstr "%A %b %e, %R:%S"
 
-#: ../js/ui/panel.js:586
+#: ../js/ui/dateMenu.js:150
 msgid "%a %b %e, %R"
 msgstr "%A %m月%d日 %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:590
+#: ../js/ui/dateMenu.js:154
 msgid "%a %R:%S"
 msgstr "%A %R:%S"
 
-#: ../js/ui/panel.js:591
+#: ../js/ui/dateMenu.js:155
 msgid "%a %R"
 msgstr "%A %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:598
+#: ../js/ui/dateMenu.js:162
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%A %m月%d日 %p%I:%M:%S"
 
-#: ../js/ui/panel.js:599
+#: ../js/ui/dateMenu.js:163
 msgid "%a %b %e, %l:%M %p"
 msgstr "%A %m月%d日 %p%I:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:603
+#: ../js/ui/dateMenu.js:167
 msgid "%a %l:%M:%S %p"
 msgstr "%A %p%I:%M:%S"
 
-#: ../js/ui/panel.js:604
+#: ../js/ui/dateMenu.js:168
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
+#. Translators: This is the date format to use when the calendar popup is
+#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
+#.
+#: ../js/ui/dateMenu.js:194
+msgid "%A %B %e, %Y"
+msgstr "%-Y年%-m月%-d日%A"
+
+#: ../js/ui/docDisplay.js:19
+msgid "RECENT ITEMS"
+msgstr "最近项目"
+
+#: ../js/ui/endSessionDialog.js:63
+#, c-format
+msgid "Log Out %s"
+msgstr "注销 %s"
+
+#: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69
+msgid "Log Out"
+msgstr "注销"
+
+#: ../js/ui/endSessionDialog.js:65
+msgid "Click Log Out to quit these applications and log out of the system."
+msgstr "点“注销“来退出这些应用程序及系统"
+
+#: ../js/ui/endSessionDialog.js:66
+#, c-format
+msgid "%s will be logged out automatically in %d seconds."
+msgstr "%s 将在 %d 秒后自动注销。"
+
+#: ../js/ui/endSessionDialog.js:67
+#, c-format
+msgid "You will be logged out automatically in %d seconds."
+msgstr "你将在 %d 秒后自动注销。"
+
+#: ../js/ui/endSessionDialog.js:68
+msgid "Logging out of the system."
+msgstr "从系统注销"
+
+#: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78
+msgid "Shut Down"
+msgstr "关机"
+
+#: ../js/ui/endSessionDialog.js:75
+msgid "Click Shut Down to quit these applications and shut down the system."
+msgstr "点“关机“来退出这些应用程序并关闭系统。"
+
+#: ../js/ui/endSessionDialog.js:76
+#, c-format
+msgid "The system will shut down automatically in %d seconds."
+msgstr "系统将在 %d 秒后自动关机。"
+
+#: ../js/ui/endSessionDialog.js:77
+msgid "Shutting down the system."
+msgstr "关闭计算机。"
+
+#: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88
+msgid "Restart"
+msgstr "重启"
+
+#: ../js/ui/endSessionDialog.js:85
+msgid "Click Restart to quit these applications and restart the system."
+msgstr "点“重启“来退出这些应用程序并重启系统"
+
+#: ../js/ui/endSessionDialog.js:86
+#, c-format
+msgid "The system will restart automatically in %d seconds."
+msgstr "系统将在 %d 秒后自动重启。"
+
+#: ../js/ui/endSessionDialog.js:87
+msgid "Restarting the system."
+msgstr "重启计算机。"
+
+#: ../js/ui/endSessionDialog.js:395
+msgid "Confirm"
+msgstr "确定"
+
+#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470
+msgid "Cancel"
+msgstr "取消"
+
+#: ../js/ui/lookingGlass.js:584
+msgid "No extensions installed"
+msgstr "未安装扩展"
+
+#: ../js/ui/lookingGlass.js:621
+msgid "Enabled"
+msgstr "已启用"
+
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:623 ../src/gvc/gvc-mixer-control.c:1087
+msgid "Disabled"
+msgstr "已禁用"
+
+#: ../js/ui/lookingGlass.js:625
+msgid "Error"
+msgstr "错误"
+
+#: ../js/ui/lookingGlass.js:627
+msgid "Out of date"
+msgstr "过时"
+
+#: ../js/ui/lookingGlass.js:652
+msgid "View Source"
+msgstr "查看源"
+
+#: ../js/ui/lookingGlass.js:658
+msgid "Web Page"
+msgstr "网页"
+
+#: ../js/ui/messageTray.js:1854
+msgid "System Information"
+msgstr "系统信息"
+
+#: ../js/ui/overview.js:88
+msgid "Undo"
+msgstr "撤销"
+
+#: ../js/ui/overview.js:159
+msgid "Windows"
+msgstr "窗口"
+
+#: ../js/ui/overview.js:162
+msgid "Applications"
+msgstr "应用程序"
+
+#. TODO - _quit() doesn't really work on apps in state STARTING yet
+#: ../js/ui/panel.js:480
+#, c-format
+msgid "Quit %s"
+msgstr "退出 %s"
+
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:749
+#: ../js/ui/panel.js:614
 msgid "Activities"
 msgstr "活动"
 
-#: ../js/ui/placeDisplay.js:111
+#: ../js/ui/placeDisplay.js:122
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "卸载 %s 失败"
 
-#: ../js/ui/placeDisplay.js:114
+#: ../js/ui/placeDisplay.js:125
 msgid "Retry"
 msgstr "重试"
 
-#: ../js/ui/placeDisplay.js:159
+#: ../js/ui/placeDisplay.js:165
 msgid "Connect to..."
 msgstr "连接到..."
 
-#: ../js/ui/placeDisplay.js:558
+#: ../js/ui/placeDisplay.js:409
 msgid "PLACES & DEVICES"
 msgstr "位置和设备"
 
@@ -520,88 +572,93 @@ msgstr "位置和设备"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:33
+#: ../js/ui/popupMenu.js:512
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
-#: ../js/ui/runDialog.js:233
+#: ../js/ui/runDialog.js:209
 msgid "Please enter a command:"
 msgstr "请输入一个命令："
 
-#: ../js/ui/runDialog.js:378
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "运行“%s”失败："
+#: ../js/ui/searchDisplay.js:295
+msgid "Searching..."
+msgstr "正在搜索..."
 
-#: ../js/ui/statusMenu.js:101
+#: ../js/ui/searchDisplay.js:309
+msgid "No matching results."
+msgstr "无匹配结果。"
+
+#: ../js/ui/statusMenu.js:102
 msgid "Available"
 msgstr "可用"
 
-#: ../js/ui/statusMenu.js:106
+#: ../js/ui/statusMenu.js:107
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../js/ui/statusMenu.js:114
+#: ../js/ui/statusMenu.js:115
 msgid "My Account"
 msgstr "我的帐户"
 
-#: ../js/ui/statusMenu.js:118
+#: ../js/ui/statusMenu.js:119
 msgid "System Settings"
 msgstr "系统设置"
 
-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:126
 msgid "Lock Screen"
 msgstr "锁住屏幕"
 
-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:130
 msgid "Switch User"
 msgstr "切换用户"
 
-#: ../js/ui/statusMenu.js:134
+#: ../js/ui/statusMenu.js:135
 msgid "Log Out..."
 msgstr "退出..."
 
-#: ../js/ui/statusMenu.js:141
-msgid "Suspend..."
-msgstr "休眠..."
-
-#: ../js/ui/statusMenu.js:145
+#. This is temporarily removed, see
+#. http://bugzilla.gnome.org/show_bug.cgi?id=636680
+#. for details.
+#. item = new PopupMenu.PopupMenuItem(_("Suspend..."));
+#. item.connect('activate', Lang.bind(this, this._onShutDownActivate));
+#. this.menu.addMenuItem(item);
+#: ../js/ui/statusMenu.js:149
 msgid "Shut Down..."
 msgstr "关机..."
 
-#: ../js/ui/status/accessibility.js:82
+#: ../js/ui/status/accessibility.js:83
 msgid "Zoom"
 msgstr "缩放"
 
-#: ../js/ui/status/accessibility.js:88
+#: ../js/ui/status/accessibility.js:89
 msgid "Screen Reader"
 msgstr "屏幕阅读器"
 
-#: ../js/ui/status/accessibility.js:91
+#: ../js/ui/status/accessibility.js:92
 msgid "Screen Keyboard"
 msgstr "屏幕键盘"
 
-#: ../js/ui/status/accessibility.js:94
+#: ../js/ui/status/accessibility.js:95
 msgid "Visual Alerts"
 msgstr "视觉响铃"
 
-#: ../js/ui/status/accessibility.js:97
+#: ../js/ui/status/accessibility.js:98
 msgid "Sticky Keys"
 msgstr "粘滞键"
 
-#: ../js/ui/status/accessibility.js:100
+#: ../js/ui/status/accessibility.js:101
 msgid "Slow Keys"
 msgstr "慢速键"
 
-#: ../js/ui/status/accessibility.js:103
+#: ../js/ui/status/accessibility.js:104
 msgid "Bounce Keys"
 msgstr "筛选键"
 
-#: ../js/ui/status/accessibility.js:106
+#: ../js/ui/status/accessibility.js:107
 msgid "Mouse Keys"
 msgstr "鼠标按键"
 
-#: ../js/ui/status/accessibility.js:110
+#: ../js/ui/status/accessibility.js:111
 msgid "Universal Access Settings"
 msgstr "通用访问设置"
 
@@ -613,7 +670,9 @@ msgstr "高对比度"
 msgid "Large Text"
 msgstr "大号文本"
 
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:234
+#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
+#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
 msgid "Bluetooth"
 msgstr "蓝牙"
 
@@ -629,109 +688,104 @@ msgstr "发送文件到设备..."
 msgid "Setup a New Device..."
 msgstr "安装新设备..."
 
-#: ../js/ui/status/bluetooth.js:94
+#: ../js/ui/status/bluetooth.js:95
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
-#: ../js/ui/status/bluetooth.js:185
+#: ../js/ui/status/bluetooth.js:192
 msgid "Connection"
 msgstr "连接"
 
-#: ../js/ui/status/bluetooth.js:221
+#: ../js/ui/status/bluetooth.js:228
 msgid "Send Files..."
 msgstr "发送文件..."
 
-#: ../js/ui/status/bluetooth.js:226
+#: ../js/ui/status/bluetooth.js:233
 msgid "Browse Files..."
 msgstr "浏览文件..."
 
-#: ../js/ui/status/bluetooth.js:235
+#: ../js/ui/status/bluetooth.js:242
 msgid "Error browsing device"
 msgstr "浏览设备出错"
 
-#: ../js/ui/status/bluetooth.js:236
+#: ../js/ui/status/bluetooth.js:243
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "无法浏览请求的设备，错误为 %s"
 
-#: ../js/ui/status/bluetooth.js:244
+#: ../js/ui/status/bluetooth.js:251
 msgid "Keyboard Settings"
 msgstr "键盘设置"
 
-#: ../js/ui/status/bluetooth.js:249
+#: ../js/ui/status/bluetooth.js:256
 msgid "Mouse Settings"
 msgstr "鼠标设置"
 
-#: ../js/ui/status/bluetooth.js:256 ../js/ui/status/volume.js:62
+#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
 msgid "Sound Settings"
 msgstr "声音设置"
 
-#: ../js/ui/status/bluetooth.js:327 ../js/ui/status/bluetooth.js:361
-#: ../js/ui/status/bluetooth.js:401 ../js/ui/status/bluetooth.js:434
-msgid "Bluetooth Agent"
-msgstr "蓝牙助手"
-
-#: ../js/ui/status/bluetooth.js:362
+#: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../js/ui/status/bluetooth.js:368
+#: ../js/ui/status/bluetooth.js:378
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "设备 %s 希望访问 %s 服务"
 
-#: ../js/ui/status/bluetooth.js:370
+#: ../js/ui/status/bluetooth.js:380
 msgid "Always grant access"
 msgstr "始终允许"
 
-#: ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:381
 msgid "Grant this time only"
 msgstr "允许一次"
 
-#: ../js/ui/status/bluetooth.js:372
+#: ../js/ui/status/bluetooth.js:382
 msgid "Reject"
 msgstr "拒绝"
 
-#: ../js/ui/status/bluetooth.js:402
+#: ../js/ui/status/bluetooth.js:412
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s 的配对确认"
 
-#: ../js/ui/status/bluetooth.js:408 ../js/ui/status/bluetooth.js:442
+#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "设备 %s 希望与此电脑配对"
 
-#: ../js/ui/status/bluetooth.js:409
+#: ../js/ui/status/bluetooth.js:419
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "请确认 PIN 码 %s 和要配对的设备是否相同。"
 
-#: ../js/ui/status/bluetooth.js:411
+#: ../js/ui/status/bluetooth.js:421
 msgid "Matches"
 msgstr "相同"
 
-#: ../js/ui/status/bluetooth.js:412
+#: ../js/ui/status/bluetooth.js:422
 msgid "Does not match"
 msgstr "不同"
 
-#: ../js/ui/status/bluetooth.js:435
+#: ../js/ui/status/bluetooth.js:445
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s 的配对请求"
 
-#: ../js/ui/status/bluetooth.js:443
+#: ../js/ui/status/bluetooth.js:453
 msgid "Please enter the PIN mentioned on the device."
 msgstr "请输入设备上的 PIN 码。"
 
-#: ../js/ui/status/bluetooth.js:459
+#: ../js/ui/status/bluetooth.js:469
 msgid "OK"
 msgstr "确定"
 
-#: ../js/ui/status/bluetooth.js:460
-msgid "Cancel"
-msgstr "取消"
+#: ../js/ui/status/keyboard.js:72
+msgid "Localization Settings"
+msgstr "本地化设置"
 
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
@@ -765,78 +819,78 @@ msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "剩余 %d 分钟"
 
-#: ../js/ui/status/power.js:237
+#: ../js/ui/status/power.js:235
 msgid "AC adapter"
 msgstr "AC 适配器"
 
-#: ../js/ui/status/power.js:239
+#: ../js/ui/status/power.js:237
 msgid "Laptop battery"
 msgstr "笔记本电池"
 
-#: ../js/ui/status/power.js:241
+#: ../js/ui/status/power.js:239
 msgid "UPS"
 msgstr "UPS"
 
-#: ../js/ui/status/power.js:243
+#: ../js/ui/status/power.js:241
 msgid "Monitor"
 msgstr "显示器"
 
-#: ../js/ui/status/power.js:245
+#: ../js/ui/status/power.js:243
 msgid "Mouse"
 msgstr "鼠标"
 
-#: ../js/ui/status/power.js:247
+#: ../js/ui/status/power.js:245
 msgid "Keyboard"
 msgstr "键盘"
 
-#: ../js/ui/status/power.js:249
+#: ../js/ui/status/power.js:247
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:251
+#: ../js/ui/status/power.js:249
 msgid "Cell phone"
 msgstr "手机"
 
-#: ../js/ui/status/power.js:253
+#: ../js/ui/status/power.js:251
 msgid "Media player"
 msgstr "媒体播放器"
 
-#: ../js/ui/status/power.js:255
+#: ../js/ui/status/power.js:253
 msgid "Tablet"
 msgstr "触摸板"
 
-#: ../js/ui/status/power.js:257
+#: ../js/ui/status/power.js:255
 msgid "Computer"
 msgstr "计算机"
 
-#: ../js/ui/status/power.js:259 ../src/shell-app-system.c:1012
+#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1013
 msgid "Unknown"
 msgstr "未知"
 
-#: ../js/ui/status/volume.js:41
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "音量"
 
-#: ../js/ui/status/volume.js:54
+#: ../js/ui/status/volume.js:55
 msgid "Microphone"
 msgstr "麦克风"
 
-#: ../js/ui/telepathyClient.js:560
+#: ../js/ui/telepathyClient.js:563
 #, c-format
 msgid "%s is online."
 msgstr "%s 在线。"
 
-#: ../js/ui/telepathyClient.js:565
+#: ../js/ui/telepathyClient.js:568
 #, c-format
 msgid "%s is offline."
 msgstr "%s 离线。"
 
-#: ../js/ui/telepathyClient.js:568
+#: ../js/ui/telepathyClient.js:571
 #, c-format
 msgid "%s is away."
 msgstr "%s 离开。"
 
-#: ../js/ui/telepathyClient.js:571
+#: ../js/ui/telepathyClient.js:574
 #, c-format
 msgid "%s is busy."
 msgstr "%s 忙碌。"
@@ -844,7 +898,7 @@ msgstr "%s 忙碌。"
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:665
+#: ../js/ui/telepathyClient.js:669
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "发送于 %X on %A"
@@ -863,15 +917,6 @@ msgstr "%s 已启动"
 msgid "'%s' is ready"
 msgstr "%s 已就绪"
 
-#: ../js/ui/workspacesView.js:244
-msgid ""
-"Can't add a new workspace because maximum workspaces limit has been reached."
-msgstr "无法添加新工作区，因为已经达到了工作区数量限制。"
-
-#: ../js/ui/workspacesView.js:260
-msgid "Can't remove the first workspace."
-msgstr "不能移除第一个工作区。"
-
 #. translators:
 #. * The number of sound outputs on a particular device
 #: ../src/gvc/gvc-mixer-control.c:1094
@@ -892,29 +937,29 @@ msgstr[0] "%u 个输入"
 msgid "System Sounds"
 msgstr "系统声音"
 
-#: ../src/shell-global.c:1156
+#: ../src/shell-global.c:1363
 msgid "Less than a minute ago"
 msgstr "少于一分钟前"
 
-#: ../src/shell-global.c:1160
+#: ../src/shell-global.c:1367
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../src/shell-global.c:1165
+#: ../src/shell-global.c:1372
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../src/shell-global.c:1170
+#: ../src/shell-global.c:1377
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../src/shell-global.c:1175
+#: ../src/shell-global.c:1382
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -944,6 +989,197 @@ msgstr "搜索"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
+#~ msgid "Clock"
+#~ msgstr "时钟"
+
+#~ msgid "Customize the panel clock"
+#~ msgstr "自定义面板时钟"
+
+#~ msgid "Custom format of the clock"
+#~ msgstr "自定义面板时钟格式"
+
+#~ msgid "Hour format"
+#~ msgstr "小时格式"
+
+#~ msgid ""
+#~ "If true and format is either \"12-hour\" or \"24-hour\", display seconds "
+#~ "in time."
+#~ msgstr "如果为真并且格式为 12 时制或 24 时制，在时钟中显示秒。"
+
+#~ msgid ""
+#~ "This key specifies the format used by the panel clock when the format key "
+#~ "is set to \"custom\". You can use conversion specifiers understood by "
+#~ "strftime() to obtain a specific format. See the strftime() manual for "
+#~ "more information."
+#~ msgstr ""
+#~ "格式(format)键设置“custom”(自定义)时，这个键指定面板时钟的格式。您可以使用"
+#~ "可以被 strftime() 理解的转义符获取特定的格式。请查看 strftime() 的文档获取"
+#~ "更多信息。"
+
+#~ msgid ""
+#~ "This key specifies the hour format used by the panel clock. Possible "
+#~ "values are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to "
+#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. 1970-"
+#~ "01-01. If set to \"custom\", the clock will display time according to the "
+#~ "format specified in the custom_format key. Note that if set to either "
+#~ "\"unix\" or \"custom\", the show_date and show_seconds keys are ignored."
+#~ msgstr ""
+#~ "此键指定面板时钟使用的时间格式。可能的值为 \"12-hour\"、\"24-hour\"、"
+#~ "\"unix\" 和 \"custom\"。如果设为 unix，时钟将显示从 Epoch(也就是 1970-1-1 "
+#~ "UTC)开始的秒数。如果设为 \"custom\"，时钟将根据在 custom_format 键中设定的"
+#~ "格式规则显示时间。注意，如果设置为 \"unix\" 或 \"custom\"，show_date 和 "
+#~ "show_seconds 键将被忽略。"
+
+#~ msgid "Clip the crosshairs at the center"
+#~ msgstr "将十字夹在中间"
+
+#~ msgid "Color of the crosshairs"
+#~ msgstr "十字的颜色"
+
+#~ msgid ""
+#~ "Determines the length of the vertical and horizontal lines that make up "
+#~ "the crosshairs."
+#~ msgstr "确定组成十字的水平线和竖直线的长度。"
+
+#~ msgid ""
+#~ "Determines the position of the magnified mouse image within the magnified "
+#~ "view and how it reacts to system mouse movement. The values are - none: "
+#~ "no mouse tracking; - centered: the mouse image is displayed at the center "
+#~ "of the zoom region (which also represents the point under the system "
+#~ "mouse) and the magnified contents are scrolled as the system mouse moves; "
+#~ "- proportional: the position of the magnified mouse in the zoom region is "
+#~ "proportionally the same as the position of the system mouse on screen; - "
+#~ "push: when the magnified mouse intersects a boundary of the zoom region, "
+#~ "the contents are scrolled into view."
+#~ msgstr ""
+#~ "确定放大了的鼠标图像在放大了的视图中的的位置，以及如何对系统鼠标的移动做出"
+#~ "反馈。可用的值有 - none：鼠标不跟踪；- centered：鼠标图像显示在放大区域的"
+#~ "中心(这也表示系统鼠标下的点)，而且放大的内容也随着系统鼠标的移动而滚动；- "
+#~ "proportional：放大区域中，放大的鼠标的位置和系统鼠标在屏幕上的位置成比例相"
+#~ "同(数学上的“相似”)；- push：当放大的鼠标与放大区域的边界相交时，将内容滚动"
+#~ "进视图。"
+
+#~ msgid ""
+#~ "Determines the transparency of the crosshairs, from fully opaque to fully "
+#~ "transparent."
+#~ msgstr "确定十字线的透明度，从全遮蔽到全透明。"
+
+#~ msgid ""
+#~ "Determines whether the crosshairs intersect the magnified mouse sprite, "
+#~ "or are clipped such that the ends of the horizontal and vertical lines "
+#~ "surround the mouse image."
+#~ msgstr ""
+#~ "确定十字是和放大的光标精灵交叉，还是固定来让水平和竖直线环绕鼠标形象。"
+
+#~ msgid "Enable lens mode"
+#~ msgstr "启用透镜模式"
+
+#~ msgid ""
+#~ "Enables/disables display of crosshairs centered on the magnified mouse "
+#~ "sprite."
+#~ msgstr "启用或禁用穿过放大的鼠标精灵的十字。"
+
+#~ msgid ""
+#~ "For centered mouse tracking, when the system pointer is at or near the "
+#~ "edge of the screen, the magnified contents continue to scroll such that "
+#~ "the screen edge moves into the magnified view."
+#~ msgstr ""
+#~ "对于居中的鼠标跟踪，当系统指针位于或者接近屏幕的边缘时，放大的内容继续滚"
+#~ "动，以便让屏幕边缘移动到放大的视图。"
+
+#~ msgid "Length of the crosshairs"
+#~ msgstr "十字长度"
+
+#~ msgid "Magnification factor"
+#~ msgstr "放大因子"
+
+#~ msgid "Mouse Tracking Mode"
+#~ msgstr "鼠标跟随模式"
+
+#~ msgid "Opacity of the crosshairs"
+#~ msgstr "十字的不透明度"
+
+#~ msgid "Screen position"
+#~ msgstr "屏幕位置"
+
+#~ msgid "Scroll magnified contents beyond the edges of the desktop"
+#~ msgstr "在桌面边界以外滚动放大内容"
+
+#~ msgid "Show or hide crosshairs"
+#~ msgstr "显示或隐藏十字线"
+
+#~ msgid "Show or hide the magnifier"
+#~ msgstr "显示或隐藏放大镜"
+
+#~ msgid "Show or hide the magnifier and all of its zoom regions."
+#~ msgstr "显示或隐藏放大镜及其全部放大区域。"
+
+#~ msgid ""
+#~ "The color of the the vertical and horizontal lines that make up the "
+#~ "crosshairs."
+#~ msgstr "组成十字的水平线和竖直线的颜色。"
+
+#~ msgid ""
+#~ "The magnified view either fills the entire screen, or occupies the top-"
+#~ "half, bottom-half, left-half, or right-half of the screen."
+#~ msgstr ""
+#~ "放大的视图是充满整个屏幕还是占据屏幕的顶半部、底半部、左半部或右半部。"
+
+#~ msgid ""
+#~ "The power of the magnification. A value of 1.0 means no magnification. A "
+#~ "value of 2.0 doubles the size."
+#~ msgstr "边长的放大倍数。1.0 表示不放大，2.0 表示将长度增倍。"
+
+#~ msgid "Thickness of the crosshairs"
+#~ msgstr "十字的厚度"
+
+#~ msgid ""
+#~ "Whether the magnified view should be centered over the location of the "
+#~ "system mouse and move with it."
+#~ msgstr "放大的视图是否以系统鼠标为中心放置并且随之移动。"
+
+#~ msgid ""
+#~ "Width of the vertical and horizontal lines that make up the crosshairs."
+#~ msgstr "组成十字的水平和竖直线的宽度。"
+
+#~ msgid "Clock Format"
+#~ msgstr "时钟格式"
+
+#~ msgid "Clock Preferences"
+#~ msgstr "时钟首选项"
+
+#~ msgid "Panel Display"
+#~ msgstr "面板显示"
+
+#~ msgid "Show seco_nds"
+#~ msgstr "显示秒(_N)"
+
+#~ msgid "Show the _date"
+#~ msgstr "显示日期(_D)"
+
+#~ msgid "_12 hour format"
+#~ msgstr "_12 时格式"
+
+#~ msgid "_24 hour format"
+#~ msgstr "_24 小时格式"
+
+#~ msgid "Preferences"
+#~ msgstr "首选项"
+
+#~ msgid "Suspend..."
+#~ msgstr "休眠..."
+
+#~ msgid "Bluetooth Agent"
+#~ msgstr "蓝牙助手"
+
+#~ msgid ""
+#~ "Can't add a new workspace because maximum workspaces limit has been "
+#~ "reached."
+#~ msgstr "无法添加新工作区，因为已经达到了工作区数量限制。"
+
+#~ msgid "Can't remove the first workspace."
+#~ msgstr "不能移除第一个工作区。"
+
 #~ msgid "What's using power..."
 #~ msgstr "哪些设备在用电..."
 
@@ -963,30 +1199,15 @@ msgstr "%1$s: %2$s"
 #~ msgid "Find"
 #~ msgstr "查找"
 
-#~ msgid "Searching..."
-#~ msgstr "正在搜索..."
-
-#~ msgid "No matching results."
-#~ msgstr "无匹配结果。"
-
 #~ msgid "Invisible"
 #~ msgstr "隐身"
 
-#~ msgid "Restart..."
-#~ msgstr "重启..."
-
 #~ msgid "ON"
 #~ msgstr "开"
 
 #~ msgid "OFF"
 #~ msgstr "关"
 
-#~ msgid "Account Information..."
-#~ msgstr "帐户信息..."
-
-#~ msgid "%H:%M"
-#~ msgstr "%H:%M"
-
 #~ msgid "Recent Documents"
 #~ msgstr "最近文档"