diff --git a/po/zh_CN.po b/po/zh_CN.po
index e7cd6a5ed..239dfe788 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,24 +14,26 @@
 # hui <www.eternalhui@gmail.com>, 2013, 2014.
 # mosquito <sensor.wen@gmail.com>, 2014.
 # Tong Hui <tonghuix@gmail.com>, 2013, 2014, 2015.
-# Aron Xu <aronxu@gnome.org>, 2010, 2011, 2012, 2013, 2015, 2016.
 # liushuyu <liushuyu_011@126.com>, 2015.
+# Aron Xu <aronxu@gnome.org>, 2010, 2011, 2012, 2013, 2015, 2016.
+# Mandy Wang <wangmychn@gmail.com>, 2016.
+# Dingzhong Chen <wsxy162@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-12-27 18:15+0000\n"
-"PO-Revision-Date: 2016-12-09 21:44+0800\n"
-"Last-Translator: Mandy Wang <wangmychn@gmail.com>\n"
+"POT-Creation-Date: 2017-07-17 17:51+0000\n"
+"PO-Revision-Date: 2017-03-30 19:26+0800\n"
+"Last-Translator: Tong Hui <tonghuix@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: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: data/50-gnome-shell-system.xml:6
 msgid "System"
@@ -58,8 +60,9 @@ msgid "Open the application menu"
 msgstr "打开应用程序菜单"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:4
-msgid "GNOME Shell Extension Preferences"
-msgstr "GNOME Shell 扩展首选项"
+#: js/extensionPrefs/main.js:152
+msgid "Shell Extensions"
+msgstr "Shell 扩展"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:5
 msgid "Configure GNOME Shell Extensions"
@@ -99,10 +102,20 @@ msgstr ""
 "EnableExtension 和 DisableExtension 的值进行修改，以修改此列表。"
 
 #: data/org.gnome.shell.gschema.xml.in:26
+msgid "Disable user extensions"
+msgstr "禁用用户扩展"
+
+#: data/org.gnome.shell.gschema.xml.in:27
+msgid ""
+"Disable all extensions the user has enabled without affecting the “enabled-"
+"extension” setting."
+msgstr "禁用所有用户已经启用的扩展而不影响“启用的扩展”设置。"
+
+#: data/org.gnome.shell.gschema.xml.in:34
 msgid "Disables the validation of extension version compatibility"
 msgstr "禁止检查扩展版本兼容性"
 
-#: data/org.gnome.shell.gschema.xml.in:27
+#: data/org.gnome.shell.gschema.xml.in:35
 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,66 +124,65 @@ msgstr ""
 "GNOME 只会加载声明支持当前运行版本的扩展。启用该选项会禁止此检查，并尝试加载"
 "所有扩展，无视它们声明支持的版本。"
 
-#: data/org.gnome.shell.gschema.xml.in:35
+#: data/org.gnome.shell.gschema.xml.in:43
 msgid "List of desktop file IDs for favorite applications"
 msgstr "收藏夹中的应用程序的 desktop 文件 ID 的列表"
 
-#: data/org.gnome.shell.gschema.xml.in:36
+#: data/org.gnome.shell.gschema.xml.in:44
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr "符合这些标示的应用程序将显示在收藏区中。"
 
-#: data/org.gnome.shell.gschema.xml.in:43
+#: data/org.gnome.shell.gschema.xml.in:51
 msgid "App Picker View"
 msgstr "程序选择查看器"
 
-#: data/org.gnome.shell.gschema.xml.in:44
+#: data/org.gnome.shell.gschema.xml.in:52
 msgid "Index of the currently selected view in the application picker."
 msgstr "应用程序选择器中当前已选取视图的索引。"
 
-#: data/org.gnome.shell.gschema.xml.in:50
+#: data/org.gnome.shell.gschema.xml.in:58
 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://wiki.gnome.org/Projects/GnomeShell/LookingGlass
-#: data/org.gnome.shell.gschema.xml.in:55
+#: data/org.gnome.shell.gschema.xml.in:63
 msgid "History for the looking glass dialog"
 msgstr "Looking Glass 控制台历史"
 
-#: data/org.gnome.shell.gschema.xml.in:59
-msgid "Always show the 'Log out' menu item in the user menu."
+#: data/org.gnome.shell.gschema.xml.in:67
+msgid "Always show the “Log out” menu item in the user menu."
 msgstr "总在用户菜单中显示“注销”选项。"
 
-#: data/org.gnome.shell.gschema.xml.in:60
+#: data/org.gnome.shell.gschema.xml.in:68
 msgid ""
-"This key overrides the automatic hiding of the 'Log out' menu item in single-"
+"This key overrides the automatic hiding of the “Log out” menu item in single-"
 "user, single-session situations."
-msgstr ""
-"单用户、单会话情形下，“注销”菜单项默认隐藏，使用这个按键会覆盖这种行为。"
+msgstr "单用户、单会话情形下，“注销”菜单项默认隐藏，使用这个键会覆盖这种行为。"
 
-#: data/org.gnome.shell.gschema.xml.in:67
+#: data/org.gnome.shell.gschema.xml.in:75
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr "是否记住挂载加密文件系统或远程文件系统时所使用的密码"
 
-#: data/org.gnome.shell.gschema.xml.in:68
+#: data/org.gnome.shell.gschema.xml.in:76
 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 "
-"'Remember Password' checkbox will be present. This key sets the default "
+"“Remember Password” checkbox will be present. This key sets the default "
 "state of the checkbox."
 msgstr ""
 "挂载加密设备或远程文件系统时 Gnome Shell 将要求输入密码。如果该密码可以记住并"
 "在今后使用，则会有“记住密码”复选框出现。这个键设置了该复选框的默认状态。"
 
-#: data/org.gnome.shell.gschema.xml.in:77
+#: data/org.gnome.shell.gschema.xml.in:85
 msgid ""
 "Whether the default Bluetooth adapter had set up devices associated to it"
 msgstr "默认的蓝牙适配器是否有已配对的设备"
 
