diff --git a/po/zh_CN.po b/po/zh_CN.po
index 852795025..665359c48 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,16 +14,15 @@
 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-09-21 19:11+0000\n"
-"PO-Revision-Date: 2011-09-28 00:56+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-26 09:33+0000\n"
+"PO-Revision-Date: 2011-11-26 09:39+0000\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/gnome-shell.desktop.in.in.h:1
@@ -55,11 +54,14 @@ msgstr "屏幕录像的帧率。"
 #: ../data/org.gnome.shell.gschema.xml.in.h:5
 msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
-"should be loaded. disabled-extensions overrides this setting for extensions "
-"that appear in both lists."
+"should be loaded. Any extension that wants to be loaded needs to be in this "
+"list. You can also manipulate this list with the EnableExtension and "
+"DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"GNOME Shell 扩展有一个 uuid 属性，此键列出了不应该加载的扩展。disabled-"
-"extensions 会覆盖同时出现在两个列表里的扩展的设置。"
+"GNOME Shell 扩展有一个 uuid 属性，此键列出了应该加载的扩展。"
+"任何需要加载的扩展都需出现在此列表中。您还可以通过 DBus 的方式对 "
+"org.gnome.Shell 里的 EnableExtension 和 DisableExtension 的值进行修改，"
+"以修改此列表。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:6
 msgid "History for command (Alt-F2) dialog"
@@ -177,7 +179,7 @@ msgstr "使用哪个键盘"
 msgid "disabled OpenSearch providers"
 msgstr "已禁用的 OpenSearch 提供商"
 
-#: ../js/gdm/loginDialog.js:617
+#: ../js/gdm/loginDialog.js:623
 msgid "Session..."
 msgstr "会话..."
 
@@ -186,43 +188,44 @@ msgctxt "title"
 msgid "Sign In"
 msgstr "登录"
 
-#. translators: this message is shown below the password entry field
+#. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
 #: ../js/gdm/loginDialog.js:830
 msgid "(or swipe finger)"
 msgstr "(或滑动手指)"
 
-#: ../js/gdm/loginDialog.js:848
+#. translators: this message is shown below the user list on the
+#. login screen. It can be activated to reveal an entry for
+#. manually entering the username.
+#: ../js/gdm/loginDialog.js:851
 msgid "Not listed?"
 msgstr "未列出？"
 
-#: ../js/gdm/loginDialog.js:1004 ../js/ui/endSessionDialog.js:426
-#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:165
-#: ../js/ui/polkitAuthenticationAgent.js:171 ../js/ui/status/bluetooth.js:480
+#: ../js/gdm/loginDialog.js:1019 ../js/ui/endSessionDialog.js:418
+#: ../js/ui/extensionSystem.js:516 ../js/ui/networkAgent.js:145
+#: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:463
 msgid "Cancel"
 msgstr "取消"
 
-#: ../js/gdm/loginDialog.js:1009
+#: ../js/gdm/loginDialog.js:1024
 msgctxt "button"
 msgid "Sign In"
 msgstr "登录"
 
-#: ../js/gdm/loginDialog.js:1358
+#: ../js/gdm/loginDialog.js:1376
 msgid "Login Window"
 msgstr "登录窗口"
 
-#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:514
-#: ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:585
+#: ../js/gdm/powerMenu.js:113 ../js/ui/userMenu.js:578
+#: ../js/ui/userMenu.js:580 ../js/ui/userMenu.js:649
 msgid "Suspend"
 msgstr "挂起"
 
-#: ../js/gdm/powerMenu.js:121 ../js/ui/endSessionDialog.js:89
-#: ../js/ui/endSessionDialog.js:97 ../js/ui/endSessionDialog.js:106
+#: ../js/gdm/powerMenu.js:118
 msgid "Restart"
 msgstr "重启"
 
-#: ../js/gdm/powerMenu.js:126 ../js/ui/endSessionDialog.js:80
-#: ../js/ui/endSessionDialog.js:91
+#: ../js/gdm/powerMenu.js:123
 msgid "Power Off"
 msgstr "关机"
 
@@ -242,69 +245,69 @@ msgid "Execution of '%s' failed:"
 msgstr "运行“%s”失败："
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:255
+#: ../js/ui/appDisplay.js:251
 msgid "All"
 msgstr "全部"
 
-#: ../js/ui/appDisplay.js:319
+#: ../js/ui/appDisplay.js:310
 msgid "APPLICATIONS"
 msgstr "应用程序"
 
-#: ../js/ui/appDisplay.js:377
+#: ../js/ui/appDisplay.js:366
 msgid "SETTINGS"
 msgstr "设置"
 
-#: ../js/ui/appDisplay.js:684
+#: ../js/ui/appDisplay.js:664
 msgid "New Window"
 msgstr "新窗口"
 
-#: ../js/ui/appDisplay.js:687
+#: ../js/ui/appDisplay.js:667
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: ../js/ui/appDisplay.js:688
+#: ../js/ui/appDisplay.js:668
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
-#: ../js/ui/appFavorites.js:89
+#: ../js/ui/appFavorites.js:87
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s 已经添加到了您的收藏夹。"
 
-#: ../js/ui/appFavorites.js:120
+#: ../js/ui/appFavorites.js:118
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"
 
-#: ../js/ui/autorunManager.js:280
+#: ../js/ui/autorunManager.js:265
 msgid "Removable Devices"
 msgstr "可移动设备"
 
-#: ../js/ui/autorunManager.js:590
+#: ../js/ui/autorunManager.js:560
 #, c-format
 msgid "Open with %s"
 msgstr "使用 %s 打开"
 
-#: ../js/ui/autorunManager.js:616
+#: ../js/ui/autorunManager.js:586
 msgid "Eject"
 msgstr "弹出"
 
 #. 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:63
+#: ../js/ui/calendar.js:62
 msgctxt "event list time"
 msgid "All Day"
 msgstr "全天"
 
 #. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:68
+#: ../js/ui/calendar.js:67
 msgctxt "event list time"
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:75
+#: ../js/ui/calendar.js:74
 msgctxt "event list time"
 msgid "%l:%M %p"
 msgstr "%I:%M %p"
@@ -314,43 +317,43 @@ msgstr "%I:%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:115
+#: ../js/ui/calendar.js:114
 msgctxt "grid sunday"
 msgid "S"
 msgstr "日"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:117
+#: ../js/ui/calendar.js:116
 msgctxt "grid monday"
 msgid "M"
 msgstr "一"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:119
