diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0e00caf52..badd053a4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,23 +6,23 @@
 # zhang ping <zhangping159@gmail.com>, 2010.
 # 指冷玉笙寒 (dhyang) <dhyang555@gmail.com>, 2010
 # Ray Wang <raywang@gnome.org>, 2009, 2011.
-# YunQiang Su <wzssyqa@gmail.com>, 2010, 2011.
 # 李炜 <lw124124@gmail.com>, 2011.
 # chiachen <luojiazhen@gmail.com>, 2011.
 # Aron Xu <aronxu@gnome.org>, 2010, 2011.
+# YunQiang Su <wzssyqa@gmail.com>, 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&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-18 14:39+0000\n"
-"PO-Revision-Date: 2011-08-21 22:29+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"POT-Creation-Date: 2011-09-11 10:39+0000\n"
+"PO-Revision-Date: 2011-09-13 11:51+0800\n"
+"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -62,27 +62,22 @@ msgstr ""
 "extensions 会覆盖同时出现在两个列表里的扩展的设置。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:6
-msgid ""
-"GNOME Shell extensions have a uuid property; this key lists extensions which "
-"should not be loaded. This setting overrides enabled-extensions for "
-"extensions that appear in both lists."
-msgstr ""
-"GNOME Shell 扩展有一个 uuid 属性，此键列出了不应该加载的扩展。此设置会覆盖 "
-"enable-extensions 中同时出现在两个列表里的扩展的设置。"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:7
 msgid "History for command (Alt-F2) dialog"
 msgstr "命令对话框(Alt-F2)的历史记录"
 
 # http://live.gnome.org/GnomeShell/LookingGlass
-#: ../data/org.gnome.shell.gschema.xml.in.h:8
+#: ../data/org.gnome.shell.gschema.xml.in.h:7
 msgid "History for the looking glass dialog"
 msgstr "Looking Glass 控制台历史"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:9
+#: ../data/org.gnome.shell.gschema.xml.in.h:8
 msgid "If true, display date in the clock, in addition to time."
 msgstr "如果为真，在时钟中显示日期以及时间。"
 
+#: ../data/org.gnome.shell.gschema.xml.in.h:9
+msgid "If true, display onscreen keyboard."
+msgstr "如果为真，显示屏幕键盘。"
+
 #: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid "If true, display seconds in time."
 msgstr "如果为真，在时间上显示秒数。"
@@ -123,20 +118,24 @@ msgid "Show date in clock"
 msgstr "显示日期"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:16
+msgid "Show the onscreen keyboard"
+msgstr "显示屏幕键盘"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show the week date in the calendar"
 msgstr "在日历中显示星期"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "Show time with seconds"
 msgstr "显示秒"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr "符合这些标示的应用程序将显示在收藏区中。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 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 "
@@ -145,17 +144,17 @@ msgstr ""
 "录制的屏幕录像的文件名将是根据当前时间得到的独特值，并使用这个扩展名。录制另"
 "外一个不同容器格式的录像时，它应该被更改。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 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:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "用于编码屏幕录像的 GStreamer 管道"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 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 "
@@ -166,59 +165,93 @@ msgstr ""
 "时，此数据将保持私密，您可能因为隐私原因想要禁用此项。请注意，这么做，并不会"
 "移除已经保存的数据。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
-msgid "Uuids of extensions to disable"
-msgstr "要禁用的扩展的 uuid"
-
 #: ../data/org.gnome.shell.gschema.xml.in.h:24
+msgid "The type of keyboard to use."
+msgstr "要使用的键盘类型。"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
 msgid "Uuids of extensions to enable"
 msgstr "要启用的扩展的 uuid"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "Whether to collect stats about applications usage"
 msgstr "是否收集应用程序的使用情况"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.h:27
+msgid "Which keyboard to use"
+msgstr "使用哪个键盘"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:28
 msgid "disabled OpenSearch providers"
 msgstr "已禁用的 OpenSearch 提供商"
 
-#: ../js/misc/util.js:68
+#: ../js/gdm/loginDialog.js:604
+msgid "Session..."
+msgstr "会话..."
+
+#: ../js/gdm/loginDialog.js:761
+#| msgid "Sign In"
+msgctxt "title"
+msgid "Sign In"
+msgstr "登录"
+
+#: ../js/gdm/loginDialog.js:818
+msgid "Not listed?"
+msgstr "未列出？"
+
+#: ../js/gdm/loginDialog.js:928 ../js/ui/endSessionDialog.js:410
+#: ../js/ui/networkAgent.js:158 ../js/ui/polkitAuthenticationAgent.js:170
+#: ../js/ui/status/bluetooth.js:480
+msgid "Cancel"
+msgstr "取消"
+
+#: ../js/gdm/loginDialog.js:933
+#| msgid "Sign In"
+msgctxt "button"
+msgid "Sign In"
+msgstr "登录"
+
+#: ../js/gdm/loginDialog.js:1253
+msgid "Login Window"
+msgstr "登录窗口"
+
+#: ../js/misc/util.js:92
 msgid "Command not found"
 msgstr "命令未找到"
 
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:95
+#: ../js/misc/util.js:119
 msgid "Could not parse command:"
 msgstr "不能解析命令："
 
-#: ../js/misc/util.js:103
+#: ../js/misc/util.js:127
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "运行“%s”失败："
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:253
+#: ../js/ui/appDisplay.js:255
 msgid "All"
 msgstr "全部"
 