-#: data/org.gnome.shell.gschema.xml.in:78
+#: data/org.gnome.shell.gschema.xml.in:86
 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,116 +192,116 @@ msgstr ""
 "Shell 只会在有蓝牙适配器有供电时或有设备与默认适配器关联时显示蓝牙菜单。若默"
 "认适配器不再和设备关联，蓝牙菜单将不再因此出现。"
 
-#: data/org.gnome.shell.gschema.xml.in:93
+#: data/org.gnome.shell.gschema.xml.in:101
 msgid "Keybinding to open the application menu"
 msgstr "用于打开应用程序菜单的快捷键"
 
-#: data/org.gnome.shell.gschema.xml.in:94
+#: data/org.gnome.shell.gschema.xml.in:102
 msgid "Keybinding to open the application menu."
 msgstr "用于打开应用程序菜单的快捷键。"
 
-#: data/org.gnome.shell.gschema.xml.in:100
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "用于打开“显示应用程序”视图的快捷键 "
-
-#: 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:108
-msgid "Keybinding to open the overview"
-msgstr "用于打开概览的快捷键 "
+msgid "Keybinding to open the “Show Applications” view"
+msgstr "用于打开“显示应用程序”视图的快捷键"
 
 #: data/org.gnome.shell.gschema.xml.in:109
-msgid "Keybinding to open the Activities Overview."
-msgstr "用于打开活动概览的快捷键。 "
+msgid ""
+"Keybinding to open the “Show Applications” view of the Activities Overview."
+msgstr "用于在活动视图中打开“显示应用程序”视图的快捷键。"
 
-#: data/org.gnome.shell.gschema.xml.in:115
+#: data/org.gnome.shell.gschema.xml.in:116
+msgid "Keybinding to open the overview"
+msgstr "用于打开概览的快捷键"
+
+#: data/org.gnome.shell.gschema.xml.in:117
+msgid "Keybinding to open the Activities Overview."
+msgstr "用于打开活动概览的快捷键。"
+
+#: data/org.gnome.shell.gschema.xml.in:123
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr "用来切换通知列表是否可见的快捷键"
 
-#: data/org.gnome.shell.gschema.xml.in:116
+#: data/org.gnome.shell.gschema.xml.in:124
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr "用来切换通知列表是否可见的快捷键。"
 
-#: data/org.gnome.shell.gschema.xml.in:122
+#: data/org.gnome.shell.gschema.xml.in:130
 msgid "Keybinding to focus the active notification"
 msgstr "用于移动焦点到活动通知的快捷键"
 
-#: data/org.gnome.shell.gschema.xml.in:123
+#: data/org.gnome.shell.gschema.xml.in:131
 msgid "Keybinding to focus the active notification."
 msgstr "用于移动焦点到活动通知的快捷键。"
 
-#: data/org.gnome.shell.gschema.xml.in:129
+#: data/org.gnome.shell.gschema.xml.in:137
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
-msgstr "暂停和恢复所有执行中动画的快捷键，用于调试 "
+msgstr "暂停和恢复所有执行中动画的快捷键，用于调试"
 
-#: data/org.gnome.shell.gschema.xml.in:138
+#: data/org.gnome.shell.gschema.xml.in:146
 msgid "Which keyboard to use"
 msgstr "使用哪种键盘"
 
-#: data/org.gnome.shell.gschema.xml.in:139
+#: data/org.gnome.shell.gschema.xml.in:147
 msgid "The type of keyboard to use."
 msgstr "要使用的键盘类型。"
 
-#: data/org.gnome.shell.gschema.xml.in:150
-#: data/org.gnome.shell.gschema.xml.in:177
+#: data/org.gnome.shell.gschema.xml.in:158
+#: data/org.gnome.shell.gschema.xml.in:185
 msgid "Limit switcher to current workspace."
 msgstr "仅在当前工作区切换。"
 
-#: data/org.gnome.shell.gschema.xml.in:151
+#: data/org.gnome.shell.gschema.xml.in:159
 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:168
+#: data/org.gnome.shell.gschema.xml.in:176
 msgid "The application icon mode."
 msgstr "应用程序图标模式。"
 
-#: data/org.gnome.shell.gschema.xml.in:169
+#: data/org.gnome.shell.gschema.xml.in:177
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
-"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-"only' (shows only the application icon) or 'both'."
+"are “thumbnail-only” (shows a thumbnail of the window), “app-icon-"
+"only” (shows only the application icon) or “both”."
 msgstr ""
-"配置窗口如何显示于切换器中。有效的值有“thumbnail-only”“app-icon-"
-"only”和“both”。"
+"配置窗口如何显示于切换器中。有效的值有“thumbnail-only”（显示窗口缩略"
+"图）、“app-icon-only”（仅显示应用程序图标）和“both”。"
 
-#: data/org.gnome.shell.gschema.xml.in:178
+#: data/org.gnome.shell.gschema.xml.in:186
 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:189
+#: data/org.gnome.shell.gschema.xml.in:197
 msgid "Attach modal dialog to the parent window"
 msgstr "将模态对话框附到其父窗口上"
 
-#: data/org.gnome.shell.gschema.xml.in:190
-#: data/org.gnome.shell.gschema.xml.in:199
+#: data/org.gnome.shell.gschema.xml.in:198
 #: data/org.gnome.shell.gschema.xml.in:207
 #: data/org.gnome.shell.gschema.xml.in:215
 #: data/org.gnome.shell.gschema.xml.in:223
+#: data/org.gnome.shell.gschema.xml.in:231
 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:198
+#: data/org.gnome.shell.gschema.xml.in:206
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "启用拖拽到屏幕边缘时平铺窗口的功能"
 
-#: data/org.gnome.shell.gschema.xml.in:206
+#: data/org.gnome.shell.gschema.xml.in:214
 msgid "Workspaces are managed dynamically"
 msgstr "动态管理工作区"
 