+#: ../js/ui/calendar.js:118
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "二"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:121
+#: ../js/ui/calendar.js:120
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "三"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:122
 msgctxt "grid thursday"
 msgid "T"
 msgstr "四"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:124
 msgctxt "grid friday"
 msgid "F"
 msgstr "五"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:127
+#: ../js/ui/calendar.js:126
 msgctxt "grid saturday"
 msgid "S"
 msgstr "六"
@@ -361,423 +364,472 @@ msgstr "六"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #.
-#: ../js/ui/calendar.js:140
+#: ../js/ui/calendar.js:139
 msgctxt "list sunday"
 msgid "Su"
 msgstr "星期日"
 
 #. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:142
+#: ../js/ui/calendar.js:141
 msgctxt "list monday"
 msgid "M"
 msgstr "星期一"
 
 #. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:144
+#: ../js/ui/calendar.js:143
 msgctxt "list tuesday"
 msgid "T"
 msgstr "星期二"
 
 #. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:146
+#: ../js/ui/calendar.js:145
 msgctxt "list wednesday"
 msgid "W"
 msgstr "星期三"
 
 #. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:148
+#: ../js/ui/calendar.js:147
 msgctxt "list thursday"
 msgid "Th"
 msgstr "星期四"
 
 #. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:150
+#: ../js/ui/calendar.js:149
 msgctxt "list friday"
 msgid "F"
 msgstr "星期五"
 
 #. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:152
+#: ../js/ui/calendar.js:151
 msgctxt "list saturday"
 msgid "S"
 msgstr "星期六"
 
 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:687
+#: ../js/ui/calendar.js:681
 msgid "Nothing Scheduled"
 msgstr "无计划"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:703
+#: ../js/ui/calendar.js:697
 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:706
+#: ../js/ui/calendar.js:700
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: ../js/ui/calendar.js:716
+#: ../js/ui/calendar.js:710
 msgid "Today"
 msgstr "今天"
 
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:714
 msgid "Tomorrow"
 msgstr "明天"
 
-#: ../js/ui/calendar.js:729
+#: ../js/ui/calendar.js:723
 msgid "This week"
 msgstr "本周"
 
-#: ../js/ui/calendar.js:737
+#: ../js/ui/calendar.js:731
 msgid "Next week"
 msgstr "下周"
 
-#: ../js/ui/contactDisplay.js:59 ../js/ui/notificationDaemon.js:444
-#: ../js/ui/status/power.js:223 ../src/shell-app.c:355
+#: ../js/ui/contactDisplay.js:63 ../js/ui/notificationDaemon.js:466
+#: ../js/ui/status/power.js:215 ../src/shell-app.c:350
 msgid "Unknown"
 msgstr "未知"
 
-#: ../js/ui/contactDisplay.js:80 ../js/ui/userMenu.js:139
+#: ../js/ui/contactDisplay.js:84 ../js/ui/userMenu.js:127
 msgid "Available"
 msgstr "可用"
 
-#: ../js/ui/contactDisplay.js:85 ../js/ui/userMenu.js:148
+#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:136
 msgid "Away"
 msgstr "离开"
 
-#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:142
+#: ../js/ui/contactDisplay.js:93 ../js/ui/userMenu.js:130
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../js/ui/contactDisplay.js:93
+#: ../js/ui/contactDisplay.js:97
 msgid "Offline"
 msgstr "离线"
 
-#: ../js/ui/contactDisplay.js:140
+#: ../js/ui/contactDisplay.js:141
 msgid "CONTACTS"
 msgstr "联系人"
 
-#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1197
+#: ../js/ui/dash.js:169 ../js/ui/messageTray.js:1204
 msgid "Remove"
 msgstr "移除"
 
-#: ../js/ui/dateMenu.js:99
+#: ../js/ui/dateMenu.js:96
 msgid "Date and Time Settings"
 msgstr "日期和时间设置"
 
-#: ../js/ui/dateMenu.js:125
+#: ../js/ui/dateMenu.js:122
 msgid "Open Calendar"
 msgstr "打开日历"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:183
+#: ../js/ui/dateMenu.js:180
 msgid "%a %b %e, %R:%S"
 msgstr "%m月%d日%R:%S%A"
 
-#: ../js/ui/dateMenu.js:184
+#: ../js/ui/dateMenu.js:181
 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:188
+#: ../js/ui/dateMenu.js:185
 msgid "%a %R:%S"
 msgstr "%A %R:%S"
 
-#: ../js/ui/dateMenu.js:189
+#: ../js/ui/dateMenu.js:186
 msgid "%a %R"
 msgstr "%A %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:196
+#: ../js/ui/dateMenu.js:193
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%m月%d日%A %I:%M:%S %p"
 
-#: ../js/ui/dateMenu.js:197
+#: ../js/ui/dateMenu.js:194
 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:201
+#: ../js/ui/dateMenu.js:198
 msgid "%a %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
-#: ../js/ui/dateMenu.js:202
+#: ../js/ui/dateMenu.js:199
 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:213
+#: ../js/ui/dateMenu.js:210
 msgid "%A %B %e, %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: ../js/ui/docDisplay.js:16
+#: ../js/ui/docDisplay.js:13
 msgid "RECENT ITEMS"
 msgstr "最近项目"
 
-#: ../js/ui/endSessionDialog.js:60
+#: ../js/ui/endSessionDialog.js:61
 #, c-format
+msgctxt "title"
 msgid "Log Out %s"
 msgstr "注销 %s"
 
-#: ../js/ui/endSessionDialog.js:61 ../js/ui/endSessionDialog.js:75
+#: ../js/ui/endSessionDialog.js:62
+msgctxt "title"
 msgid "Log Out"
 msgstr "注销"
 
-#: ../js/ui/endSessionDialog.js:62
+#: ../js/ui/endSessionDialog.js:63
 msgid "Click Log Out to quit these applications and log out of the system."
 msgstr "点“注销“来退出这些应用程序及系统"
 
-#: ../js/ui/endSessionDialog.js:64
+#: ../js/ui/endSessionDialog.js:65
 #, c-format
 msgid "%s will be logged out automatically in %d second."
 msgid_plural "%s will be logged out automatically in %d seconds."
 msgstr[0] "%s 将在 %d 秒后自动注销。"
 
-#: ../js/ui/endSessionDialog.js:69
+#: ../js/ui/endSessionDialog.js:70
 #, c-format
 msgid "You will be logged out automatically in %d second."
 msgid_plural "You will be logged out automatically in %d seconds."
 msgstr[0] "您将在 %d 秒后自动注销。"
 
-#: ../js/ui/endSessionDialog.js:73
+#: ../js/ui/endSessionDialog.js:74
 msgid "Logging out of the system."
 msgstr "从系统注销"
 