-#: ../js/ui/appDisplay.js:315
+#: ../js/ui/appDisplay.js:319
 msgid "APPLICATIONS"
 msgstr "应用程序"
 
-#: ../js/ui/appDisplay.js:373
+#: ../js/ui/appDisplay.js:377
 msgid "SETTINGS"
 msgstr "设置"
 
-#: ../js/ui/appDisplay.js:681
+#: ../js/ui/appDisplay.js:685
 msgid "New Window"
 msgstr "新窗口"
 
-#: ../js/ui/appDisplay.js:684
+#: ../js/ui/appDisplay.js:688
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: ../js/ui/appDisplay.js:685
+#: ../js/ui/appDisplay.js:689
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
@@ -232,12 +265,12 @@ msgstr "%s 已经添加到了您的收藏夹。"
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"
 
-#: ../js/ui/autorunManager.js:591
+#: ../js/ui/autorunManager.js:592
 #, c-format
 msgid "Open with %s"
 msgstr "使用 %s 打开"
 
-#: ../js/ui/autorunManager.js:617
+#: ../js/ui/autorunManager.js:618
 msgid "Eject"
 msgstr "弹出"
 
@@ -355,94 +388,119 @@ msgid "S"
 msgstr "星期六"
 
 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:678
+#: ../js/ui/calendar.js:687
 msgid "Nothing Scheduled"
 msgstr "无计划"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:694
+#: ../js/ui/calendar.js:703
 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:697
+#: ../js/ui/calendar.js:706
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: ../js/ui/calendar.js:707
+#: ../js/ui/calendar.js:716
 msgid "Today"
 msgstr "今天"
 
-#: ../js/ui/calendar.js:711
+#: ../js/ui/calendar.js:720
 msgid "Tomorrow"
 msgstr "明天"
 
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:729
 msgid "This week"
 msgstr "本周"
 
-#: ../js/ui/calendar.js:728
+#: ../js/ui/calendar.js:737
 msgid "Next week"
 msgstr "下周"
 
-#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1123
+#: ../js/ui/contactDisplay.js:59 ../js/ui/notificationDaemon.js:444
+#: ../js/ui/status/power.js:223 ../src/shell-app.c:355
+msgid "Unknown"
+msgstr "未知"
+
+#: ../js/ui/contactDisplay.js:80 ../js/ui/userMenu.js:147
+msgid "Available"
+msgstr "可用"
+
+#: ../js/ui/contactDisplay.js:85 ../js/ui/userMenu.js:156
+msgid "Away"
+msgstr "离开"
+
+#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:150
+msgid "Busy"
+msgstr "忙碌"
+
+#: ../js/ui/contactDisplay.js:93
+msgid "Offline"
+msgstr "离线"
+
+#: ../js/ui/contactDisplay.js:140
+msgid "CONTACTS"
+msgstr "联系人"
+
+#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1195
 msgid "Remove"
 msgstr "移除"
 
-#: ../js/ui/dateMenu.js:90
+#: ../js/ui/dateMenu.js:99
 msgid "Date and Time Settings"
 msgstr "日期和时间设置"
 
-#: ../js/ui/dateMenu.js:110
+#: ../js/ui/dateMenu.js:125
 msgid "Open Calendar"
 msgstr "打开日历"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:167
+#: ../js/ui/dateMenu.js:183
 msgid "%a %b %e, %R:%S"
 msgstr "%m月%d日%R:%S%A"
 
-#: ../js/ui/dateMenu.js:168
+#: ../js/ui/dateMenu.js:184
 msgid "%a %b %e, %R"
 msgstr "%m月%d日%R%A"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:172
+#: ../js/ui/dateMenu.js:188
 msgid "%a %R:%S"
 msgstr "%A %R:%S"
 
-#: ../js/ui/dateMenu.js:173
+#: ../js/ui/dateMenu.js:189
 msgid "%a %R"
 msgstr "%A %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:180
+#: ../js/ui/dateMenu.js:196
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%m月%d日%A %I:%M:%S %p"
 
-#: ../js/ui/dateMenu.js:181
+#: ../js/ui/dateMenu.js:197
 msgid "%a %b %e, %l:%M %p"
 msgstr "%m月%d日%A %I:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:185
+#: ../js/ui/dateMenu.js:201
 msgid "%a %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
-#: ../js/ui/dateMenu.js:186
+#: ../js/ui/dateMenu.js:202
 msgid "%a %l:%M %p"
 msgstr "%I:%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:197
+#: ../js/ui/dateMenu.js:213
 msgid "%A %B %e, %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -512,85 +570,166 @@ msgstr "系统将在 %d 秒后自动重启。"
 msgid "Restarting the system."
 msgstr "重启计算机。"
 
-#: ../js/ui/endSessionDialog.js:410 ../js/ui/polkitAuthenticationAgent.js:170
-#: ../js/ui/status/bluetooth.js:497
-msgid "Cancel"
-msgstr "取消"
+#: ../js/ui/keyboard.js:513 ../js/ui/status/power.js:211
+msgid "Keyboard"
+msgstr "键盘"
 
-#: ../js/ui/lookingGlass.js:640
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "未安装扩展"
 
-#: ../js/ui/lookingGlass.js:686
+#: ../js/ui/lookingGlass.js:687
 msgid "Enabled"
 msgstr "已启用"
 
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:688 ../src/gvc/gvc-mixer-control.c:1091
+#: ../js/ui/lookingGlass.js:689 ../src/gvc/gvc-mixer-control.c:1093
 msgid "Disabled"
 msgstr "已禁用"
 