-#: data/org.gnome.shell.gschema.xml.in:214
+#: data/org.gnome.shell.gschema.xml.in:222
 msgid "Workspaces only on primary monitor"
 msgstr "仅在主显示器上显示工作区"
 
-#: data/org.gnome.shell.gschema.xml.in:222
+#: data/org.gnome.shell.gschema.xml.in:230
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "将鼠标模式下焦点的更改推迟到指针停止移动之后"
 
@@ -302,32 +314,28 @@ msgstr "网络登录"
 msgid "network-workgroup"
 msgstr "network-workgroup"
 
-#: js/extensionPrefs/main.js:117
+#: js/extensionPrefs/main.js:120
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "载入 %s 的首选想对话框出错："
 
-#: js/extensionPrefs/main.js:149
-msgid "GNOME Shell Extensions"
-msgstr "配置 GNOME Shell 扩展"
-
-#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
+#: js/gdm/authPrompt.js:149 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:926
+#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:195
+#: js/ui/shellMountOperation.js:399 js/ui/status/network.js:947
 msgid "Cancel"
 msgstr "取消"
 
-#: js/gdm/authPrompt.js:169 js/gdm/authPrompt.js:216 js/gdm/authPrompt.js:448
+#: js/gdm/authPrompt.js:171 js/gdm/authPrompt.js:218 js/gdm/authPrompt.js:450
 msgid "Next"
 msgstr "下一步"
 
-#: js/gdm/authPrompt.js:212 js/ui/shellMountOperation.js:403
+#: js/gdm/authPrompt.js:214 js/ui/shellMountOperation.js:403
 #: js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "解锁"
 
-#: js/gdm/authPrompt.js:214
+#: js/gdm/authPrompt.js:216
 msgctxt "button"
 msgid "Sign In"
 msgstr "登录"
@@ -348,7 +356,7 @@ msgstr "未列出？"
 #: js/gdm/loginDialog.js:859
 #, javascript-format
 msgid "(e.g., user or %s)"
-msgstr "(如 user 或 %s)"
+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
@@ -362,7 +370,7 @@ msgstr "用户名："
 msgid "Login Window"
 msgstr "登录窗口"
 
-#: js/gdm/util.js:341
+#: js/gdm/util.js:346
 msgid "Authentication error"
 msgstr "认证出错"
 
@@ -371,40 +379,84 @@ 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:478
 msgid "(or swipe finger)"
-msgstr "(或滑动手指)"
+msgstr "（或滑动手指）"
 
-#: js/misc/util.js:119
+#: js/misc/util.js:122
 msgid "Command not found"
 msgstr "命令未找到"
 
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: js/misc/util.js:152
+#: js/misc/util.js:155
 msgid "Could not parse command:"
 msgstr "不能解析命令："
 
-#: js/misc/util.js:160
+#: js/misc/util.js:163
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "运行“%s”失败："
 
+#: js/misc/util.js:180
+msgid "Just now"
+msgstr "刚刚"
+
+#: js/misc/util.js:182
+#, javascript-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d 分钟前"
+
+#: js/misc/util.js:185
+#, javascript-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d 小时前"
+
+#: js/misc/util.js:188
+msgid "Yesterday"
+msgstr "昨天"
+
+#: js/misc/util.js:190
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天前"
+
+#: js/misc/util.js:193
+#, javascript-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d 周前"
+
+#: js/misc/util.js:196
+#, javascript-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d 月前"
+
+#: js/misc/util.js:198
+#, javascript-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d 年前"
+
 #. Translators: Time in 24h format
-#: js/misc/util.js:191
+#: js/misc/util.js:229
 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:235
 #, 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:241
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A %H:%M"
@@ -412,34 +464,34 @@ 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:247
 #, no-c-format
 msgid "%B %d, %H∶%M"
-msgstr "%m月%d日, %H:%M"
+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:253
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
-msgstr "%Y年%m月%d日, %H:%M"
+msgstr "%Y年%m月%d日，%H:%M"
 
 #. Translators: Time in 12h format
-#: js/misc/util.js:220
+#: js/misc/util.js:258
 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:264
 #, 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:270
 #, no-c-format
 msgid "%A, %l∶%M %p"
 msgstr "%A%p %-l:%M"
@@ -447,7 +499,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:276
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
 msgstr "%m月%d日%p %-l:%M"
@@ -455,61 +507,71 @@ 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:282
 #, 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
-msgid "Web Authentication Redirect"
-msgstr "网页认证重定向"
+#. TRANSLATORS: this is the title of the wifi captive portal login window
+#: js/portalHelper/main.js:66
+msgid "Hotspot Login"
+msgstr "热点登录"
+
+#: js/portalHelper/main.js:112
+msgid ""
+"Your connection to this hotspot login is not secure. Passwords or other "
+"information you enter on this page can be viewed by people nearby."
+msgstr ""
+"到这个热点登录的连接不安全。您在此页面输入的密码或其他信息可被附近的人看到。"
 
 #. 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
+#: js/ui/accessDialog.js:62 js/ui/status/location.js:405
 msgid "Deny Access"
 msgstr "拒绝访问"
 
-#: js/ui/accessDialog.js:63 js/ui/status/location.js:429
+#: js/ui/accessDialog.js:63 js/ui/status/location.js:408
 msgid "Grant Access"
 msgstr "允许访问"
 
-#: js/ui/appDisplay.js:794
+#: js/ui/appDisplay.js:806
 msgid "Frequently used applications will appear here"
 msgstr "常用的应用程序会出现在这里"
 
-#: js/ui/appDisplay.js:914
+#: js/ui/appDisplay.js:927
 msgid "Frequent"
 msgstr "常用"
 
-#: js/ui/appDisplay.js:921
+#: js/ui/appDisplay.js:934
 msgid "All"
 msgstr "全部"
 
-#: js/ui/appDisplay.js:1853
+#: js/ui/appDisplay.js:1895
 msgid "New Window"
 msgstr "新窗口"
 
