diff --git a/po/zh_CN.po b/po/zh_CN.po
index e578a838f..473d6d85a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -22,8 +22,8 @@ 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: 2016-03-25 22:36+0000\n"
-"PO-Revision-Date: 2016-03-26 15:13+0800\n"
+"POT-Creation-Date: 2016-10-11 08:09+0000\n"
+"PO-Revision-Date: 2016-10-18 17:30+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -31,63 +31,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.7.6\n"
+"X-Generator: Poedit 1.8.9\n"
 
-#: ../data/50-gnome-shell-system.xml.in.h:1
+#: data/50-gnome-shell-system.xml:6
 msgid "System"
 msgstr "系统"
 
-#: ../data/50-gnome-shell-system.xml.in.h:2
+#: data/50-gnome-shell-system.xml:9
 msgid "Show the notification list"
 msgstr "显示通知列表"
 
-#: ../data/50-gnome-shell-system.xml.in.h:3
+#: data/50-gnome-shell-system.xml:12
 msgid "Focus the active notification"
 msgstr "聚焦到活动通知"
 
-#: ../data/50-gnome-shell-system.xml.in.h:4
+#: data/50-gnome-shell-system.xml:15
 msgid "Show the overview"
 msgstr "显示活动概览"
 
-#: ../data/50-gnome-shell-system.xml.in.h:5
+#: data/50-gnome-shell-system.xml:18
 msgid "Show all applications"
 msgstr "显示全部应用程序"
 
-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: data/50-gnome-shell-system.xml:21
 msgid "Open the application menu"
 msgstr "打开应用程序菜单"
 
-#: ../data/gnome-shell-extension-prefs.desktop.in.in.h:1
+#: data/gnome-shell-extension-prefs.desktop.in.in:4
 msgid "GNOME Shell Extension Preferences"
 msgstr "GNOME Shell 扩展首选项"
 
-#: ../data/gnome-shell-extension-prefs.desktop.in.in.h:2
+#: data/gnome-shell-extension-prefs.desktop.in.in:5
 msgid "Configure GNOME Shell Extensions"
 msgstr "配置 GNOME Shell 扩展"
 
-#: ../data/org.gnome.Shell.desktop.in.in.h:1
+#: data/org.gnome.Shell.desktop.in.in:4
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
 
-#: ../data/org.gnome.Shell.desktop.in.in.h:2
+#: data/org.gnome.Shell.desktop.in.in:5
 msgid "Window management and application launching"
 msgstr "窗口管理和应用程序启动"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:1
+#: data/org.gnome.shell.gschema.xml.in:6
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr "启用从 Alt-F2 调用对开发者和测试者有用的内部工具"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:2
+#: data/org.gnome.shell.gschema.xml.in:9
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr "允许使用 Alt-F2 对话框访问内部调试和监视工具。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:3
+#: data/org.gnome.shell.gschema.xml.in:16
 msgid "UUIDs of extensions to enable"
 msgstr "要启用的扩展的 UUID"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:4
+#: data/org.gnome.shell.gschema.xml.in:17
 msgid ""
 "GNOME Shell extensions have a UUID property; this key lists extensions which "
 "should be loaded. Any extension that wants to be loaded needs to be in this "
@@ -98,11 +98,11 @@ msgstr ""
 "展都需出现在此列表中。您还可以通过 DBus 的方式对 org.gnome.Shell 里的 "
 "EnableExtension 和 DisableExtension 的值进行修改，以修改此列表。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:5
+#: data/org.gnome.shell.gschema.xml.in:26
 msgid "Disables the validation of extension version compatibility"
 msgstr "禁止检查扩展版本兼容性"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:6
+#: data/org.gnome.shell.gschema.xml.in:27
 msgid ""
 "GNOME Shell will only load extensions that claim to support the current "
 "running version. Enabling this option will disable this check and try to "
@@ -111,51 +111,51 @@ msgstr ""
 "GNOME 只会加载声明支持当前运行版本的扩展。启用该选项会禁止此检查，并尝试加载"
 "所有扩展，无视它们声明支持的版本。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
+#: data/org.gnome.shell.gschema.xml.in:35
 msgid "List of desktop file IDs for favorite applications"
 msgstr "收藏夹中的应用程序的 desktop 文件 ID 的列表"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:8
+#: data/org.gnome.shell.gschema.xml.in:36
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr "符合这些标示的应用程序将显示在收藏区中。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:9
+#: data/org.gnome.shell.gschema.xml.in:43
 msgid "App Picker View"
 msgstr "程序选择查看器"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
+#: data/org.gnome.shell.gschema.xml.in:44
 msgid "Index of the currently selected view in the application picker."
 msgstr "应用程序选择器中当前已选取视图的索引。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
+#: data/org.gnome.shell.gschema.xml.in:50
 msgid "History for command (Alt-F2) dialog"
 msgstr "命令对话框(Alt-F2)的历史记录"
 
 # http://live.gnome.org/GnomeShell/LookingGlass
-#. Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+#. Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass
+#: data/org.gnome.shell.gschema.xml.in:55
 msgid "History for the looking glass dialog"
 msgstr "Looking Glass 控制台历史"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: data/org.gnome.shell.gschema.xml.in:59
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "总在用户菜单中显示“注销”选项。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: data/org.gnome.shell.gschema.xml.in:60
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
 msgstr ""
 "单用户、单会话情形下，“注销”菜单项默认隐藏，使用这个按键会覆盖这种行为。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: data/org.gnome.shell.gschema.xml.in:67
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr "是否记住挂载加密文件系统或远程文件系统时所使用的密码"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: data/org.gnome.shell.gschema.xml.in:68
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a "
@@ -165,12 +165,12 @@ msgstr ""
 "挂载加密设备或远程文件系统时 Gnome Shell 将要求输入密码。如果该密码可以记住并"
 "在今后使用，则会有“记住密码”复选框出现。这个键设置了该复选框的默认状态。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: data/org.gnome.shell.gschema.xml.in:77
 msgid ""
 "Whether the default Bluetooth adapter had set up devices associated to it"
 msgstr "默认的蓝牙适配器是否有已配对的设备"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: data/org.gnome.shell.gschema.xml.in:78
 msgid ""
 "The shell will only show a Bluetooth menu item if a Bluetooth adapter is "
 "powered, or if there were devices set up associated with the default "
@@ -180,83 +180,76 @@ msgstr ""
 "Shell 只会在有蓝牙适配器有供电时或有设备与默认适配器关联时显示蓝牙菜单。若默"
 "认适配器不再和设备关联，蓝牙菜单将不再因此出现。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