-#: ../js/ui/lookingGlass.js:690
+#: ../js/ui/lookingGlass.js:691
 msgid "Error"
 msgstr "错误"
 
-#: ../js/ui/lookingGlass.js:692
+#: ../js/ui/lookingGlass.js:693
 msgid "Out of date"
 msgstr "过时"
 
-#: ../js/ui/lookingGlass.js:717
+#: ../js/ui/lookingGlass.js:695
+msgid "Downloading"
+msgstr "正在下载"
+
+#: ../js/ui/lookingGlass.js:720
 msgid "View Source"
 msgstr "查看源"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:726
 msgid "Web Page"
 msgstr "网页"
 
-#: ../js/ui/messageTray.js:1116
+#: ../js/ui/messageTray.js:1188
 msgid "Open"
 msgstr "打开"
 
-#: ../js/ui/messageTray.js:2277
+#: ../js/ui/messageTray.js:2367
 msgid "System Information"
 msgstr "系统信息"
 
-#: ../js/ui/notificationDaemon.js:427 ../js/ui/status/power.js:238
-#: ../src/shell-app.c:340
-msgid "Unknown"
-msgstr "未知"
+#: ../js/ui/networkAgent.js:138
+msgid "Show password"
+msgstr "显示密码"
 
-#: ../js/ui/overview.js:89
+#: ../js/ui/networkAgent.js:153
+msgid "Connect"
+msgstr "连接"
+
+#. Cisco LEAP
+#: ../js/ui/networkAgent.js:248 ../js/ui/networkAgent.js:260
+#: ../js/ui/networkAgent.js:287 ../js/ui/networkAgent.js:307
+#: ../js/ui/networkAgent.js:317
+msgid "Password: "
+msgstr "密码："
+
+#. static WEP
+#: ../js/ui/networkAgent.js:253
+msgid "Key: "
+msgstr "密钥："
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. is not visible here since we only care about phase2 authentication
+#. (and don't even care of which one)
+#: ../js/ui/networkAgent.js:285 ../js/ui/networkAgent.js:303
+msgid "Username: "
+msgstr "用户名："
+
+#: ../js/ui/networkAgent.js:291
+msgid "Identity: "
+msgstr "身份："
+
+#: ../js/ui/networkAgent.js:293
+msgid "Private key password: "
+msgstr "私人密钥密码："
+
+#: ../js/ui/networkAgent.js:305
+msgid "Service: "
+msgstr "服务："
+
+#: ../js/ui/networkAgent.js:334
+msgid "Authentication required by wireless network"
+msgstr "无线网络要求身份认证"
+
+#: ../js/ui/networkAgent.js:335
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
+msgstr "访问无线网络“%s”需要密码或密钥。"
+
+#: ../js/ui/networkAgent.js:339
+msgid "Wired 802.1X authentication"
+msgstr "有线 802.1X 认证"
+
+#: ../js/ui/networkAgent.js:341
+msgid "Network name: "
+msgstr "网络名称："
+
+#: ../js/ui/networkAgent.js:346
+msgid "DSL authentication"
+msgstr "DSL 认证"
+
+#: ../js/ui/networkAgent.js:353
+msgid "PIN code required"
+msgstr "需要 PIN 码"
+
+#: ../js/ui/networkAgent.js:354
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "移动宽带设备需要 PIN 码"
+
+#: ../js/ui/networkAgent.js:355
+msgid "PIN: "
+msgstr "PIN："
+
+#: ../js/ui/networkAgent.js:361
+msgid "Mobile broadband network password"
+msgstr "移动宽带网络密码"
+
+#: ../js/ui/networkAgent.js:362
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "连接到“%s”需要密码。"
+
+#: ../js/ui/overview.js:91
 msgid "Undo"
 msgstr "撤销"
 
-#: ../js/ui/overview.js:184
+#: ../js/ui/overview.js:205
 msgid "Windows"
 msgstr "窗口"
 
-#: ../js/ui/overview.js:187
+#: ../js/ui/overview.js:208
 msgid "Applications"
 msgstr "应用程序"
 
 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/overview.js:203
+#: ../js/ui/overview.js:230
 msgid "Dash"
 msgstr "Dash"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:531
+#: ../js/ui/panel.js:538
 #, c-format
 msgid "Quit %s"
 msgstr "退出 %s"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:567
+#: ../js/ui/panel.js:574
 msgid "Activities"
 msgstr "活动"
 
-#: ../js/ui/panel.js:876
+#: ../js/ui/panel.js:967
 msgid "Top Bar"
 msgstr "顶栏"
 
@@ -633,14 +772,14 @@ msgstr "抱歉，您的输入有误。请重试。"
 
 #: ../js/ui/polkitAuthenticationAgent.js:274
 msgid "Password:"
-msgstr "口令："
+msgstr "密码："
 
 #. Translators: this MUST be either "toggle-switch-us"
 #. (for toggle switches containing the English words
 #. "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:676
+#: ../js/ui/popupMenu.js:687
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
@@ -648,17 +787,17 @@ msgstr "toggle-switch-intl"
 msgid "Please enter a command:"
 msgstr "请输入一个命令："
 
-#: ../js/ui/searchDisplay.js:318
+#: ../js/ui/searchDisplay.js:340
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: ../js/ui/searchDisplay.js:332
+#: ../js/ui/searchDisplay.js:363
 msgid "No matching results."
 msgstr "无匹配结果。"
 
 #: ../js/ui/shellMountOperation.js:285
 msgid "Wrong password, please try again"