-#: js/ui/appDisplay.js:1881 js/ui/dash.js:289
+#: js/ui/appDisplay.js:1909
+msgid "Launch using Dedicated Graphics Card"
+msgstr "使用独立显卡启动"
+
+#: js/ui/appDisplay.js:1936 js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: js/ui/appDisplay.js:1887
+#: js/ui/appDisplay.js:1942
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
-#: js/ui/appDisplay.js:1897
+#: js/ui/appDisplay.js:1952
 msgid "Show Details"
 msgstr "显示细节"
 
-#: js/ui/appFavorites.js:135
+#: js/ui/appFavorites.js:138
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s 已经添加到了您的收藏夹。"
 
-#: js/ui/appFavorites.js:169
+#: js/ui/appFavorites.js:172
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"
@@ -536,13 +598,13 @@ msgstr "麦克风"
 
 #: js/ui/backgroundMenu.js:19
 msgid "Change Background…"
-msgstr "更换壁纸..."
+msgstr "更换壁纸…"
 
-#: js/ui/backgroundMenu.js:21
+#: js/ui/backgroundMenu.js:21 js/ui/status/nightLight.js:51
 msgid "Display Settings"
 msgstr "显示设置"
 
-#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:374
+#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:407
 msgid "Settings"
 msgstr "设置"
 
@@ -619,37 +681,33 @@ 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:721
+#: js/ui/calendar.js:729
 msgctxt "event list time"
 msgid "All Day"
 msgstr "全天"
 
-#: js/ui/calendar.js:836
-msgid "Events"
-msgstr "事件"
-
-#: js/ui/calendar.js:845
+#: js/ui/calendar.js:862
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%m月%d日 %A"
 
-#: js/ui/calendar.js:849
+#: js/ui/calendar.js:866
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日 %A"
 
-#: js/ui/calendar.js:931
-msgid "Notifications"
-msgstr "提示"
-
-#: js/ui/calendar.js:1082
+#: js/ui/calendar.js:1086
 msgid "No Notifications"
 msgstr "无提示"
 
-#: js/ui/calendar.js:1085
+#: js/ui/calendar.js:1089
 msgid "No Events"
 msgstr "无事件"
 
+#: js/ui/calendar.js:1117
+msgid "Clear All"
+msgstr "全部清除"
+
 #: js/ui/components/automountManager.js:91
 msgid "External drive connected"
 msgstr "外部驱动器已连接"
@@ -658,7 +716,7 @@ msgstr "外部驱动器已连接"
 msgid "External drive disconnected"
 msgstr "外部驱动器已断开"
 
-#: js/ui/components/autorunManager.js:355
+#: js/ui/components/autorunManager.js:356
 #, javascript-format
 msgid "Open with %s"
 msgstr "使用 %s 打开"
@@ -671,8 +729,8 @@ msgstr "密码："
 msgid "Type again:"
 msgstr "再输一次："
 
-#: js/ui/components/networkAgent.js:140 js/ui/status/network.js:270
-#: js/ui/status/network.js:353 js/ui/status/network.js:929
+#: js/ui/components/networkAgent.js:140 js/ui/status/network.js:272
+#: js/ui/status/network.js:366 js/ui/status/network.js:950
 msgid "Connect"
 msgstr "连接"
 
@@ -745,7 +803,7 @@ msgstr "移动宽带网络密码"
 msgid "A password is required to connect to “%s”."
 msgstr "连接到“%s”需要密码。"
 
-#: js/ui/components/networkAgent.js:655 js/ui/status/network.js:1672
+#: js/ui/components/networkAgent.js:655 js/ui/status/network.js:1760
 msgid "Network Manager"
 msgstr "网络管理器"
 
@@ -761,22 +819,23 @@ msgstr "管理员"
 msgid "Authenticate"
 msgstr "认证"
 
+# 依源注释，错误不一定是输入有误。是否应该更换成“认证失败/出错”
 #. Translators: "that didn't work" refers to the fact that the
 #. * 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
-msgid "Sorry, that didn't work. Please try again."
-msgstr "抱歉，您的输入有误。请重试。"
+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:765
+#: js/ui/components/telepathyClient.js:799
 #, 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:179
 msgid "Windows"
 msgstr "窗口"
 
@@ -793,7 +852,7 @@ 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:75
 msgid "%B %e %Y"
 msgstr "%Y年%m月%d日"
 
@@ -801,18 +860,71 @@ 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:82
 msgid "%A %B %e %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: js/ui/dateMenu.js:160
+#: js/ui/dateMenu.js:144
 msgid "Add world clocks…"
-msgstr "添加世界时钟..."
+msgstr "添加世界时钟…"
 
-#: js/ui/dateMenu.js:161
+#: js/ui/dateMenu.js:145
 msgid "World Clocks"
 msgstr "世界时钟"
 
+#: js/ui/dateMenu.js:224
+msgid "Weather"
+msgstr "天气"
+
+#. Translators: %s is a weather condition like "Clear sky"; see
+#. libgweather for the possible condition strings. If at all
+#. possible, the sentence should match the grammatical case etc. of
+#. the inserted conditions.
+#: js/ui/dateMenu.js:281
+#, javascript-format
+msgid "%s all day."
+msgstr "全天 %s。"
+
+#. Translators: %s is a weather condition like "Clear sky"; see
+#. libgweather for the possible condition strings. If at all
+#. possible, the sentence should match the grammatical case etc. of
+#. the inserted conditions.
+#: js/ui/dateMenu.js:287
+#, javascript-format
+msgid "%s, then %s later."
+msgstr "%s 转 %s。"
+
+#. Translators: %s is a weather condition like "Clear sky"; see
+#. libgweather for the possible condition strings. If at all
+#. possible, the sentence should match the grammatical case etc. of
+#. the inserted conditions.
+#: js/ui/dateMenu.js:293
+#, javascript-format
+msgid "%s, then %s, followed by %s later."
+msgstr "%s 转 %s，最后 %s。"
+
+#: js/ui/dateMenu.js:300
+msgid "Select a location…"
+msgstr "选择位置…"
+
+#: js/ui/dateMenu.js:303
+msgid "Loading…"
+msgstr "正在加载…"
+
+#. Translators: %s is a temperature with unit, e.g. "23℃"
+#: js/ui/dateMenu.js:309
+#, javascript-format
+msgid "Feels like %s."
+msgstr "体感温度 %s。"
+
+#: js/ui/dateMenu.js:312
+msgid "Go online for weather information"
+msgstr "上线以获取天气信息"
+
+#: js/ui/dateMenu.js:314
+msgid "Weather information is currently unavailable"
+msgstr "天气信息当前不可用"
+
 #: js/ui/endSessionDialog.js:64
 #, javascript-format
 msgctxt "title"