+#: ../js/ui/endSessionDialog.js:76
+msgctxt "button"
+msgid "Log Out"
+msgstr "注销"
+
 #: ../js/ui/endSessionDialog.js:81
+msgctxt "title"
+msgid "Power Off"
+msgstr "关机"
+
+#: ../js/ui/endSessionDialog.js:82
 msgid "Click Power Off to quit these applications and power off the system."
 msgstr "点击关机以退出应用程序并关闭系统。"
 
-#: ../js/ui/endSessionDialog.js:83
+#: ../js/ui/endSessionDialog.js:84
 #, c-format
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
 msgstr[0] "系统将在 %d 秒后自动关机。"
 
-#: ../js/ui/endSessionDialog.js:87
+#: ../js/ui/endSessionDialog.js:88
 msgid "Powering off the system."
 msgstr "关闭系统。"
 
+#: ../js/ui/endSessionDialog.js:90 ../js/ui/endSessionDialog.js:107
+msgctxt "button"
+msgid "Restart"
+msgstr "重启"
+
+#: ../js/ui/endSessionDialog.js:92
+msgctxt "button"
+msgid "Power Off"
+msgstr "关机"
+
 #: ../js/ui/endSessionDialog.js:98
+msgctxt "title"
+msgid "Restart"
+msgstr "重启"
+
+#: ../js/ui/endSessionDialog.js:99
 msgid "Click Restart to quit these applications and restart the system."
 msgstr "点“重启“来退出这些应用程序并重启系统"
 
-#: ../js/ui/endSessionDialog.js:100
+#: ../js/ui/endSessionDialog.js:101
 #, c-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "系统将在 %d 秒后自动重启。"
 
-#: ../js/ui/endSessionDialog.js:104
+#: ../js/ui/endSessionDialog.js:105
 msgid "Restarting the system."
 msgstr "重启系统。"
 
-#: ../js/ui/extensionSystem.js:481
+#: ../js/ui/extensionSystem.js:520
 msgid "Install"
 msgstr "安装"
 
-#: ../js/ui/extensionSystem.js:485
+#: ../js/ui/extensionSystem.js:524
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "从 extensions.gnome.org 下载并安装 %s？"
 
-#: ../js/ui/keyboard.js:517 ../js/ui/status/power.js:211
+#: ../js/ui/keyboard.js:322
+msgid "tray"
+msgstr "托盘"
+
+#: ../js/ui/keyboard.js:539 ../js/ui/status/power.js:203
 msgid "Keyboard"
 msgstr "键盘"
 
-#: ../js/ui/lookingGlass.js:645
+#: ../js/ui/lookingGlass.js:724
 msgid "No extensions installed"
 msgstr "未安装扩展"
 
-#: ../js/ui/lookingGlass.js:691
+#. Translators: argument is an extension UUID.
+#: ../js/ui/lookingGlass.js:779
+#, c-format
+msgid "%s has not emitted any errors."
+msgstr "%s 没有传出任何错误信息。"
+
+#: ../js/ui/lookingGlass.js:785
+msgid "Hide Errors"
+msgstr "隐藏错误"
+
+#: ../js/ui/lookingGlass.js:789 ../js/ui/lookingGlass.js:840
+msgid "Show Errors"
+msgstr "显示错误"
+
+#: ../js/ui/lookingGlass.js:798
 msgid "Enabled"
 msgstr "已启用"
 
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:693 ../src/gvc/gvc-mixer-control.c:1093
+#: ../js/ui/lookingGlass.js:801 ../src/gvc/gvc-mixer-control.c:1093
 msgid "Disabled"
 msgstr "已禁用"
 
-#: ../js/ui/lookingGlass.js:695
+#: ../js/ui/lookingGlass.js:803
 msgid "Error"
 msgstr "错误"
 
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:805
 msgid "Out of date"
 msgstr "过时"
 
-#: ../js/ui/lookingGlass.js:699
+#: ../js/ui/lookingGlass.js:807
 msgid "Downloading"
 msgstr "正在下载"
 
-#: ../js/ui/lookingGlass.js:724
+#: ../js/ui/lookingGlass.js:828
 msgid "View Source"
 msgstr "查看源"
 
-#: ../js/ui/lookingGlass.js:730
+#: ../js/ui/lookingGlass.js:834
 msgid "Web Page"
 msgstr "网页"
 
-#: ../js/ui/messageTray.js:1190
+#: ../js/ui/messageTray.js:1197
 msgid "Open"
 msgstr "打开"
 
-#: ../js/ui/messageTray.js:2372
+#: ../js/ui/messageTray.js:1214
+msgid "Unmute"
+msgstr "取消静音"
+
+#: ../js/ui/messageTray.js:1214
+msgid "Mute"
+msgstr "静音"
+
+#: ../js/ui/messageTray.js:2424
 msgid "System Information"
 msgstr "系统信息"
 
-#: ../js/ui/networkAgent.js:145
-msgid "Show password"
-msgstr "显示密码"
-
-#: ../js/ui/networkAgent.js:160
+#: ../js/ui/networkAgent.js:140
 msgid "Connect"
 msgstr "连接"
 
 #. Cisco LEAP
-#: ../js/ui/networkAgent.js:255 ../js/ui/networkAgent.js:267
-#: ../js/ui/networkAgent.js:294 ../js/ui/networkAgent.js:314
-#: ../js/ui/networkAgent.js:324
+#: ../js/ui/networkAgent.js:235 ../js/ui/networkAgent.js:247
+#: ../js/ui/networkAgent.js:274 ../js/ui/networkAgent.js:294
+#: ../js/ui/networkAgent.js:304
 msgid "Password: "
 msgstr "密码："
 
 #. static WEP
-#: ../js/ui/networkAgent.js:260
+#: ../js/ui/networkAgent.js:240
 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:292 ../js/ui/networkAgent.js:310
+#: ../js/ui/networkAgent.js:272 ../js/ui/networkAgent.js:290
 msgid "Username: "
 msgstr "用户名："
 
-#: ../js/ui/networkAgent.js:298
+#: ../js/ui/networkAgent.js:278
 msgid "Identity: "
 msgstr "身份："
 
-#: ../js/ui/networkAgent.js:300
+#: ../js/ui/networkAgent.js:280
 msgid "Private key password: "
 msgstr "私人密钥密码："
 
-#: ../js/ui/networkAgent.js:312
+#: ../js/ui/networkAgent.js:292
 msgid "Service: "
 msgstr "服务："
 
-#: ../js/ui/networkAgent.js:341
+#: ../js/ui/networkAgent.js:321
 msgid "Authentication required by wireless network"
 msgstr "无线网络要求身份认证"
 