-msgid "Show the week date in the calendar"
-msgstr "在日历中显示星期"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
-msgid "If true, display the ISO week date in the calendar."
-msgstr "如果为 true，在日历中显示 ISO 周日期。"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: data/org.gnome.shell.gschema.xml.in:93
 msgid "Keybinding to open the application menu"
 msgstr "用于打开应用程序菜单的按键组合"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: data/org.gnome.shell.gschema.xml.in:94
 msgid "Keybinding to open the application menu."
 msgstr "用于打开应用程序菜单的按键组合。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: data/org.gnome.shell.gschema.xml.in:100
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "用于打开“显示应用程序”视图的按键组合"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: data/org.gnome.shell.gschema.xml.in:101
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr "用于在活动视图中打开“显示应用程序”视图的按键组合。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: data/org.gnome.shell.gschema.xml.in:108
 msgid "Keybinding to open the overview"
 msgstr "用于打开概览的按键组合"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: data/org.gnome.shell.gschema.xml.in:109
 msgid "Keybinding to open the Activities Overview."
 msgstr "用于打开活动概览的按键组合。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: data/org.gnome.shell.gschema.xml.in:115
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr "用来切换通知列表是否可见的快捷键"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: data/org.gnome.shell.gschema.xml.in:116
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr "用来切换通知列表是否可见的快捷键。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: data/org.gnome.shell.gschema.xml.in:122
 msgid "Keybinding to focus the active notification"
 msgstr "用于移动焦点到活动通知的快捷键"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: data/org.gnome.shell.gschema.xml.in:123
 msgid "Keybinding to focus the active notification."
 msgstr "用于移动焦点到活动通知的快捷键。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: data/org.gnome.shell.gschema.xml.in:129
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr "暂停和恢复所有执行中动画的组合键，用于调试"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: data/org.gnome.shell.gschema.xml.in:138
 msgid "Which keyboard to use"
 msgstr "使用哪种键盘"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: data/org.gnome.shell.gschema.xml.in:139
 msgid "The type of keyboard to use."
 msgstr "要使用的键盘类型。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: data/org.gnome.shell.gschema.xml.in:150
+#: data/org.gnome.shell.gschema.xml.in:177
 msgid "Limit switcher to current workspace."
 msgstr "仅在当前工作区切换。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: data/org.gnome.shell.gschema.xml.in:151
 msgid ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
 msgstr "如果设为 true，则切换器只显示当前工作区中的应用。否则，显示所有应用。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: data/org.gnome.shell.gschema.xml.in:168
 msgid "The application icon mode."
 msgstr "应用程序图标模式。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
+#: data/org.gnome.shell.gschema.xml.in:169
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@@ -265,87 +258,94 @@ msgstr ""
 "配置窗口如何显示于切换器中。有效的值有“thumbnail-only”“app-icon-"
 "only”和“both”。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: data/org.gnome.shell.gschema.xml.in:178
 msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
 msgstr "如果设为 true，切换器只显示当前工作区的窗口。否则，包括所有窗口。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: data/org.gnome.shell.gschema.xml.in:189
 msgid "Attach modal dialog to the parent window"
 msgstr "将模态对话框附到其父窗口上"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: data/org.gnome.shell.gschema.xml.in:190
+#: data/org.gnome.shell.gschema.xml.in:199
+#: data/org.gnome.shell.gschema.xml.in:207
+#: data/org.gnome.shell.gschema.xml.in:215
+#: data/org.gnome.shell.gschema.xml.in:223
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr "当 GNOME Shell 运行时，此键会覆盖 org.gnome.mutter 键。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: data/org.gnome.shell.gschema.xml.in:198
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "启用拖拽到屏幕边缘时平铺窗口的功能"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: data/org.gnome.shell.gschema.xml.in:206
 msgid "Workspaces are managed dynamically"
 msgstr "动态管理工作区"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: data/org.gnome.shell.gschema.xml.in:214
 msgid "Workspaces only on primary monitor"
 msgstr "仅在主显示器上显示工作区"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+#: data/org.gnome.shell.gschema.xml.in:222
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "将鼠标模式下焦点的更改推迟到指针停止移动之后"
 
-#: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
+#: data/org.gnome.Shell.PortalHelper.desktop.in.in:3
 msgid "Network Login"
 msgstr "网络登录"
 
-#: ../js/extensionPrefs/main.js:117
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.Shell.PortalHelper.desktop.in.in:9
+msgid "network-workgroup"
+msgstr "network-workgroup"
+
+#: js/extensionPrefs/main.js:117
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "载入 %s 的首选想对话框出错："
 
-#: ../js/extensionPrefs/main.js:149
+#: js/extensionPrefs/main.js:149
 msgid "GNOME Shell Extensions"
 msgstr "配置 GNOME Shell 扩展"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/audioDeviceSelection.js:71
-#: ../js/ui/components/networkAgent.js:145
-#: ../js/ui/components/polkitAgent.js:179 ../js/ui/endSessionDialog.js:452
-#: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:916
+#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
+#: js/ui/components/networkAgent.js:145 js/ui/components/polkitAgent.js:179
+#: js/ui/endSessionDialog.js:483 js/ui/extensionDownloader.js:195
+#: js/ui/shellMountOperation.js:399 js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "取消"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216
-#: ../js/gdm/authPrompt.js:448
+#: js/gdm/authPrompt.js:169 js/gdm/authPrompt.js:216 js/gdm/authPrompt.js:448
 msgid "Next"
 msgstr "下一步"
 
-#: ../js/gdm/authPrompt.js:212 ../js/ui/shellMountOperation.js:403
-#: ../js/ui/unlockDialog.js:59
+#: js/gdm/authPrompt.js:212 js/ui/shellMountOperation.js:403
+#: js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "解锁"
 
-#: ../js/gdm/authPrompt.js:214
+#: js/gdm/authPrompt.js:214
 msgctxt "button"
 msgid "Sign In"
 msgstr "登录"
 
-#: ../js/gdm/loginDialog.js:285
+#: js/gdm/loginDialog.js:285
 msgid "Choose Session"
 msgstr "选择会话"
 
 #. 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:435
+#: js/gdm/loginDialog.js:435
 msgid "Not listed?"
 msgstr "未列出？"
 
 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:854
+#: js/gdm/loginDialog.js:859
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(如 user 或 %s)"
@@ -353,16 +353,16 @@ msgstr "(如 user 或 %s)"
 #. 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/gdm/loginDialog.js:859 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:289
+#: js/gdm/loginDialog.js:864 js/ui/components/networkAgent.js:271
+#: js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "用户名："
 
-#: ../js/gdm/loginDialog.js:1196
+#: js/gdm/loginDialog.js:1201
 msgid "Login Window"
 msgstr "登录窗口"
 
-#: ../js/gdm/util.js:341
+#: js/gdm/util.js:341
 msgid "Authentication error"
 msgstr "认证出错"
 
@@ -371,40 +371,40 @@ msgstr "认证出错"
 #. as a cue to display our own message.
 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:473
+#: js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(或滑动手指)"
 
-#: ../js/misc/util.js:119
+#: js/misc/util.js:119
 msgid "Command not found"
 msgstr "命令未找到"
 
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:152
+#: js/misc/util.js:152
 msgid "Could not parse command:"
 msgstr "不能解析命令："
 
-#: ../js/misc/util.js:160
+#: js/misc/util.js:160
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "运行“%s”失败："
 
 #. Translators: Time in 24h format
-#: ../js/misc/util.js:191
+#: js/misc/util.js:191
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30"
-#: ../js/misc/util.js:197
+#: js/misc/util.js:197
 #, no-c-format
 msgid "Yesterday, %H∶%M"
 msgstr "昨天 %H:%M"
 
 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30"
-#: ../js/misc/util.js:203
+#: js/misc/util.js:203
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A %H:%M"
@@ -412,7 +412,7 @@ msgstr "%A %H:%M"
 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30"
-#: ../js/misc/util.js:209
+#: js/misc/util.js:209
 #, no-c-format
 msgid "%B %d, %H∶%M"
 msgstr "%m月%d日, %H:%M"
@@ -420,26 +420,26 @@ msgstr "%m月%d日, %H:%M"
 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
 #. i.e. "May 25 2012, 14:30"