@@ -940,16 +1052,16 @@ msgid "Other users are logged in."
 msgstr "有其他用户登录。"
 
 #. Translators: Remote here refers to a remote session, like a ssh login
-#: js/ui/endSessionDialog.js:671
+#: js/ui/endSessionDialog.js:670
 #, javascript-format
 msgid "%s (remote)"
-msgstr "%s (远程)"
+msgstr "%s（远程）"
 
 #. Translators: Console here refers to a tty like a VT console
-#: js/ui/endSessionDialog.js:674
+#: js/ui/endSessionDialog.js:673
 #, javascript-format
 msgid "%s (console)"
-msgstr "%s (控制台)"
+msgstr "%s（控制台）"
 
 #: js/ui/extensionDownloader.js:199
 msgid "Install"
@@ -973,78 +1085,72 @@ msgstr "隐藏托盘"
 msgid "Status Icons"
 msgstr "状态图标"
 
-#: js/ui/lookingGlass.js:643
+#: js/ui/lookingGlass.js:642
 msgid "No extensions installed"
 msgstr "未安装扩展"
 
 #. Translators: argument is an extension UUID.
-#: js/ui/lookingGlass.js:697
+#: js/ui/lookingGlass.js:696
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s 没有传出任何错误信息。"
 
-#: js/ui/lookingGlass.js:703
+#: js/ui/lookingGlass.js:702
 msgid "Hide Errors"
 msgstr "隐藏错误"
 
-#: js/ui/lookingGlass.js:707 js/ui/lookingGlass.js:767
+#: js/ui/lookingGlass.js:706 js/ui/lookingGlass.js:766
 msgid "Show Errors"
 msgstr "显示错误"
 
-#: js/ui/lookingGlass.js:716
+#: js/ui/lookingGlass.js:715
 msgid "Enabled"
 msgstr "已启用"
 
 #. translators:
 #. * The device has been disabled
-#: js/ui/lookingGlass.js:719 src/gvc/gvc-mixer-control.c:1866
+#: js/ui/lookingGlass.js:718 src/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "已禁用"
 
-#: js/ui/lookingGlass.js:721
+#: js/ui/lookingGlass.js:720
 msgid "Error"
 msgstr "错误"
 
-#: js/ui/lookingGlass.js:723
+#: js/ui/lookingGlass.js:722
 msgid "Out of date"
 msgstr "过时"
 
-#: js/ui/lookingGlass.js:725
+#: js/ui/lookingGlass.js:724
 msgid "Downloading"
 msgstr "正在下载"
 
-#: js/ui/lookingGlass.js:749
+#: js/ui/lookingGlass.js:748
 msgid "View Source"
 msgstr "查看源"
 
-#: js/ui/lookingGlass.js:758
+#: js/ui/lookingGlass.js:757
 msgid "Web Page"
 msgstr "网页"
 
-#: js/ui/messageList.js:543
-msgid "Clear section"
-msgstr "清除选中项目"
-
-#: js/ui/messageTray.js:1486
+#: js/ui/messageTray.js:1493
 msgid "System Information"
 msgstr "系统信息"
 
-#: js/ui/mpris.js:194
+#: js/ui/mpris.js:211
 msgid "Unknown artist"
 msgstr "未知艺人"
 
-#: js/ui/mpris.js:195
+#: js/ui/mpris.js:212
 msgid "Unknown title"
 msgstr "未知标题"
 
-#: js/ui/mpris.js:217
-msgid "Media"
-msgstr "媒体"
-
 #: js/ui/overview.js:84
 msgid "Undo"
 msgstr "撤销"
 
+#. Translators: This is the main view to select
+#. activities. See also note for "Activities" string.
 #: js/ui/overview.js:113
 msgid "Overview"
 msgstr "概览"
@@ -1055,7 +1161,51 @@ msgstr "概览"
 #. characters.
 #: js/ui/overview.js:240
 msgid "Type to search…"
-msgstr "输入以搜索..."
+msgstr "输入以搜索…"
+
+#: js/ui/padOsd.js:103
+msgid "New shortcut…"
+msgstr "新建快捷键…"
+
+#: js/ui/padOsd.js:152
+msgid "Application defined"
+msgstr "定义的应用程序"
+
+#: js/ui/padOsd.js:153
+msgid "Show on-screen help"
+msgstr "显示屏幕帮助"
+
+#: js/ui/padOsd.js:154
+msgid "Switch monitor"
+msgstr "切换显示器"
+
+#: js/ui/padOsd.js:155
+msgid "Assign keystroke"
+msgstr "分配按键"
+
+#: js/ui/padOsd.js:220
+msgid "Done"
+msgstr "完成"
+
+#: js/ui/padOsd.js:734
+msgid "Edit…"
+msgstr "编辑…"
+
+#: js/ui/padOsd.js:774 js/ui/padOsd.js:879
+msgid "None"
+msgstr "无"
+
+#: js/ui/padOsd.js:833
+msgid "Press a button to configure"
+msgstr "按下按键以配置"
+
+#: js/ui/padOsd.js:834
+msgid "Press Esc to exit"
+msgstr "按下 Esc 退出"
+
+#: js/ui/padOsd.js:837
+msgid "Press any key to exit"
+msgstr "按下任意键退出"
 
 #: js/ui/panel.js:358
 msgid "Quit"