-#: ../js/ui/networkAgent.js:342
+#: ../js/ui/networkAgent.js:322
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr "访问无线网络“%s”需要密码或密钥。"
 
-#: ../js/ui/networkAgent.js:346
+#: ../js/ui/networkAgent.js:326
 msgid "Wired 802.1X authentication"
 msgstr "有线 802.1X 认证"
 
-#: ../js/ui/networkAgent.js:348
+#: ../js/ui/networkAgent.js:328
 msgid "Network name: "
 msgstr "网络名称："
 
-#: ../js/ui/networkAgent.js:353
+#: ../js/ui/networkAgent.js:333
 msgid "DSL authentication"
 msgstr "DSL 认证"
 
-#: ../js/ui/networkAgent.js:360
+#: ../js/ui/networkAgent.js:340
 msgid "PIN code required"
 msgstr "需要 PIN 码"
 
-#: ../js/ui/networkAgent.js:361
+#: ../js/ui/networkAgent.js:341
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码"
 
-#: ../js/ui/networkAgent.js:362
+#: ../js/ui/networkAgent.js:342
 msgid "PIN: "
 msgstr "PIN："
 
-#: ../js/ui/networkAgent.js:368
+#: ../js/ui/networkAgent.js:348
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: ../js/ui/networkAgent.js:369
+#: ../js/ui/networkAgent.js:349
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "连接到“%s”需要密码。"
 
-#: ../js/ui/overview.js:91
+#: ../js/ui/overview.js:89
 msgid "Undo"
 msgstr "撤销"
 
-#: ../js/ui/overview.js:205
+#: ../js/ui/overview.js:201
 msgid "Windows"
 msgstr "窗口"
 
-#: ../js/ui/overview.js:208
+#: ../js/ui/overview.js:204
 msgid "Applications"
 msgstr "应用程序"
 
 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/overview.js:230
+#: ../js/ui/overview.js:226
 msgid "Dash"
 msgstr "Dash"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:539
+#: ../js/ui/panel.js:532
 #, 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:575
+#: ../js/ui/panel.js:565
 msgid "Activities"
 msgstr "活动"
 
-#: ../js/ui/panel.js:967
+#: ../js/ui/panel.js:953
 msgid "Top Bar"
 msgstr "顶栏"
 
-#: ../js/ui/placeDisplay.js:120
+#: ../js/ui/placeDisplay.js:115
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "卸载 %s 失败"
 
-#: ../js/ui/placeDisplay.js:123
+#: ../js/ui/placeDisplay.js:118
 msgid "Retry"
 msgstr "重试"
 
-#: ../js/ui/placeDisplay.js:163
+#: ../js/ui/placeDisplay.js:156
 msgid "Connect to..."
 msgstr "连接到..."
 
-#: ../js/ui/placeDisplay.js:375
+#: ../js/ui/placeDisplay.js:364
 msgid "PLACES & DEVICES"
 msgstr "位置和设备"
 
-#: ../js/ui/polkitAuthenticationAgent.js:72
+#: ../js/ui/polkitAuthenticationAgent.js:71
 msgid "Authentication Required"
 msgstr "需要认证"
 
-#: ../js/ui/polkitAuthenticationAgent.js:106
+#: ../js/ui/polkitAuthenticationAgent.js:109
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../js/ui/polkitAuthenticationAgent.js:175
+#: ../js/ui/polkitAuthenticationAgent.js:179
 msgid "Authenticate"
 msgstr "认证"
 
@@ -785,11 +837,11 @@ msgstr "认证"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: ../js/ui/polkitAuthenticationAgent.js:256
+#: ../js/ui/polkitAuthenticationAgent.js:260
 msgid "Sorry, that didn't work. Please try again."
 msgstr "抱歉，您的输入有误。请重试。"
 
-#: ../js/ui/polkitAuthenticationAgent.js:268
+#: ../js/ui/polkitAuthenticationAgent.js:272
 msgid "Password:"
 msgstr "密码："
 
@@ -798,454 +850,469 @@ 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:727
+#: ../js/ui/popupMenu.js:717
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
-#: ../js/ui/runDialog.js:208
+#: ../js/ui/runDialog.js:205
 msgid "Please enter a command:"
 msgstr "请输入一个命令："
 
-#: ../js/ui/searchDisplay.js:340
+#: ../js/ui/searchDisplay.js:333
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: ../js/ui/searchDisplay.js:363
+#: ../js/ui/searchDisplay.js:356
 msgid "No matching results."
 msgstr "无匹配结果。"
 
-#: ../js/ui/shellMountOperation.js:285
+#: ../js/ui/shellEntry.js:26
+msgid "Copy"
+msgstr "复制"
+
+#: ../js/ui/shellEntry.js:31
+msgid "Paste"
+msgstr "粘贴"
+
+#: ../js/ui/shellEntry.js:77
+msgid "Show Text"
+msgstr "显示文本"
+
+#: ../js/ui/shellEntry.js:79
+msgid "Hide Text"
+msgstr "隐藏文本"
+
+#: ../js/ui/shellMountOperation.js:269
 msgid "Wrong password, please try again"
 msgstr "密码错误，请重试"
 
-#: ../js/ui/status/accessibility.js:60
+#: ../js/ui/status/accessibility.js:52
 msgid "Zoom"
 msgstr "缩放"
 
 #. let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
 #. 'screen-reader-enabled');
 #. this.menu.addMenuItem(screenReader);
-#: ../js/ui/status/accessibility.js:71
-#| msgid "Screen Reader"
+#: ../js/ui/status/accessibility.js:63
 msgid "Screen Keyboard"
 msgstr "屏幕键盘"
 
-#: ../js/ui/status/accessibility.js:75
+#: ../js/ui/status/accessibility.js:67
 msgid "Visual Alerts"
 msgstr "视觉响铃"
 
-#: ../js/ui/status/accessibility.js:78
+#: ../js/ui/status/accessibility.js:70
 msgid "Sticky Keys"
 msgstr "粘滞键"
 
-#: ../js/ui/status/accessibility.js:81
+#: ../js/ui/status/accessibility.js:73
 msgid "Slow Keys"
 msgstr "慢速键"
 
-#: ../js/ui/status/accessibility.js:84
+#: ../js/ui/status/accessibility.js:76
 msgid "Bounce Keys"
 msgstr "筛选键"
 
-#: ../js/ui/status/accessibility.js:87
+#: ../js/ui/status/accessibility.js:79
 msgid "Mouse Keys"
 msgstr "鼠标按键"
 