-#: ../js/misc/util.js:215
+#: js/misc/util.js:215
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
 msgstr "%Y年%m月%d日, %H:%M"
 
 #. Translators: Time in 12h format
-#: ../js/misc/util.js:220
+#: js/misc/util.js:220
 msgid "%l∶%M %p"
 msgstr "%p %-l:%M"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm"
-#: ../js/misc/util.js:226
+#: js/misc/util.js:226
 #, no-c-format
 msgid "Yesterday, %l∶%M %p"
 msgstr "昨天%p %-l:%M"
 
 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm"
-#: ../js/misc/util.js:232
+#: js/misc/util.js:232
 #, no-c-format
 msgid "%A, %l∶%M %p"
 msgstr "%A%p %-l:%M"
@@ -447,7 +447,7 @@ msgstr "%A%p %-l:%M"
 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm"
-#: ../js/misc/util.js:238
+#: js/misc/util.js:238
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
 msgstr "%m月%d日%p %-l:%M"
@@ -455,89 +455,99 @@ msgstr "%m月%d日%p %-l:%M"
 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"
-#: ../js/misc/util.js:244
+#: js/misc/util.js:244
 #, no-c-format
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%Y年%m月%d日，%p %-l:%M"
 
 #. TRANSLATORS: this is the title of the wifi captive portal login
 #. * window, until we know the title of the actual login page
-#: ../js/portalHelper/main.js:85
+#: js/portalHelper/main.js:85
 msgid "Web Authentication Redirect"
 msgstr "网页认证重定向"
 
-#: ../js/ui/appDisplay.js:794
+#. No support for non-modal system dialogs, so ignore the option
+#. let modal = options['modal'] || true;
+#: js/ui/accessDialog.js:62 js/ui/status/location.js:426
+msgid "Deny Access"
+msgstr "拒绝访问"
+
+#: js/ui/accessDialog.js:63 js/ui/status/location.js:429
+msgid "Grant Access"
+msgstr "允许访问"
+
+#: js/ui/appDisplay.js:794
 msgid "Frequently used applications will appear here"
 msgstr "常用的应用程序会出现在这里"
 
-#: ../js/ui/appDisplay.js:914
+#: js/ui/appDisplay.js:914
 msgid "Frequent"
 msgstr "常用"
 
-#: ../js/ui/appDisplay.js:921
+#: js/ui/appDisplay.js:921
 msgid "All"
 msgstr "全部"
 
-#: ../js/ui/appDisplay.js:1853
+#: js/ui/appDisplay.js:1853
 msgid "New Window"
 msgstr "新窗口"
 
-#: ../js/ui/appDisplay.js:1881 ../js/ui/dash.js:289
+#: js/ui/appDisplay.js:1881 js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: ../js/ui/appDisplay.js:1887
+#: js/ui/appDisplay.js:1887
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
-#: ../js/ui/appDisplay.js:1897
+#: js/ui/appDisplay.js:1897
 msgid "Show Details"
 msgstr "显示细节"
 
-#: ../js/ui/appFavorites.js:134
+#: js/ui/appFavorites.js:134
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s 已经添加到了您的收藏夹。"
 
-#: ../js/ui/appFavorites.js:168
+#: js/ui/appFavorites.js:168
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"
 
-#: ../js/ui/audioDeviceSelection.js:59
+#: js/ui/audioDeviceSelection.js:59
 msgid "Select Audio Device"
 msgstr "选择声音设备"
 
-#: ../js/ui/audioDeviceSelection.js:69
+#: js/ui/audioDeviceSelection.js:69
 msgid "Sound Settings"
 msgstr "声音设置"
 
-#: ../js/ui/audioDeviceSelection.js:78
+#: js/ui/audioDeviceSelection.js:78
 msgid "Headphones"
 msgstr "耳机"
 
-#: ../js/ui/audioDeviceSelection.js:80
+#: js/ui/audioDeviceSelection.js:80
 msgid "Headset"
 msgstr "耳麦"
 
-#: ../js/ui/audioDeviceSelection.js:82 ../js/ui/status/volume.js:213
+#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:213
 msgid "Microphone"
 msgstr "麦克风"
 
-#: ../js/ui/backgroundMenu.js:19
+#: js/ui/backgroundMenu.js:19
 msgid "Change Background…"
 msgstr "更换壁纸..."
 
-#: ../js/ui/backgroundMenu.js:21
+#: js/ui/backgroundMenu.js:21
 msgid "Display Settings"
 msgstr "显示设置"
 
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
+#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:374
 msgid "Settings"
 msgstr "设置"
 
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: ../js/ui/calendar.js:47
+#: js/ui/calendar.js:47
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "周日和周六"
@@ -547,218 +557,207 @@ msgstr "周日和周六"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:76
+#: js/ui/calendar.js:76
 msgctxt "grid sunday"
 msgid "S"
 msgstr "日"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:78
+#: js/ui/calendar.js:78
 msgctxt "grid monday"
 msgid "M"
 msgstr "一"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:80
+#: js/ui/calendar.js:80
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "二"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:82
+#: js/ui/calendar.js:82
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "三"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:84
+#: js/ui/calendar.js:84
 msgctxt "grid thursday"
 msgid "T"
 msgstr "四"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:86
+#: js/ui/calendar.js:86
 msgctxt "grid friday"
 msgid "F"
 msgstr "五"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:88
+#: js/ui/calendar.js:88
 msgctxt "grid saturday"
 msgid "S"
 msgstr "六"
 
-#: ../js/ui/calendar.js:416
+#: js/ui/calendar.js:442
 msgid "Previous month"
 msgstr "上个月"
 
-#: ../js/ui/calendar.js:426
+#: js/ui/calendar.js:452
 msgid "Next month"
 msgstr "下个月"
 
-#: ../js/ui/calendar.js:579
+#: js/ui/calendar.js:605
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: ../js/ui/calendar.js:634
+#: js/ui/calendar.js:660
 msgid "Week %V"
 msgstr "第 %V 星期"
 
 #. 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:695
+#: js/ui/calendar.js:721
 msgctxt "event list time"
 msgid "All Day"
 msgstr "全天"
 
-#: ../js/ui/calendar.js:821
+#: js/ui/calendar.js:836
 msgid "Events"
 msgstr "事件"
 
-#: ../js/ui/calendar.js:830
+#: js/ui/calendar.js:845
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%m月%d日 %A"
 
-#: ../js/ui/calendar.js:834
+#: js/ui/calendar.js:849
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日 %A"
 
-#: ../js/ui/calendar.js:919
+#: js/ui/calendar.js:931
 msgid "Notifications"
 msgstr "提示"
 
-#: ../js/ui/calendar.js:1070
+#: js/ui/calendar.js:1082
 msgid "No Notifications"
 msgstr "无提示"
 
-#: ../js/ui/calendar.js:1073
+#: js/ui/calendar.js:1085
 msgid "No Events"
 msgstr "无事件"
 
-#: ../js/ui/components/automountManager.js:91
+#: js/ui/components/automountManager.js:91
 msgid "External drive connected"
 msgstr "外部驱动器已连接"
 
-#: ../js/ui/components/automountManager.js:102
+#: js/ui/components/automountManager.js:102
 msgid "External drive disconnected"
 msgstr "外部驱动器已断开"
 
-#: ../js/ui/components/autorunManager.js:355
+#: js/ui/components/autorunManager.js:355
 #, javascript-format
 msgid "Open with %s"
 msgstr "使用 %s 打开"
 