-msgstr "口令错误，请重试"
+msgstr "密码错误，请重试"
 
 #: ../js/ui/status/accessibility.js:60
 msgid "Zoom"
@@ -694,17 +833,17 @@ msgstr "鼠标按键"
 msgid "Universal Access Settings"
 msgstr "通用访问设置"
 
-#: ../js/ui/status/accessibility.js:145
+#: ../js/ui/status/accessibility.js:141
 msgid "High Contrast"
 msgstr "高对比度"
 
-#: ../js/ui/status/accessibility.js:182
+#: ../js/ui/status/accessibility.js:178
 msgid "Large Text"
 msgstr "大号文本"
 
-#: ../js/ui/status/bluetooth.js:39 ../js/ui/status/bluetooth.js:270
-#: ../js/ui/status/bluetooth.js:364 ../js/ui/status/bluetooth.js:398
-#: ../js/ui/status/bluetooth.js:438 ../js/ui/status/bluetooth.js:471
+#: ../js/ui/status/bluetooth.js:39 ../js/ui/status/bluetooth.js:261
+#: ../js/ui/status/bluetooth.js:347 ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:421 ../js/ui/status/bluetooth.js:454
 msgid "Bluetooth"
 msgstr "蓝牙"
 
@@ -720,111 +859,111 @@ msgstr "发送文件到设备..."
 msgid "Set up a New Device..."
 msgstr "安装新设备..."
 
-#: ../js/ui/status/bluetooth.js:92
+#: ../js/ui/status/bluetooth.js:91
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:116
+#: ../js/ui/status/bluetooth.js:111
 msgid "hardware disabled"
 msgstr "已通过硬件开关禁用"
 
-#: ../js/ui/status/bluetooth.js:217
+#: ../js/ui/status/bluetooth.js:208
 msgid "Connection"
 msgstr "连接"
 
-#: ../js/ui/status/bluetooth.js:226 ../js/ui/status/network.js:497
+#: ../js/ui/status/bluetooth.js:217 ../js/ui/status/network.js:486
 msgid "disconnecting..."
 msgstr "正在断开..."
 
-#: ../js/ui/status/bluetooth.js:239 ../js/ui/status/network.js:503
+#: ../js/ui/status/bluetooth.js:230 ../js/ui/status/network.js:492
 msgid "connecting..."
 msgstr "正在连接..."
 
-#: ../js/ui/status/bluetooth.js:257
+#: ../js/ui/status/bluetooth.js:248
 msgid "Send Files..."
 msgstr "发送文件..."
 
-#: ../js/ui/status/bluetooth.js:262
+#: ../js/ui/status/bluetooth.js:253
 msgid "Browse Files..."
 msgstr "浏览文件..."
 
-#: ../js/ui/status/bluetooth.js:271
+#: ../js/ui/status/bluetooth.js:262
 msgid "Error browsing device"
 msgstr "浏览设备出错"
 
-#: ../js/ui/status/bluetooth.js:272
+#: ../js/ui/status/bluetooth.js:263
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "无法浏览请求的设备，错误为 %s"
 
-#: ../js/ui/status/bluetooth.js:280
+#: ../js/ui/status/bluetooth.js:271
 msgid "Keyboard Settings"
 msgstr "键盘设置"
 
-#: ../js/ui/status/bluetooth.js:285
+#: ../js/ui/status/bluetooth.js:274
 msgid "Mouse Settings"
 msgstr "鼠标设置"
 
-#: ../js/ui/status/bluetooth.js:292 ../js/ui/status/volume.js:64
+#: ../js/ui/status/bluetooth.js:279 ../js/ui/status/volume.js:62
 msgid "Sound Settings"
 msgstr "声音设置"
 
-#: ../js/ui/status/bluetooth.js:399
+#: ../js/ui/status/bluetooth.js:382
 #, c-format
 msgid "Authorization request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../js/ui/status/bluetooth.js:405
+#: ../js/ui/status/bluetooth.js:388
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "设备 %s 希望访问 %s 服务"
 
-#: ../js/ui/status/bluetooth.js:407
+#: ../js/ui/status/bluetooth.js:390
 msgid "Always grant access"
 msgstr "始终允许"
 
-#: ../js/ui/status/bluetooth.js:408
+#: ../js/ui/status/bluetooth.js:391
 msgid "Grant this time only"
 msgstr "允许一次"
 
-#: ../js/ui/status/bluetooth.js:409 ../js/ui/telepathyClient.js:985
+#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1185
 msgid "Reject"
 msgstr "拒绝"
 
-#: ../js/ui/status/bluetooth.js:439
+#: ../js/ui/status/bluetooth.js:422
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s 的配对确认"
 
-#: ../js/ui/status/bluetooth.js:445 ../js/ui/status/bluetooth.js:479
+#: ../js/ui/status/bluetooth.js:428 ../js/ui/status/bluetooth.js:462
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "设备 %s 希望与此电脑配对"
 
-#: ../js/ui/status/bluetooth.js:446
+#: ../js/ui/status/bluetooth.js:429
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "请确认 PIN 码 %s 和要配对的设备是否相同。"
 
-#: ../js/ui/status/bluetooth.js:448
+#: ../js/ui/status/bluetooth.js:431
 msgid "Matches"
 msgstr "相同"
 
-#: ../js/ui/status/bluetooth.js:449
+#: ../js/ui/status/bluetooth.js:432
 msgid "Does not match"
 msgstr "不同"
 