-#: ../js/ui/status/accessibility.js:91
+#: ../js/ui/status/accessibility.js:83
 msgid "Universal Access Settings"
 msgstr "通用访问设置"
 
-#: ../js/ui/status/accessibility.js:141
+#: ../js/ui/status/accessibility.js:117
 msgid "High Contrast"
 msgstr "高对比度"
 
-#: ../js/ui/status/accessibility.js:178
+#: ../js/ui/status/accessibility.js:154
 msgid "Large Text"
 msgstr "大号文本"
 
-#: ../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
+#: ../js/ui/status/bluetooth.js:36 ../js/ui/status/bluetooth.js:259
+#: ../js/ui/status/bluetooth.js:342 ../js/ui/status/bluetooth.js:372
+#: ../js/ui/status/bluetooth.js:408 ../js/ui/status/bluetooth.js:437
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../js/ui/status/bluetooth.js:52
+#: ../js/ui/status/bluetooth.js:49
 msgid "Visibility"
 msgstr "可见性"
 
-#: ../js/ui/status/bluetooth.js:66
+#: ../js/ui/status/bluetooth.js:63
 msgid "Send Files to Device..."
 msgstr "发送文件到设备..."
 
-#: ../js/ui/status/bluetooth.js:67
+#: ../js/ui/status/bluetooth.js:64
 msgid "Set up a New Device..."
 msgstr "安装新设备..."
 
-#: ../js/ui/status/bluetooth.js:91
+#: ../js/ui/status/bluetooth.js:88
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:111
+#: ../js/ui/status/bluetooth.js:108
 msgid "hardware disabled"
 msgstr "已通过硬件开关禁用"
 
-#: ../js/ui/status/bluetooth.js:208
+#: ../js/ui/status/bluetooth.js:204
 msgid "Connection"
 msgstr "连接"
 
-#: ../js/ui/status/bluetooth.js:217 ../js/ui/status/network.js:486
+#: ../js/ui/status/bluetooth.js:215 ../js/ui/status/network.js:475
 msgid "disconnecting..."
 msgstr "正在断开..."
 
-#: ../js/ui/status/bluetooth.js:230 ../js/ui/status/network.js:492
+#: ../js/ui/status/bluetooth.js:228 ../js/ui/status/network.js:481
 msgid "connecting..."
 msgstr "正在连接..."
 
-#: ../js/ui/status/bluetooth.js:248
+#: ../js/ui/status/bluetooth.js:246
 msgid "Send Files..."
 msgstr "发送文件..."
 
-#: ../js/ui/status/bluetooth.js:253
+#: ../js/ui/status/bluetooth.js:251
 msgid "Browse Files..."
 msgstr "浏览文件..."
 
-#: ../js/ui/status/bluetooth.js:262
+#: ../js/ui/status/bluetooth.js:260
 msgid "Error browsing device"
 msgstr "浏览设备出错"
 
-#: ../js/ui/status/bluetooth.js:263
+#: ../js/ui/status/bluetooth.js:261
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "无法浏览请求的设备，错误为 %s"
 
-#: ../js/ui/status/bluetooth.js:271
+#: ../js/ui/status/bluetooth.js:269
 msgid "Keyboard Settings"
 msgstr "键盘设置"
 
-#: ../js/ui/status/bluetooth.js:274
+#: ../js/ui/status/bluetooth.js:272
 msgid "Mouse Settings"
 msgstr "鼠标设置"
 
-#: ../js/ui/status/bluetooth.js:279 ../js/ui/status/volume.js:62
+#: ../js/ui/status/bluetooth.js:277 ../js/ui/status/volume.js:58
 msgid "Sound Settings"
 msgstr "声音设置"
 
-#: ../js/ui/status/bluetooth.js:382
+#: ../js/ui/status/bluetooth.js:373
 #, c-format
 msgid "Authorization request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../js/ui/status/bluetooth.js:388
+#: ../js/ui/status/bluetooth.js:379
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "设备 %s 希望访问 %s 服务"
 
-#: ../js/ui/status/bluetooth.js:390
+#: ../js/ui/status/bluetooth.js:381
 msgid "Always grant access"
 msgstr "始终允许"
 
-#: ../js/ui/status/bluetooth.js:391
+#: ../js/ui/status/bluetooth.js:382
 msgid "Grant this time only"
 msgstr "允许一次"
 
-#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1196
+#: ../js/ui/status/bluetooth.js:383 ../js/ui/telepathyClient.js:1181
 msgid "Reject"
 msgstr "拒绝"
 
-#: ../js/ui/status/bluetooth.js:422
+#: ../js/ui/status/bluetooth.js:409
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s 的配对确认"
 
-#: ../js/ui/status/bluetooth.js:428 ../js/ui/status/bluetooth.js:462
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/status/bluetooth.js:445
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "设备 %s 希望与此电脑配对"
 
-#: ../js/ui/status/bluetooth.js:429
+#: ../js/ui/status/bluetooth.js:416
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "请确认 PIN 码 %s 和要配对的设备是否相同。"
 
-#: ../js/ui/status/bluetooth.js:431
+#: ../js/ui/status/bluetooth.js:418
 msgid "Matches"
 msgstr "相同"
 
-#: ../js/ui/status/bluetooth.js:432
+#: ../js/ui/status/bluetooth.js:419
 msgid "Does not match"
 msgstr "不同"
 
-#: ../js/ui/status/bluetooth.js:455
+#: ../js/ui/status/bluetooth.js:438
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s 的配对请求"
 
-#: ../js/ui/status/bluetooth.js:463
+#: ../js/ui/status/bluetooth.js:446
 msgid "Please enter the PIN mentioned on the device."
 msgstr "请输入设备上的 PIN 码。"
 
-#: ../js/ui/status/bluetooth.js:479
+#: ../js/ui/status/bluetooth.js:462
 msgid "OK"
 msgstr "确定"
 
-#: ../js/ui/status/keyboard.js:73
+#: ../js/ui/status/keyboard.js:68
 msgid "Show Keyboard Layout"
 msgstr "显示键盘布局"
 
-#: ../js/ui/status/keyboard.js:78
+#: ../js/ui/status/keyboard.js:73
 msgid "Region and Language Settings"
 msgstr "区域和语言设置"
 
-#: ../js/ui/status/network.js:97
+#: ../js/ui/status/network.js:96
 msgid "<unknown>"
 msgstr "<未知>"
 
 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:285
+#: ../js/ui/status/network.js:275
 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:484
+#: ../js/ui/status/network.js:473
 msgid "unmanaged"
 msgstr "设备未托管"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:495
+#: ../js/ui/status/network.js:484
 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:505