-#: ../js/ui/components/keyring.js:120 ../js/ui/components/polkitAgent.js:315
+#: js/ui/components/keyring.js:120 js/ui/components/polkitAgent.js:315
 msgid "Password:"
 msgstr "密码："
 
-#: ../js/ui/components/keyring.js:153
+#: js/ui/components/keyring.js:153
 msgid "Type again:"
 msgstr "再输一次："
 
-#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:269
-#: ../js/ui/status/network.js:352 ../js/ui/status/network.js:919
+#: js/ui/components/networkAgent.js:140 js/ui/status/network.js:269
+#: js/ui/status/network.js:352 js/ui/status/network.js:919
 msgid "Connect"
 msgstr "连接"
 
 #. Cisco LEAP
-#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:303
+#: js/ui/components/networkAgent.js:233 js/ui/components/networkAgent.js:245
+#: js/ui/components/networkAgent.js:273 js/ui/components/networkAgent.js:293
+#: js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "密码："
 
 #. static WEP
-#: ../js/ui/components/networkAgent.js:238
+#: js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "密钥："
 
-#: ../js/ui/components/networkAgent.js:277
+#: js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "身份："
 
-#: ../js/ui/components/networkAgent.js:279
+#: js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "私人密钥密码："
 
-#: ../js/ui/components/networkAgent.js:291
+#: js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "服务："
 
-#: ../js/ui/components/networkAgent.js:320
-#: ../js/ui/components/networkAgent.js:658
+#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "无线网络要求身份认证"
 
-#: ../js/ui/components/networkAgent.js:321
-#: ../js/ui/components/networkAgent.js:659
+#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:659
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
 msgstr "访问无线网络“%s”需要密码或密钥。"
 
-#: ../js/ui/components/networkAgent.js:325
-#: ../js/ui/components/networkAgent.js:662
+#: js/ui/components/networkAgent.js:325 js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "有线 802.1X 认证"
 
-#: ../js/ui/components/networkAgent.js:327
+#: js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "网络名称："
 
-#: ../js/ui/components/networkAgent.js:332
-#: ../js/ui/components/networkAgent.js:666
+#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "DSL 认证"
 
-#: ../js/ui/components/networkAgent.js:339
-#: ../js/ui/components/networkAgent.js:672
+#: js/ui/components/networkAgent.js:339 js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "需要 PIN 码"
 
-#: ../js/ui/components/networkAgent.js:340
-#: ../js/ui/components/networkAgent.js:673
+#: js/ui/components/networkAgent.js:340 js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码"
 
-#: ../js/ui/components/networkAgent.js:341
+#: js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN："
 
-#: ../js/ui/components/networkAgent.js:348
-#: ../js/ui/components/networkAgent.js:679
+#: js/ui/components/networkAgent.js:348 js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: ../js/ui/components/networkAgent.js:349
-#: ../js/ui/components/networkAgent.js:663
-#: ../js/ui/components/networkAgent.js:667
-#: ../js/ui/components/networkAgent.js:680
+#: js/ui/components/networkAgent.js:349 js/ui/components/networkAgent.js:663
+#: js/ui/components/networkAgent.js:667 js/ui/components/networkAgent.js:680
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "连接到“%s”需要密码。"
 
-#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1658
+#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1660
 msgid "Network Manager"
 msgstr "网络管理器"
 
-#: ../js/ui/components/polkitAgent.js:60
+#: js/ui/components/polkitAgent.js:60
 msgid "Authentication Required"
 msgstr "需要认证"
 
-#: ../js/ui/components/polkitAgent.js:102
+#: js/ui/components/polkitAgent.js:102
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../js/ui/components/polkitAgent.js:182
+#: js/ui/components/polkitAgent.js:182
 msgid "Authenticate"
 msgstr "认证"
 
@@ -766,35 +765,35 @@ msgstr "认证"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: ../js/ui/components/polkitAgent.js:301 ../js/ui/shellMountOperation.js:383
+#: js/ui/components/polkitAgent.js:301 js/ui/shellMountOperation.js:383
 msgid "Sorry, that didn't work. Please try again."
 msgstr "抱歉，您的输入有误。请重试。"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:760
+#: js/ui/components/telepathyClient.js:765
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s"
 
-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:155
+#: js/ui/ctrlAltTab.js:29 js/ui/viewSelector.js:155
 msgid "Windows"
 msgstr "窗口"
 
-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: js/ui/dash.js:250 js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "显示应用程序"
 
 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/dash.js:449
+#: js/ui/dash.js:449
 msgid "Dash"
 msgstr "Dash"
 
 #. 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:73
+#: js/ui/dateMenu.js:73
 msgid "%B %e %Y"
 msgstr "%Y年%m月%d日"
 
@@ -802,234 +801,251 @@ msgstr "%Y年%m月%d日"
 #. * below the time in the shell; it should combine the weekday and the
 #. * date, e.g. "Tuesday February 17 2015".
 #.
-#: ../js/ui/dateMenu.js:80
+#: js/ui/dateMenu.js:80
 msgid "%A %B %e %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: ../js/ui/dateMenu.js:160
+#: js/ui/dateMenu.js:160
 msgid "Add world clocks…"
 msgstr "添加世界时钟..."
 
-#: ../js/ui/dateMenu.js:161
+#: js/ui/dateMenu.js:161
 msgid "World Clocks"
 msgstr "世界时钟"
 
-#: ../js/ui/endSessionDialog.js:64
+#: js/ui/endSessionDialog.js:64
 #, javascript-format
 msgctxt "title"
 msgid "Log Out %s"
 msgstr "注销 %s"
 
-#: ../js/ui/endSessionDialog.js:65
+#: js/ui/endSessionDialog.js:65
 msgctxt "title"
 msgid "Log Out"
 msgstr "注销"
 
-#: ../js/ui/endSessionDialog.js:67
+#: js/ui/endSessionDialog.js:67
 #, javascript-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:72
+#: js/ui/endSessionDialog.js:72
 #, javascript-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:78
+#: js/ui/endSessionDialog.js:78
 msgctxt "button"
 msgid "Log Out"
 msgstr "注销"
 
-#: ../js/ui/endSessionDialog.js:84
+#: js/ui/endSessionDialog.js:84
 msgctxt "title"
 msgid "Power Off"
 msgstr "关机"
 
-#: ../js/ui/endSessionDialog.js:85
+#: js/ui/endSessionDialog.js:85
 msgctxt "title"
 msgid "Install Updates & Power Off"
 msgstr "安装更新并关机"
 
-#: ../js/ui/endSessionDialog.js:87
+#: js/ui/endSessionDialog.js:87
 #, javascript-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:91
+#: js/ui/endSessionDialog.js:91
 msgctxt "checkbox"
 msgid "Install pending software updates"
 msgstr "安装挂起的软件更新"
 
-#: ../js/ui/endSessionDialog.js:94 ../js/ui/endSessionDialog.js:111
+#: js/ui/endSessionDialog.js:94 js/ui/endSessionDialog.js:111
 msgctxt "button"
 msgid "Restart"
 msgstr "重启"
 
-#: ../js/ui/endSessionDialog.js:96
+#: js/ui/endSessionDialog.js:96
 msgctxt "button"
 msgid "Power Off"
 msgstr "关机"
 
-#: ../js/ui/endSessionDialog.js:103
+#: js/ui/endSessionDialog.js:103
 msgctxt "title"
 msgid "Restart"
 msgstr "重启"
 