-#: ../js/ui/status/bluetooth.js:472
+#: ../js/ui/status/bluetooth.js:455
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s 的配对请求"
 
-#: ../js/ui/status/bluetooth.js:480
+#: ../js/ui/status/bluetooth.js:463
 msgid "Please enter the PIN mentioned on the device."
 msgstr "请输入设备上的 PIN 码。"
 
-#: ../js/ui/status/bluetooth.js:496
+#: ../js/ui/status/bluetooth.js:479
 msgid "OK"
 msgstr "确定"
 
@@ -836,305 +975,258 @@ msgstr "显示键盘布局"
 msgid "Region and Language Settings"
 msgstr "区域和语言设置"
 
-#: ../js/ui/statusMenu.js:192 ../js/ui/statusMenu.js:196
-#: ../js/ui/statusMenu.js:262
-msgid "Power Off..."
-msgstr "关机..."
-
-#: ../js/ui/statusMenu.js:194 ../js/ui/statusMenu.js:196
-#: ../js/ui/statusMenu.js:261
-msgid "Suspend"
-msgstr "挂起"
-
-#: ../js/ui/statusMenu.js:217
-msgid "Available"
-msgstr "可用"
-
-#: ../js/ui/statusMenu.js:222
-msgid "Busy"
-msgstr "忙碌"
-
-#: ../js/ui/statusMenu.js:230
-msgid "My Account"
-msgstr "我的帐户"
-
-#: ../js/ui/statusMenu.js:234
-msgid "System Settings"
-msgstr "系统设置"
-
-#: ../js/ui/statusMenu.js:242
-msgid "Lock Screen"
-msgstr "锁定"
-
-#: ../js/ui/statusMenu.js:247
-msgid "Switch User"
-msgstr "切换用户"
-
-#: ../js/ui/statusMenu.js:252
-msgid "Log Out..."
-msgstr "注销..."
-
-#: ../js/ui/status/network.js:108
+#: ../js/ui/status/network.js:97
 msgid "<unknown>"
 msgstr "<未知>"
 
 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:296
+#: ../js/ui/status/network.js:285
 msgid "disabled"
 msgstr "已禁用"
 
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu)
-#: ../js/ui/status/network.js:495
+#: ../js/ui/status/network.js:484
 msgid "unmanaged"
 msgstr "设备未托管"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:506
+#: ../js/ui/status/network.js:495
 msgid "authentication required"
 msgstr "需要认证"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:516
+#: ../js/ui/status/network.js:505
 msgid "firmware missing"
 msgstr "固件缺失"
 
 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:523
+#: ../js/ui/status/network.js:512
 msgid "cable unplugged"
 msgstr "线缆被拔出"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:528
+#: ../js/ui/status/network.js:517
 msgid "unavailable"
 msgstr "不可用"
 
-#: ../js/ui/status/network.js:530
+#: ../js/ui/status/network.js:519
 msgid "connection failed"
 msgstr "连接失败"
 
-#: ../js/ui/status/network.js:586 ../js/ui/status/network.js:1511
+#: ../js/ui/status/network.js:575 ../js/ui/status/network.js:1515
 msgid "More..."
 msgstr "更多..."
 
 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:622 ../js/ui/status/network.js:1448
+#: ../js/ui/status/network.js:611 ../js/ui/status/network.js:1455
 msgid "Connected (private)"
 msgstr "已连接(私有网络)"
 
-#: ../js/ui/status/network.js:707
+#: ../js/ui/status/network.js:689
 msgid "Auto Ethernet"
 msgstr "自动以太网"
 
-#: ../js/ui/status/network.js:775
+#: ../js/ui/status/network.js:753
 msgid "Auto broadband"
 msgstr "自动移动宽带"
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:756
 msgid "Auto dial-up"
 msgstr "自动拨号"
 
 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:902 ../js/ui/status/network.js:1460
+#: ../js/ui/status/network.js:878 ../js/ui/status/network.js:1467
 #, c-format
 msgid "Auto %s"
 msgstr "自动 %s"
 
-#: ../js/ui/status/network.js:904
+#: ../js/ui/status/network.js:880
 msgid "Auto bluetooth"
 msgstr "自动蓝牙"
 
-#: ../js/ui/status/network.js:1462
+#: ../js/ui/status/network.js:1469
 msgid "Auto wireless"
 msgstr "自动无线"
 
-#: ../js/ui/status/network.js:1554
+#: ../js/ui/status/network.js:1558
 msgid "Enable networking"
 msgstr "启用联网"
 
-#: ../js/ui/status/network.js:1566
+#: ../js/ui/status/network.js:1570
 msgid "Wired"
 msgstr "有线"
 
-#: ../js/ui/status/network.js:1577
+#: ../js/ui/status/network.js:1581
 msgid "Wireless"
 msgstr "无线"
 
-#: ../js/ui/status/network.js:1587
+#: ../js/ui/status/network.js:1591
 msgid "Mobile broadband"
 msgstr "移动宽带"
 
-#: ../js/ui/status/network.js:1597
+#: ../js/ui/status/network.js:1601
 msgid "VPN Connections"
 msgstr "VPN 连接"
 
-#: ../js/ui/status/network.js:1609
+#: ../js/ui/status/network.js:1612
 msgid "Network Settings"
 msgstr "网络设置"
 