+#: ../js/ui/status/network.js:494
 msgid "firmware missing"
 msgstr "固件缺失"
 
 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:512
+#: ../js/ui/status/network.js:501
 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:517
+#: ../js/ui/status/network.js:506
 msgid "unavailable"
 msgstr "不可用"
 
-#: ../js/ui/status/network.js:519
+#: ../js/ui/status/network.js:508
 msgid "connection failed"
 msgstr "连接失败"
 
-#: ../js/ui/status/network.js:575 ../js/ui/status/network.js:1523
+#: ../js/ui/status/network.js:564 ../js/ui/status/network.js:1506
 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:611 ../js/ui/status/network.js:1458
+#: ../js/ui/status/network.js:600 ../js/ui/status/network.js:1441
 msgid "Connected (private)"
 msgstr "已连接(私有网络)"
 
-#: ../js/ui/status/network.js:689
+#: ../js/ui/status/network.js:675
 msgid "Auto Ethernet"
 msgstr "自动以太网"
 
-#: ../js/ui/status/network.js:753
+#: ../js/ui/status/network.js:736
 msgid "Auto broadband"
 msgstr "自动移动宽带"
 
-#: ../js/ui/status/network.js:756
+#: ../js/ui/status/network.js:739
 msgid "Auto dial-up"
 msgstr "自动拨号"
 
 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:878 ../js/ui/status/network.js:1470
+#: ../js/ui/status/network.js:858 ../js/ui/status/network.js:1453
 #, c-format
 msgid "Auto %s"
 msgstr "自动 %s"
 
-#: ../js/ui/status/network.js:880
+#: ../js/ui/status/network.js:860
 msgid "Auto bluetooth"
 msgstr "自动蓝牙"
 
-#: ../js/ui/status/network.js:1472
+#: ../js/ui/status/network.js:1455
 msgid "Auto wireless"
 msgstr "自动无线"
 
-#: ../js/ui/status/network.js:1566
+#: ../js/ui/status/network.js:1547
 msgid "Enable networking"
 msgstr "启用联网"
 
-#: ../js/ui/status/network.js:1578
+#: ../js/ui/status/network.js:1559
 msgid "Wired"
 msgstr "有线"
 
-#: ../js/ui/status/network.js:1589
+#: ../js/ui/status/network.js:1570
 msgid "Wireless"
 msgstr "无线"
 
-#: ../js/ui/status/network.js:1599
+#: ../js/ui/status/network.js:1580
 msgid "Mobile broadband"
 msgstr "移动宽带"
 
-#: ../js/ui/status/network.js:1609
+#: ../js/ui/status/network.js:1590
 msgid "VPN Connections"
 msgstr "VPN 连接"
 
-#: ../js/ui/status/network.js:1620
+#: ../js/ui/status/network.js:1601
 msgid "Network Settings"
 msgstr "网络设置"
 
-#: ../js/ui/status/network.js:1757
+#: ../js/ui/status/network.js:1738
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: ../js/ui/status/network.js:1758
+#: ../js/ui/status/network.js:1739
 msgid "Activation of network connection failed"
 msgstr "启用网络连接失败"
 
-#: ../js/ui/status/network.js:2008
+#: ../js/ui/status/network.js:1989
 msgid "Networking is disabled"
 msgstr "联网已禁用"
 
-#: ../js/ui/status/network.js:2133
+#: ../js/ui/status/network.js:2113
 msgid "Network Manager"
 msgstr "网络管理器"
 
-#: ../js/ui/status/power.js:82
+#: ../js/ui/status/power.js:77
 msgid "Power Settings"
 msgstr "电源设置"
 
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:103
+#: ../js/ui/status/power.js:98
 msgid "Estimating..."
 msgstr "估计中..."
 
-#: ../js/ui/status/power.js:110
+#: ../js/ui/status/power.js:105
 #, 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:113
+#: ../js/ui/status/power.js:108
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "剩余 %d %s %d %s"
 
-#: ../js/ui/status/power.js:115
+#: ../js/ui/status/power.js:110
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: ../js/ui/status/power.js:115
+#: ../js/ui/status/power.js:110
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: ../js/ui/status/power.js:118
+#: ../js/ui/status/power.js:113
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "剩余 %d 分钟"
 
-#: ../js/ui/status/power.js:121 ../js/ui/status/power.js:194
+#: ../js/ui/status/power.js:116 ../js/ui/status/power.js:186
 #, c-format
 msgctxt "percent of battery remaining"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../js/ui/status/power.js:201
+#: ../js/ui/status/power.js:193
 msgid "AC adapter"
 msgstr "AC 适配器"
 
-#: ../js/ui/status/power.js:203
+#: ../js/ui/status/power.js:195
 msgid "Laptop battery"
 msgstr "笔记本电池"
 
-#: ../js/ui/status/power.js:205
+#: ../js/ui/status/power.js:197
 msgid "UPS"
 msgstr "UPS"
 
-#: ../js/ui/status/power.js:207
+#: ../js/ui/status/power.js:199
 msgid "Monitor"
 msgstr "显示器"
 
-#: ../js/ui/status/power.js:209
+#: ../js/ui/status/power.js:201
 msgid "Mouse"
 msgstr "鼠标"
 
-#: ../js/ui/status/power.js:213
+#: ../js/ui/status/power.js:205
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:215
+#: ../js/ui/status/power.js:207
 msgid "Cell phone"
 msgstr "手机"
 
-#: ../js/ui/status/power.js:217
+#: ../js/ui/status/power.js:209
 msgid "Media player"
 msgstr "媒体播放器"
 
-#: ../js/ui/status/power.js:219
+#: ../js/ui/status/power.js:211
 msgid "Tablet"
 msgstr "触摸板"
 
-#: ../js/ui/status/power.js:221
+#: ../js/ui/status/power.js:213
 msgid "Computer"
 msgstr "计算机"
 
-#: ../js/ui/status/volume.js:42
+#: ../js/ui/status/volume.js:38
 msgid "Volume"
 msgstr "音量"
 
-#: ../js/ui/status/volume.js:54
+#: ../js/ui/status/volume.js:50
 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:259
+#: ../js/ui/telepathyClient.js:256
 msgid "Invitation"
 msgstr "邀请"
 
 #. We got the TpContact
-#: ../js/ui/telepathyClient.js:325
+#: ../js/ui/telepathyClient.js:324
 msgid "Call"
 msgstr "呼叫"
 
 #. We got the TpContact
-#: ../js/ui/telepathyClient.js:353
+#: ../js/ui/telepathyClient.js:354
 msgid "File Transfer"
 msgstr "文件传送"
 