-#: ../js/ui/endSessionDialog.js:105
+#: js/ui/endSessionDialog.js:105
 #, javascript-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:119
+#: js/ui/endSessionDialog.js:119
 msgctxt "title"
 msgid "Restart & Install Updates"
 msgstr "重启并安装更新"
 
-#: ../js/ui/endSessionDialog.js:121
+#: js/ui/endSessionDialog.js:121
 #, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
 msgid_plural ""
 "The system will automatically restart and install updates in %d seconds."
 msgstr[0] "系统将在 %d 秒后自动重启并安装更新。"
 
-#: ../js/ui/endSessionDialog.js:127
+#: js/ui/endSessionDialog.js:127 js/ui/endSessionDialog.js:147
 msgctxt "button"
 msgid "Restart &amp; Install"
 msgstr "重启并安装"
 
-#: ../js/ui/endSessionDialog.js:128
+#: js/ui/endSessionDialog.js:128
 msgctxt "button"
 msgid "Install &amp; Power Off"
 msgstr "安装并关机"
 
-#: ../js/ui/endSessionDialog.js:129
+#: js/ui/endSessionDialog.js:129
 msgctxt "checkbox"
 msgid "Power off after updates are installed"
 msgstr "安装更新后关机"
 
-#: ../js/ui/endSessionDialog.js:338
+#: js/ui/endSessionDialog.js:137
+msgctxt "title"
+msgid "Restart & Install Upgrade"
+msgstr "重启并安装更新"
+
+#. Translators: This is the text displayed for system upgrades in the
+#. shut down dialog. First %s gets replaced with the distro name and
+#. second %s with the distro version to upgrade to
+#: js/ui/endSessionDialog.js:142
+#, javascript-format
+msgid ""
+"%s %s will be installed after restart. Upgrade installation can take a long "
+"time: ensure that you have backed up and that the computer is plugged in."
+msgstr ""
+"重启后将安装 %s %s。更新可能需要较长时间：请确保已经进行了备份并且已经插入了"
+"电源。"
+
+#: js/ui/endSessionDialog.js:361
 msgid "Running on battery power: please plug in before installing updates."
 msgstr "正在用电池供电：安装更新前请插上电源。"
 
-#: ../js/ui/endSessionDialog.js:355
+#: js/ui/endSessionDialog.js:378
 msgid "Some applications are busy or have unsaved work."
 msgstr "有些应用程序正忙或有未保存的工作。"
 
-#: ../js/ui/endSessionDialog.js:362
+#: js/ui/endSessionDialog.js:385
 msgid "Other users are logged in."
 msgstr "有其他用户登录。"
 
 #. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/endSessionDialog.js:640
+#: js/ui/endSessionDialog.js:671
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (远程)"
 
 #. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/endSessionDialog.js:643
+#: js/ui/endSessionDialog.js:674
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (控制台)"
 
-#: ../js/ui/extensionDownloader.js:199
+#: js/ui/extensionDownloader.js:199
 msgid "Install"
 msgstr "安装"
 
-#: ../js/ui/extensionDownloader.js:204
+#: js/ui/extensionDownloader.js:204
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "从 extensions.gnome.org 下载并安装“%s”？"
 
-#: ../js/ui/keyboard.js:741 ../js/ui/status/keyboard.js:713
+#: js/ui/keyboard.js:742 js/ui/status/keyboard.js:782
 msgid "Keyboard"
 msgstr "键盘"
 
 #. translators: 'Hide' is a verb
-#: ../js/ui/legacyTray.js:65
+#: js/ui/legacyTray.js:65
 msgid "Hide tray"
 msgstr "隐藏托盘"
 
-#: ../js/ui/legacyTray.js:106
+#: js/ui/legacyTray.js:106
 msgid "Status Icons"
 msgstr "状态图标"
 
-#: ../js/ui/lookingGlass.js:643
+#: js/ui/lookingGlass.js:643
 msgid "No extensions installed"
 msgstr "未安装扩展"
 
 #. Translators: argument is an extension UUID.
-#: ../js/ui/lookingGlass.js:697
+#: js/ui/lookingGlass.js:697
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s 没有传出任何错误信息。"
 
-#: ../js/ui/lookingGlass.js:703
+#: js/ui/lookingGlass.js:703
 msgid "Hide Errors"
 msgstr "隐藏错误"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: js/ui/lookingGlass.js:707 js/ui/lookingGlass.js:767
 msgid "Show Errors"
 msgstr "显示错误"
 
-#: ../js/ui/lookingGlass.js:716
+#: js/ui/lookingGlass.js:716
 msgid "Enabled"
 msgstr "已启用"
 
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1828
+#: js/ui/lookingGlass.js:719 src/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "已禁用"
 
-#: ../js/ui/lookingGlass.js:721
+#: js/ui/lookingGlass.js:721
 msgid "Error"
 msgstr "错误"
 
-#: ../js/ui/lookingGlass.js:723
+#: js/ui/lookingGlass.js:723
 msgid "Out of date"
 msgstr "过时"
 
-#: ../js/ui/lookingGlass.js:725
+#: js/ui/lookingGlass.js:725
 msgid "Downloading"
 msgstr "正在下载"
 
-#: ../js/ui/lookingGlass.js:749
+#: js/ui/lookingGlass.js:749
 msgid "View Source"
 msgstr "查看源"
 
-#: ../js/ui/lookingGlass.js:758
+#: js/ui/lookingGlass.js:758
 msgid "Web Page"
 msgstr "网页"
 
-#: ../js/ui/messageList.js:543
+#: js/ui/messageList.js:543
 msgid "Clear section"
 msgstr "清除选中项目"
 
-#: ../js/ui/messageTray.js:1486
+#: js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "系统信息"
 
-#: ../js/ui/mpris.js:194
+#: js/ui/mpris.js:194
 msgid "Unknown artist"
 msgstr "未知艺人"
 
-#: ../js/ui/mpris.js:195
+#: js/ui/mpris.js:195
 msgid "Unknown title"
 msgstr "未知标题"
 
-#: ../js/ui/mpris.js:217
+#: js/ui/mpris.js:217
 msgid "Media"
 msgstr "媒体"
 
-#: ../js/ui/overview.js:84
+#: js/ui/overview.js:84
 msgid "Undo"
 msgstr "撤销"
 
-#: ../js/ui/overview.js:117
+#: js/ui/overview.js:113
 msgid "Overview"
 msgstr "概览"
 
@@ -1037,26 +1053,26 @@ msgstr "概览"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:244
+#: js/ui/overview.js:240
 msgid "Type to search…"
 msgstr "输入以搜索..."
 
-#: ../js/ui/panel.js:358
+#: js/ui/panel.js:358
 msgid "Quit"
 msgstr "退出"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:414
+#: js/ui/panel.js:414
 msgid "Activities"
 msgstr "活动"
 
-#: ../js/ui/panel.js:695
+#: js/ui/panel.js:695
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "系统"
 
-#: ../js/ui/panel.js:807
+#: js/ui/panel.js:807
 msgid "Top Bar"
 msgstr "顶栏"
 
@@ -1065,45 +1081,45 @@ 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:289
+#: js/ui/popupMenu.js:289
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"
 
-#: ../js/ui/runDialog.js:71
+#: js/ui/runDialog.js:71
 msgid "Enter a Command"
 msgstr "输入一个命令"
 