-#: ../js/ui/status/network.js:1901
-#, c-format
-msgid "You're now connected to mobile broadband connection '%s'"
-msgstr "您已连接至移动宽带连接 %s"
+#: ../js/ui/status/network.js:1747
+msgid "Connectivity lost"
+msgstr "连接丢失"
 
-#: ../js/ui/status/network.js:1905
-#, c-format
-msgid "You're now connected to wireless network '%s'"
-msgstr "您已连接至无线网络 %s"
+#: ../js/ui/status/network.js:1748
+msgid "You're no longer connected to the network"
+msgstr "您已不再连接到该网络"
 
-#: ../js/ui/status/network.js:1909
-#, c-format
-msgid "You're now connected to wired network '%s'"
-msgstr "您已连接至有线网络 %s"
+#: ../js/ui/status/network.js:1756
+msgid "Connection failed"
+msgstr "连接失败"
 
-#: ../js/ui/status/network.js:1913
-#, c-format
-msgid "You're now connected to VPN network '%s'"
-msgstr "您已连接至 VPN 网络 %s"
+#: ../js/ui/status/network.js:1757
+msgid "Activation of network connection failed"
+msgstr "启用网络连接失败"
 
-#: ../js/ui/status/network.js:1918
-#, c-format
-msgid "You're now connected to '%s'"
-msgstr "您已连接至 %s"
-
-#: ../js/ui/status/network.js:1926
-msgid "Connection established"
-msgstr "连接已建立"
-
-#: ../js/ui/status/network.js:2052
+#: ../js/ui/status/network.js:2008
 msgid "Networking is disabled"
 msgstr "联网已禁用"
 
-#: ../js/ui/status/network.js:2177
+#: ../js/ui/status/network.js:2133
 msgid "Network Manager"
 msgstr "网络管理器"
 
-#: ../js/ui/status/power.js:83
+#: ../js/ui/status/power.js:82
 msgid "Power Settings"
 msgstr "电源设置"
 
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:109
+#: ../js/ui/status/power.js:103
 msgid "Estimating..."
 msgstr "估计中..."
 
-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:110
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
 msgstr[0] "剩余 %d 小时"
 
 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:119
+#: ../js/ui/status/power.js:113
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "剩余 %d %s %d %s"
 
-#: ../js/ui/status/power.js:121
+#: ../js/ui/status/power.js:115
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: ../js/ui/status/power.js:121
+#: ../js/ui/status/power.js:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: ../js/ui/status/power.js:124
+#: ../js/ui/status/power.js:118
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "剩余 %d 分钟"
 
-#: ../js/ui/status/power.js:216
+#: ../js/ui/status/power.js:201
 msgid "AC adapter"
 msgstr "AC 适配器"
 
-#: ../js/ui/status/power.js:218
+#: ../js/ui/status/power.js:203
 msgid "Laptop battery"
 msgstr "笔记本电池"
 
-#: ../js/ui/status/power.js:220
+#: ../js/ui/status/power.js:205
 msgid "UPS"
 msgstr "UPS"
 
-#: ../js/ui/status/power.js:222
+#: ../js/ui/status/power.js:207
 msgid "Monitor"
 msgstr "显示器"
 
-#: ../js/ui/status/power.js:224
+#: ../js/ui/status/power.js:209
 msgid "Mouse"
 msgstr "鼠标"
 
-#: ../js/ui/status/power.js:226
-msgid "Keyboard"
-msgstr "键盘"
-
-#: ../js/ui/status/power.js:228
+#: ../js/ui/status/power.js:213
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:230
+#: ../js/ui/status/power.js:215
 msgid "Cell phone"
 msgstr "手机"
 
-#: ../js/ui/status/power.js:232
+#: ../js/ui/status/power.js:217
 msgid "Media player"
 msgstr "媒体播放器"
 
-#: ../js/ui/status/power.js:234
+#: ../js/ui/status/power.js:219
 msgid "Tablet"
 msgstr "触摸板"
 
-#: ../js/ui/status/power.js:236
+#: ../js/ui/status/power.js:221
 msgid "Computer"
 msgstr "计算机"
 
-#: ../js/ui/status/volume.js:43
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "音量"
 
-#: ../js/ui/status/volume.js:56
+#: ../js/ui/status/volume.js:54
 msgid "Microphone"
 msgstr "麦克风"
 
 #. We got the TpContact
 #. FIXME: We don't have a 'chat room' icon (bgo #653737) use
 #. system-users for now as Empathy does.
-#: ../js/ui/telepathyClient.js:229
+#: ../js/ui/telepathyClient.js:256
 msgid "Invitation"
 msgstr "邀请"
 
 #. We got the TpContact
-#: ../js/ui/telepathyClient.js:295
+#: ../js/ui/telepathyClient.js:322
 msgid "Call"
 msgstr "呼叫"
 
 #. We got the TpContact
-#: ../js/ui/telepathyClient.js:323
+#: ../js/ui/telepathyClient.js:350
 msgid "File Transfer"
 msgstr "文件传送"
 
-#: ../js/ui/telepathyClient.js:573
+#: ../js/ui/telepathyClient.js:432
+msgid "Subscription request"
+msgstr "订阅请求"
+
+#: ../js/ui/telepathyClient.js:460
+msgid "Connection error"
+msgstr "连接错误"
+
+#: ../js/ui/telepathyClient.js:722
 #, c-format
 msgid "%s is online."
 msgstr "%s 在线。"
 
-#: ../js/ui/telepathyClient.js:578
+#: ../js/ui/telepathyClient.js:727
 #, c-format
 msgid "%s is offline."
 msgstr "%s 离线。"
 