-#: ../js/ui/telepathyClient.js:434
+#: ../js/ui/telepathyClient.js:435
 msgid "Subscription request"
 msgstr "订阅请求"
 
-#: ../js/ui/telepathyClient.js:470
+#: ../js/ui/telepathyClient.js:471
 msgid "Connection error"
 msgstr "连接错误"
 
-#: ../js/ui/telepathyClient.js:733
+#: ../js/ui/telepathyClient.js:735
 #, c-format
 msgid "%s is online."
 msgstr "%s 在线。"
 
-#: ../js/ui/telepathyClient.js:738
+#: ../js/ui/telepathyClient.js:740
 #, c-format
 msgid "%s is offline."
 msgstr "%s 离线。"
 
-#: ../js/ui/telepathyClient.js:741
+#: ../js/ui/telepathyClient.js:743
 #, c-format
 msgid "%s is away."
 msgstr "%s 离开。"
 
-#: ../js/ui/telepathyClient.js:744
+#: ../js/ui/telepathyClient.js:746
 #, c-format
 msgid "%s is busy."
 msgstr "%s 忙碌。"
@@ -1253,35 +1320,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:978
+#: ../js/ui/telepathyClient.js:977
 #, 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:984
+#: ../js/ui/telepathyClient.js:983
 #, 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:989
+#: ../js/ui/telepathyClient.js:988
 #, 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:1031
+#: ../js/ui/telepathyClient.js:1030
 #, 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:1140
+#: ../js/ui/telepathyClient.js:1132
 #, c-format
 msgid "Invitation to %s"
 msgstr "邀请 %s"
@@ -1289,34 +1356,35 @@ 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:1148
+#: ../js/ui/telepathyClient.js:1140
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 要请您加入 %s"
 
-#: ../js/ui/telepathyClient.js:1150 ../js/ui/telepathyClient.js:1239
-#: ../js/ui/telepathyClient.js:1343
+#: ../js/ui/telepathyClient.js:1142 ../js/ui/telepathyClient.js:1222
+#: ../js/ui/telepathyClient.js:1320
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../js/ui/telepathyClient.js:1151 ../js/ui/telepathyClient.js:1240
-#: ../js/ui/telepathyClient.js:1344
+#: ../js/ui/telepathyClient.js:1143 ../js/ui/telepathyClient.js:1223
+#: ../js/ui/telepathyClient.js:1321
 msgid "Accept"
 msgstr "接受"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1184
+#: ../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:1187
+#: ../js/ui/telepathyClient.js:1176
 #, c-format
 msgid "Call from %s"
 msgstr "来自 %s 的呼叫"
 
-#: ../js/ui/telepathyClient.js:1197
+#. translators: this is a button label (verb), not a noun
+#: ../js/ui/telepathyClient.js:1183
 msgid "Answer"
 msgstr "接听"
 
@@ -1325,108 +1393,108 @@ msgstr "接听"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/telepathyClient.js:1233
+#: ../js/ui/telepathyClient.js:1216
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s 正在向您发送 %s"
 
 #. To translators: The parameter is the contact's alias
-#: ../js/ui/telepathyClient.js:1308
+#: ../js/ui/telepathyClient.js:1285
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想得到授权来查看您的在线状态"
 
-#: ../js/ui/telepathyClient.js:1406
+#: ../js/ui/telepathyClient.js:1378
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../js/ui/telepathyClient.js:1408
+#: ../js/ui/telepathyClient.js:1380
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: ../js/ui/telepathyClient.js:1410
+#: ../js/ui/telepathyClient.js:1382
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../js/ui/telepathyClient.js:1412
+#: ../js/ui/telepathyClient.js:1384
 msgid "Certificate not provided"
 msgstr "未提供证书"
 
-#: ../js/ui/telepathyClient.js:1414
+#: ../js/ui/telepathyClient.js:1386
 msgid "Certificate untrusted"
 msgstr "证书不受信任"
 
-#: ../js/ui/telepathyClient.js:1416
+#: ../js/ui/telepathyClient.js:1388
 msgid "Certificate expired"
 msgstr "证书过期"
 
-#: ../js/ui/telepathyClient.js:1418
+#: ../js/ui/telepathyClient.js:1390
 msgid "Certificate not activated"
 msgstr "证书未激活"
 
-#: ../js/ui/telepathyClient.js:1420
+#: ../js/ui/telepathyClient.js:1392
 msgid "Certificate hostname mismatch"
 msgstr "证书的主机名不匹配"
 
-#: ../js/ui/telepathyClient.js:1422
+#: ../js/ui/telepathyClient.js:1394
 msgid "Certificate fingerprint mismatch"
 msgstr "证书的指纹不匹配"
 
-#: ../js/ui/telepathyClient.js:1424
+#: ../js/ui/telepathyClient.js:1396
 msgid "Certificate self-signed"
 msgstr "证书是自已签发的"
 
-#: ../js/ui/telepathyClient.js:1426
+#: ../js/ui/telepathyClient.js:1398
 msgid "Status is set to offline"
 msgstr "已将状态设为离线。"
 
-#: ../js/ui/telepathyClient.js:1428
+#: ../js/ui/telepathyClient.js:1400
 msgid "Encryption is not available"
 msgstr "加密不可用"
 
-#: ../js/ui/telepathyClient.js:1430
+#: ../js/ui/telepathyClient.js:1402
 msgid "Certificate is invalid"
 msgstr "证书无效"
 
-#: ../js/ui/telepathyClient.js:1432
+#: ../js/ui/telepathyClient.js:1404
 msgid "Connection has been refused"
 msgstr "连接被拒绝"
 
-#: ../js/ui/telepathyClient.js:1434
+#: ../js/ui/telepathyClient.js:1406
 msgid "Connection can't be established"
 msgstr "无法建立连接"
 
-#: ../js/ui/telepathyClient.js:1436
+#: ../js/ui/telepathyClient.js:1408
 msgid "Connection has been lost"
 msgstr "连接丢失"
 
-#: ../js/ui/telepathyClient.js:1438
+#: ../js/ui/telepathyClient.js:1410
 msgid "This resource is already connected to the server"
 msgstr "此资源已经连接到服务器"
 
-#: ../js/ui/telepathyClient.js:1440
+#: ../js/ui/telepathyClient.js:1412
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "连接已经被使用相同资源的新连接所替换"
 
-#: ../js/ui/telepathyClient.js:1442
+#: ../js/ui/telepathyClient.js:1414
 msgid "The account already exists on the server"
 msgstr "服务器上已经存在该账户"
 