@@ -1072,7 +1222,7 @@ msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "系统"
 
-#: js/ui/panel.js:807
+#: js/ui/panel.js:810
 msgid "Top Bar"
 msgstr "顶栏"
 
@@ -1089,7 +1239,7 @@ msgstr "toggle-switch-us"
 msgid "Enter a Command"
 msgstr "输入一个命令"
 
-#: js/ui/runDialog.js:111 js/ui/windowMenu.js:162
+#: js/ui/runDialog.js:111 js/ui/windowMenu.js:160
 msgid "Close"
 msgstr "关闭"
 
@@ -1099,31 +1249,31 @@ msgstr "Wayland 下重启不可用"
 
 #: js/ui/runDialog.js:282
 msgid "Restarting…"
-msgstr "正在重新启动..."
+msgstr "正在重新启动…"
 
 #. Translators: This is a time format for a date in
 #. long format
-#: js/ui/screenShield.js:85
+#: js/ui/screenShield.js:88
 msgid "%A, %B %d"
 msgstr "%m月%d日 %A"
 
-#: js/ui/screenShield.js:144
+#: js/ui/screenShield.js:147
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 条新消息"
 
-#: js/ui/screenShield.js:146
+#: js/ui/screenShield.js:149
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d 条新通知"
 
-#: js/ui/screenShield.js:449 js/ui/status/system.js:382
+#: js/ui/screenShield.js:452 js/ui/status/system.js:415
 msgid "Lock"
 msgstr "锁定"
 
-#: js/ui/screenShield.js:704
+#: js/ui/screenShield.js:715
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME 需要锁定屏幕"
 
@@ -1134,19 +1284,19 @@ 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:825 js/ui/screenShield.js:1292
+#: js/ui/screenShield.js:836 js/ui/screenShield.js:1308
 msgid "Unable to lock"
 msgstr "无法锁定"
 
-#: js/ui/screenShield.js:826 js/ui/screenShield.js:1293
+#: js/ui/screenShield.js:837 js/ui/screenShield.js:1309
 msgid "Lock was blocked by an application"
 msgstr "一个应用程序阻止了锁定"
 
-#: js/ui/search.js:617
+#: js/ui/search.js:621
 msgid "Searching…"
-msgstr "正在搜索..."
+msgstr "正在搜索…"
 
-#: js/ui/search.js:619
+#: js/ui/search.js:623
 msgid "No results."
 msgstr "无结果。"
 
@@ -1222,7 +1372,7 @@ msgstr "大号文本"
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:625
+#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:638
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
@@ -1238,17 +1388,17 @@ msgid "Off"
 msgstr "关"
 
 #: js/ui/status/bluetooth.js:140
-msgid "Not In Use"
-msgstr "未在使用"
+msgid "On"
+msgstr "开"
 
-#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1289
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1310
 msgid "Turn On"
 msgstr "开启"
 
-#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:179
-#: js/ui/status/network.js:354 js/ui/status/network.js:1289
-#: js/ui/status/network.js:1404 js/ui/status/rfkill.js:90
-#: js/ui/status/rfkill.js:117
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:181
+#: js/ui/status/network.js:367 js/ui/status/network.js:1310
+#: js/ui/status/network.js:1429 js/ui/status/nightLight.js:47
+#: js/ui/status/rfkill.js:90 js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "关闭"
 
@@ -1260,52 +1410,52 @@ msgstr "亮度"
 msgid "Show Keyboard Layout"
 msgstr "显示键盘布局"
 
-#: js/ui/status/location.js:107 js/ui/status/location.js:215
+#: js/ui/status/location.js:88 js/ui/status/location.js:196
 msgid "Location Enabled"
 msgstr "定位服务已启用"
 
-#: js/ui/status/location.js:108 js/ui/status/location.js:216
+#: js/ui/status/location.js:89 js/ui/status/location.js:197
 msgid "Disable"
 msgstr "禁用"
 
-#: js/ui/status/location.js:109
+#: js/ui/status/location.js:90
 msgid "Privacy Settings"
 msgstr "隐私设置"
 
-#: js/ui/status/location.js:214
+#: js/ui/status/location.js:195
 msgid "Location In Use"
 msgstr "定位服务正被使用"
 
-#: js/ui/status/location.js:218
+#: js/ui/status/location.js:199
 msgid "Location Disabled"
 msgstr "定位服务已禁用"
 
-#: js/ui/status/location.js:219
+#: js/ui/status/location.js:200
 msgid "Enable"
 msgstr "启用"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:435
+#: js/ui/status/location.js:414
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "允许 %s 访问您的位置信息？"
 
-#: js/ui/status/location.js:437
+#: js/ui/status/location.js:416
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr "位置访问权限可以随时在隐私设置里更改。"
 
-#: js/ui/status/network.js:102
+#: js/ui/status/network.js:104
 msgid "<unknown>"
 msgstr "<未知>"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:452 js/ui/status/network.js:1318
+#: js/ui/status/network.js:465 js/ui/status/network.js:1339
 #, javascript-format
 msgid "%s Off"
 msgstr "%s 已关闭"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:455
+#: js/ui/status/network.js:468
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s 已连接"
@@ -1313,171 +1463,206 @@ 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:460
+#: js/ui/status/network.js:473
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s 未托管"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:463
+#: js/ui/status/network.js:476
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "%s 正在断开"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:470 js/ui/status/network.js:1310
+#: js/ui/status/network.js:483 js/ui/status/network.js:1331
 #, 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:473
+#: js/ui/status/network.js:486
 #, 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:481
+#: js/ui/status/network.js:494
 #, 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:485
+#: js/ui/status/network.js:498
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "%s 不可用"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:488
+#: js/ui/status/network.js:501
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "%s 连接失败"
 