-#: ../js/ui/telepathyClient.js:581
+#: ../js/ui/telepathyClient.js:730
 #, c-format
 msgid "%s is away."
 msgstr "%s 离开。"
 
-#: ../js/ui/telepathyClient.js:584
+#: ../js/ui/telepathyClient.js:733
 #, c-format
 msgid "%s is busy."
 msgstr "%s 忙碌。"
@@ -1142,35 +1234,35 @@ 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:770
+#: ../js/ui/telepathyClient.js:967
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "发送于 <b>%X</b>，在 <b>%A</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25",
 #. shown when you get a chat message in the same year.
-#: ../js/ui/telepathyClient.js:776
+#: ../js/ui/telepathyClient.js:973
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "发送于 <b>%A</b>，<b>%B %d</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year.
-#: ../js/ui/telepathyClient.js:781
+#: ../js/ui/telepathyClient.js:978
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "发送于 <b>%A</b>，<b>%B %d</b>，%Y"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/telepathyClient.js:822
+#: ../js/ui/telepathyClient.js:1020
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s"
 
 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/telepathyClient.js:929
+#: ../js/ui/telepathyClient.js:1129
 #, c-format
 msgid "Invitation to %s"
 msgstr "邀请 %s"
@@ -1178,32 +1270,34 @@ msgstr "邀请 %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/telepathyClient.js:937
+#: ../js/ui/telepathyClient.js:1137
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 要请您加入 %s"
 
-#: ../js/ui/telepathyClient.js:939 ../js/ui/telepathyClient.js:1028
+#: ../js/ui/telepathyClient.js:1139 ../js/ui/telepathyClient.js:1228
+#: ../js/ui/telepathyClient.js:1332
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../js/ui/telepathyClient.js:940 ../js/ui/telepathyClient.js:1029
+#: ../js/ui/telepathyClient.js:1140 ../js/ui/telepathyClient.js:1229
+#: ../js/ui/telepathyClient.js:1333
 msgid "Accept"
 msgstr "接受"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:973
+#: ../js/ui/telepathyClient.js:1173
 #, c-format
 msgid "Video call from %s"
 msgstr "来自 %s 的视频呼叫"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:976
+#: ../js/ui/telepathyClient.js:1176
 #, c-format
 msgid "Call from %s"
 msgstr "来自 %s 的呼叫"
 
-#: ../js/ui/telepathyClient.js:986
+#: ../js/ui/telepathyClient.js:1186
 msgid "Answer"
 msgstr "接听"
 
@@ -1212,11 +1306,177 @@ msgstr "接听"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/telepathyClient.js:1022
+#: ../js/ui/telepathyClient.js:1222
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s 正在向您发送 %s"
 
+#. To translators: The parameter is the contact's alias
+#: ../js/ui/telepathyClient.js:1297
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s 想得到授权来查看您的在线状态"
+
+#: ../js/ui/telepathyClient.js:1395
+msgid "Network error"
+msgstr "网络错误"
+
+#: ../js/ui/telepathyClient.js:1397
+msgid "Authentication failed"
+msgstr "认证失败"
+
+#: ../js/ui/telepathyClient.js:1399
+msgid "Encryption error"
+msgstr "加密错误"
+
+#: ../js/ui/telepathyClient.js:1401
+msgid "Certificate not provided"
+msgstr "未提供证书"
+
+#: ../js/ui/telepathyClient.js:1403
+msgid "Certificate untrusted"
+msgstr "证书不受信任"
+
+#: ../js/ui/telepathyClient.js:1405
+msgid "Certificate expired"
+msgstr "证书过期"
+
+#: ../js/ui/telepathyClient.js:1407
+msgid "Certificate not activated"
+msgstr "证书未激活"
+
+#: ../js/ui/telepathyClient.js:1409
+msgid "Certificate hostname mismatch"
+msgstr "证书的主机名不匹配"
+
+#: ../js/ui/telepathyClient.js:1411
+msgid "Certificate fingerprint mismatch"
+msgstr "证书的指纹不匹配"
+
+#: ../js/ui/telepathyClient.js:1413
+msgid "Certificate self-signed"
+msgstr "证书是自已签发的"
+
+#: ../js/ui/telepathyClient.js:1415
+msgid "Status is set to offline"
+msgstr "已将状态设为离线。"
+
+#: ../js/ui/telepathyClient.js:1417
+msgid "Encryption is not available"
+msgstr "加密不可用"
+
+#: ../js/ui/telepathyClient.js:1419
+msgid "Certificate is invalid"
+msgstr "证书无效"
+
+#: ../js/ui/telepathyClient.js:1421
+msgid "Connection has been refused"
+msgstr "连接被拒绝"
+
+#: ../js/ui/telepathyClient.js:1423
+msgid "Connection can't be established"
+msgstr "无法建立连接"
+
+#: ../js/ui/telepathyClient.js:1425
+msgid "Connection has been lost"
+msgstr "连接丢失"
+
+#: ../js/ui/telepathyClient.js:1427
+msgid "This resource is already connected to the server"
+msgstr "此资源已经连接到服务器"
+
+#: ../js/ui/telepathyClient.js:1429
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "连接已经被使用相同资源的新连接所替换"
+
+#: ../js/ui/telepathyClient.js:1431
+msgid "The account already exists on the server"
+msgstr "服务器上已经存在该账户"
+
+#: ../js/ui/telepathyClient.js:1433
+msgid "Server is currently too busy to handle the connection"
+msgstr "服务器太忙，暂时无法处理该连接"
+
+#: ../js/ui/telepathyClient.js:1435
+msgid "Certificate has been revoked"
+msgstr "证书已撤销"
+
+#: ../js/ui/telepathyClient.js:1437
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "证书使用了不安全的加密算法或加密很弱"
+
+#: ../js/ui/telepathyClient.js:1439
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "服务器证书的长度或证书链的长度超过了加密算法库的额定限制"
+
+#. translators: argument is the account name, like
+#. * name@jabber.org for example.
+#: ../js/ui/telepathyClient.js:1448
+#, c-format
+msgid "Connection to %s failed"
+msgstr "连接 %s 失败"
+
+#: ../js/ui/telepathyClient.js:1455
+msgid "Unknown reason"
+msgstr "未知原因"
+
+#: ../js/ui/telepathyClient.js:1462
+msgid "Reconnect"
+msgstr "重新连接"
+
+#: ../js/ui/telepathyClient.js:1463
+msgid "Edit account"
+msgstr "编辑帐户"
+
+#: ../js/ui/userMenu.js:153
+msgid "Hidden"
+msgstr "隐身"
+
+#: ../js/ui/userMenu.js:159
+msgid "Idle"
+msgstr "空闲"
+
+#: ../js/ui/userMenu.js:162
+msgid "Unavailable"
+msgstr "不可用"
+
+#: ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:520 ../js/ui/userMenu.js:589
+msgid "Power Off..."
+msgstr "关机..."
+
+#: ../js/ui/userMenu.js:518 ../js/ui/userMenu.js:520 ../js/ui/userMenu.js:588
+msgid "Suspend"
+msgstr "挂起"
+
+#: ../js/ui/userMenu.js:551
+#| msgid "Applications"
+msgid "Notifications"
+msgstr "提示"
+
+#: ../js/ui/userMenu.js:559
+msgid "Online Accounts"
+msgstr "在线帐户"
+
+#: ../js/ui/userMenu.js:563
+msgid "System Settings"
+msgstr "系统设置"
+
+#: ../js/ui/userMenu.js:570
+msgid "Lock Screen"
+msgstr "锁定"
+
+#: ../js/ui/userMenu.js:575
+msgid "Switch User"
+msgstr "切换用户"
+
+#: ../js/ui/userMenu.js:580
+msgid "Log Out..."
+msgstr "注销..."
+
 #. Translators: this is the text displayed
 #. in the search entry when no search is
 #. active; it should not exceed ~30