-#: ../js/ui/telepathyClient.js:1444
+#: ../js/ui/telepathyClient.js:1416
 msgid "Server is currently too busy to handle the connection"
 msgstr "服务器太忙，暂时无法处理该连接"
 
-#: ../js/ui/telepathyClient.js:1446
+#: ../js/ui/telepathyClient.js:1418
 msgid "Certificate has been revoked"
 msgstr "证书已撤销"
 
-#: ../js/ui/telepathyClient.js:1448
+#: ../js/ui/telepathyClient.js:1420
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "证书使用了不安全的加密算法或加密很弱"
 
-#: ../js/ui/telepathyClient.js:1450
+#: ../js/ui/telepathyClient.js:1422
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -1434,68 +1502,68 @@ msgstr "服务器证书的长度或证书链的长度超过了加密算法库的
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1459
+#: ../js/ui/telepathyClient.js:1432
 #, c-format
 msgid "Connection to %s failed"
 msgstr "连接 %s 失败"
 
-#: ../js/ui/telepathyClient.js:1468
+#: ../js/ui/telepathyClient.js:1441
 msgid "Reconnect"
 msgstr "重新连接"
 
-#: ../js/ui/telepathyClient.js:1469
+#: ../js/ui/telepathyClient.js:1442
 msgid "Edit account"
 msgstr "编辑帐户"
 
-#: ../js/ui/telepathyClient.js:1515
+#: ../js/ui/telepathyClient.js:1488
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../js/ui/userMenu.js:145
+#: ../js/ui/userMenu.js:133
 msgid "Hidden"
 msgstr "隐身"
 
-#: ../js/ui/userMenu.js:151
+#: ../js/ui/userMenu.js:139
 msgid "Idle"
 msgstr "空闲"
 
-#: ../js/ui/userMenu.js:154
+#: ../js/ui/userMenu.js:142
 msgid "Unavailable"
 msgstr "不可用"
 
-#: ../js/ui/userMenu.js:512 ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:586
+#: ../js/ui/userMenu.js:576 ../js/ui/userMenu.js:580 ../js/ui/userMenu.js:650
 msgid "Power Off..."
 msgstr "关机..."
 
-#: ../js/ui/userMenu.js:548
+#: ../js/ui/userMenu.js:612
 msgid "Notifications"
 msgstr "提示"
 
-#: ../js/ui/userMenu.js:556
+#: ../js/ui/userMenu.js:620
 msgid "Online Accounts"
 msgstr "在线帐户"
 
-#: ../js/ui/userMenu.js:560
+#: ../js/ui/userMenu.js:624
 msgid "System Settings"
 msgstr "系统设置"
 
-#: ../js/ui/userMenu.js:567
+#: ../js/ui/userMenu.js:631
 msgid "Lock Screen"
 msgstr "锁定"
 
-#: ../js/ui/userMenu.js:572
+#: ../js/ui/userMenu.js:636
 msgid "Switch User"
 msgstr "切换用户"
 
-#: ../js/ui/userMenu.js:577
+#: ../js/ui/userMenu.js:641
 msgid "Log Out..."
 msgstr "注销..."
 
-#: ../js/ui/userMenu.js:605
+#: ../js/ui/userMenu.js:669
 msgid "Your chat status will be set to busy"
 msgstr "您的聊天状态将被设置为忙碌"
 
-#: ../js/ui/userMenu.js:606
+#: ../js/ui/userMenu.js:670
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@@ -1507,20 +1575,15 @@ msgstr ""
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/viewSelector.js:120
+#: ../js/ui/viewSelector.js:113
 msgid "Type to search..."
 msgstr "搜索..."
 
-#: ../js/ui/viewSelector.js:140 ../src/shell-util.c:261
+#: ../js/ui/viewSelector.js:131 ../src/shell-util.c:244
 msgid "Search"
 msgstr "搜索"
 
-#: ../js/ui/windowAttentionHandler.js:39
-#, c-format
-msgid "%s has finished starting"
-msgstr "%s 已启动"
-
-#: ../js/ui/windowAttentionHandler.js:41
+#: ../js/ui/windowAttentionHandler.js:33
 #, c-format
 msgid "'%s' is ready"
 msgstr "%s 已就绪"
@@ -1545,15 +1608,15 @@ msgstr[0] "%u 个输入"
 msgid "System Sounds"
 msgstr "系统声音"
 
-#: ../src/main.c:480
+#: ../src/main.c:508
 msgid "Print version"
 msgstr "打印版本"
 
-#: ../src/main.c:486
+#: ../src/main.c:514
 msgid "Mode used by GDM for login screen"
 msgstr "GDM 用于登录屏幕的模式"
 
-#: ../src/shell-app.c:581
+#: ../src/shell-app.c:567
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "启动 %s 失败"
@@ -1570,13 +1633,15 @@ msgstr "默认"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "认证对话框被用户驳回"
 
-#: ../src/shell-util.c:100
-msgid "Home Folder"
-msgstr "主文件夹"
+#. Translators: this is the same string as the one found in
+#. * nautilus
+#: ../src/shell-util.c:89
+msgid "Home"
+msgstr "主目录"
 
 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-util.c:115
+#: ../src/shell-util.c:98
 msgid "File System"
 msgstr "文件系统"
 
@@ -1585,11 +1650,28 @@ msgstr "文件系统"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-util.c:311
+#: ../src/shell-util.c:294
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
+#~ msgid ""
+#~ "GNOME Shell extensions have a uuid property; this key lists extensions "
+#~ "which should be loaded. disabled-extensions overrides this setting for "
+#~ "extensions that appear in both lists."
+#~ msgstr ""
+#~ "GNOME Shell 扩展有一个 uuid 属性，此键列出了不应该加载的扩展。disabled-"
+#~ "extensions 会覆盖同时出现在两个列表里的扩展的设置。"
+
+#~ msgid "Show password"
+#~ msgstr "显示密码"
+
+#~ msgid "%s has finished starting"
+#~ msgstr "%s 已启动"
+
+#~ msgid "Home Folder"
+#~ msgstr "主文件夹"
+
 #~ msgid "If true, display onscreen keyboard."
 #~ msgstr "如果为真，显示屏幕键盘。"
 
@@ -1608,14 +1690,6 @@ msgstr "%1$s: %2$s"
 #~ 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"
 
@@ -1846,9 +1920,6 @@ msgstr "%1$s: %2$s"
 #~ msgid "Show seco_nds"
 #~ msgstr "显示秒(_N)"
 
-#~ msgid "Show the _date"
-#~ msgstr "显示日期(_D)"
-
 #~ msgid "_12 hour format"
 #~ msgstr "_12 时格式"