-#: ../js/ui/runDialog.js:111 ../js/ui/windowMenu.js:162
+#: js/ui/runDialog.js:111 js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "关闭"
 
-#: ../js/ui/runDialog.js:282
+#: js/ui/runDialog.js:282
 msgid "Restarting…"
 msgstr "正在重新启动..."
 
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:85
+#: js/ui/screenShield.js:85
 msgid "%A, %B %d"
 msgstr "%m月%d日 %A"
 
-#: ../js/ui/screenShield.js:144
+#: js/ui/screenShield.js:144
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 条新消息"
 
-#: ../js/ui/screenShield.js:146
+#: js/ui/screenShield.js:146
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d 条新通知"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
+#: js/ui/screenShield.js:449 js/ui/status/system.js:382
 msgid "Lock"
 msgstr "锁定"
 
-#: ../js/ui/screenShield.js:684
+#: js/ui/screenShield.js:704
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME 需要锁定屏幕"
 
@@ -1114,186 +1130,178 @@ msgstr "GNOME 需要锁定屏幕"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
+#: js/ui/screenShield.js:825 js/ui/screenShield.js:1291
 msgid "Unable to lock"
 msgstr "无法锁定"
 
-#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
+#: js/ui/screenShield.js:826 js/ui/screenShield.js:1292
 msgid "Lock was blocked by an application"
 msgstr "一个应用程序阻止了锁定"
 
-#: ../js/ui/search.js:617
+#: js/ui/search.js:617
 msgid "Searching…"
 msgstr "正在搜索..."
 
-#: ../js/ui/search.js:619
+#: js/ui/search.js:619
 msgid "No results."
 msgstr "无结果。"
 
-#: ../js/ui/shellEntry.js:25
+#: js/ui/shellEntry.js:25
 msgid "Copy"
 msgstr "复制"
 
-#: ../js/ui/shellEntry.js:30
+#: js/ui/shellEntry.js:30
 msgid "Paste"
 msgstr "粘贴"
 
-#: ../js/ui/shellEntry.js:97
+#: js/ui/shellEntry.js:97
 msgid "Show Text"
 msgstr "显示文本"
 
-#: ../js/ui/shellEntry.js:99
+#: js/ui/shellEntry.js:99
 msgid "Hide Text"
 msgstr "隐藏文本"
 
-#: ../js/ui/shellMountOperation.js:370
+#: js/ui/shellMountOperation.js:370
 msgid "Password"
 msgstr "密码"
 
-#: ../js/ui/shellMountOperation.js:391
+#: js/ui/shellMountOperation.js:391
 msgid "Remember Password"
 msgstr "记住密码"
 
-#: ../js/ui/status/accessibility.js:42
+#: js/ui/status/accessibility.js:42
 msgid "Accessibility"
 msgstr "辅助功能"
 
-#: ../js/ui/status/accessibility.js:57
+#: js/ui/status/accessibility.js:57
 msgid "Zoom"
 msgstr "缩放"
 
-#: ../js/ui/status/accessibility.js:64
+#: js/ui/status/accessibility.js:64
 msgid "Screen Reader"
 msgstr "屏幕阅读器"
 
-#: ../js/ui/status/accessibility.js:68
+#: js/ui/status/accessibility.js:68
 msgid "Screen Keyboard"
 msgstr "屏幕键盘"
 
-#: ../js/ui/status/accessibility.js:72
+#: js/ui/status/accessibility.js:72
 msgid "Visual Alerts"
 msgstr "视觉响铃"
 
-#: ../js/ui/status/accessibility.js:75
+#: js/ui/status/accessibility.js:75
 msgid "Sticky Keys"
 msgstr "粘滞键"
 
-#: ../js/ui/status/accessibility.js:78
+#: js/ui/status/accessibility.js:78
 msgid "Slow Keys"
 msgstr "慢速键"
 
-#: ../js/ui/status/accessibility.js:81
+#: js/ui/status/accessibility.js:81
 msgid "Bounce Keys"
 msgstr "筛选键"
 
-#: ../js/ui/status/accessibility.js:84
+#: js/ui/status/accessibility.js:84
 msgid "Mouse Keys"
 msgstr "鼠标按键"
 
-#: ../js/ui/status/accessibility.js:167
+#: js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "高对比度"
 
-#: ../js/ui/status/accessibility.js:202
+#: js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "大号文本"
 
-#: ../js/ui/status/bluetooth.js:47
+#: js/ui/status/bluetooth.js:47
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../js/ui/status/bluetooth.js:56
+#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:624
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
 #. Translators: this is the number of connected bluetooth devices
-#: ../js/ui/status/bluetooth.js:136
+#: js/ui/status/bluetooth.js:136
 #, javascript-format
 msgid "%d Connected"
 msgid_plural "%d Connected"
 msgstr[0] "%d 台设备已连接"
 
-#: ../js/ui/status/bluetooth.js:138
+#: js/ui/status/bluetooth.js:138
 msgid "Off"
 msgstr "关"
 
-#: ../js/ui/status/bluetooth.js:140
+#: js/ui/status/bluetooth.js:140
 msgid "Not In Use"
 msgstr "未在使用"
 
-#: ../js/ui/status/bluetooth.js:142 ../js/ui/status/network.js:1279
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1279
 msgid "Turn On"
 msgstr "开启"
 
-#: ../js/ui/status/bluetooth.js:142 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:353 ../js/ui/status/network.js:1279
-#: ../js/ui/status/network.js:1394 ../js/ui/status/rfkill.js:90
-#: ../js/ui/status/rfkill.js:117
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:178
+#: js/ui/status/network.js:353 js/ui/status/network.js:1279
+#: js/ui/status/network.js:1394 js/ui/status/rfkill.js:90
+#: js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "关闭"
 
-#: ../js/ui/status/brightness.js:44
+#: js/ui/status/brightness.js:44
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../js/ui/status/keyboard.js:736
+#: js/ui/status/keyboard.js:805
 msgid "Show Keyboard Layout"
 msgstr "显示键盘布局"
 
-#: ../js/ui/status/location.js:107 ../js/ui/status/location.js:215
+#: js/ui/status/location.js:107 js/ui/status/location.js:215
 msgid "Location Enabled"
 msgstr "定位服务已启用"
 
-#: ../js/ui/status/location.js:108 ../js/ui/status/location.js:216
+#: js/ui/status/location.js:108 js/ui/status/location.js:216
 msgid "Disable"
 msgstr "禁用"
 
-#: ../js/ui/status/location.js:109
+#: js/ui/status/location.js:109
 msgid "Privacy Settings"
 msgstr "隐私设置"
 
-#: ../js/ui/status/location.js:214
+#: js/ui/status/location.js:214
 msgid "Location In Use"
 msgstr "定位服务正被使用"
 
-#: ../js/ui/status/location.js:218
+#: js/ui/status/location.js:218
 msgid "Location Disabled"
 msgstr "定位服务已禁用"
 
-#: ../js/ui/status/location.js:219
+#: js/ui/status/location.js:219
 msgid "Enable"
 msgstr "启用"
 
-#: ../js/ui/status/location.js:426
-msgid "Deny Access"
-msgstr "拒绝访问"
-
-#: ../js/ui/status/location.js:429
-msgid "Grant Access"
-msgstr "允许访问"
-
 #. Translators: %s is an application name
-#: ../js/ui/status/location.js:435
+#: js/ui/status/location.js:435
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "允许 %s 访问您的位置信息？"
 