@@ -1241,7 +1501,7 @@ msgstr "%s 已就绪"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1098
+#: ../src/gvc/gvc-mixer-control.c:1100
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1249,21 +1509,25 @@ msgstr[0] "%u 个输出"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1108
+#: ../src/gvc/gvc-mixer-control.c:1110
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 个输入"
 
-#: ../src/gvc/gvc-mixer-control.c:1406
+#: ../src/gvc/gvc-mixer-control.c:1408
 msgid "System Sounds"
 msgstr "系统声音"
 
-#: ../src/main.c:466
+#: ../src/main.c:480
 msgid "Print version"
 msgstr "打印版本"
 
-#: ../src/shell-app.c:566
+#: ../src/main.c:486
+msgid "Mode used by GDM for login screen"
+msgstr "GDM 用于登录屏幕的模式"
+
+#: ../src/shell-app.c:581
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "启动 %s 失败"
@@ -1300,9 +1564,31 @@ msgstr "文件系统"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
-#: ../src/shell-util.c:600
-msgid "calendar:week_start:0"
-msgstr "calendar:week_start:0"
+#~ msgid "Do Not Disturb"
+#~ msgstr "请勿打扰"
+
+#~ msgid "calendar:week_start:0"
+#~ msgstr "calendar:week_start:0"
+
+#~ msgid ""
+#~ "GNOME Shell extensions have a uuid property; this key lists extensions "
+#~ "which should not be loaded. This setting overrides enabled-extensions for "
+#~ "extensions that appear in both lists."
+#~ msgstr ""
+#~ "GNOME Shell 扩展有一个 uuid 属性，此键列出了不应该加载的扩展。此设置会覆"
+#~ "盖 enable-extensions 中同时出现在两个列表里的扩展的设置。"
+
+#~ msgid "Uuids of extensions to disable"
+#~ msgstr "要禁用的扩展的 uuid"
+
+#~ msgid "You're now connected to mobile broadband connection '%s'"
+#~ msgstr "您已连接至移动宽带连接 %s"
+
+#~ msgid "You're now connected to wireless network '%s'"
+#~ msgstr "您已连接至无线网络 %s"
+
+#~ msgid "You're now connected to VPN network '%s'"
+#~ msgstr "您已连接至 VPN 网络 %s"
 
 #~ msgid "Localization Settings"
 #~ msgstr "本地化设置"
@@ -1350,9 +1636,6 @@ msgstr "calendar:week_start:0"
 #~ msgid "Screen Reader"
 #~ msgstr "屏幕阅读器"
 
-#~ msgid "Screen Keyboard"
-#~ msgstr "屏幕键盘"
-
 #~ msgid "PREFERENCES"
 #~ msgstr "首选项"
 
@@ -1392,16 +1675,17 @@ msgstr "calendar:week_start:0"
 #~ 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."
+#~ "\"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 键将被忽略。"
+#~ "此键指定面板时钟使用的时间格式。可能的值为 \"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 "将十字夹在中间"