-#: js/ui/status/network.js:504
+#: js/ui/status/network.js:517
 msgid "Wired Settings"
 msgstr "有线设置"
 
-#: js/ui/status/network.js:546
+#: js/ui/status/network.js:559
 msgid "Mobile Broadband Settings"
 msgstr "移动宽带设置"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:589 js/ui/status/network.js:1315
+#: js/ui/status/network.js:602 js/ui/status/network.js:1336
 #, 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:593
+#: js/ui/status/network.js:606
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s 已禁用"
 
-#: js/ui/status/network.js:633
+#: js/ui/status/network.js:646
 msgid "Connect to Internet"
 msgstr "连接到互联网"
 
-#: js/ui/status/network.js:823
+#: js/ui/status/network.js:844
 msgid "Airplane Mode is On"
 msgstr "已开启飞行模式"
 
-#: js/ui/status/network.js:824
+#: js/ui/status/network.js:845
 msgid "Wi-Fi is disabled when airplane mode is on."
-msgstr "启用飞行模式时 Wi-Fi 会关闭"
+msgstr "启用飞行模式时 Wi-Fi 会关闭。"
 
-#: js/ui/status/network.js:825
+#: js/ui/status/network.js:846
 msgid "Turn Off Airplane Mode"
 msgstr "关闭飞行模式"
 
-#: js/ui/status/network.js:834
+#: js/ui/status/network.js:855
 msgid "Wi-Fi is Off"
-msgstr "Wi-Fi 关闭"
+msgstr "Wi-Fi 已关闭"
 
-#: js/ui/status/network.js:835
+#: js/ui/status/network.js:856
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
-msgstr "连接网络需要开启 Wi-Fi"
+msgstr "连接网络需要开启 Wi-Fi。"
 
-#: js/ui/status/network.js:836
+#: js/ui/status/network.js:857
 msgid "Turn On Wi-Fi"
 msgstr "开启 Wi-Fi"
 
-#: js/ui/status/network.js:861
+#: js/ui/status/network.js:882
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi 网络"
 
-#: js/ui/status/network.js:863
+#: js/ui/status/network.js:884
 msgid "Select a network"
 msgstr "选择网络"
 
-#: js/ui/status/network.js:893
+#: js/ui/status/network.js:914
 msgid "No Networks"
 msgstr "无网络"
 
-#: js/ui/status/network.js:914 js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:935 js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "使用硬件开关关闭"
 
-#: js/ui/status/network.js:1181
+#: js/ui/status/network.js:1202
 msgid "Select Network"
 msgstr "选择网络"
 
-#: js/ui/status/network.js:1187
+#: js/ui/status/network.js:1208
 msgid "Wi-Fi Settings"
 msgstr "Wi-Fi 设置"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1306
+#: js/ui/status/network.js:1327
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "%s 热点已激活"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1321
+#: js/ui/status/network.js:1342
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s 无连接"
 
-#: js/ui/status/network.js:1421
-msgid "connecting..."
-msgstr "正在连接..."
+#: js/ui/status/network.js:1446
+msgid "connecting…"
+msgstr "正在连接…"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: js/ui/status/network.js:1424
+#: js/ui/status/network.js:1449
 msgid "authentication required"
 msgstr "需要认证"
 
-#: js/ui/status/network.js:1426
+#: js/ui/status/network.js:1451
 msgid "connection failed"
 msgstr "连接失败"
 
-#: js/ui/status/network.js:1492 js/ui/status/rfkill.js:93
+#: js/ui/status/network.js:1517 js/ui/status/network.js:1612
+#: js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "网络设置"
 
-#: js/ui/status/network.js:1494
+#: js/ui/status/network.js:1519
 msgid "VPN Settings"
 msgstr "VPN 设置"
 
-#: js/ui/status/network.js:1513
+#: js/ui/status/network.js:1538
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1523
+#: js/ui/status/network.js:1548
 msgid "VPN Off"
 msgstr "VPN 已关闭"
 
-#: js/ui/status/network.js:1711
+#: js/ui/status/network.js:1643
+#, javascript-format
+msgid "%s Wired Connection"
+msgid_plural "%s Wired Connections"
+msgstr[0] "%s 个有线连接"
+
+#: js/ui/status/network.js:1647
+#, javascript-format
+msgid "%s Wi-Fi Connection"
+msgid_plural "%s Wi-Fi Connections"
+msgstr[0] "%s 个 Wi-Fi 连接"
+
+#: js/ui/status/network.js:1651
+#, javascript-format
+msgid "%s Modem Connection"
+msgid_plural "%s Modem Connections"
+msgstr[0] "%s 个调制解调器连接"
+
+#: js/ui/status/network.js:1799
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: js/ui/status/network.js:1712
+#: js/ui/status/network.js:1800
 msgid "Activation of network connection failed"
 msgstr "启用网络连接失败"
 
+#: js/ui/status/nightLight.js:68
+msgid "Night Light Disabled"
+msgstr "夜光 已禁用"
+
+#: js/ui/status/nightLight.js:69
+msgid "Night Light On"
+msgstr "夜光 已开启"
+
+#: js/ui/status/nightLight.js:70
+msgid "Resume"
+msgstr "恢复"
+
+#: js/ui/status/nightLight.js:71
+msgid "Disable Until Tomorrow"
+msgstr "禁用直到明天"
+
 #: js/ui/status/power.js:61
 msgid "Power Settings"
 msgstr "电源设置"
@@ -1490,7 +1675,7 @@ msgstr "已充满电"
 #. to estimate battery life
 #: js/ui/status/power.js:84 js/ui/status/power.js:90
 msgid "Estimating…"
-msgstr "正在估计..."
+msgstr "正在估计…"
 
 #. Translators: this is <hours>:<minutes> Remaining (<percentage>)
 #: js/ui/status/power.js:98
@@ -1514,29 +1699,29 @@ msgstr "%d %%"
 #. changing the menu contents.
 #: js/ui/status/rfkill.js:88
 msgid "Airplane Mode On"