-#: ../js/ui/status/location.js:437
+#: js/ui/status/location.js:437
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr "位置访问权限可以随时在隐私设置里更改。"
 
-#: ../js/ui/status/network.js:101
+#: js/ui/status/network.js:101
 msgid "<unknown>"
 msgstr "<未知>"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1308
+#: js/ui/status/network.js:451 js/ui/status/network.js:1308
 #, javascript-format
 msgid "%s Off"
 msgstr "%s 已关闭"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:454
+#: js/ui/status/network.js:454
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s 已连接"
@@ -1301,198 +1309,198 @@ msgstr "%s 已连接"
 #. 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);
 #. %s is a network identifier
-#: ../js/ui/status/network.js:459
+#: js/ui/status/network.js:459
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s 未托管"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:462
+#: js/ui/status/network.js:462
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "%s 正在断开"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1300
+#: js/ui/status/network.js:469 js/ui/status/network.js:1300
 #, javascript-format
 msgid "%s Connecting"
 msgstr "%s 正在连接"
 
 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
-#: ../js/ui/status/network.js:472
+#: js/ui/status/network.js:472
 #, javascript-format
 msgid "%s Requires Authentication"
 msgstr "%s 需要认证"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing; %s is a network identifier
-#: ../js/ui/status/network.js:480
+#: js/ui/status/network.js:480
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "%s 的固件缺失"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage; %s is a network identifier
-#: ../js/ui/status/network.js:484
+#: js/ui/status/network.js:484
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "%s 不可用"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:487
+#: js/ui/status/network.js:487
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "%s 连接失败"
 
-#: ../js/ui/status/network.js:503
+#: js/ui/status/network.js:503
 msgid "Wired Settings"
 msgstr "有线设置"
 
-#: ../js/ui/status/network.js:545 ../js/ui/status/network.js:624
+#: js/ui/status/network.js:545
 msgid "Mobile Broadband Settings"
 msgstr "移动宽带设置"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#: js/ui/status/network.js:588 js/ui/status/network.js:1305
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "%s 硬件开关关闭"
 
 #. Translators: this is for a network device that cannot be activated
 #. because it's disabled by rfkill (airplane mode); %s is a network identifier
-#: ../js/ui/status/network.js:592
+#: js/ui/status/network.js:592
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s 已禁用"
 
-#: ../js/ui/status/network.js:632
-msgid "Use as Internet connection"
-msgstr "使用互联网连接"
+#: js/ui/status/network.js:632
+msgid "Connect to Internet"
+msgstr "连接到互联网"
 
-#: ../js/ui/status/network.js:813
+#: js/ui/status/network.js:813
 msgid "Airplane Mode is On"
 msgstr "已开启乘机模式"
 
-#: ../js/ui/status/network.js:814
+#: js/ui/status/network.js:814
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "启用乘机模式时 Wi-Fi 会关闭"
 
-#: ../js/ui/status/network.js:815
+#: js/ui/status/network.js:815
 msgid "Turn Off Airplane Mode"
 msgstr "关闭乘机模式"
 
-#: ../js/ui/status/network.js:824
+#: js/ui/status/network.js:824
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi 关闭"
 
-#: ../js/ui/status/network.js:825
+#: js/ui/status/network.js:825
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "连接网络需要开启 Wi-Fi"
 
-#: ../js/ui/status/network.js:826
+#: js/ui/status/network.js:826
 msgid "Turn On Wi-Fi"
 msgstr "开启 Wi-Fi"
 
-#: ../js/ui/status/network.js:851
+#: js/ui/status/network.js:851
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi 网络"
 
-#: ../js/ui/status/network.js:853
+#: js/ui/status/network.js:853
 msgid "Select a network"
 msgstr "选择网络"
 
-#: ../js/ui/status/network.js:883
+#: js/ui/status/network.js:883
 msgid "No Networks"
 msgstr "无网络"
 
-#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:904 js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "使用硬件开关关闭"
 
-#: ../js/ui/status/network.js:1171
+#: js/ui/status/network.js:1171
 msgid "Select Network"
 msgstr "选择网络"
 
-#: ../js/ui/status/network.js:1177
+#: js/ui/status/network.js:1177
 msgid "Wi-Fi Settings"
 msgstr "Wi-Fi 设置"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:1296
+#: js/ui/status/network.js:1296
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "%s 热点已激活"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:1311
+#: js/ui/status/network.js:1311
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s 无连接"
 
-#: ../js/ui/status/network.js:1411
+#: js/ui/status/network.js:1411
 msgid "connecting..."
 msgstr "正在连接..."
 
 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:1414
+#: js/ui/status/network.js:1414
 msgid "authentication required"
 msgstr "需要认证"
 
-#: ../js/ui/status/network.js:1416
+#: js/ui/status/network.js:1416
 msgid "connection failed"
 msgstr "连接失败"
 
-#: ../js/ui/status/network.js:1482 ../js/ui/status/rfkill.js:93
+#: js/ui/status/network.js:1482 js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "网络设置"
 
-#: ../js/ui/status/network.js:1484
+#: js/ui/status/network.js:1484
 msgid "VPN Settings"
 msgstr "VPN 设置"
 
-#: ../js/ui/status/network.js:1503
+#: js/ui/status/network.js:1503
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1513
+#: js/ui/status/network.js:1513
 msgid "VPN Off"
 msgstr "VPN 已关闭"
 
-#: ../js/ui/status/network.js:1697
+#: js/ui/status/network.js:1699
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: ../js/ui/status/network.js:1698
+#: js/ui/status/network.js:1700
 msgid "Activation of network connection failed"
 msgstr "启用网络连接失败"
 
-#: ../js/ui/status/power.js:61
+#: js/ui/status/power.js:61
 msgid "Power Settings"
 msgstr "电源设置"
 
-#: ../js/ui/status/power.js:77
+#: js/ui/status/power.js:77
 msgid "Fully Charged"
 msgstr "已充满电"
 
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:84 ../js/ui/status/power.js:90
+#: js/ui/status/power.js:84 js/ui/status/power.js:90
 msgid "Estimating…"
 msgstr "正在估计..."
 
 #. Translators: this is <hours>:<minutes> Remaining (<percentage>)
-#: ../js/ui/status/power.js:98
+#: js/ui/status/power.js:98
 #, javascript-format
 msgid "%d∶%02d Remaining (%d %%)"
 msgstr "剩余 %d:%02d (%d%%)"
 
 #. Translators: this is <hours>:<minutes> Until Full (<percentage>)
-#: ../js/ui/status/power.js:103
+#: js/ui/status/power.js:103
 #, javascript-format
 msgid "%d∶%02d Until Full (%d %%)"
 msgstr "距充满还剩 %d:%02d (%d%%)"
 
-#: ../js/ui/status/power.js:131 ../js/ui/status/power.js:133
+#: js/ui/status/power.js:131 js/ui/status/power.js:133
 #, javascript-format
 msgid "%d %%"
 msgstr "%d %%"
@@ -1500,79 +1508,79 @@ msgstr "%d %%"
 #. The menu only appears when airplane mode is on, so just
 #. statically build it as if it was on, rather than dynamically
 #. changing the menu contents.
-#: ../js/ui/status/rfkill.js:88
+#: js/ui/status/rfkill.js:88
 msgid "Airplane Mode On"
 msgstr "已开启飞行模式"
 