-msgstr "已开启飞行模式"
+msgstr "飞行模式 已开启"
 
-#: js/ui/status/system.js:351
+#: js/ui/status/system.js:384
 msgid "Switch User"
 msgstr "切换用户"
 
-#: js/ui/status/system.js:356
+#: js/ui/status/system.js:389
 msgid "Log Out"
 msgstr "注销"
 
-#: js/ui/status/system.js:361
+#: js/ui/status/system.js:394
 msgid "Account Settings"
 msgstr "帐号设置"
 
-#: js/ui/status/system.js:378
+#: js/ui/status/system.js:411
 msgid "Orientation Lock"
 msgstr "方向锁定"
 
-#: js/ui/status/system.js:386
+#: js/ui/status/system.js:419
 msgid "Suspend"
 msgstr "挂起"
 
-#: js/ui/status/system.js:389
+#: js/ui/status/system.js:422
 msgid "Power Off"
 msgstr "关机"
 
@@ -1556,11 +1741,11 @@ msgstr "以另一个用户身份登录"
 msgid "Unlock Window"
 msgstr "解锁窗口"
 
-#: js/ui/viewSelector.js:159
+#: js/ui/viewSelector.js:183
 msgid "Applications"
 msgstr "应用程序"
 
-#: js/ui/viewSelector.js:163
+#: js/ui/viewSelector.js:187
 msgid "Search"
 msgstr "搜索"
 
@@ -1569,22 +1754,22 @@ msgstr "搜索"
 msgid "“%s” is ready"
 msgstr "“%s”已就绪"
 
-#: js/ui/windowManager.js:63
+#: js/ui/windowManager.js:84
 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:103
 msgid "Revert Settings"
 msgstr "还原设置"
 
-#: js/ui/windowManager.js:85
+#: js/ui/windowManager.js:106
 msgid "Keep Changes"
 msgstr "保留更改"
 
-#: js/ui/windowManager.js:103
+#: js/ui/windowManager.js:124
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1592,10 +1777,10 @@ 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:679
 #, javascript-format
-msgid "%d x %d"
-msgstr "%d x %d"
+msgid "%d × %d"
+msgstr "%d × %d"
 
 #: js/ui/windowMenu.js:34
 msgid "Minimize"
@@ -1629,35 +1814,35 @@ msgstr "置顶"
 msgid "Always on Visible Workspace"
 msgstr "总在可见工作区"
 
-#: js/ui/windowMenu.js:105
+#: js/ui/windowMenu.js:103
 msgid "Move to Workspace Left"
 msgstr "移至工作区的左侧"
 
-#: js/ui/windowMenu.js:110
+#: js/ui/windowMenu.js:108
 msgid "Move to Workspace Right"
 msgstr "移至工作区的右侧"
 
-#: js/ui/windowMenu.js:115
+#: js/ui/windowMenu.js:113
 msgid "Move to Workspace Up"
 msgstr "移至工作区的上端"
 
-#: js/ui/windowMenu.js:120
+#: js/ui/windowMenu.js:118
 msgid "Move to Workspace Down"
 msgstr "移至工作区的下端"
 
-#: js/ui/windowMenu.js:136
+#: js/ui/windowMenu.js:134
 msgid "Move to Monitor Up"
 msgstr "移到显示器的上端"
 
-#: js/ui/windowMenu.js:142
+#: js/ui/windowMenu.js:140
 msgid "Move to Monitor Down"
 msgstr "移到显示器的下端"
 
-#: js/ui/windowMenu.js:148
+#: js/ui/windowMenu.js:146
 msgid "Move to Monitor Left"
 msgstr "移到显示器的左侧"
 
-#: js/ui/windowMenu.js:154
+#: js/ui/windowMenu.js:152
 msgid "Move to Monitor Right"
 msgstr "移至显示器的右侧"
 
@@ -1690,19 +1875,19 @@ msgstr[0] "%u 个输入"
 msgid "System Sounds"
 msgstr "系统声音"
 
-#: src/main.c:381
+#: src/main.c:372
 msgid "Print version"
 msgstr "打印版本"
 
-#: src/main.c:387
+#: src/main.c:378
 msgid "Mode used by GDM for login screen"
 msgstr "GDM 用于登录屏幕的模式"
 
-#: src/main.c:393
-msgid "Use a specific mode, e.g. \"gdm\" for login screen"
-msgstr "使用指定模式，如 “gdm”用于登录屏幕的模式"
+#: src/main.c:384
+msgid "Use a specific mode, e.g. “gdm” for login screen"
+msgstr "使用指定模式，如指定“gdm”用于登录屏幕"
 
-#: src/main.c:399
+#: src/main.c:390
 msgid "List possible modes"
 msgstr "列出可用的模式"
 
@@ -1728,6 +1913,30 @@ msgstr "密码不能为空"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "认证对话框被用户驳回"
 
+#~ msgid "GNOME Shell Extension Preferences"
+#~ msgstr "GNOME Shell 扩展首选项"
+
+#~ msgid "Web Authentication Redirect"
+#~ msgstr "网页认证重定向"
+
+#~ msgid "Events"
+#~ msgstr "事件"
+
+#~ msgid "Notifications"
+#~ msgstr "提示"
+
+#~ msgid "Clear section"
+#~ msgstr "清除选中项目"
+
+#~ msgid "Media"
+#~ msgstr "媒体"
+
+#~ msgid "Not In Use"
+#~ msgstr "未在使用"
+
+#~ msgid "%d x %d"
+#~ msgstr "%d x %d"
+
 #~ msgid "Show the week date in the calendar"
 #~ msgstr "在日历中显示星期"
 
@@ -1759,9 +1968,6 @@ msgstr "认证对话框被用户驳回"
 #~ msgid "Airplane Mode"
 #~ msgstr "乘机模式"
 
-#~ msgid "On"
-#~ msgstr "开"
-
 #~ msgctxt "event list time"
 #~ msgid "%H∶%M"
 #~ msgstr "%H∶%M"