-#: ../js/ui/status/system.js:343
+#: js/ui/status/system.js:351
 msgid "Switch User"
 msgstr "切换用户"
 
-#: ../js/ui/status/system.js:348
+#: js/ui/status/system.js:356
 msgid "Log Out"
 msgstr "注销"
 
-#: ../js/ui/status/system.js:353
+#: js/ui/status/system.js:361
 msgid "Account Settings"
 msgstr "帐号设置"
 
-#: ../js/ui/status/system.js:370
+#: js/ui/status/system.js:378
 msgid "Orientation Lock"
 msgstr "方向锁定"
 
-#: ../js/ui/status/system.js:378
+#: js/ui/status/system.js:386
 msgid "Suspend"
 msgstr "挂起"
 
-#: ../js/ui/status/system.js:381
+#: js/ui/status/system.js:389
 msgid "Power Off"
 msgstr "关机"
 
-#: ../js/ui/status/volume.js:127
+#: js/ui/status/volume.js:127
 msgid "Volume changed"
 msgstr "音量已变更"
 
-#: ../js/ui/status/volume.js:162
+#: js/ui/status/volume.js:162
 msgid "Volume"
 msgstr "音量"
 
-#: ../js/ui/unlockDialog.js:67
+#: js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "以另一个用户身份登录"
 
-#: ../js/ui/unlockDialog.js:84
+#: js/ui/unlockDialog.js:84
 msgid "Unlock Window"
 msgstr "解锁窗口"
 
-#: ../js/ui/viewSelector.js:159
+#: js/ui/viewSelector.js:159
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../js/ui/viewSelector.js:163
+#: js/ui/viewSelector.js:163
 msgid "Search"
 msgstr "搜索"
 
-#: ../js/ui/windowAttentionHandler.js:20
+#: js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "“%s”已就绪"
 
-#: ../js/ui/windowManager.js:63
+#: js/ui/windowManager.js:63
 msgid "Do you want to keep these display settings?"
 msgstr "你想保留这些显示设置吗？"
 
 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #.
-#: ../js/ui/windowManager.js:82
+#: js/ui/windowManager.js:82
 msgid "Revert Settings"
 msgstr "还原设置"
 
-#: ../js/ui/windowManager.js:85
+#: js/ui/windowManager.js:85
 msgid "Keep Changes"
 msgstr "保留更改"
 
-#: ../js/ui/windowManager.js:103
+#: js/ui/windowManager.js:103
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1580,82 +1588,87 @@ msgstr[0] "设置更改将在 %d 后还原"
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height.
-#: ../js/ui/windowManager.js:658
+#: js/ui/windowManager.js:658
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../js/ui/windowMenu.js:34
+#: js/ui/windowMenu.js:34
 msgid "Minimize"
 msgstr "最小化"
 
-#: ../js/ui/windowMenu.js:41
+#: js/ui/windowMenu.js:41
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: ../js/ui/windowMenu.js:45
+#: js/ui/windowMenu.js:45
 msgid "Maximize"
 msgstr "最大化"
 
-#: ../js/ui/windowMenu.js:52
+#: js/ui/windowMenu.js:52
 msgid "Move"
 msgstr "移动"
 
-#: ../js/ui/windowMenu.js:58
+#: js/ui/windowMenu.js:58
 msgid "Resize"
 msgstr "改变大小"
 
-#: ../js/ui/windowMenu.js:65
+#: js/ui/windowMenu.js:65
 msgid "Move Titlebar Onscreen"
 msgstr "在屏幕中移动标题栏"
 
-#: ../js/ui/windowMenu.js:70
+#: js/ui/windowMenu.js:70
 msgid "Always on Top"
 msgstr "置顶"
 
-#: ../js/ui/windowMenu.js:89
+#: js/ui/windowMenu.js:89
 msgid "Always on Visible Workspace"
 msgstr "总在可见工作区"
 
-#: ../js/ui/windowMenu.js:105
+#: js/ui/windowMenu.js:105
 msgid "Move to Workspace Left"
 msgstr "移至工作区的左侧"
 
-#: ../js/ui/windowMenu.js:110
+#: js/ui/windowMenu.js:110
 msgid "Move to Workspace Right"
 msgstr "移至工作区的右侧"
 
-#: ../js/ui/windowMenu.js:115
+#: js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "移至工作区的上端"
 
-#: ../js/ui/windowMenu.js:120
+#: js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "移至工作区的下端"
 
-#: ../js/ui/windowMenu.js:136
+#: js/ui/windowMenu.js:136
 msgid "Move to Monitor Up"
 msgstr "移到显示器的上端"
 
-#: ../js/ui/windowMenu.js:142
+#: js/ui/windowMenu.js:142
 msgid "Move to Monitor Down"
 msgstr "移到显示器的下端"
 
-#: ../js/ui/windowMenu.js:148
+#: js/ui/windowMenu.js:148
 msgid "Move to Monitor Left"
 msgstr "移到显示器的左侧"
 
-#: ../js/ui/windowMenu.js:154
+#: js/ui/windowMenu.js:154
 msgid "Move to Monitor Right"
 msgstr "移至显示器的右侧"
 
-#: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
+#: src/calendar-server/evolution-calendar.desktop.in:3
 msgid "Evolution Calendar"
 msgstr "Evolution 日历"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: src/calendar-server/evolution-calendar.desktop.in:6
+msgid "evolution"
+msgstr "evolution"
+
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1835
+#: src/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1663,54 +1676,63 @@ msgstr[0] "%u 个输出"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1845
+#: src/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 个输入"
 
-#: ../src/gvc/gvc-mixer-control.c:2371
+#: src/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "系统声音"
 
-#: ../src/main.c:381
+#: src/main.c:381
 msgid "Print version"
 msgstr "打印版本"
 
-#: ../src/main.c:387
+#: src/main.c:387
 msgid "Mode used by GDM for login screen"
 msgstr "GDM 用于登录屏幕的模式"
 
-#: ../src/main.c:393
+#: src/main.c:393
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "使用指定模式，如 “gdm”用于登录屏幕的模式"
 
-#: ../src/main.c:399
+#: src/main.c:399
 msgid "List possible modes"
 msgstr "列出可用的模式"
 
-#: ../src/shell-app.c:246
+#: src/shell-app.c:270
 msgctxt "program"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/shell-app.c:487
+#: src/shell-app.c:511
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "启动“%s”失败"
 
-#: ../src/shell-keyring-prompt.c:730
+#: src/shell-keyring-prompt.c:730
 msgid "Passwords do not match."
 msgstr "密码不匹配。"
 
-#: ../src/shell-keyring-prompt.c:738
+#: src/shell-keyring-prompt.c:738
 msgid "Password cannot be blank"
 msgstr "密码不能为空"
 
-#: ../src/shell-polkit-authentication-agent.c:353
+#: src/shell-polkit-authentication-agent.c:353
 msgid "Authentication dialog was dismissed by the user"
 msgstr "认证对话框被用户驳回"
 
+#~ msgid "Show the week date in the calendar"
+#~ msgstr "在日历中显示星期"
+
+#~ msgid "If true, display the ISO week date in the calendar."
+#~ msgstr "如果为 true，在日历中显示 ISO 周日期。"
+
+#~ msgid "Use as Internet connection"
+#~ msgstr "使用互联网连接"
+
 #~ msgid "%s is requesting access to your location."
 #~ msgstr "%s 申请访问您的位置信息。"