From 8f4e45abfac2bbadb8349531a703846acc96492e Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Fri, 3 Nov 2017 10:18:20 +0200
Subject: [PATCH 01/22] Update Arabic translation

---
 po/ar.po | 1089 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 644 insertions(+), 445 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 047295eb8..ac1f05f7a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,10 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-09-14 13:31+0200\n"
-"PO-Revision-Date: 2017-09-14 13:31+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-03 10:10+0200\n"
+"PO-Revision-Date: 2017-11-03 10:17+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -22,52 +21,315 @@ msgstr ""
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Project-Style: gnome\n"
 
-#: ../js/extensionPrefs/main.js:120
-#, javascript-format
-msgid "There was an error loading the preferences dialog for %s:"
-msgstr "حدث خطأ أثناء تشغيل حوار تفضيلات %s‏:"
+#: data/50-gnome-shell-system.xml:6
+msgid "System"
+msgstr "النظام"
+
+#: data/50-gnome-shell-system.xml:9
+msgid "Show the notification list"
+msgstr "اعرض قائمة التنبيهات"
+
+#: data/50-gnome-shell-system.xml:12
+msgid "Focus the active notification"
+msgstr "ركّز على التنبيه النشط"
+
+#: data/50-gnome-shell-system.xml:15
+msgid "Show the overview"
+msgstr "اعرض النظرة العامة"
+
+#: data/50-gnome-shell-system.xml:18
+msgid "Show all applications"
+msgstr "أظهر كل التطبيقات"
 
-#: ../js/extensionPrefs/main.js:152
+#: data/50-gnome-shell-system.xml:21
+msgid "Open the application menu"
+msgstr "افتح قائمة التطبيقات"
+
+#: data/gnome-shell-extension-prefs.desktop.in.in:4
+#: js/extensionPrefs/main.js:152
 msgid "Shell Extensions"
 msgstr "امتدادات الصدفة"
 
-#: ../js/gdm/authPrompt.js:149 ../js/ui/audioDeviceSelection.js:71
-#: ../js/ui/components/networkAgent.js:117
-#: ../js/ui/components/polkitAgent.js:148 ../js/ui/endSessionDialog.js:482
-#: ../js/ui/extensionDownloader.js:197 ../js/ui/shellMountOperation.js:344
-#: ../js/ui/status/network.js:936
+#: data/gnome-shell-extension-prefs.desktop.in.in:5
+msgid "Configure GNOME Shell Extensions"
+msgstr "اضبط امتدادات صدفة جنوم"
+
+#: data/org.gnome.Shell.desktop.in.in:4
+msgid "GNOME Shell"
+msgstr "صدفة جنوم"
+
+#: data/org.gnome.Shell.desktop.in.in:5
+msgid "Window management and application launching"
+msgstr "إدارة النوافذ وإطلاق التطبيقات"
+
+#: 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: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:16
+msgid "UUIDs of extensions to enable"
+msgstr "معرّفات الامتدادات التي ستُفعّل"
+
+#: 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 "
+"list. You can also manipulate this list with the EnableExtension and "
+"DisableExtension D-Bus methods on org.gnome.Shell."
+msgstr ""
+
+#: 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: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 "
+"load all extensions regardless of the versions they claim to support."
+msgstr ""
+
+#: data/org.gnome.shell.gschema.xml.in:43
+msgid "List of desktop file IDs for favorite applications"
+msgstr ""
+
+#: 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:51
+msgid "App Picker View"
+msgstr ""
+
+#: 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:58
+msgid "History for command (Alt-F2) dialog"
+msgstr "التأريخ لنافذة حوار الأمر (Alt-F2)"
+
+#. Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass
+#: data/org.gnome.shell.gschema.xml.in:63
+msgid "History for the looking glass dialog"
+msgstr "التأريخ لنافذة المرآة"
+
+#: 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:68
+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:75
+msgid ""
+"Whether to remember password for mounting encrypted or remote filesystems"
+msgstr ""
+
+#: 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 "
+"state of the checkbox."
+msgstr ""
+
+#: 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: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 "
+"adapter. This will be reset if the default adapter is ever seen not to have "
+"devices associated to it."
+msgstr ""
+
+#: data/org.gnome.shell.gschema.xml.in:101
+msgid "Keybinding to open the application menu"
+msgstr "اختصار فتح قائمة التطبيقات"
+
+#: data/org.gnome.shell.gschema.xml.in:102
+msgid "Keybinding to open the application menu."
+msgstr "اختصار فتح قائمة التطبيقات."
+
+#: data/org.gnome.shell.gschema.xml.in:108
+msgid "Keybinding to open the “Show Applications” view"
+msgstr "اختصار منظور ”اعرض التطبيقات“"
+
+#: data/org.gnome.shell.gschema.xml.in:109
+msgid ""
+"Keybinding to open the “Show Applications” view of the Activities Overview."
+msgstr "اختصار منظور ”اعرض التطبيقات“ في النظرة العامة للتطبيقات."
+
+#: 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:124
+msgid "Keybinding to toggle the visibility of the notification list."
+msgstr "اختصار تبديل حالة ظهور قائمة التنبيهات."
+
+#: data/org.gnome.shell.gschema.xml.in:130
+msgid "Keybinding to focus the active notification"
+msgstr "اختصار التركيز على التنبيه النشط"
+
+#: data/org.gnome.shell.gschema.xml.in:131
+msgid "Keybinding to focus the active notification."
+msgstr "اختصار التركيز على التنبيه النشط."
+
+#: data/org.gnome.shell.gschema.xml.in:137
+msgid ""
+"Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgstr ""
+
+#: data/org.gnome.shell.gschema.xml.in:146
+msgid "Which keyboard to use"
+msgstr "أي لوحة مفاتيح ترغب باستخدامها"
+
+#: data/org.gnome.shell.gschema.xml.in:147
+msgid "The type of keyboard to use."
+msgstr "نوع لوحة المفاتيح التي ترغب باستخدامها."
+
+#: 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:159
+msgid ""
+"If true, only applications that have windows on the current workspace are "
+"shown in the switcher. Otherwise, all applications are included."
+msgstr ""
+
+#: data/org.gnome.shell.gschema.xml.in:176
+msgid "The application icon mode."
+msgstr ""
+
+#: 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”."
+msgstr ""
+
+#: 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 ""
+
+#: data/org.gnome.shell.gschema.xml.in:197
+msgid "Attach modal dialog to the parent window"
+msgstr ""
+
+#: 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 ""
+
+#: 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:214
+msgid "Workspaces are managed dynamically"
+msgstr ""
+
+#: data/org.gnome.shell.gschema.xml.in:222
+msgid "Workspaces only on primary monitor"
+msgstr "مساحات عمل على الشاشة الرئيسية فقط"
+
+#: data/org.gnome.shell.gschema.xml.in:230
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+
+#: data/org.gnome.Shell.PortalHelper.desktop.in.in:3
+msgid "Network Login"
+msgstr "ولوج الشّبكة"
+
+#. 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:120
+#, javascript-format
+msgid "There was an error loading the preferences dialog for %s:"
+msgstr "حدث خطأ أثناء تشغيل حوار تفضيلات %s‏:"
+
+#: js/gdm/authPrompt.js:149 js/ui/audioDeviceSelection.js:71
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
+#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
+#: js/ui/shellMountOperation.js:344 js/ui/status/network.js:936
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: ../js/gdm/authPrompt.js:171 ../js/gdm/authPrompt.js:218
-#: ../js/gdm/authPrompt.js:450
+#: js/gdm/authPrompt.js:171 js/gdm/authPrompt.js:218 js/gdm/authPrompt.js:450
 msgid "Next"
 msgstr "التالي"
 
-#: ../js/gdm/authPrompt.js:214 ../js/ui/shellMountOperation.js:348
-#: ../js/ui/unlockDialog.js:59
+#: js/gdm/authPrompt.js:214 js/ui/shellMountOperation.js:348
+#: js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "فك القفل"
 
-#: ../js/gdm/authPrompt.js:216
+#: js/gdm/authPrompt.js:216
 msgctxt "button"
 msgid "Sign In"
 msgstr "ادخل"
 
-#: ../js/gdm/loginDialog.js:308
+#: js/gdm/loginDialog.js:308
 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:458
+#: js/gdm/loginDialog.js:458
 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:888
+#: js/gdm/loginDialog.js:888
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(مثلا مستخدم أو %s)"
@@ -75,16 +337,16 @@ msgstr "(مثلا مستخدم أو %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:893 ../js/ui/components/networkAgent.js:243
-#: ../js/ui/components/networkAgent.js:261
+#: js/gdm/loginDialog.js:893 js/ui/components/networkAgent.js:243
+#: js/ui/components/networkAgent.js:261
 msgid "Username: "
 msgstr "اسم المستخدم: "
 
-#: ../js/gdm/loginDialog.js:1236
+#: js/gdm/loginDialog.js:1236
 msgid "Login Window"
 msgstr "نافذة الولوج"
 
-#: ../js/gdm/util.js:346
+#: js/gdm/util.js:346
 msgid "Authentication error"
 msgstr "خطأ في الاستيثاق"
 
@@ -93,96 +355,96 @@ 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:478
+#: js/gdm/util.js:478
 msgid "(or swipe finger)"
 msgstr "(أو مرر إصبع)"
 
 #. Translators: The name of the power-off action in search
-#: ../js/misc/systemActions.js:99
+#: js/misc/systemActions.js:99
 msgctxt "search-result"
 msgid "Power off"
 msgstr "أطفئ"
 
 #. Translators: A list of keywords that match the power-off action, separated by semicolons
-#: ../js/misc/systemActions.js:102
+#: js/misc/systemActions.js:102
 msgid "power off;shutdown"
 msgstr "أطفئ;أغلق"
 
 #. Translators: The name of the lock screen action in search
-#: ../js/misc/systemActions.js:106
+#: js/misc/systemActions.js:106
 msgctxt "search-result"
 msgid "Lock screen"
 msgstr "أوصد الشاشة"
 
 #. Translators: A list of keywords that match the lock screen action, separated by semicolons
-#: ../js/misc/systemActions.js:109
+#: js/misc/systemActions.js:109
 msgid "lock screen"
 msgstr "أوصد الشاشة"
 
 #. Translators: The name of the logout action in search
-#: ../js/misc/systemActions.js:113
+#: js/misc/systemActions.js:113
 msgctxt "search-result"
 msgid "Log out"
 msgstr "اخرج"
 
 #. Translators: A list of keywords that match the logout action, separated by semicolons
-#: ../js/misc/systemActions.js:116
+#: js/misc/systemActions.js:116
 msgid "logout;sign off"
 msgstr "اخرج"
 
 #. Translators: The name of the suspend action in search
-#: ../js/misc/systemActions.js:120
+#: js/misc/systemActions.js:120
 msgctxt "search-result"
 msgid "Suspend"
 msgstr "علّق"
 
 #. Translators: A list of keywords that match the suspend action, separated by semicolons
-#: ../js/misc/systemActions.js:123
+#: js/misc/systemActions.js:123
 msgid "suspend;sleep"
 msgstr "علّق"
 
 #. Translators: The name of the switch user action in search
-#: ../js/misc/systemActions.js:127
+#: js/misc/systemActions.js:127
 msgctxt "search-result"
 msgid "Switch user"
 msgstr "بدّل المستخدم"
 
 #. Translators: A list of keywords that match the switch user action, separated by semicolons
-#: ../js/misc/systemActions.js:130
+#: js/misc/systemActions.js:130
 msgid "switch user"
 msgstr "بدّل المستخدم"
 
 #. Translators: The name of the lock orientation action in search
-#: ../js/misc/systemActions.js:134
+#: js/misc/systemActions.js:134
 msgctxt "search-result"
 msgid "Lock orientation"
 msgstr "أوصد الاتجاه"
 
 #. Translators: A list of keywords that match the lock orientation action, separated by semicolons
-#: ../js/misc/systemActions.js:137
+#: js/misc/systemActions.js:137
 msgid "lock orientation"
 msgstr "أوصد الاتجاه"
 
-#: ../js/misc/util.js:122
+#: js/misc/util.js:122
 msgid "Command not found"
 msgstr "لم يُعثَر على الأمر"
 
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:155
+#: js/misc/util.js:155
 msgid "Could not parse command:"
 msgstr "تعذّر تحليل الأمر:"
 
-#: ../js/misc/util.js:163
+#: js/misc/util.js:163
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "فشل تنفيذ ”%s“:‏"
 
-#: ../js/misc/util.js:180
+#: js/misc/util.js:180
 msgid "Just now"
 msgstr "الآن"
 
-#: ../js/misc/util.js:182
+#: js/misc/util.js:182
 #, javascript-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -193,7 +455,7 @@ msgstr[3] "منذ %d دقائق"
 msgstr[4] "منذ %d دقيقة"
 msgstr[5] "منذ %d دقيقة"
 
-#: ../js/misc/util.js:185
+#: js/misc/util.js:185
 #, javascript-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -204,11 +466,11 @@ msgstr[3] "منذ %d ساعات"
 msgstr[4] "منذ %d ساعة"
 msgstr[5] "منذ %d ساعة"
 
-#: ../js/misc/util.js:188
+#: js/misc/util.js:188
 msgid "Yesterday"
 msgstr "أمس"
 
-#: ../js/misc/util.js:190
+#: js/misc/util.js:190
 #, javascript-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -219,7 +481,7 @@ msgstr[3] "منذ %d أيام"
 msgstr[4] "منذ %d يوما"
 msgstr[5] "منذ %d يوم"
 
-#: ../js/misc/util.js:193
+#: js/misc/util.js:193
 #, javascript-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -230,7 +492,7 @@ msgstr[3] "منذ %d أسابيع"
 msgstr[4] "منذ %d أسبوعا"
 msgstr[5] "منذ %d أسبوع"
 
-#: ../js/misc/util.js:196
+#: js/misc/util.js:196
 #, javascript-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -241,7 +503,7 @@ msgstr[3] "منذ %d أشهر"
 msgstr[4] "منذ %d شهرًا"
 msgstr[5] "منذ %d شهر"
 
-#: ../js/misc/util.js:198
+#: js/misc/util.js:198
 #, javascript-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -253,20 +515,20 @@ msgstr[4] "منذ %d سنة"
 msgstr[5] "منذ %d سنة"
 
 #. Translators: Time in 24h format
-#: ../js/misc/util.js:228
+#: js/misc/util.js:228
 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:234
+#: js/misc/util.js:234
 #, 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:240
+#: js/misc/util.js:240
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A، %H:%M"
@@ -274,7 +536,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:246
+#: js/misc/util.js:246
 #, no-c-format
 msgid "%B %d, %H∶%M"
 msgstr "%d %B، %H:%M"
@@ -282,26 +544,26 @@ msgstr "%d %B، %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:252
+#: js/misc/util.js:252
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
 msgstr "%d %B، %H:%M"
 
 #. Translators: Time in 12h format
-#: ../js/misc/util.js:257
+#: js/misc/util.js:257
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm"
-#: ../js/misc/util.js:263
+#: js/misc/util.js:263
 #, no-c-format
 msgid "Yesterday, %l∶%M %p"
 msgstr "بالأمس، %l∶%M %p"
 
 #. 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:269
+#: js/misc/util.js:269
 #, no-c-format
 msgid "%A, %l∶%M %p"
 msgstr "%l:%M %p"
@@ -309,7 +571,7 @@ msgstr "%l:%M %p"
 #. 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:275
+#: js/misc/util.js:275
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
 msgstr "%d %B، %H:%M"
@@ -317,17 +579,17 @@ msgstr "%d %B، %H:%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:281
+#: js/misc/util.js:281
 #, no-c-format
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%d %B %Y، %l∶%M %p"
 
 #. TRANSLATORS: this is the title of the wifi captive portal login window
-#: ../js/portalHelper/main.js:66
+#: js/portalHelper/main.js:66
 msgid "Hotspot Login"
 msgstr "ولوج نقطة البث"
 
-#: ../js/portalHelper/main.js:112
+#: 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."
@@ -337,90 +599,90 @@ msgstr ""
 
 #. No support for non-modal system dialogs, so ignore the option
 #. let modal = options['modal'] || true;
-#: ../js/ui/accessDialog.js:63 ../js/ui/status/location.js:395
+#: js/ui/accessDialog.js:63 js/ui/status/location.js:395
 msgid "Deny Access"
 msgstr "ارفض منح الصلاحية"
 
-#: ../js/ui/accessDialog.js:64 ../js/ui/status/location.js:398
+#: js/ui/accessDialog.js:64 js/ui/status/location.js:398
 msgid "Grant Access"
 msgstr "امنح الصلاحية"
 
-#: ../js/ui/appDisplay.js:809
+#: js/ui/appDisplay.js:809
 msgid "Frequently used applications will appear here"
 msgstr "التطبيقات شائعة الاستخدام ستظهر هنا"
 
-#: ../js/ui/appDisplay.js:930
+#: js/ui/appDisplay.js:930
 msgid "Frequent"
 msgstr "شائعة"
 
-#: ../js/ui/appDisplay.js:937
+#: js/ui/appDisplay.js:937
 msgid "All"
 msgstr "الكل"
 
-#: ../js/ui/appDisplay.js:1915
+#: js/ui/appDisplay.js:1915
 msgid "New Window"
 msgstr "نافذة جديدة"
 
-#: ../js/ui/appDisplay.js:1929
+#: js/ui/appDisplay.js:1929
 msgid "Launch using Dedicated Graphics Card"
 msgstr "شغل باستخدام بطاقة الرسوميات المنفصلة"
 
-#: ../js/ui/appDisplay.js:1956 ../js/ui/dash.js:289
+#: js/ui/appDisplay.js:1956 js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "أزِل من المفضّلة"
 
-#: ../js/ui/appDisplay.js:1962
+#: js/ui/appDisplay.js:1962
 msgid "Add to Favorites"
 msgstr "أضِف إلى المفضّلة"
 
-#: ../js/ui/appDisplay.js:1972
+#: js/ui/appDisplay.js:1972
 msgid "Show Details"
 msgstr "أظهر التفاصيل"
 
-#: ../js/ui/appFavorites.js:141
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "أُضيف %s إلى مفضلتك."
 
-#: ../js/ui/appFavorites.js:175
+#: js/ui/appFavorites.js:175
 #, 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:221
+#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:221
 msgid "Microphone"
 msgstr "ميكروفون"
 
-#: ../js/ui/backgroundMenu.js:19
+#: js/ui/backgroundMenu.js:19
 msgid "Change Background…"
 msgstr "غيّر الخلفية…"
 
-#: ../js/ui/backgroundMenu.js:21 ../js/ui/status/nightLight.js:51
+#: 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:265
+#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:265
 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 "56"
@@ -430,234 +692,223 @@ msgstr "56"
 #. * 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:442
+#: js/ui/calendar.js:449
 msgid "Previous month"
 msgstr "الشهر السابق"
 
-#: ../js/ui/calendar.js:452
+#: js/ui/calendar.js:459
 msgid "Next month"
 msgstr "الشهر التالي"
 
-#: ../js/ui/calendar.js:605
+#: js/ui/calendar.js:612
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: ../js/ui/calendar.js:660
+#: js/ui/calendar.js:667
 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:729
+#: js/ui/calendar.js:736
 msgctxt "event list time"
 msgid "All Day"
 msgstr "طوال اليوم"
 
-#: ../js/ui/calendar.js:862
+#: js/ui/calendar.js:869
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %d %B"
 
-#: ../js/ui/calendar.js:866
+#: js/ui/calendar.js:873
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: ../js/ui/calendar.js:1086
+#: js/ui/calendar.js:1093
 msgid "No Notifications"
 msgstr "لا تنبيهات"
 
-#: ../js/ui/calendar.js:1089
+#: js/ui/calendar.js:1096
 msgid "No Events"
 msgstr "لا أحداث"
 
-#: ../js/ui/calendar.js:1117
+#: js/ui/calendar.js:1124
 msgid "Clear All"
 msgstr "امسح الكل"
 
 #. Translators: %s is an application name
-#: ../js/ui/closeDialog.js:44
+#: js/ui/closeDialog.js:44
 #, javascript-format
 msgid "“%s” is not responding."
 msgstr "”‏%s“ لا يستجيب."
 
-#: ../js/ui/closeDialog.js:45
+#: js/ui/closeDialog.js:45
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "ربما ترغب في الانتظار قليلا ليُكمِل أو إجبار التطبيق على الإنهاء كُلّية."
 
-#: ../js/ui/closeDialog.js:61
+#: js/ui/closeDialog.js:61
 msgid "Force Quit"
 msgstr "أجبر الإنهاء"
 
-#: ../js/ui/closeDialog.js:64
+#: js/ui/closeDialog.js:64
 msgid "Wait"
 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:354
+#: js/ui/components/autorunManager.js:358
 #, javascript-format
 msgid "Open with %s"
 msgstr "افتح باستخدام %s"
 
-#: ../js/ui/components/keyring.js:107 ../js/ui/components/polkitAgent.js:284
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: ../js/ui/components/keyring.js:140
+#: js/ui/components/keyring.js:140
 msgid "Type again:"
 msgstr "أدخلها ثانية:"
 
-#: ../js/ui/components/networkAgent.js:112 ../js/ui/status/network.js:261
-#: ../js/ui/status/network.js:355 ../js/ui/status/network.js:939
+#: js/ui/components/networkAgent.js:112 js/ui/status/network.js:261
+#: js/ui/status/network.js:355 js/ui/status/network.js:939
 msgid "Connect"
 msgstr "اتصل"
 
 #. Cisco LEAP
-#: ../js/ui/components/networkAgent.js:205
-#: ../js/ui/components/networkAgent.js:217
-#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:265
-#: ../js/ui/components/networkAgent.js:275
+#: js/ui/components/networkAgent.js:205 js/ui/components/networkAgent.js:217
+#: js/ui/components/networkAgent.js:245 js/ui/components/networkAgent.js:265
+#: js/ui/components/networkAgent.js:275
 msgid "Password: "
 msgstr "كلمة السرّ: "
 
 #. static WEP
-#: ../js/ui/components/networkAgent.js:210
+#: js/ui/components/networkAgent.js:210
 msgid "Key: "
 msgstr "المفتاح: "
 
-#: ../js/ui/components/networkAgent.js:249
+#: js/ui/components/networkAgent.js:249
 msgid "Identity: "
 msgstr "التعريف: "
 
-#: ../js/ui/components/networkAgent.js:251
+#: js/ui/components/networkAgent.js:251
 msgid "Private key password: "
 msgstr "كلمة سرّ المفتاح الخاص: "
 
-#: ../js/ui/components/networkAgent.js:263
+#: js/ui/components/networkAgent.js:263
 msgid "Service: "
 msgstr "الخدمة: "
 
-#: ../js/ui/components/networkAgent.js:292
-#: ../js/ui/components/networkAgent.js:638
+#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:638
 msgid "Authentication required by wireless network"
 msgstr "تتطلب الشبكة اللاسلكية الاستيثاق"
 
-#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:639
+#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:639
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
 msgstr "كلمات السر أو مفاتيح التعمية مطلوبة للوصول إلى الشبكة اللاسلكية ”%s“."
 
-#: ../js/ui/components/networkAgent.js:297
-#: ../js/ui/components/networkAgent.js:642
+#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:642
 msgid "Wired 802.1X authentication"
 msgstr "استيثاق 802.1X سلكي"
 
-#: ../js/ui/components/networkAgent.js:299
+#: js/ui/components/networkAgent.js:299
 msgid "Network name: "
 msgstr "اسم الشبكة: "
 
-#: ../js/ui/components/networkAgent.js:304
-#: ../js/ui/components/networkAgent.js:646
+#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:646
 msgid "DSL authentication"
 msgstr "استيثاق اتصال DSL"
 
-#: ../js/ui/components/networkAgent.js:311
-#: ../js/ui/components/networkAgent.js:652
+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:652
 msgid "PIN code required"
 msgstr "رمز PIN مطلوب"
 
-#: ../js/ui/components/networkAgent.js:312
-#: ../js/ui/components/networkAgent.js:653
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:653
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "جهاز شبكة الهاتف المحمول يتطلب رمز PIN"
 
-#: ../js/ui/components/networkAgent.js:313
+#: js/ui/components/networkAgent.js:313
 msgid "PIN: "
 msgstr "PIN: "
 
-#: ../js/ui/components/networkAgent.js:320
-#: ../js/ui/components/networkAgent.js:659
+#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:659
 msgid "Mobile broadband network password"
 msgstr "كلمة سرّ شبكة الهاتف المحمول"
 
-#: ../js/ui/components/networkAgent.js:321
-#: ../js/ui/components/networkAgent.js:643
-#: ../js/ui/components/networkAgent.js:647
-#: ../js/ui/components/networkAgent.js:660
+#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:643
+#: js/ui/components/networkAgent.js:647 js/ui/components/networkAgent.js:660
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "كلمة السرّ مطلوبة للاتصال ب‍ ”%s“."
 
-#: ../js/ui/components/networkAgent.js:627 ../js/ui/status/network.js:1720
+#: js/ui/components/networkAgent.js:627 js/ui/status/network.js:1720
 msgid "Network Manager"
 msgstr "مدير الشبكة"
 
-#: ../js/ui/components/polkitAgent.js:43
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "الاستيثاق مطلوب"
 
-#: ../js/ui/components/polkitAgent.js:71
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "المدير"
 
-#: ../js/ui/components/polkitAgent.js:151
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "استوثق"
 
@@ -665,35 +916,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:270 ../js/ui/shellMountOperation.js:328
+#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:328
 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:799
+#: 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:186
+#: js/ui/ctrlAltTab.js:29 js/ui/viewSelector.js:186
 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 "الشريط"
 
 #. 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:75
+#: js/ui/dateMenu.js:76
 msgid "%B %e %Y"
 msgstr "%e %B %Y"
 
@@ -701,19 +952,19 @@ msgstr "%e %B %Y"
 #. * below the time in the shell; it should combine the weekday and the
 #. * date, e.g. "Tuesday February 17 2015".
 #.
-#: ../js/ui/dateMenu.js:82
+#: js/ui/dateMenu.js:83
 msgid "%A %B %e %Y"
 msgstr "%A %e %B %Y"
 
-#: ../js/ui/dateMenu.js:144
+#: js/ui/dateMenu.js:145
 msgid "Add world clocks…"
 msgstr "أضف ساعات عالمية…"
 
-#: ../js/ui/dateMenu.js:145
+#: js/ui/dateMenu.js:146
 msgid "World Clocks"
 msgstr "ساعات عالمية"
 
-#: ../js/ui/dateMenu.js:224
+#: js/ui/dateMenu.js:225
 msgid "Weather"
 msgstr "الطقس"
 
@@ -721,7 +972,7 @@ msgstr "الطقس"
 #. 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:286
+#: js/ui/dateMenu.js:289
 #, javascript-format
 msgid "%s all day."
 msgstr "%s طوال اليوم."
@@ -730,7 +981,7 @@ msgstr "%s طوال اليوم."
 #. 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:292
+#: js/ui/dateMenu.js:295
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s، ثم %s فيما بعد."
@@ -739,45 +990,45 @@ msgstr "%s، ثم %s فيما بعد."
 #. 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:298
+#: js/ui/dateMenu.js:301
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s، ثم %s، و بعدها %s."
 
-#: ../js/ui/dateMenu.js:309
+#: js/ui/dateMenu.js:312
 msgid "Select a location…"
 msgstr "اختر موقعا…"
 
-#: ../js/ui/dateMenu.js:312
+#: js/ui/dateMenu.js:315
 msgid "Loading…"
 msgstr "يحمّل…"
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: ../js/ui/dateMenu.js:318
+#: js/ui/dateMenu.js:321
 #, javascript-format
 msgid "Feels like %s."
 msgstr "تبدو مثل %s."
 
-#: ../js/ui/dateMenu.js:321
+#: js/ui/dateMenu.js:324
 msgid "Go online for weather information"
 msgstr "اتصل بالإنترنت لمعلومات الطقس"
 
-#: ../js/ui/dateMenu.js:323
+#: js/ui/dateMenu.js:326
 msgid "Weather information is currently unavailable"
 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."
@@ -788,7 +1039,7 @@ msgstr[3] "سيُخرج %s تلقائيا بعد %d ثوان."
 msgstr[4] "سيُخرج %s تلقائيا بعد %d ثانية."
 msgstr[5] "سيُخرج %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."
@@ -799,22 +1050,22 @@ msgstr[3] "ستُخرج تلقائيا بعد %d ثوان."
 msgstr[4] "ستُخرج تلقائيا بعد %d ثانية."
 msgstr[5] "ستُخرج تلقائيا بعد %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."
@@ -825,27 +1076,27 @@ msgstr[3] "سيُطفأ النظام تلقائيا بعد %d ثوان."
 msgstr[4] "سيُطفأ النظام تلقائيا بعد %d ثانية."
 msgstr[5] "سيُطفأ النظام تلقائيا بعد %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."
@@ -856,12 +1107,12 @@ msgstr[3] "سيُعاد تشغيل النظام تلقائيا بعد %d ثوا
 msgstr[4] "سيُعاد تشغيل النظام تلقائيا بعد %d ثانية."
 msgstr[5] "سيُعاد تشغيل النظام تلقائيا بعد %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 ""
@@ -873,22 +1124,22 @@ msgstr[3] "سيُعاد تشغيل النظام تلقائيا و تُثبت ا
 msgstr[4] "سيُعاد تشغيل النظام تلقائيا و تُثبت التحديثات بعد %d ثانية."
 msgstr[5] "سيُعاد تشغيل النظام تلقائيا و تُثبت التحديثات بعد %d ثانية."
 
-#: ../js/ui/endSessionDialog.js:127 ../js/ui/endSessionDialog.js:147
+#: 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:137
+#: js/ui/endSessionDialog.js:137
 msgctxt "title"
 msgid "Restart & Install Upgrade"
 msgstr "أعد التشغيل و ثبّت الترقية"
@@ -896,7 +1147,7 @@ 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
+#: js/ui/endSessionDialog.js:142
 #, javascript-format
 msgid ""
 "%s %s will be installed after restart. Upgrade installation can take a long "
@@ -905,134 +1156,134 @@ msgstr ""
 "ستُثبّت %s %s بعد إعادة التشغيل. قد يستغرق تثبيت الترقية بعض الوقت: تأكد من "
 "الحفظ الاحتياطي، و توصيل الحاسوب بمقبس الطاقة."
 
-#: ../js/ui/endSessionDialog.js:361
+#: js/ui/endSessionDialog.js:361
 msgid "Running on battery power: please plug in before installing updates."
 msgstr "يعمل على طاقة البطارية: رجاءً وصّل بمقبس التيار قبل تثبيت التحديثات."
 
-#: ../js/ui/endSessionDialog.js:378
+#: js/ui/endSessionDialog.js:378
 msgid "Some applications are busy or have unsaved work."
 msgstr "بعض التطبيقات مشغولة أو تحتوي عملًا لم يُحفظ."
 
-#: ../js/ui/endSessionDialog.js:385
+#: 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:670
+#: js/ui/endSessionDialog.js:670
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (عن بعد)"
 
 #. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/endSessionDialog.js:673
+#: js/ui/endSessionDialog.js:673
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (طرفية)"
 
-#: ../js/ui/extensionDownloader.js:201
+#: js/ui/extensionDownloader.js:201
 msgid "Install"
 msgstr "ثبت"
 
-#: ../js/ui/extensionDownloader.js:206
+#: js/ui/extensionDownloader.js:206
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "هل تريد تنزيل و تثبيت ”%s“ من extensions.gnome.org؟"
 
 #. Translators: %s is an application name like "Settings"
-#: ../js/ui/inhibitShortcutsDialog.js:59
+#: js/ui/inhibitShortcutsDialog.js:59
 #, javascript-format
 msgid "%s wants to inhibit shortcuts"
 msgstr "يريد %s تعطيل الاختصارات"
 
-#: ../js/ui/inhibitShortcutsDialog.js:60
+#: js/ui/inhibitShortcutsDialog.js:60
 msgid "Application wants to inhibit shortcuts"
 msgstr "يريد التطبيق تعطيل الاختصارات"
 
 #. Translators: %s is a keyboard shortcut like "Super+x"
-#: ../js/ui/inhibitShortcutsDialog.js:69
+#: js/ui/inhibitShortcutsDialog.js:69
 #, javascript-format
 msgid "You can restore shortcuts by pressing %s."
 msgstr "يمكنك استعادة الاختصارات بضغط %s."
 
-#: ../js/ui/inhibitShortcutsDialog.js:74
+#: js/ui/inhibitShortcutsDialog.js:74
 msgid "Deny"
 msgstr "ارفض"
 
-#: ../js/ui/inhibitShortcutsDialog.js:80
+#: js/ui/inhibitShortcutsDialog.js:80
 msgid "Allow"
 msgstr "اسمح"
 
-#: ../js/ui/keyboard.js:738 ../js/ui/status/keyboard.js:782
+#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:782
 msgid "Keyboard"
 msgstr "لوحة المفاتيح"
 
-#: ../js/ui/lookingGlass.js:642
+#: js/ui/lookingGlass.js:642
 msgid "No extensions installed"
 msgstr "لا امتدادات مثبّتة"
 
 #. Translators: argument is an extension UUID.
-#: ../js/ui/lookingGlass.js:696
+#: js/ui/lookingGlass.js:696
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "لم يصدر %s أي خطأ."
 
-#: ../js/ui/lookingGlass.js:702
+#: js/ui/lookingGlass.js:702
 msgid "Hide Errors"
 msgstr "أخفِ الأخطاء"
 
-#: ../js/ui/lookingGlass.js:706 ../js/ui/lookingGlass.js:766
+#: js/ui/lookingGlass.js:706 js/ui/lookingGlass.js:766
 msgid "Show Errors"
 msgstr "اظهر الأخطاء"
 
-#: ../js/ui/lookingGlass.js:715
+#: js/ui/lookingGlass.js:715
 msgid "Enabled"
 msgstr "مفعّل"
 
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:718 ../subprojects/gvc/gvc-mixer-control.c:1866
+#: js/ui/lookingGlass.js:718 subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "معطّل"
 
-#: ../js/ui/lookingGlass.js:720
+#: js/ui/lookingGlass.js:720
 msgid "Error"
 msgstr "خطأ"
 
-#: ../js/ui/lookingGlass.js:722
+#: js/ui/lookingGlass.js:722
 msgid "Out of date"
 msgstr "قديم"
 
-#: ../js/ui/lookingGlass.js:724
+#: js/ui/lookingGlass.js:724
 msgid "Downloading"
 msgstr "ينزّل"
 
-#: ../js/ui/lookingGlass.js:748
+#: js/ui/lookingGlass.js:748
 msgid "View Source"
 msgstr "اعرض المصدر"
 
-#: ../js/ui/lookingGlass.js:757
+#: js/ui/lookingGlass.js:757
 msgid "Web Page"
 msgstr "صفحة الوب"
 
-#: ../js/ui/messageTray.js:1493
+#: js/ui/messageTray.js:1494
 msgid "System Information"
 msgstr "معلومات النظام"
 
-#: ../js/ui/mpris.js:211
+#: js/ui/mpris.js:211
 msgid "Unknown artist"
 msgstr "فنان غير معروف"
 
-#: ../js/ui/mpris.js:212
+#: js/ui/mpris.js:212
 msgid "Unknown title"
 msgstr "عنوان غير معروف"
 
-#: ../js/ui/overview.js:84
+#: 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
+#: js/ui/overview.js:113
 msgid "Overview"
 msgstr "نظرة عامة"
 
@@ -1040,70 +1291,70 @@ msgstr "نظرة عامة"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:240
+#: js/ui/overview.js:240
 msgid "Type to search…"
 msgstr "اكتب نصا للبحث عنه…"
 
-#: ../js/ui/padOsd.js:103
+#: js/ui/padOsd.js:103
 msgid "New shortcut…"
 msgstr "اختصار جديد…"
 
-#: ../js/ui/padOsd.js:152
+#: js/ui/padOsd.js:152
 msgid "Application defined"
 msgstr "التطبيقات معرّفة"
 
-#: ../js/ui/padOsd.js:153
+#: js/ui/padOsd.js:153
 msgid "Show on-screen help"
 msgstr "اعرض المساعدة على الشاشة"
 
-#: ../js/ui/padOsd.js:154
+#: js/ui/padOsd.js:154
 msgid "Switch monitor"
 msgstr "بدّل الشاشة"
 
-#: ../js/ui/padOsd.js:155
+#: js/ui/padOsd.js:155
 msgid "Assign keystroke"
 msgstr "أسند ضغطة مفتاح"
 
-#: ../js/ui/padOsd.js:220
+#: js/ui/padOsd.js:220
 msgid "Done"
 msgstr "تم"
 
-#: ../js/ui/padOsd.js:734
+#: js/ui/padOsd.js:734
 msgid "Edit…"
 msgstr "حرّر…"
 
-#: ../js/ui/padOsd.js:774 ../js/ui/padOsd.js:879
+#: js/ui/padOsd.js:774 js/ui/padOsd.js:879
 msgid "None"
 msgstr "لا شيء"
 
-#: ../js/ui/padOsd.js:833
+#: js/ui/padOsd.js:833
 msgid "Press a button to configure"
 msgstr "اضغط زر للضبط"
 
-#: ../js/ui/padOsd.js:834
+#: js/ui/padOsd.js:834
 msgid "Press Esc to exit"
 msgstr "اضغط Esc للخروج"
 
-#: ../js/ui/padOsd.js:837
+#: js/ui/padOsd.js:837
 msgid "Press any key to exit"
 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:812
+#: js/ui/panel.js:812
 msgid "Top Bar"
 msgstr "الشريط العلوي"
 
@@ -1112,33 +1363,33 @@ 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:291
+#: js/ui/popupMenu.js:291
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
-#: ../js/ui/runDialog.js:71
+#: js/ui/runDialog.js:71
 msgid "Enter a Command"
 msgstr "اكتب أمرًا"
 
-#: ../js/ui/runDialog.js:111 ../js/ui/windowMenu.js:160
+#: js/ui/runDialog.js:111 js/ui/windowMenu.js:160
 msgid "Close"
 msgstr "أغلِق"
 
-#: ../js/ui/runDialog.js:277
+#: js/ui/runDialog.js:277
 msgid "Restart is not available on Wayland"
 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:88
+#: js/ui/screenShield.js:88
 msgid "%A, %B %d"
 msgstr "%A، %d %B"
 
-#: ../js/ui/screenShield.js:147
+#: js/ui/screenShield.js:147
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1149,7 +1400,7 @@ msgstr[3] "%d رسائل جديدة"
 msgstr[4] "%d رسالة جديدة"
 msgstr[5] "%d رسالة جديدة"
 
-#: ../js/ui/screenShield.js:149
+#: js/ui/screenShield.js:149
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1160,11 +1411,11 @@ msgstr[3] "%d تنبيهات جديدة"
 msgstr[4] "%d تنبيها جديدا"
 msgstr[5] "%d تنبيه جديد"
 
-#: ../js/ui/screenShield.js:452 ../js/ui/status/system.js:284
+#: js/ui/screenShield.js:452 js/ui/status/system.js:284
 msgid "Lock"
 msgstr "أوصِد"
 
-#: ../js/ui/screenShield.js:715
+#: js/ui/screenShield.js:715
 msgid "GNOME needs to lock the screen"
 msgstr "تحتاج جنوم إلى إيصاد الشاشة"
 
@@ -1175,23 +1426,23 @@ msgstr "تحتاج جنوم إلى إيصاد الشاشة"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1308
+#: js/ui/screenShield.js:836 js/ui/screenShield.js:1308
 msgid "Unable to lock"
 msgstr "تعذّر الإيصاد"
 
-#: ../js/ui/screenShield.js:837 ../js/ui/screenShield.js:1309
+#: js/ui/screenShield.js:837 js/ui/screenShield.js:1309
 msgid "Lock was blocked by an application"
 msgstr "منع تطبيق الإيصاد"
 
-#: ../js/ui/search.js:651
+#: js/ui/search.js:651
 msgid "Searching…"
 msgstr "يبحث…"
 
-#: ../js/ui/search.js:653
+#: js/ui/search.js:653
 msgid "No results."
 msgstr "لا نتائج."
 
-#: ../js/ui/search.js:777
+#: js/ui/search.js:777
 #, javascript-format
 msgid "%d more"
 msgid_plural "%d more"
@@ -1202,84 +1453,84 @@ msgstr[3] "%d أكثر"
 msgstr[4] "%d أكثر"
 msgstr[5] "%d أكثر"
 
-#: ../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:315
+#: js/ui/shellMountOperation.js:315
 msgid "Password"
 msgstr "كلمة السر"
 
-#: ../js/ui/shellMountOperation.js:336
+#: js/ui/shellMountOperation.js:336
 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:48
 msgid "Bluetooth"
 msgstr "بلوتوث"
 
-#: ../js/ui/status/bluetooth.js:56 ../js/ui/status/network.js:627
+#: js/ui/status/bluetooth.js:57 js/ui/status/network.js:627
 msgid "Bluetooth Settings"
 msgstr "إعدادات بلوتوث"
 
 #. Translators: this is the number of connected bluetooth devices
-#: ../js/ui/status/bluetooth.js:136
+#: js/ui/status/bluetooth.js:137
 #, javascript-format
 msgid "%d Connected"
 msgid_plural "%d Connected"
@@ -1290,79 +1541,79 @@ msgstr[3] "%d مُتصل"
 msgstr[4] "%d مُتصل"
 msgstr[5] "%d مُتصل"
 
-#: ../js/ui/status/bluetooth.js:138
+#: js/ui/status/bluetooth.js:139
 msgid "Off"
 msgstr "مغلق"
 
-#: ../js/ui/status/bluetooth.js:140
+#: js/ui/status/bluetooth.js:141
 msgid "On"
 msgstr "مفعّل"
 
-#: ../js/ui/status/bluetooth.js:142 ../js/ui/status/network.js:1299
+#: js/ui/status/bluetooth.js:143 js/ui/status/network.js:1299
 msgid "Turn On"
 msgstr "شغّل"
 
-#: ../js/ui/status/bluetooth.js:142 ../js/ui/status/network.js:170
-#: ../js/ui/status/network.js:356 ../js/ui/status/network.js:1299
-#: ../js/ui/status/network.js:1418 ../js/ui/status/nightLight.js:47
-#: ../js/ui/status/rfkill.js:90 ../js/ui/status/rfkill.js:117
+#: js/ui/status/bluetooth.js:143 js/ui/status/network.js:170
+#: js/ui/status/network.js:356 js/ui/status/network.js:1299
+#: js/ui/status/network.js:1418 js/ui/status/nightLight.js:47
+#: 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:805
+#: js/ui/status/keyboard.js:805
 msgid "Show Keyboard Layout"
 msgstr "أظهر تخطيط لوحة المفاتيح"
 
-#: ../js/ui/status/location.js:89 ../js/ui/status/location.js:197
+#: js/ui/status/location.js:89 js/ui/status/location.js:197
 msgid "Location Enabled"
 msgstr "التموضع مفعّل"
 
-#: ../js/ui/status/location.js:90 ../js/ui/status/location.js:198
+#: js/ui/status/location.js:90 js/ui/status/location.js:198
 msgid "Disable"
 msgstr "عطّل"
 
-#: ../js/ui/status/location.js:91
+#: js/ui/status/location.js:91
 msgid "Privacy Settings"
 msgstr "إعدادات الخصوصية"
 
-#: ../js/ui/status/location.js:196
+#: js/ui/status/location.js:196
 msgid "Location In Use"
 msgstr "التموضع مستخدم"
 
-#: ../js/ui/status/location.js:200
+#: js/ui/status/location.js:200
 msgid "Location Disabled"
 msgstr "التموضع غير مفعّل"
 
-#: ../js/ui/status/location.js:201
+#: js/ui/status/location.js:201
 msgid "Enable"
 msgstr "فعّل"
 
 #. Translators: %s is an application name
-#: ../js/ui/status/location.js:388
+#: js/ui/status/location.js:388
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "أتريد إعطاء %s صلاحية معرفة مكانك؟"
 
-#: ../js/ui/status/location.js:389
+#: js/ui/status/location.js:389
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr "يمكن تغيير صلاحيات الوصول لمكانك في أي وقت من إعدادات الخصوصية."
 
-#: ../js/ui/status/network.js:104
+#: js/ui/status/network.js:104
 msgid "<unknown>"
 msgstr "<غير معروفة>"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:454 ../js/ui/status/network.js:1328
+#: js/ui/status/network.js:454 js/ui/status/network.js:1328
 #, javascript-format
 msgid "%s Off"
 msgstr "‏%s مغلق"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:457
+#: js/ui/status/network.js:457
 #, javascript-format
 msgid "%s Connected"
 msgstr "‏%s مُتصل"
@@ -1370,164 +1621,164 @@ 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:462
+#: js/ui/status/network.js:462
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "‏%s غير مُدار"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:465
+#: js/ui/status/network.js:465
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "‏%s يقطع الاتّصال"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:472 ../js/ui/status/network.js:1320
+#: js/ui/status/network.js:472 js/ui/status/network.js:1320
 #, 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:475
+#: js/ui/status/network.js:475
 #, 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:483
+#: js/ui/status/network.js:483
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "برمجيات %s المغروسة (Firmware) غير متاحة"
 
 #. 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:487
+#: js/ui/status/network.js:487
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "‏%s غير متاح"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:490
+#: js/ui/status/network.js:490
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "فشل اتصال %s"
 
-#: ../js/ui/status/network.js:506
+#: js/ui/status/network.js:506
 msgid "Wired Settings"
 msgstr "إعدادات الاتصال السلكي"
 
-#: ../js/ui/status/network.js:548
+#: js/ui/status/network.js:548
 msgid "Mobile Broadband Settings"
 msgstr "إعدادات شبكة الهاتف المحمول"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:591 ../js/ui/status/network.js:1325
+#: js/ui/status/network.js:591 js/ui/status/network.js:1325
 #, 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:595
+#: js/ui/status/network.js:595
 #, javascript-format
 msgid "%s Disabled"
 msgstr "‏%s معطّل"
 
-#: ../js/ui/status/network.js:635
+#: js/ui/status/network.js:635
 msgid "Connect to Internet"
 msgstr "اتصل بالإنترنت"
 
-#: ../js/ui/status/network.js:833
+#: js/ui/status/network.js:833
 msgid "Airplane Mode is On"
 msgstr "وضع الطائرة مُفعّل"
 
-#: ../js/ui/status/network.js:834
+#: js/ui/status/network.js:834
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "الاتصال اللاسلكي مُعطّل في وضع الطائرة."
 
-#: ../js/ui/status/network.js:835
+#: js/ui/status/network.js:835
 msgid "Turn Off Airplane Mode"
 msgstr "عطّل وضع الطائرة"
 
-#: ../js/ui/status/network.js:844
+#: js/ui/status/network.js:844
 msgid "Wi-Fi is Off"
 msgstr "الاتصال اللاسلكي مغلق"
 
-#: ../js/ui/status/network.js:845
+#: js/ui/status/network.js:845
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "تحتاج إلى تشغيل الاتصال اللاسلكي للاتصال بالشبكة."
 
-#: ../js/ui/status/network.js:846
+#: js/ui/status/network.js:846
 msgid "Turn On Wi-Fi"
 msgstr "شغّل الاتصال اللاسلكي"
 
-#: ../js/ui/status/network.js:871
+#: js/ui/status/network.js:871
 msgid "Wi-Fi Networks"
 msgstr "الشبكات اللاسلكية"
 
-#: ../js/ui/status/network.js:873
+#: js/ui/status/network.js:873
 msgid "Select a network"
 msgstr "اختر شبكة"
 
-#: ../js/ui/status/network.js:903
+#: js/ui/status/network.js:903
 msgid "No Networks"
 msgstr "لا شبكات"
 
-#: ../js/ui/status/network.js:924 ../js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:924 js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "استخدم زر العتاد للإغلاق"
 
-#: ../js/ui/status/network.js:1191
+#: js/ui/status/network.js:1191
 msgid "Select Network"
 msgstr "اختر شبكة"
 
-#: ../js/ui/status/network.js:1197
+#: js/ui/status/network.js:1197
 msgid "Wi-Fi Settings"
 msgstr "إعدادات الاتصال اللاسلكي"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:1316
+#: js/ui/status/network.js:1316
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "نقطة اتصال %s نشطة"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:1331
+#: js/ui/status/network.js:1331
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "‏%s غير متّصل"
 
-#: ../js/ui/status/network.js:1435
+#: js/ui/status/network.js:1435
 msgid "connecting…"
 msgstr "يتّصل…"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:1438
+#: js/ui/status/network.js:1438
 msgid "authentication required"
 msgstr "الاستيثاق مطلوب"
 
-#: ../js/ui/status/network.js:1440
+#: js/ui/status/network.js:1440
 msgid "connection failed"
 msgstr "فشل الاتصال"
 
-#: ../js/ui/status/network.js:1494
+#: js/ui/status/network.js:1494
 msgid "VPN Settings"
-msgstr "إعدادات ش‌خ‌ف (VPN)"
+msgstr "إعدادات VPN"
 
-#: ../js/ui/status/network.js:1498
+#: js/ui/status/network.js:1498
 msgid "VPN"
-msgstr "ش‌خ‌ف (VPN)"
+msgstr "‏VPN"
 
-#: ../js/ui/status/network.js:1508
+#: js/ui/status/network.js:1508
 msgid "VPN Off"
-msgstr "أطفِئ ش‌خ‌ف (VPN) "
+msgstr "‏VPN مُطفأ"
 
-#: ../js/ui/status/network.js:1572 ../js/ui/status/rfkill.js:93
+#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "إعدادات الشّبكة"
 
-#: ../js/ui/status/network.js:1603
+#: js/ui/status/network.js:1603
 #, javascript-format
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
@@ -1538,7 +1789,7 @@ msgstr[3] "%s اتصالات سلكية"
 msgstr[4] "%s اتصالًا سلكيًا"
 msgstr[5] "%s اتصال سلكي"
 
-#: ../js/ui/status/network.js:1607
+#: js/ui/status/network.js:1607
 #, javascript-format
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
@@ -1549,7 +1800,7 @@ msgstr[3] "%s اتصالات لاسكلية"
 msgstr[4] "%s اتصالًا لاسكليًا"
 msgstr[5] "%s اتصال لاسكلي"
 
-#: ../js/ui/status/network.js:1611
+#: js/ui/status/network.js:1611
 #, javascript-format
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
@@ -1560,57 +1811,57 @@ msgstr[3] "‏%s اتصالات مودم"
 msgstr[4] "‏%s اتصال مودم"
 msgstr[5] "‏%s اتصال مودم"
 
-#: ../js/ui/status/network.js:1759
+#: js/ui/status/network.js:1759
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: ../js/ui/status/network.js:1760
+#: js/ui/status/network.js:1760
 msgid "Activation of network connection failed"
 msgstr "فشل تفعيل اتصال الشبكة"
 
-#: ../js/ui/status/nightLight.js:68
+#: js/ui/status/nightLight.js:68
 msgid "Night Light Disabled"
 msgstr "الإضاءة الليلية موقفة"
 
-#: ../js/ui/status/nightLight.js:69
+#: js/ui/status/nightLight.js:69
 msgid "Night Light On"
 msgstr "الإضاءة الليلية مفعّلة"
 
-#: ../js/ui/status/nightLight.js:70
+#: js/ui/status/nightLight.js:70
 msgid "Resume"
 msgstr "استكمل"
 
-#: ../js/ui/status/nightLight.js:71
+#: js/ui/status/nightLight.js:71
 msgid "Disable Until Tomorrow"
 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 ٪"
@@ -1618,107 +1869,107 @@ 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:228
+#: js/ui/status/system.js:228
 msgid "Switch User"
 msgstr "بدّل المستخدم"
 
-#: ../js/ui/status/system.js:240
+#: js/ui/status/system.js:240
 msgid "Log Out"
 msgstr "اخرج"
 
-#: ../js/ui/status/system.js:252
+#: js/ui/status/system.js:252
 msgid "Account Settings"
 msgstr "إعدادات الحساب"
 
-#: ../js/ui/status/system.js:269
+#: js/ui/status/system.js:269
 msgid "Orientation Lock"
 msgstr "قفل الاتجاه"
 
-#: ../js/ui/status/system.js:295
+#: js/ui/status/system.js:295
 msgid "Suspend"
 msgstr "علّق"
 
-#: ../js/ui/status/system.js:305
+#: js/ui/status/system.js:305
 msgid "Power Off"
 msgstr "أطفئ الحاسوب"
 
-#: ../js/ui/status/volume.js:128
+#: js/ui/status/volume.js:128
 msgid "Volume changed"
 msgstr "تغيّرت شدة الصوت"
 
-#: ../js/ui/status/volume.js:170
+#: js/ui/status/volume.js:170
 msgid "Volume"
 msgstr "شدة الصوت"
 
 #. Translators: this is for display mirroring i.e. cloning.
 #. * Try to keep it under around 15 characters.
 #.
-#: ../js/ui/switchMonitor.js:21
+#: js/ui/switchMonitor.js:21
 msgid "Mirror"
 msgstr "طابق"
 
 #. Translators: this is for the desktop spanning displays.
 #. * Try to keep it under around 15 characters.
 #.
-#: ../js/ui/switchMonitor.js:26
+#: js/ui/switchMonitor.js:26
 msgid "Join Displays"
 msgstr "ضم الشاشات"
 
 #. Translators: this is for using only an external display.
 #. * Try to keep it under around 15 characters.
 #.
-#: ../js/ui/switchMonitor.js:31
+#: js/ui/switchMonitor.js:31
 msgid "External Only"
 msgstr "الخارجية فقط"
 
 #. Translators: this is for using only the laptop display.
 #. * Try to keep it under around 15 characters.
 #.
-#: ../js/ui/switchMonitor.js:36
+#: js/ui/switchMonitor.js:36
 msgid "Built-in Only"
 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:190
+#: js/ui/viewSelector.js:190
 msgid "Applications"
 msgstr "التطبيقات"
 
-#: ../js/ui/viewSelector.js:194
+#: js/ui/viewSelector.js:194
 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:72
+#: js/ui/windowManager.js:72
 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:84
+#: js/ui/windowManager.js:84
 msgid "Revert Settings"
 msgstr "تراجع عن الإعدادات"
 
-#: ../js/ui/windowManager.js:87
+#: js/ui/windowManager.js:87
 msgid "Keep Changes"
 msgstr "أبق على التغييرات"
 
-#: ../js/ui/windowManager.js:105
+#: js/ui/windowManager.js:105
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1731,116 +1982,125 @@ msgstr[5] "سيُتراجع عن التغييرات بعد %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:660
+#: js/ui/windowManager.js:660
 #, javascript-format
 msgid "%d × %d"
 msgstr "%d × %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:103
+#: js/ui/windowMenu.js:103
 msgid "Move to Workspace Left"
 msgstr "انقل لمساحة العمل على اليسار"
 
-#: ../js/ui/windowMenu.js:108
+#: js/ui/windowMenu.js:108
 msgid "Move to Workspace Right"
 msgstr "انقل لمساحة العمل على اليمين"
 
-#: ../js/ui/windowMenu.js:113
+#: js/ui/windowMenu.js:113
 msgid "Move to Workspace Up"
 msgstr "انقل لمساحة العمل لأعلى"
 
-#: ../js/ui/windowMenu.js:118
+#: js/ui/windowMenu.js:118
 msgid "Move to Workspace Down"
 msgstr "انقل لمساحة العمل لأسفل"
 
-#: ../js/ui/windowMenu.js:134
+#: js/ui/windowMenu.js:134
 msgid "Move to Monitor Up"
 msgstr "انقل للشاشة الأعلى"
 
-#: ../js/ui/windowMenu.js:140
+#: js/ui/windowMenu.js:140
 msgid "Move to Monitor Down"
 msgstr "انقل للشاشة الأسفل"
 
-#: ../js/ui/windowMenu.js:146
+#: js/ui/windowMenu.js:146
 msgid "Move to Monitor Left"
 msgstr "انقل للشاشة اليسرى"
 
-#: ../js/ui/windowMenu.js:152
+#: js/ui/windowMenu.js:152
 msgid "Move to Monitor Right"
 msgstr "انقل للشاشة اليمنى"
 
-#: ../src/main.c:380
+#: src/calendar-server/evolution-calendar.desktop.in:3
+msgid "Evolution Calendar"
+msgstr "تقويم إيفُليوشِن"
+
+#. 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"
+
+#: src/main.c:437
 msgid "Print version"
 msgstr "اطبع الإصدارة"
 
-#: ../src/main.c:386
+#: src/main.c:443
 msgid "Mode used by GDM for login screen"
 msgstr "الوضع الذي يستخدمه مدير ولوج جنوم لشاشة الولوج"
 
-#: ../src/main.c:392
+#: src/main.c:449
 msgid "Use a specific mode, e.g. “gdm” for login screen"
 msgstr "استخدم طورا معينا، مثلا: ”gdm“ لشاشة الولوج"
 
-#: ../src/main.c:398
+#: src/main.c:455
 msgid "List possible modes"
 msgstr "اسرد كل الأطوار الممكنة"
 
-#: ../src/shell-app.c:270
+#: src/shell-app.c:270
 msgctxt "program"
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: ../src/shell-app.c:511
+#: 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 "أغلق المستخدم مربع الاستيثاق الحِواري"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../subprojects/gvc/gvc-mixer-control.c:1873
+#: subprojects/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1853,7 +2113,7 @@ msgstr[5] "%u مخرج"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../subprojects/gvc/gvc-mixer-control.c:1883
+#: subprojects/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
@@ -1864,7 +2124,7 @@ msgstr[3] "%u مداخل"
 msgstr[4] "%u مدخلا"
 msgstr[5] "%u مدخل"
 
-#: ../subprojects/gvc/gvc-mixer-control.c:2738
+#: subprojects/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "أصوات النظام"
 
@@ -1874,64 +2134,9 @@ msgstr "أصوات النظام"
 #~ msgid "Status Icons"
 #~ msgstr "أيقونات الحالة"
 
-#~ msgid "System"
-#~ msgstr "النظام"
-
-#~ msgid "Show the notification list"
-#~ msgstr "اعرض قائمة التنبيهات"
-
-#~ msgid "Focus the active notification"
-#~ msgstr "ركّز على التنبيه النشط"
-
-#~ msgid "Show the overview"
-#~ msgstr "اعرض الملخص"
-
-#~ msgid "Show all applications"
-#~ msgstr "أظهر كل التطبيقات"
-
-#~ msgid "Open the application menu"
-#~ msgstr "افتح قائمة التطبيقات"
-
 #~ msgid "GNOME Shell Extension Preferences"
 #~ msgstr "تفضيلات امتدادات صدفة جنوم"
 
-#~ msgid "Configure GNOME Shell Extensions"
-#~ msgstr "اضبط امتدادات صدفة جنوم"
-
-#~ msgid "GNOME Shell"
-#~ msgstr "صدفة جنوم"
-
-#~ msgid "Window management and application launching"
-#~ msgstr "إدارة النوافذ وإطلاق التطبيقات"
-
-#~ msgid "Enable internal tools useful for developers and testers from Alt-F2"
-#~ msgstr "تمكين الأدوات الداخلية المفيدة للمطورين والمختبرين من Alt-F2"
-
-#~ msgid ""
-#~ "Allows access to internal debugging and monitoring tools using the Alt-F2 "
-#~ "dialog."
-#~ msgstr ""
-#~ "السماح بالوصول إلى التنقيح الداخلي ومراقبة الأدوات باستخدام نافذة حوار "
-#~ "Alt-F2."
-
-#~ msgid "UUIDs of extensions to enable"
-#~ msgstr "معرّفات الامتدادات التي ستُفعّل"
-
-#~ msgid "History for command (Alt-F2) dialog"
-#~ msgstr "التأريخ لنافذة حوار الأمر (Alt-F2)"
-
-#~ msgid "Which keyboard to use"
-#~ msgstr "أي لوحة مفاتيح ترغب باستخدامها"
-
-#~ msgid "The type of keyboard to use."
-#~ msgstr "نوع لوحة المفاتيح التي ترغب باستخدامها."
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "مساحات عمل على الشاشة الرئيسية فقط"
-
-#~ msgid "network-workgroup"
-#~ msgstr "network-workgroup"
-
 #~ msgid "Web Authentication Redirect"
 #~ msgstr "إعادة توجيه استيثاق عبر الوب"
 
@@ -1953,12 +2158,6 @@ msgstr "أصوات النظام"
 #~ msgid "%d x %d"
 #~ msgstr "%d × %d"
 
-#~ msgid "Evolution Calendar"
-#~ msgstr "تقويم إيفُليوشِن"
-
-#~ msgid "evolution"
-#~ msgstr "evolution"
-
 #~ msgid "Show the week date in the calendar"
 #~ msgstr "اعرض تاريخ الأسبوع في التقويم"
 
-- 
2.17.0


From bfe2558d683cf4df3dbb3a8f19e3a07337ad62c6 Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Mon, 6 Nov 2017 13:03:05 +0100
Subject: [PATCH 02/22] =?UTF-8?q?Updated=20Norwegian=20bokm=C3=A5l=20trans?=
 =?UTF-8?q?lation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 po/nb.po | 575 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 355 insertions(+), 220 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index 3f4a73bbe..20052e24a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,10 @@
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 3.24.x\n"
+"Project-Id-Version: gnome-shell 3.26.x\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-20 18:14+0000\n"
-"PO-Revision-Date: 2017-03-25 12:07+0100\n"
+"POT-Creation-Date: 2017-10-23 10:13+0000\n"
+"PO-Revision-Date: 2017-11-06 13:03+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -45,7 +45,7 @@ msgid "Open the application menu"
 msgstr "Åpne programmenyen"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:4
-#: js/extensionPrefs/main.js:149
+#: js/extensionPrefs/main.js:152
 msgid "Shell Extensions"
 msgstr "Utvidelser for GNOME Shell"
 
@@ -322,15 +322,15 @@ msgstr "Nettverkspålogging"
 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 "Det oppsto en feil ved lasting av brukervalgdialog for %s:"
 
 #: 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:482 js/ui/extensionDownloader.js:195
-#: js/ui/shellMountOperation.js:399 js/ui/status/network.js:947
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
+#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
+#: js/ui/shellMountOperation.js:344 js/ui/status/network.js:936
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -338,7 +338,7 @@ msgstr "Avbryt"
 msgid "Next"
 msgstr "Neste"
 
-#: js/gdm/authPrompt.js:214 js/ui/shellMountOperation.js:403
+#: js/gdm/authPrompt.js:214 js/ui/shellMountOperation.js:348
 #: js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Lås opp"
@@ -348,20 +348,20 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Logg inn"
 
-#: js/gdm/loginDialog.js:285
+#: js/gdm/loginDialog.js:308
 msgid "Choose Session"
 msgstr "Velg økt"
 
 #. 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:458
 msgid "Not listed?"
 msgstr "Ikke listet?"
 
 #. 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:859
+#: js/gdm/loginDialog.js:888
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(f.eks. bruker eller %s)"
@@ -369,16 +369,16 @@ msgstr "(f.eks. bruker eller %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:864 js/ui/components/networkAgent.js:271
-#: js/ui/components/networkAgent.js:289
+#: js/gdm/loginDialog.js:893 js/ui/components/networkAgent.js:243
+#: js/ui/components/networkAgent.js:261
 msgid "Username: "
 msgstr "Brukernavn: "
 
-#: js/gdm/loginDialog.js:1201
+#: js/gdm/loginDialog.js:1236
 msgid "Login Window"
 msgstr "Innloggingsvindu"
 
-#: js/gdm/util.js:342
+#: js/gdm/util.js:346
 msgid "Authentication error"
 msgstr "Autentiseringsfeil"
 
@@ -387,10 +387,76 @@ msgstr "Autentiseringsfeil"
 #. 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:474
+#: js/gdm/util.js:478
 msgid "(or swipe finger)"
 msgstr "(eller dra finger)"
 
+#. Translators: The name of the power-off action in search
+#: js/misc/systemActions.js:99
+msgctxt "search-result"
+msgid "Power off"
+msgstr "Slå av"
+
+#. Translators: A list of keywords that match the power-off action, separated by semicolons
+#: js/misc/systemActions.js:102
+msgid "power off;shutdown"
+msgstr "slå av;steng ned"
+
+#. Translators: The name of the lock screen action in search
+#: js/misc/systemActions.js:106
+msgctxt "search-result"
+msgid "Lock screen"
+msgstr "Lås skjerm"
+
+#. Translators: A list of keywords that match the lock screen action, separated by semicolons
+#: js/misc/systemActions.js:109
+msgid "lock screen"
+msgstr "lås skjerm"
+
+#. Translators: The name of the logout action in search
+#: js/misc/systemActions.js:113
+msgctxt "search-result"
+msgid "Log out"
+msgstr "Logg ut"
+
+#. Translators: A list of keywords that match the logout action, separated by semicolons
+#: js/misc/systemActions.js:116
+msgid "logout;sign off"
+msgstr "logg ut"
+
+#. Translators: The name of the suspend action in search
+#: js/misc/systemActions.js:120
+msgctxt "search-result"
+msgid "Suspend"
+msgstr "Hvilemodus"
+
+#. Translators: A list of keywords that match the suspend action, separated by semicolons
+#: js/misc/systemActions.js:123
+msgid "suspend;sleep"
+msgstr "hvilemodus"
+
+#. Translators: The name of the switch user action in search
+#: js/misc/systemActions.js:127
+msgctxt "search-result"
+msgid "Switch user"
+msgstr "Bytt bruker"
+
+#. Translators: A list of keywords that match the switch user action, separated by semicolons
+#: js/misc/systemActions.js:130
+msgid "switch user"
+msgstr "bytt bruker"
+
+#. Translators: The name of the lock orientation action in search
+#: js/misc/systemActions.js:134
+msgctxt "search-result"
+msgid "Lock orientation"
+msgstr "Lås for orientering"
+
+#. Translators: A list of keywords that match the lock orientation action, separated by semicolons
+#: js/misc/systemActions.js:137
+msgid "lock orientation"
+msgstr "lås for orientering"
+
 #: js/misc/util.js:122
 msgid "Command not found"
 msgstr "Kommando ikke funnet"
@@ -457,20 +523,20 @@ msgstr[0] "%d år siden"
 msgstr[1] "%d år siden"
 
 #. Translators: Time in 24h format
-#: js/misc/util.js:229
+#: js/misc/util.js:228
 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:235
+#: js/misc/util.js:234
 #, no-c-format
 msgid "Yesterday, %H∶%M"
 msgstr "I går, %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:241
+#: js/misc/util.js:240
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A, %H.%M"
@@ -478,7 +544,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:247
+#: js/misc/util.js:246
 #, no-c-format
 msgid "%B %d, %H∶%M"
 msgstr "%d %B, %H.%M"
@@ -486,26 +552,26 @@ msgstr "%d %B, %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:253
+#: js/misc/util.js:252
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
 msgstr "%d %B %Y, %H.%M"
 
 #. Translators: Time in 12h format
-#: js/misc/util.js:258
+#: js/misc/util.js:257
 msgid "%l∶%M %p"
 msgstr "%H.%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:264
+#: js/misc/util.js:263
 #, no-c-format
 msgid "Yesterday, %l∶%M %p"
 msgstr "I går, %H.%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:270
+#: js/misc/util.js:269
 #, no-c-format
 msgid "%A, %l∶%M %p"
 msgstr "%A, %H.%M"
@@ -513,7 +579,7 @@ msgstr "%A, %H.%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:276
+#: js/misc/util.js:275
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
 msgstr "%d %B, %H.%M"
@@ -521,17 +587,17 @@ msgstr "%d %B, %H.%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:282
+#: js/misc/util.js:281
 #, no-c-format
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%d %B %Y, %H.%M"
 
 #. TRANSLATORS: this is the title of the wifi captive portal login window
-#: js/portalHelper/main.js:67
+#: js/portalHelper/main.js:66
 msgid "Hotspot Login"
 msgstr "Pålogging for trådløst aksesspunkt"
 
-#: js/portalHelper/main.js:113
+#: 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."
@@ -541,52 +607,52 @@ 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:405
+#: js/ui/accessDialog.js:63 js/ui/status/location.js:395
 msgid "Deny Access"
 msgstr "Nekt tilgang"
 
-#: js/ui/accessDialog.js:63 js/ui/status/location.js:408
+#: js/ui/accessDialog.js:64 js/ui/status/location.js:398
 msgid "Grant Access"
 msgstr "Gi tilgang"
 
-#: js/ui/appDisplay.js:806
+#: js/ui/appDisplay.js:809
 msgid "Frequently used applications will appear here"
 msgstr "Ofte brukte programmer vises her"
 
-#: js/ui/appDisplay.js:927
+#: js/ui/appDisplay.js:930
 msgid "Frequent"
 msgstr "Ofte"
 
-#: js/ui/appDisplay.js:934
+#: js/ui/appDisplay.js:937
 msgid "All"
 msgstr "Alle"
 
-#: js/ui/appDisplay.js:1892
+#: js/ui/appDisplay.js:1915
 msgid "New Window"
 msgstr "Nytt vindu"
 
-#: js/ui/appDisplay.js:1906
+#: js/ui/appDisplay.js:1929
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Start med dedikert skjermkort"
 
-#: js/ui/appDisplay.js:1933 js/ui/dash.js:289
+#: js/ui/appDisplay.js:1956 js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"
 
-#: js/ui/appDisplay.js:1939
+#: js/ui/appDisplay.js:1962
 msgid "Add to Favorites"
 msgstr "Legg til i favoritter"
 
-#: js/ui/appDisplay.js:1949
+#: js/ui/appDisplay.js:1972
 msgid "Show Details"
 msgstr "Vis detaljer"
 
-#: js/ui/appFavorites.js:138
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s ble lagt til i favoritter."
 
-#: js/ui/appFavorites.js:172
+#: js/ui/appFavorites.js:175
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s ble fjernet fra favoritter."
@@ -607,7 +673,7 @@ msgstr "Hodetelefoner"
 msgid "Headset"
 msgstr "Headset"
 
-#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:213
+#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:221
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -619,7 +685,7 @@ msgstr "Bytt bakgrunn …"
 msgid "Display Settings"
 msgstr "Innstillinger for skjerm"
 
-#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:401
+#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:265
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -675,54 +741,74 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "L"
 
-#: js/ui/calendar.js:442
+#: js/ui/calendar.js:449
 msgid "Previous month"
 msgstr "Forrige måned"
 
-#: js/ui/calendar.js:452
+#: js/ui/calendar.js:459
 msgid "Next month"
 msgstr "Neste måned"
 
-#: js/ui/calendar.js:605
+#: js/ui/calendar.js:612
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: js/ui/calendar.js:660
+#: js/ui/calendar.js:667
 msgid "Week %V"
 msgstr "Uke %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:729
+#: js/ui/calendar.js:736
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Hele dagen"
 
-#: js/ui/calendar.js:862
+#: js/ui/calendar.js:869
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %B %d"
 
-#: js/ui/calendar.js:866
+#: js/ui/calendar.js:873
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %B %d, %Y"
 
-#: js/ui/calendar.js:1086
+#: js/ui/calendar.js:1093
 msgid "No Notifications"
 msgstr "Ingen varslinger"
 
-#: js/ui/calendar.js:1089
+#: js/ui/calendar.js:1096
 msgid "No Events"
 msgstr "Ingen hendelser"
 
-#: js/ui/calendar.js:1117
+#: js/ui/calendar.js:1124
 msgid "Clear All"
 msgstr "Fjern alle"
 
+#. Translators: %s is an application name
+#: js/ui/closeDialog.js:44
+#, javascript-format
+msgid "“%s” is not responding."
+msgstr "«%s» svarer ikke"
+
+#: js/ui/closeDialog.js:45
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr "Du kan velge å vente en kort stund på at den skal fortsette eller tvinge programmet til å avslutte."
+
+#: js/ui/closeDialog.js:61
+msgid "Force Quit"
+msgstr "Tving avslutning"
+
+#: js/ui/closeDialog.js:64
+msgid "Wait"
+msgstr "Vent"
+
 #: js/ui/components/automountManager.js:91
 msgid "External drive connected"
 msgstr "Ekstern stasjon koblet til"
@@ -731,53 +817,53 @@ msgstr "Ekstern stasjon koblet til"
 msgid "External drive disconnected"
 msgstr "Ekstern stasjon koblet fra"
 
-#: js/ui/components/autorunManager.js:356
+#: js/ui/components/autorunManager.js:358
 #, javascript-format
 msgid "Open with %s"
 msgstr "Åpne med %s"
 
-#: js/ui/components/keyring.js:120 js/ui/components/polkitAgent.js:315
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "Passord:"
 
-#: js/ui/components/keyring.js:153
+#: js/ui/components/keyring.js:140
 msgid "Type again:"
 msgstr "Skriv på nytt:"
 
-#: js/ui/components/networkAgent.js:140 js/ui/status/network.js:272
-#: js/ui/status/network.js:366 js/ui/status/network.js:950
+#: js/ui/components/networkAgent.js:112 js/ui/status/network.js:261
+#: js/ui/status/network.js:355 js/ui/status/network.js:939
 msgid "Connect"
 msgstr "Koble til"
 
 #. 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:205 js/ui/components/networkAgent.js:217
+#: js/ui/components/networkAgent.js:245 js/ui/components/networkAgent.js:265
+#: js/ui/components/networkAgent.js:275
 msgid "Password: "
 msgstr "Passord: "
 
 #. static WEP
-#: js/ui/components/networkAgent.js:238
+#: js/ui/components/networkAgent.js:210
 msgid "Key: "
 msgstr "Nøkkel: "
 
-#: js/ui/components/networkAgent.js:277
+#: js/ui/components/networkAgent.js:249
 msgid "Identity: "
 msgstr "Identitet: "
 
-#: js/ui/components/networkAgent.js:279
+#: js/ui/components/networkAgent.js:251
 msgid "Private key password: "
 msgstr "Passord for privat nøkkel: "
 
-#: js/ui/components/networkAgent.js:291
+#: js/ui/components/networkAgent.js:263
 msgid "Service: "
 msgstr "Tjeneste: "
 
-#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:666
+#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:638
 msgid "Authentication required by wireless network"
 msgstr "Autentisering kreves av trådløst nettverk"
 
-#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:667
+#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:639
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -786,53 +872,53 @@ msgstr ""
 "Passord eller krypteringsnøkler kreves for å koble til trådløst nettverk "
 "«%s»."
 
-#: js/ui/components/networkAgent.js:325 js/ui/components/networkAgent.js:670
+#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:642
 msgid "Wired 802.1X authentication"
 msgstr "802.1X autentisering for trådbundet nettverk"
 
-#: js/ui/components/networkAgent.js:327
+#: js/ui/components/networkAgent.js:299
 msgid "Network name: "
 msgstr "Navn på nettverk: "
 
-#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:674
+#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:646
 msgid "DSL authentication"
 msgstr "DSL-autentisering"
 
-#: js/ui/components/networkAgent.js:339 js/ui/components/networkAgent.js:680
+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:652
 msgid "PIN code required"
 msgstr "PIN-kode kreves"
 
-#: js/ui/components/networkAgent.js:340 js/ui/components/networkAgent.js:681
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:653
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode kreves for mobil bredbåndsenhet"
 
-#: js/ui/components/networkAgent.js:341
+#: js/ui/components/networkAgent.js:313
 msgid "PIN: "
 msgstr "PIN: "
 
-#: js/ui/components/networkAgent.js:348 js/ui/components/networkAgent.js:687
+#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:659
 msgid "Mobile broadband network password"
 msgstr "Nettverkspassord for mobilt bredbånd"
 
-#: js/ui/components/networkAgent.js:349 js/ui/components/networkAgent.js:671
-#: js/ui/components/networkAgent.js:675 js/ui/components/networkAgent.js:688
+#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:643
+#: js/ui/components/networkAgent.js:647 js/ui/components/networkAgent.js:660
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Du må oppgi et passord for å koble til «%s»."
 
-#: js/ui/components/networkAgent.js:655 js/ui/status/network.js:1755
+#: js/ui/components/networkAgent.js:627 js/ui/status/network.js:1720
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"
 
-#: js/ui/components/polkitAgent.js:60
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
-#: js/ui/components/polkitAgent.js:102
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "Administrator"
 
-#: js/ui/components/polkitAgent.js:182
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "Autentiser"
 
@@ -840,7 +926,7 @@ msgstr "Autentiser"
 #. * 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:270 js/ui/shellMountOperation.js:328
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Beklager, det virket ikke. Prøv igjen."
 
@@ -851,7 +937,7 @@ msgstr "Beklager, det virket ikke. Prøv igjen."
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: js/ui/ctrlAltTab.js:29 js/ui/viewSelector.js:178
+#: js/ui/ctrlAltTab.js:29 js/ui/viewSelector.js:186
 msgid "Windows"
 msgstr "Vinduer"
 
@@ -868,7 +954,7 @@ msgstr "Favoritter"
 #. 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:75
+#: js/ui/dateMenu.js:76
 msgid "%B %e %Y"
 msgstr "%B %e %Y"
 
@@ -876,19 +962,19 @@ msgstr "%B %e %Y"
 #. * below the time in the shell; it should combine the weekday and the
 #. * date, e.g. "Tuesday February 17 2015".
 #.
-#: js/ui/dateMenu.js:82
+#: js/ui/dateMenu.js:83
 msgid "%A %B %e %Y"
 msgstr "%A %B %e %Y"
 
-#: js/ui/dateMenu.js:144
+#: js/ui/dateMenu.js:145
 msgid "Add world clocks…"
 msgstr "Legg til verdensklokker …"
 
-#: js/ui/dateMenu.js:145
+#: js/ui/dateMenu.js:146
 msgid "World Clocks"
 msgstr "Verdensklokker"
 
-#: js/ui/dateMenu.js:224
+#: js/ui/dateMenu.js:225
 msgid "Weather"
 msgstr "Vær"
 
@@ -896,7 +982,7 @@ msgstr "Vær"
 #. 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
+#: js/ui/dateMenu.js:289
 #, javascript-format
 msgid "%s all day."
 msgstr "%s hele dagen."
@@ -905,7 +991,7 @@ msgstr "%s hele dagen."
 #. 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
+#: js/ui/dateMenu.js:295
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s så %s senere."
@@ -914,30 +1000,30 @@ msgstr "%s så %s senere."
 #. 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
+#: js/ui/dateMenu.js:301
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, så %s etterfulgt av %s senere."
 
-#: js/ui/dateMenu.js:300
+#: js/ui/dateMenu.js:312
 msgid "Select a location…"
 msgstr "Velg en lokasjon …"
 
-#: js/ui/dateMenu.js:303
+#: js/ui/dateMenu.js:315
 msgid "Loading…"
 msgstr "Laster …"
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:309
+#: js/ui/dateMenu.js:321
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Føles som %s."
 
-#: js/ui/dateMenu.js:312
+#: js/ui/dateMenu.js:324
 msgid "Go online for weather information"
 msgstr "Gå på nettet for informasjon om været"
 
-#: js/ui/dateMenu.js:314
+#: js/ui/dateMenu.js:326
 msgid "Weather information is currently unavailable"
 msgstr "Værinformasjon er for tiden utilgjengelig"
 
@@ -1090,27 +1176,42 @@ msgstr "%s (ekstern)"
 msgid "%s (console)"
 msgstr "%s (konsoll)"
 
-#: js/ui/extensionDownloader.js:199
+#: js/ui/extensionDownloader.js:201
 msgid "Install"
 msgstr "Installer"
 
-#: js/ui/extensionDownloader.js:204
+#: js/ui/extensionDownloader.js:206
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Vil du laste ned og installere «%s» fra extensions.gnome.org?"
 
-#: js/ui/keyboard.js:742 js/ui/status/keyboard.js:782
-msgid "Keyboard"
-msgstr "Tastatur"
+#. Translators: %s is an application name like "Settings"
+#: js/ui/inhibitShortcutsDialog.js:59
+#, javascript-format
+msgid "%s wants to inhibit shortcuts"
+msgstr "%s vil hindre snarveier"
 
-#. translators: 'Hide' is a verb
-#: js/ui/legacyTray.js:65
-msgid "Hide tray"
-msgstr "Skjul statusområde"
+#: js/ui/inhibitShortcutsDialog.js:60
+msgid "Application wants to inhibit shortcuts"
+msgstr "Programmet vil hindre snarveier"
 
-#: js/ui/legacyTray.js:106
-msgid "Status Icons"
-msgstr "Statusikoner"
+#. Translators: %s is a keyboard shortcut like "Super+x"
+#: js/ui/inhibitShortcutsDialog.js:69
+#, javascript-format
+msgid "You can restore shortcuts by pressing %s."
+msgstr "Du kan gjenopprette snarveier ved å trykke %s."
+
+#: js/ui/inhibitShortcutsDialog.js:74
+msgid "Deny"
+msgstr "Nekt"
+
+#: js/ui/inhibitShortcutsDialog.js:80
+msgid "Allow"
+msgstr "Tillat"
+
+#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:782
+msgid "Keyboard"
+msgstr "Tastatur"
 
 #: js/ui/lookingGlass.js:642
 msgid "No extensions installed"
@@ -1136,7 +1237,7 @@ msgstr "Slått på"
 
 #. translators:
 #. * The device has been disabled
-#: js/ui/lookingGlass.js:718 src/gvc/gvc-mixer-control.c:1866
+#: js/ui/lookingGlass.js:718 subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "Slått av"
 
@@ -1160,7 +1261,7 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"
 
-#: js/ui/messageTray.js:1493
+#: js/ui/messageTray.js:1494
 msgid "System Information"
 msgstr "Systeminformasjon"
 
@@ -1210,27 +1311,27 @@ msgstr "Bytt skjerm"
 msgid "Assign keystroke"
 msgstr "Tildel tastatursnarvei"
 
-#: js/ui/padOsd.js:209
+#: js/ui/padOsd.js:220
 msgid "Done"
 msgstr "Ferdig"
 
-#: js/ui/padOsd.js:698
+#: js/ui/padOsd.js:734
 msgid "Edit…"
 msgstr "Rediger …"
 
-#: js/ui/padOsd.js:738 js/ui/padOsd.js:800
+#: js/ui/padOsd.js:774 js/ui/padOsd.js:879
 msgid "None"
 msgstr "Ingen"
 
-#: js/ui/padOsd.js:783
+#: js/ui/padOsd.js:833
 msgid "Press a button to configure"
 msgstr "Trykk en knapp for å konfigurere"
 
-#: js/ui/padOsd.js:784
+#: js/ui/padOsd.js:834
 msgid "Press Esc to exit"
 msgstr "Trykk Esc for å avslutte"
 
-#: js/ui/padOsd.js:787
+#: js/ui/padOsd.js:837
 msgid "Press any key to exit"
 msgstr "Trykk en tast for å avslutte"
 
@@ -1249,7 +1350,7 @@ msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "System"
 
-#: js/ui/panel.js:810
+#: js/ui/panel.js:812
 msgid "Top Bar"
 msgstr "Topp-panel"
 
@@ -1258,7 +1359,7 @@ msgstr "Topp-panel"
 #. "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:291
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
@@ -1298,7 +1399,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d ny varsling"
 msgstr[1] "%d nye varslinger"
 
-#: js/ui/screenShield.js:452 js/ui/status/system.js:409
+#: js/ui/screenShield.js:452 js/ui/status/system.js:284
 msgid "Lock"
 msgstr "Lås"
 
@@ -1321,14 +1422,21 @@ msgstr "Klarte ikke å låse"
 msgid "Lock was blocked by an application"
 msgstr "Låsing ble stoppet av et program"
 
-#: js/ui/search.js:617
+#: js/ui/search.js:651
 msgid "Searching…"
 msgstr "Søker …"
 
-#: js/ui/search.js:619
+#: js/ui/search.js:653
 msgid "No results."
 msgstr "Ingen resultater."
 
+#: js/ui/search.js:777
+#, javascript-format
+msgid "%d more"
+msgid_plural "%d more"
+msgstr[0] "%d flere"
+msgstr[1] "%d flere"
+
 #: js/ui/shellEntry.js:25
 msgid "Copy"
 msgstr "Kopier"
@@ -1345,11 +1453,11 @@ msgstr "Vis tekst"
 msgid "Hide Text"
 msgstr "Skjul tekst"
 
-#: js/ui/shellMountOperation.js:370
+#: js/ui/shellMountOperation.js:315
 msgid "Password"
 msgstr "Passord"
 
-#: js/ui/shellMountOperation.js:391
+#: js/ui/shellMountOperation.js:336
 msgid "Remember Password"
 msgstr "Husk passord"
 
@@ -1401,7 +1509,7 @@ msgstr "Stor tekst"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:638
+#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:627
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-innstillinger"
 
@@ -1421,13 +1529,13 @@ msgstr "Av"
 msgid "On"
 msgstr "På"
 
-#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1310
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1299
 msgid "Turn On"
 msgstr "Slå på"
 
-#: 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:1425 js/ui/status/nightLight.js:47
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:170
+#: js/ui/status/network.js:356 js/ui/status/network.js:1299
+#: js/ui/status/network.js:1418 js/ui/status/nightLight.js:47
 #: js/ui/status/rfkill.js:90 js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "Slå av"
@@ -1440,37 +1548,37 @@ msgstr "Lysstyrke"
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"
 
-#: js/ui/status/location.js:88 js/ui/status/location.js:196
+#: js/ui/status/location.js:89 js/ui/status/location.js:197
 msgid "Location Enabled"
 msgstr "Plassering slått på"
 
-#: js/ui/status/location.js:89 js/ui/status/location.js:197
+#: js/ui/status/location.js:90 js/ui/status/location.js:198
 msgid "Disable"
 msgstr "Slå av"
 
-#: js/ui/status/location.js:90
+#: js/ui/status/location.js:91
 msgid "Privacy Settings"
 msgstr "Innstillinger for personvern"
 
-#: js/ui/status/location.js:195
+#: js/ui/status/location.js:196
 msgid "Location In Use"
 msgstr "Plassering i bruk"
 
-#: js/ui/status/location.js:199
+#: js/ui/status/location.js:200
 msgid "Location Disabled"
 msgstr "Plassering slått av"
 
-#: js/ui/status/location.js:200
+#: js/ui/status/location.js:201
 msgid "Enable"
 msgstr "Slå på"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:414
+#: js/ui/status/location.js:388
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "Gi %s tilgang til din plassering?"
 
-#: js/ui/status/location.js:416
+#: js/ui/status/location.js:389
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr ""
 "Tilgang til plassering kan endres når som helst fra innstillinger for "
@@ -1481,13 +1589,13 @@ msgid "<unknown>"
 msgstr "<ukjent>"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:465 js/ui/status/network.js:1339
+#: js/ui/status/network.js:454 js/ui/status/network.js:1328
 #, javascript-format
 msgid "%s Off"
 msgstr "%s av"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:468
+#: js/ui/status/network.js:457
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s koblet til"
@@ -1495,190 +1603,189 @@ msgstr "%s koblet til"
 #. 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:473
+#: js/ui/status/network.js:462
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s håndteres ikke"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:476
+#: js/ui/status/network.js:465
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "%s kobler fra"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:483 js/ui/status/network.js:1331
+#: js/ui/status/network.js:472 js/ui/status/network.js:1320
 #, javascript-format
 msgid "%s Connecting"
 msgstr "%s kobler til"
 
 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
-#: js/ui/status/network.js:486
+#: js/ui/status/network.js:475
 #, javascript-format
 msgid "%s Requires Authentication"
 msgstr "%s krever autentisering"
 
 #. 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:494
+#: js/ui/status/network.js:483
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "Fastvare mangler for %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:498
+#: js/ui/status/network.js:487
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "%s er ikke tilgjengelig"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:501
+#: js/ui/status/network.js:490
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "%s tilkobling mislyktes"
 
-#: js/ui/status/network.js:517
+#: js/ui/status/network.js:506
 msgid "Wired Settings"
 msgstr "Innstillinger for trådbundet nettverk"
 
-#: js/ui/status/network.js:559
+#: js/ui/status/network.js:548
 msgid "Mobile Broadband Settings"
 msgstr "Innstillinger for mobilt bredbånd"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:602 js/ui/status/network.js:1336
+#: js/ui/status/network.js:591 js/ui/status/network.js:1325
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "%s maskinvare slått av"
 
 #. 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:606
+#: js/ui/status/network.js:595
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s slått av"
 
-#: js/ui/status/network.js:646
+#: js/ui/status/network.js:635
 msgid "Connect to Internet"
 msgstr "Koble til internett"
 
-#: js/ui/status/network.js:844
+#: js/ui/status/network.js:833
 msgid "Airplane Mode is On"
 msgstr "Flymodus er slått på"
 
-#: js/ui/status/network.js:845
+#: js/ui/status/network.js:834
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Trådløst blir slått av når flymodus slås på."
 
-#: js/ui/status/network.js:846
+#: js/ui/status/network.js:835
 msgid "Turn Off Airplane Mode"
 msgstr "Slå av flymodus"
 
-#: js/ui/status/network.js:855
+#: js/ui/status/network.js:844
 msgid "Wi-Fi is Off"
 msgstr "Trådløs er av"
 
-#: js/ui/status/network.js:856
+#: js/ui/status/network.js:845
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Trådløs må slås på for å koble til et nettverk."
 
-#: js/ui/status/network.js:857
+#: js/ui/status/network.js:846
 msgid "Turn On Wi-Fi"
 msgstr "Slå på trådløs"
 
-#: js/ui/status/network.js:882
+#: js/ui/status/network.js:871
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi nettverk"
 
-#: js/ui/status/network.js:884
+#: js/ui/status/network.js:873
 msgid "Select a network"
 msgstr "Velg et nettverk"
 
-#: js/ui/status/network.js:914
+#: js/ui/status/network.js:903
 msgid "No Networks"
 msgstr "Ingen nettverk"
 
-#: js/ui/status/network.js:935 js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:924 js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "Bruk maskinvarebryter til å slå av"
 
-#: js/ui/status/network.js:1202
+#: js/ui/status/network.js:1191
 msgid "Select Network"
 msgstr "Velg nettverk"
 
-#: js/ui/status/network.js:1208
+#: js/ui/status/network.js:1197
 msgid "Wi-Fi Settings"
 msgstr "Innstillinger"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1327
+#: js/ui/status/network.js:1316
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "%s aksesspunkt aktivt"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1342
+#: js/ui/status/network.js:1331
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s ikke koblet til"
 
-#: js/ui/status/network.js:1442
+#: js/ui/status/network.js:1435
 msgid "connecting…"
 msgstr "kobler til …"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: js/ui/status/network.js:1445
+#: js/ui/status/network.js:1438
 msgid "authentication required"
 msgstr "autentisering kreves"
 
-#: js/ui/status/network.js:1447
+#: js/ui/status/network.js:1440
 msgid "connection failed"
 msgstr "tilkobling mislyktes"
 
-#: js/ui/status/network.js:1513 js/ui/status/network.js:1608
-#: js/ui/status/rfkill.js:93
-msgid "Network Settings"
-msgstr "Innstillinger for nettverk"
-
-#: js/ui/status/network.js:1515
+#: js/ui/status/network.js:1494
 msgid "VPN Settings"
 msgstr "Innstillinger for VPN"
 
-#: js/ui/status/network.js:1534
+#: js/ui/status/network.js:1498
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1544
+#: js/ui/status/network.js:1508
 msgid "VPN Off"
 msgstr "VPN av"
 
-#: js/ui/status/network.js:1639
+#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93
+msgid "Network Settings"
+msgstr "Innstillinger for nettverk"
+
+#: js/ui/status/network.js:1603
 #, javascript-format
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
 msgstr[0] "%s kablet tilkobling"
 msgstr[1] "%s kablede tilkoblinger"
 
-#: js/ui/status/network.js:1643
+#: js/ui/status/network.js:1607
 #, javascript-format
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
 msgstr[0] "%s trådløs tilkobling"
 msgstr[1] "%s trådløse tilkoblinger"
 
-#: js/ui/status/network.js:1647
+#: js/ui/status/network.js:1611
 #, javascript-format
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
 msgstr[0] "%s tilkobling med modem"
 msgstr[1] "%s tilkoblinger med modem"
 
-#: js/ui/status/network.js:1794
+#: js/ui/status/network.js:1759
 msgid "Connection failed"
 msgstr "Tilkobling mislyktes"
 
-#: js/ui/status/network.js:1795
+#: js/ui/status/network.js:1760
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling mislyktes"
 
@@ -1736,38 +1843,66 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "Flymodus er slått på"
 
-#: js/ui/status/system.js:378
+#: js/ui/status/system.js:228
 msgid "Switch User"
 msgstr "Bytt bruker"
 
-#: js/ui/status/system.js:383
+#: js/ui/status/system.js:240
 msgid "Log Out"
 msgstr "Logg ut"
 
-#: js/ui/status/system.js:388
+#: js/ui/status/system.js:252
 msgid "Account Settings"
 msgstr "Innstillinger for konto"
 
-#: js/ui/status/system.js:405
+#: js/ui/status/system.js:269
 msgid "Orientation Lock"
 msgstr "Lås for orientering"
 
-#: js/ui/status/system.js:413
+#: js/ui/status/system.js:295
 msgid "Suspend"
 msgstr "Hvilemodus"
 
-#: js/ui/status/system.js:416
+#: js/ui/status/system.js:305
 msgid "Power Off"
 msgstr "Slå av"
 
-#: js/ui/status/volume.js:127
+#: js/ui/status/volume.js:128
 msgid "Volume changed"
 msgstr "Volum endret"
 
-#: js/ui/status/volume.js:162
+#: js/ui/status/volume.js:170
 msgid "Volume"
 msgstr "Volum"
 
+#. Translators: this is for display mirroring i.e. cloning.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:21
+msgid "Mirror"
+msgstr "Speil"
+
+#. Translators: this is for the desktop spanning displays.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:26
+msgid "Join Displays"
+msgstr "Slå sammen skjermer"
+
+#. Translators: this is for using only an external display.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:31
+msgid "External Only"
+msgstr "Kun ekstern"
+
+#. Translators: this is for using only the laptop display.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:36
+msgid "Built-in Only"
+msgstr "Kun innebygget"
+
 #: js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "Logg inn som en annen bruker"
@@ -1776,11 +1911,11 @@ msgstr "Logg inn som en annen bruker"
 msgid "Unlock Window"
 msgstr "Lås opp vindu"
 
-#: js/ui/viewSelector.js:182
+#: js/ui/viewSelector.js:190
 msgid "Applications"
 msgstr "Programmer"
 
-#: js/ui/viewSelector.js:186
+#: js/ui/viewSelector.js:194
 msgid "Search"
 msgstr "Søk"
 
@@ -1789,22 +1924,22 @@ msgstr "Søk"
 msgid "“%s” is ready"
 msgstr "«%s» er klar"
 
-#: js/ui/windowManager.js:84
+#: js/ui/windowManager.js:72
 msgid "Do you want to keep these display settings?"
 msgstr "Vil du beholde disse skjerminnstillingene?"
 
 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #.
-#: js/ui/windowManager.js:103
+#: js/ui/windowManager.js:84
 msgid "Revert Settings"
 msgstr "Forkast innstillinger"
 
-#: js/ui/windowManager.js:106
+#: js/ui/windowManager.js:87
 msgid "Keep Changes"
 msgstr "Behold endringer"
 
-#: js/ui/windowManager.js:124
+#: js/ui/windowManager.js:105
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1813,7 +1948,7 @@ msgstr[1] "Endringer i innstillingene forkastes om %d sekunder"
 
 #. 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:679
+#: js/ui/windowManager.js:660
 #, javascript-format
 msgid "%d × %d"
 msgstr "%d × %d"
@@ -1891,41 +2026,19 @@ msgstr "Evolution kalender"
 msgid "evolution"
 msgstr "evolution"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: src/gvc/gvc-mixer-control.c:1873
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u utgang"
-msgstr[1] "%u utganger"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: src/gvc/gvc-mixer-control.c:1883
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u inngang"
-msgstr[1] "%u innganger"
-
-#: src/gvc/gvc-mixer-control.c:2738
-msgid "System Sounds"
-msgstr "Systemlyder"
-
-#: src/main.c:372
+#: src/main.c:429
 msgid "Print version"
 msgstr "Vis versjon"
 
-#: src/main.c:378
+#: src/main.c:435
 msgid "Mode used by GDM for login screen"
 msgstr "Modus som brukes av GDM for innloggingsskjermen"
 
-#: src/main.c:384
+#: src/main.c:441
 msgid "Use a specific mode, e.g. “gdm” for login screen"
 msgstr "Bruk spesifikt modus, f.eks. «gdm» for innloggingsskjerm"
 
-#: src/main.c:390
+#: src/main.c:447
 msgid "List possible modes"
 msgstr "Vis mulige modi"
 
@@ -1950,3 +2063,25 @@ msgstr "Passordet kan ikke være tomt"
 #: src/shell-polkit-authentication-agent.c:353
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Autentiseringsdialogen ble lukket av brukeren"
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u utgang"
+msgstr[1] "%u utganger"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1883
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u inngang"
+msgstr[1] "%u innganger"
+
+#: subprojects/gvc/gvc-mixer-control.c:2738
+msgid "System Sounds"
+msgstr "Systemlyder"
-- 
2.17.0


From af79d975b06212c371432f862fe0bf3ffde1f2dd Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 16 Nov 2017 17:27:12 +0100
Subject: [PATCH 03/22] overview: Protect ::drag-end handlers

These end up emitting item-drag-end/window-drag-end pretty much
without checks. Given the MetaDnd object may end up emitting
::drag-leave as a result of the plugin ending its grab, this
would result on spurious emission of those events and subsequent
warnings.

For extra paranoia, the _inDrag variable has been split into
_inItemDrag/_inWindowDrag so we can't cross the streams.

https://bugzilla.gnome.org/show_bug.cgi?id=784545
---
 js/ui/overview.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/js/ui/overview.js b/js/ui/overview.js
index 7eb2102db..816f32f5a 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -417,7 +417,7 @@ var Overview = new Lang.Class({
 
     beginItemDrag: function(source) {
         this.emit('item-drag-begin');
-        this._inDrag = true;
+        this._inItemDrag = true;
     },
 
     cancelledItemDrag: function(source) {
@@ -425,13 +425,15 @@ var Overview = new Lang.Class({
     },
 
     endItemDrag: function(source) {
+        if (!this._inItemDrag)
+            return;
         this.emit('item-drag-end');
-        this._inDrag = false;
+        this._inItemDrag = false;
     },
 
     beginWindowDrag: function(window) {
         this.emit('window-drag-begin', window);
-        this._inDrag = true;
+        this._inWindowDrag = true;
     },
 
     cancelledWindowDrag: function(window) {
@@ -439,8 +441,10 @@ var Overview = new Lang.Class({
     },
 
     endWindowDrag: function(window) {
+        if (!this._inWindowDrag)
+            return;
         this.emit('window-drag-end', window);
-        this._inDrag = false;
+        this._inWindowDrag = false;
     },
 
     focusSearch: function() {
@@ -484,7 +488,7 @@ var Overview = new Lang.Class({
     shouldToggleByCornerOrButton: function() {
         if (this.animationInProgress)
             return false;
-        if (this._inDrag)
+        if (this._inItemDrag || this._inWindowDrag)
             return false;
         if (this._activationTime == 0 || Date.now() / 1000 - this._activationTime > OVERVIEW_ACTIVATION_TIMEOUT)
             return true;
-- 
2.17.0


From 580ba229547e637d8ab4febcad6a7af33f136b4c Mon Sep 17 00:00:00 2001
From: Petr Kovar <pkovar@redhat.com>
Date: Sun, 19 Nov 2017 12:36:17 +0100
Subject: [PATCH 04/22] Update Czech translation

---
 po/cs.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/cs.po b/po/cs.po
index 2e08c9615..90f2e0cee 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1319,7 +1319,7 @@ msgstr "Přehled"
 #. characters.
 #: js/ui/overview.js:240
 msgid "Type to search…"
-msgstr "vyhledávejte psaním…"
+msgstr "Vyhledávejte psaním…"
 
 #: js/ui/padOsd.js:103
 msgid "New shortcut…"
-- 
2.17.0


From 3b4be770a0590bcee9c739f3d9264320e23d555b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Sat, 28 Oct 2017 02:23:02 -0500
Subject: [PATCH 05/22] status/keyboard: Reset menuItems and Label objects on
 change

In the current code it could happen that we've menuItems and indicatorLabels
for sources that aren't anymore around, because in case a source is removed
we don't cleanup the their container objects.
Also, we should nullify InputManager's _currentSource when sources change
or it might point to some invalid data again.

So it could happen that we try to access an invalid menuitem or label
if a source change happens mentioning a source that has been deleted.

https://bugzilla.gnome.org/show_bug.cgi?id=788931
---
 js/ui/status/keyboard.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 70e6abf87..b2f10322d 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -529,6 +529,7 @@ var InputSourceManager = new Lang.Class({
         let sources = this._settings.inputSources;
         let nSources = sources.length;
 
+        this._currentSource = null;
         this._inputSources = {};
         this._ibusSources = {};
 
@@ -827,6 +828,9 @@ var InputSourceIndicator = new Lang.Class({
         for (let i in this._indicatorLabels)
             this._indicatorLabels[i].destroy();
 
+        this._menuItems = {};
+        this._indicatorLabels = {};
+
         let menuIndex = 0;
         for (let i in this._inputSourceManager.inputSources) {
             let is = this._inputSourceManager.inputSources[i];
-- 
2.17.0


From d5805f9f0df7bb6156179894b6b5f70e41261a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 4 Dec 2017 20:45:35 -0500
Subject: [PATCH 06/22] dash: Make sure item labels are only destroyed once

Labels are currently destroyed from both animateOutAndDestroy()
and destroy(), which now (rightfully) triggers a gjs warning. As
the label is created unconditionally since commit 36e5ae4a250,
mirror that and always release it in destroy() and hide it
elsewhere.

https://bugzilla.gnome.org/show_bug.cgi?id=791233
---
 js/ui/dash.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 0c89545a2..b89040bb6 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -178,15 +178,12 @@ var DashItemContainer = new Lang.Class({
     },
 
     destroy: function() {
-        if (this.label)
-            this.label.destroy();
-
+        this.label.destroy();
         this.parent();
     },
 
     animateOutAndDestroy: function() {
-        if (this.label)
-            this.label.destroy();
+        this.label.hide();
 
         if (this.child == null) {
             this.destroy();
-- 
2.17.0


From ac596ca1c13faf9739e1b835ea86dc4200d09b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 5 Dec 2017 17:04:24 -0500
Subject: [PATCH 07/22] dash: Do not shadow ClutterActor's destroy()

Since commit ef1e27966db2 turned DashItemContainer into an StWidget,
the destroy() method overrides the ClutterActor method, which is at
the very least bad style. Instead, follow the usual pattern of using
a ::destroy handler.

https://bugzilla.gnome.org/show_bug.cgi?id=791233
---
 js/ui/dash.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/js/ui/dash.js b/js/ui/dash.js
index b89040bb6..43b7c4450 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -50,6 +50,10 @@ var DashItemContainer = new Lang.Class({
         this._childScale = 0;
         this._childOpacity = 0;
         this.animatingOut = false;
+
+        this.connect('destroy', () => {
+            this.label.destroy();
+        });
     },
 
     vfunc_allocate: function(box, flags) {
@@ -177,11 +181,6 @@ var DashItemContainer = new Lang.Class({
                          });
     },
 
-    destroy: function() {
-        this.label.destroy();
-        this.parent();
-    },
-
     animateOutAndDestroy: function() {
         this.label.hide();
 
-- 
2.17.0


From b7b59d78b5a011fbae05786decbdd5a710ca9dba Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 4 Dec 2017 14:30:01 +0100
Subject: [PATCH 08/22] dateMenu: Ignore malformed world-clocks settings

Guard against a malformed setting that doesn't contain a
'location' key.

https://bugzilla.gnome.org/show_bug.cgi?id=791148
---
 js/ui/dateMenu.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 1d48fa8bd..5908c904f 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -132,6 +132,8 @@ var WorldClocksSection = new Lang.Class({
         let world = GWeather.Location.get_world();
         let clocks = settings.get_value('world-clocks').deep_unpack();
         for (let i = 0; i < clocks.length; i++) {
+            if (!clocks[i].location)
+                continue;
             let l = world.deserialize(clocks[i].location);
             this._locations.push({ location: l });
         }
-- 
2.17.0


From a3736d3a3951af8d5f67c3d0a961e5df9be7825f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 4 Dec 2017 14:30:01 +0100
Subject: [PATCH 09/22] dateMenu: Fix possible crash with unknown locations

If there are locations unknown to the libgweather version gnome-shell is
using, don't crash.

JS ERROR: TypeError: b.location is null
WorldClocksSection<._clocksChanged/<@resource:///org/gnome/shell/ui/dateMenu.js:141:1
WorldClocksSection<._clocksChanged@resource:///org/gnome/shell/ui/dateMenu.js:139:9

https://bugzilla.gnome.org/show_bug.cgi?id=791148
---
 js/ui/dateMenu.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 5908c904f..e732e0b1c 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -135,7 +135,8 @@ var WorldClocksSection = new Lang.Class({
             if (!clocks[i].location)
                 continue;
             let l = world.deserialize(clocks[i].location);
-            this._locations.push({ location: l });
+            if (l)
+                this._locations.push({ location: l });
         }
 
         this._locations.sort(function(a, b) {
-- 
2.17.0


From 74f4447b38e33dafbdd08a72368280d3f0193c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Fri, 8 Dec 2017 09:01:12 +0000
Subject: [PATCH 10/22] Update Icelandic translation

---
 po/is.po | 107 ++++++++++++++++++++++---------------------------------
 1 file changed, 42 insertions(+), 65 deletions(-)

diff --git a/po/is.po b/po/is.po
index b81ead20d..4807e2606 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-22 11:17+0000\n"
-"PO-Revision-Date: 2017-09-26 18:06+0000\n"
+"POT-Creation-Date: 2017-11-17 15:06+0000\n"
+"PO-Revision-Date: 2017-12-08 08:39+0000\n"
 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
 "Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
 "Language: is\n"
@@ -44,7 +44,6 @@ msgstr "Birta forritavalmynd"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:4
 #: js/extensionPrefs/main.js:152
-#| msgid "GNOME Shell Extensions"
 msgid "Shell Extensions"
 msgstr "Shell Extension skeljarviðbætur"
 
@@ -105,7 +104,7 @@ msgstr ""
 
 #: data/org.gnome.shell.gschema.xml.in:43
 msgid "List of desktop file IDs for favorite applications"
-msgstr ""
+msgstr "Listi yfir auðkenni skjáborðsskráa fyrir uppáhaldsforrit"
 
 #: data/org.gnome.shell.gschema.xml.in:44
 msgid ""
@@ -128,10 +127,9 @@ msgstr "Ferill skipanalínuglugga (Alt+F2)"
 #. Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass
 #: data/org.gnome.shell.gschema.xml.in:63
 msgid "History for the looking glass dialog"
-msgstr ""
+msgstr "Ferill looking-glass skipanalínuglugga (Alt+F)"
 
 #: data/org.gnome.shell.gschema.xml.in:67
-#| msgid "Always show the 'Log out' menu item in the user menu."
 msgid "Always show the “Log out” menu item in the user menu."
 msgstr "Alltaf sýna \"Skrá út\" atriðið í notandavalmyndinni."
 
@@ -177,14 +175,10 @@ msgid "Keybinding to open the application menu."
 msgstr "Lyklasamsetning til að opna forritavalmyndina."
 
 #: data/org.gnome.shell.gschema.xml.in:108
-#| msgid "Keybinding to open the \"Show Applications\" view"
 msgid "Keybinding to open the “Show Applications” view"
 msgstr "Lyklasamsetning til að opna \"Birta forrit\" sýnina"
 
 #: data/org.gnome.shell.gschema.xml.in:109
-#| msgid ""
-#| "Keybinding to open the \"Show Applications\" view of the Activities "
-#| "Overview."
 msgid ""
 "Keybinding to open the “Show Applications” view of the Activities Overview."
 msgstr ""
@@ -250,6 +244,9 @@ msgid ""
 "are “thumbnail-only” (shows a thumbnail of the window), “app-icon-"
 "only” (shows only the application icon) or “both”."
 msgstr ""
+"Stillir hvernig gluggar birtast í skiptinum. Möguleg gildi eru "
+"'einungis-smámynd' (birtir smámynd gluggans), 'einungis-forritstákn' (birtir "
+"aðeins táknmynd forritsins) eða 'bæði'."
 
 #: data/org.gnome.shell.gschema.xml.in:186
 msgid ""
@@ -371,7 +368,6 @@ msgstr "(eða strjúka fingri)"
 
 #. Translators: The name of the power-off action in search
 #: js/misc/systemActions.js:99
-#| msgid "Power Off"
 msgctxt "search-result"
 msgid "Power off"
 msgstr "Slökkva"
@@ -394,7 +390,6 @@ msgstr "læsa skjá"
 
 #. Translators: The name of the logout action in search
 #: js/misc/systemActions.js:113
-#| msgid "Log Out"
 msgctxt "search-result"
 msgid "Log out"
 msgstr "Skrá út"
@@ -406,40 +401,34 @@ msgstr "Útskráning;skrá út"
 
 #. Translators: The name of the suspend action in search
 #: js/misc/systemActions.js:120
-#| msgid "Suspend"
 msgctxt "search-result"
 msgid "Suspend"
 msgstr "Setja í bið"
 
 #. Translators: A list of keywords that match the suspend action, separated by semicolons
 #: js/misc/systemActions.js:123
-#| msgid "Suspend"
 msgid "suspend;sleep"
 msgstr "hvíla;svæfa"
 
 #. Translators: The name of the switch user action in search
 #: js/misc/systemActions.js:127
-#| msgid "Switch User"
 msgctxt "search-result"
 msgid "Switch user"
 msgstr "Skipta um notanda"
 
 #. Translators: A list of keywords that match the switch user action, separated by semicolons
 #: js/misc/systemActions.js:130
-#| msgid "Switch User"
 msgid "switch user"
 msgstr "skipta um notanda"
 
 #. Translators: The name of the lock orientation action in search
 #: js/misc/systemActions.js:134
-#| msgid "Orientation Lock"
 msgctxt "search-result"
 msgid "Lock orientation"
 msgstr "Stefnulás"
 
 #. Translators: A list of keywords that match the lock orientation action, separated by semicolons
 #: js/misc/systemActions.js:137
-#| msgid "Orientation Lock"
 msgid "lock orientation"
 msgstr "stefnulás"
 
@@ -477,7 +466,6 @@ msgstr[0] "fyrir %d klukkustund síðan"
 msgstr[1] "fyrir %d klukkustundum síðan"
 
 #: js/misc/util.js:188
-#| msgid "Yesterday, %H∶%M"
 msgid "Yesterday"
 msgstr "Í gær"
 
@@ -581,7 +569,6 @@ msgstr "%d. %B %Y, kl. %H∶%M %p"
 
 #. TRANSLATORS: this is the title of the wifi captive portal login window
 #: js/portalHelper/main.js:66
-#| msgid "Network Login"
 msgid "Hotspot Login"
 msgstr "Innskráning á tengipunkt (hotspot)"
 
@@ -590,6 +577,8 @@ 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 ""
+"Tenging þín við þennan aðgangsstað er ekki örugg. Aðilar í næsta nágrenni "
+"geta séð lykilorð og aðrar upplýsingar sem þú setur inn á þessari síðu."
 
 #. No support for non-modal system dialogs, so ignore the option
 #. let modal = options['modal'] || true;
@@ -633,12 +622,12 @@ msgstr "Bæta í Eftirlæti"
 msgid "Show Details"
 msgstr "Sýna ítarlegri upplýsingar"
 
-#: js/ui/appFavorites.js:140
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s var bætt við sem eftirlætisforrit."
 
-#: js/ui/appFavorites.js:174
+#: js/ui/appFavorites.js:175
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s var fjarlægt úr eftirlætisforritum."
@@ -727,58 +716,57 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "La"
 
-#: js/ui/calendar.js:442
+#: js/ui/calendar.js:449
 msgid "Previous month"
 msgstr "Fyrri mánuður"
 
-#: js/ui/calendar.js:452
+#: js/ui/calendar.js:459
 msgid "Next month"
 msgstr "Næsti mánuður"
 
-#: js/ui/calendar.js:605
+#: js/ui/calendar.js:612
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: js/ui/calendar.js:660
+#: js/ui/calendar.js:667
 msgid "Week %V"
 msgstr "Vika %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:729
+#: js/ui/calendar.js:736
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Allan daginn"
 
-#: js/ui/calendar.js:862
+#: js/ui/calendar.js:869
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d"
 
-#: js/ui/calendar.js:866
+#: js/ui/calendar.js:873
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: js/ui/calendar.js:1086
+#: js/ui/calendar.js:1093
 msgid "No Notifications"
 msgstr "Engar tilkynningar"
 
-#: js/ui/calendar.js:1089
+#: js/ui/calendar.js:1096
 msgid "No Events"
 msgstr "Engir atburðir"
 
-#: js/ui/calendar.js:1117
+#: js/ui/calendar.js:1124
 msgid "Clear All"
 msgstr "Hreinsa allt"
 
 #. Translators: %s is an application name
 #: js/ui/closeDialog.js:44
 #, javascript-format
-#| msgid "“%s” is ready"
 msgid "“%s” is not responding."
 msgstr "“%s” svarar ekki."
 
@@ -806,7 +794,7 @@ msgstr "Utanáliggjandi drif tengt"
 msgid "External drive disconnected"
 msgstr "Utanáliggjandi drif aftengt"
 
-#: js/ui/components/autorunManager.js:354
+#: js/ui/components/autorunManager.js:358
 #, javascript-format
 msgid "Open with %s"
 msgstr "Opna með %s"
@@ -917,7 +905,6 @@ msgstr "Auðkenna"
 #. * because of an authentication error (like invalid password),
 #. * for instance.
 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:328
-#| msgid "Sorry, that didn't work. Please try again."
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Æ, þetta virkaði ekki. Endilega reyndu aftur."
 
@@ -945,7 +932,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:75
+#: js/ui/dateMenu.js:76
 msgid "%B %e %Y"
 msgstr "%e. %B %Y"
 
@@ -953,19 +940,19 @@ msgstr "%e. %B %Y"
 #. * below the time in the shell; it should combine the weekday and the
 #. * date, e.g. "Tuesday February 17 2015".
 #.
-#: js/ui/dateMenu.js:82
+#: js/ui/dateMenu.js:83
 msgid "%A %B %e %Y"
 msgstr "%A %e. %B, %Y"
 
-#: js/ui/dateMenu.js:144
+#: js/ui/dateMenu.js:145
 msgid "Add world clocks…"
 msgstr "Bæta við heimsklukkum…"
 
-#: js/ui/dateMenu.js:145
+#: js/ui/dateMenu.js:146
 msgid "World Clocks"
 msgstr "Heimsklukkur"
 
-#: js/ui/dateMenu.js:224
+#: js/ui/dateMenu.js:225
 msgid "Weather"
 msgstr "Veður"
 
@@ -973,7 +960,7 @@ msgstr "Veður"
 #. 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:286
+#: js/ui/dateMenu.js:289
 #, javascript-format
 msgid "%s all day."
 msgstr "%s allan daginn."
@@ -982,7 +969,7 @@ msgstr "%s allan daginn."
 #. 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:292
+#: js/ui/dateMenu.js:295
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, síðan %s."
@@ -991,32 +978,30 @@ msgstr "%s, síðan %s."
 #. 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:298
+#: js/ui/dateMenu.js:301
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, síðan %s, en snýst svo upp í %s síðar."
 
-#: js/ui/dateMenu.js:309
-#| msgid "Select a network"
+#: js/ui/dateMenu.js:312
 msgid "Select a location…"
 msgstr "Veldu staðsetningu…"
 
-#: js/ui/dateMenu.js:312
-#| msgid "Searching…"
+#: js/ui/dateMenu.js:315
 msgid "Loading…"
 msgstr "Hleð inn..."
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:318
+#: js/ui/dateMenu.js:321
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Með vindkælingu %s."
 
-#: js/ui/dateMenu.js:321
+#: js/ui/dateMenu.js:324
 msgid "Go online for weather information"
 msgstr "Fara á netið eftir veðurupplýsingum"
 
-#: js/ui/dateMenu.js:323
+#: js/ui/dateMenu.js:326
 msgid "Weather information is currently unavailable"
 msgstr "Veðurupplýsingar eru ekki tiltækar í augnablikinu"
 
@@ -1181,11 +1166,11 @@ msgstr "Sækja og setja upp '%s' frá extensions.gnome.org?"
 #: js/ui/inhibitShortcutsDialog.js:59
 #, javascript-format
 msgid "%s wants to inhibit shortcuts"
-msgstr ""
+msgstr "%s vill koma í veg fyrir notkun flýtilykla"
 
 #: js/ui/inhibitShortcutsDialog.js:60
 msgid "Application wants to inhibit shortcuts"
-msgstr ""
+msgstr "Forrit vill koma í veg fyrir notkun flýtilykla"
 
 #. Translators: %s is a keyboard shortcut like "Super+x"
 #: js/ui/inhibitShortcutsDialog.js:69
@@ -1253,7 +1238,7 @@ msgstr "Skoða frumtexta"
 msgid "Web Page"
 msgstr "Vefsíða"
 
-#: js/ui/messageTray.js:1493
+#: js/ui/messageTray.js:1494
 msgid "System Information"
 msgstr "Kerfisupplýsingar"
 
@@ -1288,7 +1273,6 @@ msgid "New shortcut…"
 msgstr "Nýr flýtilykill..."
 
 #: js/ui/padOsd.js:152
-#| msgid "Applications"
 msgid "Application defined"
 msgstr "Forrit skilgreint"
 
@@ -1297,7 +1281,6 @@ msgid "Show on-screen help"
 msgstr "Birta upplýsingar á skjá"
 
 #: js/ui/padOsd.js:154
-#| msgid "Switch User"
 msgid "Switch monitor"
 msgstr "Skipta um skjá"
 
@@ -1726,7 +1709,6 @@ msgid "%s Not Connected"
 msgstr "%s ekki tengdur"
 
 #: js/ui/status/network.js:1435
-#| msgid "connecting..."
 msgid "connecting…"
 msgstr "tengist..."
 
@@ -1757,7 +1739,6 @@ msgstr "Stillingar nets"
 
 #: js/ui/status/network.js:1603
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
 msgstr[0] "%s þráðlaus tenging"
@@ -1765,7 +1746,6 @@ msgstr[1] "%s þráðlausar tengingar"
 
 #: js/ui/status/network.js:1607
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
 msgstr[0] "%s Wi-Fi tenging"
@@ -1773,7 +1753,6 @@ msgstr[1] "%s Wi-Fi tengingar"
 
 #: js/ui/status/network.js:1611
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
 msgstr[0] "%s mótaldstenging"
@@ -1877,7 +1856,6 @@ msgstr "Hljóðstyrkur"
 #. * Try to keep it under around 15 characters.
 #.
 #: js/ui/switchMonitor.js:21
-#| msgid "Error"
 msgid "Mirror"
 msgstr "Spegla"
 
@@ -2025,20 +2003,19 @@ msgstr "Evolution dagatal"
 msgid "evolution"
 msgstr "evolution"
 
-#: src/main.c:380
+#: src/main.c:437
 msgid "Print version"
 msgstr "Prenta útgáfunúmer"
 
-#: src/main.c:386
+#: src/main.c:443
 msgid "Mode used by GDM for login screen"
 msgstr "Hamur sem GDM notar fyrir innskráningarglugga"
 
-#: src/main.c:392
-#| msgid "Use a specific mode, e.g. \"gdm\" for login screen"
+#: src/main.c:449
 msgid "Use a specific mode, e.g. “gdm” for login screen"
 msgstr "Nota sérstakan ham, t.d. \"gdm\" fyrir innskráningarskjá"
 
-#: src/main.c:398
+#: src/main.c:455
 msgid "List possible modes"
 msgstr "Sýna alla mögulega hami"
 
-- 
2.17.0


From 983a7ca8f5682f9550fdb0b2cd32b36fa1c3b997 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Fri, 15 Dec 2017 10:05:34 -0500
Subject: [PATCH 11/22] background: don't leak wall clock when background
 changes

The background code allocates a GnomeWallClock when its first created,
but neglects to drop a reference to that clock at destroy time.
The undestroyed clocks lead to a timerfd leak that eventually prevents
the shell from functioning.

https://bugzilla.gnome.org/show_bug.cgi?id=791655
---
 js/ui/background.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/ui/background.js b/js/ui/background.js
index 1c2b83bae..3ea7900e7 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -289,6 +289,8 @@ var Background = new Lang.Class({
             this._clock.disconnect(this._timezoneChangedId);
         this._timezoneChangedId = 0;
 
+        this._clock = null;
+
         if (this._prepareForSleepId != 0)
             LoginManager.getLoginManager().disconnect(this._prepareForSleepId);
         this._prepareForSleepId = 0;
-- 
2.17.0


From 15b1810a615ec34f375395f4b93bef3eee04b85e Mon Sep 17 00:00:00 2001
From: Pieter Schalk Schoeman <pieter@sonbesie.co.za>
Date: Mon, 18 Dec 2017 17:28:02 +0000
Subject: [PATCH 12/22] Update Afrikaans translation

---
 po/af.po | 1551 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 992 insertions(+), 559 deletions(-)

diff --git a/po/af.po b/po/af.po
index 72ecaa653..d0a888c5f 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,71 +3,75 @@
 # This file is distributed under the same license as the gnome-shell package.
 # F Wolff <friedel@translate.org.za>, 2011, 2013, 2014, 2015, 2016.
 # Dawid Loubser <dawid.loubser@ibi.co.za>, 2013.
+# Pieter Schoeman <pieter@sonbesie.co.za>, 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-02-29 10:15+0000\n"
-"PO-Revision-Date: 2016-02-29 19:51+0200\n"
-"Last-Translator: F Wolff <friedel@translate.org.za>\n"
-"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
+"POT-Creation-Date: 2017-10-04 18:03+0000\n"
+"PO-Revision-Date: 2017-12-18 19:26+0200\n"
+"Last-Translator: Pieter Schoeman <pieter@sonbesie.co.za>\n"
+"Language-Team: Afrikaans <pieter@sonbesie.co.za>\n"
 "Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "X-DamnedLies-Scope: partial\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/50-gnome-shell-system.xml.in.h:1
+#: data/50-gnome-shell-system.xml:6
 msgid "System"
 msgstr "Stelsel"
 
-#: ../data/50-gnome-shell-system.xml.in.h:2
+#: data/50-gnome-shell-system.xml:9
 msgid "Show the notification list"
 msgstr "Wys die lys van kennisgewings"
 
-#: ../data/50-gnome-shell-system.xml.in.h:3
+#: data/50-gnome-shell-system.xml:12
 msgid "Focus the active notification"
 msgstr "Fokus op die aktiewe kennisgewing"
 
-#: ../data/50-gnome-shell-system.xml.in.h:4
+#: data/50-gnome-shell-system.xml:15
 msgid "Show the overview"
 msgstr "Wys die oorsig"
 
-#: ../data/50-gnome-shell-system.xml.in.h:5
+#: data/50-gnome-shell-system.xml:18
 msgid "Show all applications"
 msgstr "Wys alle toepassings"
 
-#: ../data/50-gnome-shell-system.xml.in.h:6
+#: data/50-gnome-shell-system.xml:21
 msgid "Open the application menu"
 msgstr "Open die toepassingkieslys"
 
-#: ../data/gnome-shell-extension-prefs.desktop.in.in.h:1
-msgid "GNOME Shell Extension Preferences"
-msgstr "Voorkeure vir GNOME Shell-uitbreidings"
+#: data/gnome-shell-extension-prefs.desktop.in.in:4
+#: js/extensionPrefs/main.js:152
+#| msgid "GNOME Shell Extensions"
+msgid "Shell Extensions"
+msgstr "Shell Uitbreidings"
 
-#: ../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 "Stel GNOME Shell-uitbreidings op"
+msgstr "Stel GNOME Shell Uitbreidings op"
 
-#: ../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 "Vensterbestuur en toepassinglansering"
 
-#: ../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 ""
 "Aktiveer interne gereedskap wat nuttig is vir ontwikkelaars en toetsers "
 "vanaf 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."
@@ -75,11 +79,11 @@ msgstr ""
 "Laat toegang na interne ontfout- en moniteringsgereedskap toe deur die Alt-"
 "F2-dialoog te gebruik."
 
-#: ../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's van uitbreidings om te aktiveer"
 
-#: ../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 "
@@ -91,11 +95,38 @@ msgstr ""
 "moet in hierdie lys verskyn. U kan ook hierdie lys manipuleer met die "
 "EnableExtension- en DisableExtension-DBus-metodes op org.gnome.Shell."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
+#: data/org.gnome.shell.gschema.xml.in:26
+msgid "Disable user extensions"
+msgstr "Skakel gebruikers uitbreidings af"
+
+#: data/org.gnome.shell.gschema.xml.in:27
+msgid ""
+"Disable all extensions the user has enabled without affecting the “enabled-"
+"extension” setting."
+msgstr ""
+"Skakel alle uitbreidings wat die gebruiker aangeskakel het af sonder om die "
+"\"aangeskakelde-uitbreiding\" instelling te verander."
+
+#: data/org.gnome.shell.gschema.xml.in:34
+msgid "Disables the validation of extension version compatibility"
+msgstr "Skakel die validasie van uitbreidings weergawe versoenbaarheid af"
+
+#: 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 "
+"load all extensions regardless of the versions they claim to support."
+msgstr ""
+"GNOME Shell sal slegs uitbreidings laai wat die huidig geïnstalleerde "
+"weergawe ondersteun. Deur die opsie te aktiveer sal die toets afgeskakel "
+"word en alle uitbreidings sal gelaai kan word ongeag of hulle die weergawe "
+"ondersteun of nie."
+
+#: data/org.gnome.shell.gschema.xml.in:43
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Lys van werkarealêer-ID's vir gunstelingtoepassings"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:8
+#: data/org.gnome.shell.gschema.xml.in:44
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@@ -103,198 +134,265 @@ msgstr ""
 "Die toepassings wat ooreenstem met dié identifiseerders sal in die "
 "gunstelinge-area vertoon word."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
+#: data/org.gnome.shell.gschema.xml.in:51
+msgid "App Picker View"
+msgstr "Toepassing Kieser Oorsig"
+
+#: data/org.gnome.shell.gschema.xml.in:52
+msgid "Index of the currently selected view in the application picker."
+msgstr "Indeks van die huidige aansig in die toepassing kieser "
+
+#: data/org.gnome.shell.gschema.xml.in:58
 msgid "History for command (Alt-F2) dialog"
 msgstr "Geskiedenis vir die opdrag-dialoogvenster (Alt-F2)"
 
-#. 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:63
 msgid "History for the looking glass dialog"
 msgstr "Geskiedenis vir die \"looking glass\"-dialoogvenster"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
-msgid "Always show the 'Log out' menu item in the user menu."
-msgstr "Wys altyd die 'Meld af'-kieslysitem in die gebruikerkieslys."
+#: data/org.gnome.shell.gschema.xml.in:67
+#| msgid "Always show the 'Log out' menu item in the user menu."
+msgid "Always show the “Log out” menu item in the user menu."
+msgstr "Wys altyd die 'Meld af' opsie in die gebruikerkieslys."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: data/org.gnome.shell.gschema.xml.in:68
+#| msgid ""
+#| "This key overrides the automatic hiding of the 'Log out' menu item in "
+#| "single-user, single-session situations."
 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 ""
 "Hierdie sleutel oorheers die outomatiese wegsteek van die 'Meld af'-"
 "kieslysitem in enkelgebruiker-, enkelsessie-situasies."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: data/org.gnome.shell.gschema.xml.in:75
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
 "Of wagwoord onthou moet word vir die heg van geënkripteerde of afgeleë "
 "lêerstelsels"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: 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 "
+#| "state of the checkbox."
 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 ""
 "'n Wagwoord sal versoek word wanneer 'n geënkripteerde toestel of afgeleë "
 "lêerstelsel geheg word. As die wagwoord vir toekomstige gebruik gestoor kan "
 "word sal 'n 'Onthou wagwoord'-keuseblokkie teenwoordig wees. Hierdie sleutel "
-"stel die verstektoestand van die keuseblokkie."
+"stel die verstektoestand van die keuseblokkie stel."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
-msgid "Show the week date in the calendar"
-msgstr "Wys die weekdatum in die kalender"
+#: data/org.gnome.shell.gschema.xml.in:85
+msgid ""
+"Whether the default Bluetooth adapter had set up devices associated to it"
+msgstr ""
+"Of die verstek Bluetooth verwerker opgestelde toestelle het wat daarmee "
+"verband hou."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
-msgid "If true, display the ISO week date in the calendar."
-msgstr "Indien waar, vertoon die ISO-weekdatum in die kalender."
+#: 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 "
+"adapter. This will be reset if the default adapter is ever seen not to have "
+"devices associated to it."
+msgstr ""
+"Die shell sal slegs 'n Bluetooth-kieslysitem wys as 'n Bluetooth-verwerker "
+"aangeskakel is, of as daar toestelle ingestel is wat verband hou met die "
+"verstekverwerker. Dit sal herstel word as die verstekverwerker ooit gesien "
+"word om nie toestelle wat daarmee verband hou, te hê nie."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: data/org.gnome.shell.gschema.xml.in:101
 msgid "Keybinding to open the application menu"
 msgstr "Sleutelbinding om die toepassingskieslys oop te maak"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: data/org.gnome.shell.gschema.xml.in:102
 msgid "Keybinding to open the application menu."
 msgstr "Sleutelbinding om die toepassingskieslys oop te maak."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Sleutelbinding om die \"Vertoon toepassings\"-aansig oop te maak"
+#: data/org.gnome.shell.gschema.xml.in:108
+#| msgid "Keybinding to open the \"Show Applications\" view"
+msgid "Keybinding to open the “Show Applications” view"
+msgstr "Sleutelkortpad om die \"Vertoon toepassings\"-aansig oop te maak"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: data/org.gnome.shell.gschema.xml.in:109
+#| msgid ""
+#| "Keybinding to open the \"Show Applications\" view of the Activities "
+#| "Overview."
 msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
+"Keybinding to open the “Show Applications” view of the Activities Overview."
 msgstr ""
-"Sleutelbinding om die \"Vertoon toepassings\"-aansig van die Aktiwiteite-"
+"Sleutelkortpad om die \"Vertoon toepassings\"-aansig van die Aktiwiteite-"
 "oorsig oop te maak."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: data/org.gnome.shell.gschema.xml.in:116
 msgid "Keybinding to open the overview"
 msgstr "Sleutelbinding om die oorsig oop te maak"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: data/org.gnome.shell.gschema.xml.in:117
 msgid "Keybinding to open the Activities Overview."
 msgstr "Sleutelbinding om die Aktiwiteite-oorsig oop te maak."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: data/org.gnome.shell.gschema.xml.in:123
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr "Sleutelbinding om die sigbaarheid van die kennisgewinglys te swik"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: data/org.gnome.shell.gschema.xml.in:124
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr "Sleutelbinding om die sigbaarheid van die kennisgewinglys te swik."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: data/org.gnome.shell.gschema.xml.in:130
 msgid "Keybinding to focus the active notification"
 msgstr "Sleutelbinding om die aktiewe kennisgewing te fokus"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: data/org.gnome.shell.gschema.xml.in:131
 msgid "Keybinding to focus the active notification."
 msgstr "Sleutelbinding om die aktiewe kennisgewing te fokus."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: data/org.gnome.shell.gschema.xml.in:137
+msgid ""
+"Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgstr ""
+"Sleutelkortpaaie wat alle uitvoerende tweens stop en weer begin vir "
+"ontvoutings doeleindes."
+
+#: data/org.gnome.shell.gschema.xml.in:146
 msgid "Which keyboard to use"
 msgstr "Watter sleutelbord om te gebruik"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: data/org.gnome.shell.gschema.xml.in:147
 msgid "The type of keyboard to use."
 msgstr "Die tipe sleutelbord om te gebruik."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: data/org.gnome.shell.gschema.xml.in:158
+#: data/org.gnome.shell.gschema.xml.in:185
+msgid "Limit switcher to current workspace."
+msgstr "Beperk wisselaar tot huidige werkspasie."
+
+#: 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 ""
+"As waar sal slegs toepassings wat vensters in die huidige werkspasie het in "
+"die wisselaar vertoon word. Anders sal alle toepassings ingesluit word."
+
+#: data/org.gnome.shell.gschema.xml.in:176
 msgid "The application icon mode."
 msgstr "Die toepassingsikoon-modus."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
+#: 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'."
 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 ""
 "Stel op hoe die vensters vertoon word in die wisselaar. Geldige moontlikhede "
-"is 'thumbnail-only' (wys 'n duimnael van die venster), 'app-icon-only' (wys "
-"slegs die toepassing se ikoon), of 'both'."
+"is 'slegs-duimnaelskets' (wys 'n duimnaelskets van die venster), 'slegs-toep-"
+"ikoon' (wys slegs die toepassing se ikoon), of 'altwee'."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: 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 ""
+"As waar sal slegs vensters van die huidige werkspasie in die wisselaar "
+"vertoon word. Anders sal alle vensters ingesluit word."
+
+#: data/org.gnome.shell.gschema.xml.in:197
 msgid "Attach modal dialog to the parent window"
 msgstr "Heg modale dialoogvenster vas aan die ouervenster"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: 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 ""
 "Hierdie sleutel oorskryf die sleutel in org.gnome.mutter wanneer GNOME Shell "
 "uitgevoer word."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
-#, fuzzy
+#: data/org.gnome.shell.gschema.xml.in:206
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Aktiveer rand-tilering wanneer vensters op skermrand laat val word"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+#: data/org.gnome.shell.gschema.xml.in:214
 msgid "Workspaces are managed dynamically"
-msgstr "Werkskerms word dinamies bestuur"
+msgstr "Werkspasies word dinamies bestuur"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+#: data/org.gnome.shell.gschema.xml.in:222
 msgid "Workspaces only on primary monitor"
-msgstr "Werkskerms slegs op primêre monitor"
+msgstr "Werkspasies slegs op primêre monitor"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+#: data/org.gnome.shell.gschema.xml.in:230
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Vertraag fokusverandering in muismodus totdat die wyser ophou beweeg"
 
-#: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
+#: data/org.gnome.Shell.PortalHelper.desktop.in.in:3
 msgid "Network Login"
 msgstr "Netwerkaanmelding"
 
-#: ../js/extensionPrefs/main.js:121
+#. 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 error"
+msgid "network-workgroup"
+msgstr "netwerk werkgroep"
+
+#: js/extensionPrefs/main.js:120
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "'n Fout het voorgekom tydens die lansering van die voorkeuredialoog vir %s:"
 
-#: ../js/extensionPrefs/main.js:153
-msgid "GNOME Shell Extensions"
-msgstr "GNOME Shell-uitbreidings"
-
-#: ../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:149 js/ui/audioDeviceSelection.js:71
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
+#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
+#: js/ui/shellMountOperation.js:344 js/ui/status/network.js:936
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../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 "Volgende"
 
-#: ../js/gdm/authPrompt.js:212 ../js/ui/shellMountOperation.js:403
-#: ../js/ui/unlockDialog.js:59
+#: js/gdm/authPrompt.js:214 js/ui/shellMountOperation.js:348
+#: js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Sluit oop"
 
-#: ../js/gdm/authPrompt.js:214
+#: js/gdm/authPrompt.js:216
 msgctxt "button"
 msgid "Sign In"
 msgstr "Meld aan"
 
-#: ../js/gdm/loginDialog.js:285
+#: js/gdm/loginDialog.js:308
 msgid "Choose Session"
 msgstr "Kies sessie"
 
 #. 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:458
 msgid "Not listed?"
 msgstr "Nie op die lys nie?"
 
 #. 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:888
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(bv. gebruiker of %s)"
@@ -302,17 +400,16 @@ msgstr "(bv. gebruiker of %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:893 js/ui/components/networkAgent.js:243
+#: js/ui/components/networkAgent.js:261
 msgid "Username: "
 msgstr "Gebruikernaam: "
 
-#: ../js/gdm/loginDialog.js:1196
+#: js/gdm/loginDialog.js:1236
 msgid "Login Window"
 msgstr "Aanmeldvenster"
 
-#: ../js/gdm/util.js:341
-#, fuzzy
+#: js/gdm/util.js:346
 #| msgid "Connection error"
 msgid "Authentication error"
 msgstr "Verifiëringsfout"
@@ -322,40 +419,171 @@ msgstr "Verifiëringsfout"
 #. 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 "(of veeg vinger)"
 
-#: ../js/misc/util.js:119
+#. Translators: The name of the power-off action in search
+#: js/misc/systemActions.js:99
+#| msgid "Power Off"
+msgctxt "search-result"
+msgid "Power off"
+msgstr "Skakel af"
+
+#. Translators: A list of keywords that match the power-off action, separated by semicolons
+#: js/misc/systemActions.js:102
+msgid "power off;shutdown"
+msgstr "power off;shutdown;skakel af;afskakel;"
+
+#. Translators: The name of the lock screen action in search
+#: js/misc/systemActions.js:106
+#| msgid "Lock Screen"
+msgctxt "search-result"
+msgid "Lock screen"
+msgstr "Sluit skerm"
+
+#. Translators: A list of keywords that match the lock screen action, separated by semicolons
+#: js/misc/systemActions.js:109
+#| msgid "Lock Screen"
+msgid "lock screen"
+msgstr "sluit skerm"
+
+#. Translators: The name of the logout action in search
+#: js/misc/systemActions.js:113
+#| msgid "Log Out"
+msgctxt "search-result"
+msgid "Log out"
+msgstr "Meld af"
+
+#. Translators: A list of keywords that match the logout action, separated by semicolons
+#: js/misc/systemActions.js:116
+msgid "logout;sign off"
+msgstr "meld af;teken af"
+
+#. Translators: The name of the suspend action in search
+#: js/misc/systemActions.js:120
+#| msgid "Suspend"
+msgctxt "search-result"
+msgid "Suspend"
+msgstr "Sluimer"
+
+#. Translators: A list of keywords that match the suspend action, separated by semicolons
+#: js/misc/systemActions.js:123
+#| msgid "Suspend"
+msgid "suspend;sleep"
+msgstr "suspend;sleep;sluimer;slaap"
+
+#. Translators: The name of the switch user action in search
+#: js/misc/systemActions.js:127
+#| msgid "Switch User"
+msgctxt "search-result"
+msgid "Switch user"
+msgstr "Wissel gebruiker"
+
+#. Translators: A list of keywords that match the switch user action, separated by semicolons
+#: js/misc/systemActions.js:130
+#| msgid "Switch User"
+msgid "switch user"
+msgstr "wissel gebruiker"
+
+#. Translators: The name of the lock orientation action in search
+#: js/misc/systemActions.js:134
+#| msgid "Orientation Lock"
+msgctxt "search-result"
+msgid "Lock orientation"
+msgstr "Sluit oriëntasie"
+
+#. Translators: A list of keywords that match the lock orientation action, separated by semicolons
+#: js/misc/systemActions.js:137
+#| msgid "Orientation Lock"
+msgid "lock orientation"
+msgstr "sluit oriëntasie"
+
+#: js/misc/util.js:122
 msgid "Command not found"
 msgstr "Opdrag nie gevind nie"
 
 #. 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 "Kon nie opdrag ontleed nie:"
 
-#: ../js/misc/util.js:160
+#: js/misc/util.js:163
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "Uitvoer van “%s” het misluk:"
 
+#: js/misc/util.js:180
+msgid "Just now"
+msgstr "Nounet"
+
+#: js/misc/util.js:182
+#, javascript-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minuut gelede"
+msgstr[1] "%d minute gelede"
+
+#: js/misc/util.js:185
+#, javascript-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d uur gelede"
+msgstr[1] "%d ure gelede"
+
+#: js/misc/util.js:188
+#| msgid "Yesterday, %H∶%M"
+msgid "Yesterday"
+msgstr "Gister"
+
+#: js/misc/util.js:190
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d dag gelede"
+msgstr[1] "%d dae gelede"
+
+#: js/misc/util.js:193
+#, javascript-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d week gelede"
+msgstr[1] "%d weke gelede"
+
+#: js/misc/util.js:196
+#, javascript-format
+#| msgid "%d minute ago"
+#| msgid_plural "%d minutes ago"
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d maand gelede"
+msgstr[1] "%d maande gelede"
+
+#: js/misc/util.js:198
+#, javascript-format
+#| msgid "%d day ago"
+#| msgid_plural "%d days ago"
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d jaar gelede"
+msgstr[1] "%d jaar gelede"
+
 #. Translators: Time in 24h format
-#: ../js/misc/util.js:191
+#: js/misc/util.js:228
 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:234
 #, no-c-format
 msgid "Yesterday, %H∶%M"
 msgstr "Gister, %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:240
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A %H:%M"
@@ -363,7 +591,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:246
 #, no-c-format
 msgid "%B %d, %H∶%M"
 msgstr "%e %B %H∶%M"
@@ -371,26 +599,26 @@ msgstr "%e %B %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:252
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
 msgstr "%e %B %Y, %H∶%M"
 
 #. Translators: Time in 12h format
-#: ../js/misc/util.js:220
+#: js/misc/util.js:257
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
 #. 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:263
 #, no-c-format
 msgid "Yesterday, %l∶%M %p"
 msgstr "Gister, %l∶%M %p"
 
 #. 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:269
 #, no-c-format
 msgid "%A, %l∶%M %p"
 msgstr "%A, %l:%M %p"
@@ -398,7 +626,7 @@ msgstr "%A, %l:%M %p"
 #. 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:275
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
 msgstr "%e %B %l:%M %p"
@@ -406,94 +634,111 @@ msgstr "%e %B %l:%M %p"
 #. 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:281
 #, no-c-format
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%e %B %Y, %l:%M %p"
 
-#. 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
-#, fuzzy
-#| msgid "Authentication Required"
-msgid "Web Authentication Redirect"
-msgstr "Verifiëringsversoek"
+#. TRANSLATORS: this is the title of the wifi captive portal login window
+#: js/portalHelper/main.js:66
+#| msgid "Network Login"
+msgid "Hotspot Login"
+msgstr "Kuberkolaanmelding"
+
+#: 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 ""
+"Jou verbinding met die kuberkolaanmelding is nie veilig nie. Wagwoorde en "
+"ander inligting op die bladsy kan deur ander mense gesien word."
+
+#. No support for non-modal system dialogs, so ignore the option
+#. let modal = options['modal'] || true;
+#: js/ui/accessDialog.js:63 js/ui/status/location.js:395
+msgid "Deny Access"
+msgstr "Wyer toegang"
 
-#: ../js/ui/appDisplay.js:794
+#: js/ui/accessDialog.js:64 js/ui/status/location.js:398
+msgid "Grant Access"
+msgstr "Verleen toegang"
+
+#: js/ui/appDisplay.js:809
 msgid "Frequently used applications will appear here"
 msgstr "Toepassings wat gereeld gebruik word sal hier verskyn"
 
-#: ../js/ui/appDisplay.js:914
+#: js/ui/appDisplay.js:930
 msgid "Frequent"
 msgstr "Gereeldes"
 
-#: ../js/ui/appDisplay.js:921
+#: js/ui/appDisplay.js:937
 msgid "All"
 msgstr "Almal"
 
-#: ../js/ui/appDisplay.js:1853
+#: js/ui/appDisplay.js:1915
 msgid "New Window"
 msgstr "Nuwe venster"
 
-#: ../js/ui/appDisplay.js:1881 ../js/ui/dash.js:289
+#: js/ui/appDisplay.js:1929
+msgid "Launch using Dedicated Graphics Card"
+msgstr "Begin met 'n Toegewyde Grafika Kaart"
+
+#: js/ui/appDisplay.js:1956 js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Verwyder uit gunstelinge"
 
-#: ../js/ui/appDisplay.js:1887
+#: js/ui/appDisplay.js:1962
 msgid "Add to Favorites"
 msgstr "Voeg by gunstelinge"
 
-#: ../js/ui/appDisplay.js:1897
+#: js/ui/appDisplay.js:1972
 msgid "Show Details"
 msgstr "Wys besonderhede"
 
-#: ../js/ui/appFavorites.js:134
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s is by die gunstelinge gevoeg."
 
-#: ../js/ui/appFavorites.js:168
+#: js/ui/appFavorites.js:175
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s uit die gunstelinge verwyder."
 
-#: ../js/ui/audioDeviceSelection.js:59
-#| msgid "Send Files to Device..."
+#: js/ui/audioDeviceSelection.js:59
 msgid "Select Audio Device"
 msgstr "Kies klanktoestel"
 
-#: ../js/ui/audioDeviceSelection.js:69
+#: js/ui/audioDeviceSelection.js:69
 msgid "Sound Settings"
 msgstr "Klankinstellings"
 
-#: ../js/ui/audioDeviceSelection.js:78
-#| msgid "Cell phone"
+#: js/ui/audioDeviceSelection.js:78
 msgid "Headphones"
 msgstr "Oorfone"
 
-#: ../js/ui/audioDeviceSelection.js:80
+#: js/ui/audioDeviceSelection.js:80
 msgid "Headset"
 msgstr "Kopstuk"
 
-#: ../js/ui/audioDeviceSelection.js:82 ../js/ui/status/volume.js:213
+#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:221
 msgid "Microphone"
 msgstr "Mikrofoon"
 
-#: ../js/ui/backgroundMenu.js:19
+#: js/ui/backgroundMenu.js:19
 msgid "Change Background…"
 msgstr "Verander agtergrond…"
 
-#: ../js/ui/backgroundMenu.js:21
-#| msgid "Privacy Settings"
+#: js/ui/backgroundMenu.js:21 js/ui/status/nightLight.js:51
 msgid "Display Settings"
 msgstr "Vertooninstellings"
 
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
+#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:265
 msgid "Settings"
 msgstr "Instellings"
 
 #. 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 "06"
@@ -503,158 +748,173 @@ msgstr "06"
 #. * 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 "S"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:78
+#: js/ui/calendar.js:78
 msgctxt "grid monday"
 msgid "M"
 msgstr "M"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:80
+#: js/ui/calendar.js:80
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "D"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:82
+#: js/ui/calendar.js:82
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "W"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:84
+#: js/ui/calendar.js:84
 msgctxt "grid thursday"
 msgid "T"
 msgstr "D"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:86
+#: js/ui/calendar.js:86
 msgctxt "grid friday"
 msgid "F"
 msgstr "V"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:88
+#: js/ui/calendar.js:88
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
 
-#: ../js/ui/calendar.js:416
+#: js/ui/calendar.js:449
 msgid "Previous month"
 msgstr "Vorige maand"
 
-#: ../js/ui/calendar.js:426
+#: js/ui/calendar.js:459
 msgid "Next month"
 msgstr "Volgende maand"
 
-#: ../js/ui/calendar.js:579
+#: js/ui/calendar.js:612
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: ../js/ui/calendar.js:634
+#: js/ui/calendar.js:667
 msgid "Week %V"
 msgstr "Week %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:736
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Heel dag"
 
-#: ../js/ui/calendar.js:821
-msgid "Events"
-msgstr "Gebeure"
-
-#: ../js/ui/calendar.js:830
+#: js/ui/calendar.js:869
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %e %B"
 
-#: ../js/ui/calendar.js:834
+#: js/ui/calendar.js:873
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %e %B %Y"
 
-#: ../js/ui/calendar.js:919
-msgid "Notifications"
-msgstr "Kennisgewings"
-
-#: ../js/ui/calendar.js:1070
+#: js/ui/calendar.js:1093
 msgid "No Notifications"
 msgstr "Geen kennisgewings"
 
-#: ../js/ui/calendar.js:1073
+#: js/ui/calendar.js:1096
 msgid "No Events"
 msgstr "Geen gebeure"
 
-#: ../js/ui/components/automountManager.js:91
+#: js/ui/calendar.js:1124
+msgid "Clear All"
+msgstr "Maak als skoon"
+
+#. Translators: %s is an application name
+#: js/ui/closeDialog.js:44
+#, javascript-format
+#| msgid "“%s” is ready"
+msgid "“%s” is not responding."
+msgstr "“%s” reageer nie."
+
+#: js/ui/closeDialog.js:45
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+"Jy mag 'n wyle te wag vir die program om voort te gaan of jy kan die program "
+"forseer om af te sluit."
+
+#: js/ui/closeDialog.js:61
+msgid "Force Quit"
+msgstr "Forseer Afsluit"
+
+#: js/ui/closeDialog.js:64
+msgid "Wait"
+msgstr "Wag"
+
+#: js/ui/components/automountManager.js:91
 msgid "External drive connected"
 msgstr "Eksterne skyf ingeprop"
 
-#: ../js/ui/components/automountManager.js:102
+#: js/ui/components/automountManager.js:102
 msgid "External drive disconnected"
 msgstr "Eksterne skyf uitgeprop"
 
-#: ../js/ui/components/autorunManager.js:355
+#: js/ui/components/autorunManager.js:358
 #, javascript-format
 msgid "Open with %s"
 msgstr "Open met %s"
 
-#: ../js/ui/components/keyring.js:120 ../js/ui/components/polkitAgent.js:315
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../js/ui/components/keyring.js:153
+#: js/ui/components/keyring.js:140
 msgid "Type again:"
 msgstr "Tik weer:"
 
-#: ../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:112 js/ui/status/network.js:261
+#: js/ui/status/network.js:355 js/ui/status/network.js:939
 msgid "Connect"
 msgstr "Verbind"
 
 #. 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:205 js/ui/components/networkAgent.js:217
+#: js/ui/components/networkAgent.js:245 js/ui/components/networkAgent.js:265
+#: js/ui/components/networkAgent.js:275
 msgid "Password: "
 msgstr "Wagwoord: "
 
 #. static WEP
-#: ../js/ui/components/networkAgent.js:238
+#: js/ui/components/networkAgent.js:210
 msgid "Key: "
 msgstr "Sleutel: "
 
-#: ../js/ui/components/networkAgent.js:277
+#: js/ui/components/networkAgent.js:249
 msgid "Identity: "
 msgstr "Identiteit: "
 
-#: ../js/ui/components/networkAgent.js:279
+#: js/ui/components/networkAgent.js:251
 msgid "Private key password: "
 msgstr "Private sleutel se wagwoord: "
 
-#: ../js/ui/components/networkAgent.js:291
+#: js/ui/components/networkAgent.js:263
 msgid "Service: "
 msgstr "Diens: "
 
-#: ../js/ui/components/networkAgent.js:320
-#: ../js/ui/components/networkAgent.js:658
+#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:638
 msgid "Authentication required by wireless network"
 msgstr "Verifiëring vereis deur draadlose netwerk."
 
-#: ../js/ui/components/networkAgent.js:321
-#: ../js/ui/components/networkAgent.js:659
+#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:639
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -663,60 +923,53 @@ msgstr ""
 "Wagwoorde of enkripsiesleutels is nodig om toegang te verkry tot die "
 "draadlose netwerk “%s”."
 
-#: ../js/ui/components/networkAgent.js:325
-#: ../js/ui/components/networkAgent.js:662
+#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:642
 msgid "Wired 802.1X authentication"
 msgstr "Verifiëring vir 802.1X met kabel"
 
-#: ../js/ui/components/networkAgent.js:327
+#: js/ui/components/networkAgent.js:299
 msgid "Network name: "
 msgstr "Netwerknaam: "
 
-#: ../js/ui/components/networkAgent.js:332
-#: ../js/ui/components/networkAgent.js:666
+#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:646
 msgid "DSL authentication"
 msgstr "DSL-verifiëring"
 
-#: ../js/ui/components/networkAgent.js:339
-#: ../js/ui/components/networkAgent.js:672
+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:652
 msgid "PIN code required"
 msgstr "PIN-kode nodig"
 
-#: ../js/ui/components/networkAgent.js:340
-#: ../js/ui/components/networkAgent.js:673
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:653
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode is nodig vir die selfoonbreëbandtoestel"
 
-#: ../js/ui/components/networkAgent.js:341
+#: js/ui/components/networkAgent.js:313
 msgid "PIN: "
 msgstr "PIN: "
 
-#: ../js/ui/components/networkAgent.js:348
-#: ../js/ui/components/networkAgent.js:679
+#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:659
 msgid "Mobile broadband network password"
 msgstr "Selfoonbreëband se netwerkwagwoord"
 
-#: ../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:321 js/ui/components/networkAgent.js:643
+#: js/ui/components/networkAgent.js:647 js/ui/components/networkAgent.js:660
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "'n Wagwoord is nodig om te verbind aan “%s”."
 
-#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1658
+#: js/ui/components/networkAgent.js:627 js/ui/status/network.js:1720
 msgid "Network Manager"
 msgstr "Netwerkbestuurder"
 
-#: ../js/ui/components/polkitAgent.js:60
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "Verifiëringsversoek"
 
-#: ../js/ui/components/polkitAgent.js:102
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: ../js/ui/components/polkitAgent.js:182
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "Verifieer"
 
@@ -724,35 +977,36 @@ msgstr "Verifieer"
 #. * 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."
+#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:328
+#| msgid "Sorry, that didn't work. Please try again."
+msgid "Sorry, that didn’t work. Please try again."
 msgstr "Jammer, dit het nie gewerk nie. Probeer gerus weer."
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:759
+#: js/ui/components/telepathyClient.js:799
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s staan nou bekend as %s"
 
-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:155
+#: js/ui/ctrlAltTab.js:29 js/ui/viewSelector.js:186
 msgid "Windows"
 msgstr "Vensters"
 
-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: js/ui/dash.js:250 js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Wys toepassings"
 
 #. 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 ""
+msgstr "Toeps"
 
 #. 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:76
 msgid "%B %e %Y"
 msgstr "%e %B %Y"
 
@@ -760,98 +1014,154 @@ msgstr "%e %B %Y"
 #. * 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:83
 msgid "%A %B %e %Y"
 msgstr "%A %e %B %Y"
 
-#: ../js/ui/dateMenu.js:160
+#: js/ui/dateMenu.js:145
 msgid "Add world clocks…"
 msgstr "Voeg wêreldhorlosies by…"
 
-#: ../js/ui/dateMenu.js:161
+#: js/ui/dateMenu.js:146
 msgid "World Clocks"
 msgstr "Wêreldhorlosies"
 
-#: ../js/ui/endSessionDialog.js:64
+#: js/ui/dateMenu.js:225
+msgid "Weather"
+msgstr "Weer"
+
+#. 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:289
+#, javascript-format
+msgid "%s all day."
+msgstr "%s heeldag."
+
+#. 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:295
+#, javascript-format
+msgid "%s, then %s later."
+msgstr "%s, dan %s later."
+
+#. 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:301
+#, javascript-format
+msgid "%s, then %s, followed by %s later."
+msgstr "%s, dan %s, en later %s."
+
+#: js/ui/dateMenu.js:312
+#| msgid "Select a network"
+msgid "Select a location…"
+msgstr "Kies 'n ligging..."
+
+#: js/ui/dateMenu.js:315
+#| msgid "Searching…"
+msgid "Loading…"
+msgstr "Laai tans…"
+
+#. Translators: %s is a temperature with unit, e.g. "23℃"
+#: js/ui/dateMenu.js:321
+#, javascript-format
+msgid "Feels like %s."
+msgstr "Voel soos %s."
+
+#: js/ui/dateMenu.js:324
+msgid "Go online for weather information"
+msgstr "Gaan aanlyn vir weer inligting"
+
+#: js/ui/dateMenu.js:326
+#| msgid "Encryption is not available"
+msgid "Weather information is currently unavailable"
+msgstr "Weer inligting is nie tans beskikbaar nie"
+
+#: js/ui/endSessionDialog.js:64
 #, javascript-format
 msgctxt "title"
 msgid "Log Out %s"
 msgstr "Meld af as %s"
 
-#: ../js/ui/endSessionDialog.js:65
+#: js/ui/endSessionDialog.js:65
 msgctxt "title"
 msgid "Log Out"
 msgstr "Meld af"
 
-#: ../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 sal outomaties afgemeld word oor %d sekonde."
 msgstr[1] "%s sal outomaties afgemeld word oor %d sekondes."
 
-#: ../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] "U sal outomaties afgemeld word oor %d sekonde."
 msgstr[1] "U sal outomaties afgemeld word oor %d sekondes."
 
-#: ../js/ui/endSessionDialog.js:78
+#: js/ui/endSessionDialog.js:78
 msgctxt "button"
 msgid "Log Out"
 msgstr "Meld af"
 
-#: ../js/ui/endSessionDialog.js:84
+#: js/ui/endSessionDialog.js:84
 msgctxt "title"
 msgid "Power Off"
 msgstr "Skakel af"
 
-#: ../js/ui/endSessionDialog.js:85
+#: js/ui/endSessionDialog.js:85
 msgctxt "title"
 msgid "Install Updates & Power Off"
 msgstr "Installeer bywerkings en skakel af"
 
-#: ../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] "Die stelsel sal outomaties afgeskakel word oor %d sekonde."
 msgstr[1] "Die stelsel sal outomaties afgeskakel word oor %d sekondes."
 
-#: ../js/ui/endSessionDialog.js:91
+#: js/ui/endSessionDialog.js:91
 msgctxt "checkbox"
 msgid "Install pending software updates"
 msgstr "Installeer wagtende sagtewarebywerkings"
 
-#: ../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 "Herbegin"
 
-#: ../js/ui/endSessionDialog.js:96
+#: js/ui/endSessionDialog.js:96
 msgctxt "button"
 msgid "Power Off"
 msgstr "Skakel af"
 
-#: ../js/ui/endSessionDialog.js:103
+#: js/ui/endSessionDialog.js:103
 msgctxt "title"
 msgid "Restart"
 msgstr "Herbegin"
 
-#: ../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] "Die stelsel sal outomaties herbegin oor %d sekonde."
 msgstr[1] "Die stelsel sal outomaties herbegin oor %d sekondes."
 
-#: ../js/ui/endSessionDialog.js:119
+#: js/ui/endSessionDialog.js:119
 msgctxt "title"
 msgid "Restart & Install Updates"
 msgstr "Herbegin en installeer bywerkings"
 
-#: ../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 ""
@@ -863,144 +1173,169 @@ msgstr[1] ""
 "Die stelsel sal outomaties herbegin, en bywerkings sal geïnstalleer word oor "
 "%d sekondes."
 
-#: ../js/ui/endSessionDialog.js:127
+#: js/ui/endSessionDialog.js:127 js/ui/endSessionDialog.js:147
 msgctxt "button"
 msgid "Restart &amp; Install"
 msgstr "Herbegin en installeer"
 
-#: ../js/ui/endSessionDialog.js:128
+#: js/ui/endSessionDialog.js:128
 msgctxt "button"
 msgid "Install &amp; Power Off"
 msgstr "Installeer en skakel af"
 
-#: ../js/ui/endSessionDialog.js:129
+#: js/ui/endSessionDialog.js:129
 msgctxt "checkbox"
 msgid "Power off after updates are installed"
 msgstr "Skakel af nadat bywerkings geïnstalleer is"
 
-#: ../js/ui/endSessionDialog.js:338
+#: js/ui/endSessionDialog.js:137
+#| msgctxt "title"
+#| msgid "Restart & Install Updates"
+msgctxt "title"
+msgid "Restart & Install Upgrade"
+msgstr "Herbegin en installeer bywerkings"
+
+#. 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 sal na die rekenaar herbegin het geïnstalleer word. Die installasie "
+"van opgraderings kan lank neem: maak seker dat 'n rugsteen gemaak is en dat "
+"die rekenaar ingeprop is."
+
+#: js/ui/endSessionDialog.js:361
 msgid "Running on battery power: please plug in before installing updates."
 msgstr "Tans op batterykrag: prop in voordat bywerkings geïnstalleer word."
 
-#: ../js/ui/endSessionDialog.js:355
+#: js/ui/endSessionDialog.js:378
 msgid "Some applications are busy or have unsaved work."
 msgstr "Sommige toepassings is besig of het ongestoorde werk."
 
-#: ../js/ui/endSessionDialog.js:362
+#: js/ui/endSessionDialog.js:385
 msgid "Other users are logged in."
 msgstr "Ander gebruikers is aangemeld."
 
 #. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/endSessionDialog.js:640
+#: js/ui/endSessionDialog.js:670
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (afgeleë)"
 
 #. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/endSessionDialog.js:643
+#: js/ui/endSessionDialog.js:673
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (konsole)"
 
-#: ../js/ui/extensionDownloader.js:199
+#: js/ui/extensionDownloader.js:201
 msgid "Install"
 msgstr "Installeer"
 
-#: ../js/ui/extensionDownloader.js:204
+#: js/ui/extensionDownloader.js:206
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Wil u “%s” vanaf extensions.gnome.org aflaai en installeer?"
 
-#: ../js/ui/keyboard.js:741 ../js/ui/status/keyboard.js:713
-msgid "Keyboard"
-msgstr "Sleutelbord"
+#. Translators: %s is an application name like "Settings"
+#: js/ui/inhibitShortcutsDialog.js:59
+#, javascript-format
+msgid "%s wants to inhibit shortcuts"
+msgstr "%s wil kortpaaie onderdruk"
+
+#: js/ui/inhibitShortcutsDialog.js:60
+msgid "Application wants to inhibit shortcuts"
+msgstr "Toepassing wil kortpaaie onderdruk"
+
+#. Translators: %s is a keyboard shortcut like "Super+x"
+#: js/ui/inhibitShortcutsDialog.js:69
+#, javascript-format
+msgid "You can restore shortcuts by pressing %s."
+msgstr "Jy kan kortpaaie herstel deur %s te druk."
 
-#. translators: 'Hide' is a verb
-#: ../js/ui/legacyTray.js:66
-#| msgid "Hide Text"
-msgid "Hide tray"
-msgstr "Versteek laai"
+#: js/ui/inhibitShortcutsDialog.js:74
+msgid "Deny"
+msgstr "Weier"
 
-#: ../js/ui/legacyTray.js:107
-msgid "Status Icons"
-msgstr "Statusikone"
+#: js/ui/inhibitShortcutsDialog.js:80
+msgid "Allow"
+msgstr "Laat toe"
 
-#: ../js/ui/lookingGlass.js:643
+#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:782
+msgid "Keyboard"
+msgstr "Sleutelbord"
+
+#: js/ui/lookingGlass.js:642
 msgid "No extensions installed"
 msgstr "Geen uitbreidings geïnstalleer nie"
 
 #. 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 het nie enige foute uitgevoer nie."
 
-#: ../js/ui/lookingGlass.js:703
+#: js/ui/lookingGlass.js:702
 msgid "Hide Errors"
 msgstr "Versteek foute"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: js/ui/lookingGlass.js:706 js/ui/lookingGlass.js:766
 msgid "Show Errors"
 msgstr "Wys foute"
 
-#: ../js/ui/lookingGlass.js:716
+#: js/ui/lookingGlass.js:715
 msgid "Enabled"
 msgstr "Geaktiveer"
 
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1828
+#: js/ui/lookingGlass.js:718 subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "Gedeaktiveer"
 
-#: ../js/ui/lookingGlass.js:721
+#: js/ui/lookingGlass.js:720
 msgid "Error"
 msgstr "Fout"
 
-#: ../js/ui/lookingGlass.js:723
+#: js/ui/lookingGlass.js:722
 msgid "Out of date"
 msgstr "Verouderd"
 
-#: ../js/ui/lookingGlass.js:725
+#: js/ui/lookingGlass.js:724
 msgid "Downloading"
 msgstr "Laai tans af"
 
-#: ../js/ui/lookingGlass.js:749
+#: js/ui/lookingGlass.js:748
 msgid "View Source"
 msgstr "Bekyk bronkode"
 
-#: ../js/ui/lookingGlass.js:758
+#: js/ui/lookingGlass.js:757
 msgid "Web Page"
 msgstr "Webblad"
 
-#: ../js/ui/messageList.js:543
-msgid "Clear section"
-msgstr ""
-
-#: ../js/ui/messageTray.js:1486
+#: js/ui/messageTray.js:1494
 msgid "System Information"
 msgstr "Stelselinligting"
 
-#: ../js/ui/mpris.js:194
-#| msgid "Unknown reason"
+#: js/ui/mpris.js:211
 msgid "Unknown artist"
 msgstr "Onbekende kunstenaar"
 
-#: ../js/ui/mpris.js:195
-#| msgctxt "program"
-#| msgid "Unknown"
+#: js/ui/mpris.js:212
 msgid "Unknown title"
 msgstr "Onbekende titel"
 
-#: ../js/ui/mpris.js:217
-msgid "Media"
-msgstr "Media"
-
-#: ../js/ui/overview.js:84
+#: js/ui/overview.js:84
 msgid "Undo"
 msgstr "Ontdoen"
 
-#: ../js/ui/overview.js:117
+#. Translators: This is the main view to select
+#. activities. See also note for "Activities" string.
+#: js/ui/overview.js:113
 msgid "Overview"
 msgstr "Oorsig"
 
@@ -1008,27 +1343,73 @@ msgstr "Oorsig"
 #. 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 "Tik om te soek…"
 
-#: ../js/ui/panel.js:358
+#: js/ui/padOsd.js:103
+msgid "New shortcut…"
+msgstr "Nuwe kortpad..."
+
+#: js/ui/padOsd.js:152
+#| msgid "Applications"
+msgid "Application defined"
+msgstr "Toepassings gedefinieer"
+
+#: js/ui/padOsd.js:153
+#| msgid "Show the onscreen keyboard"
+msgid "Show on-screen help"
+msgstr "Wys hulp op die skerm"
+
+#: js/ui/padOsd.js:154
+#| msgid "Switch User"
+msgid "Switch monitor"
+msgstr "Wissel skerms"
+
+#: js/ui/padOsd.js:155
+msgid "Assign keystroke"
+msgstr "Ken steutel toe"
+
+#: js/ui/padOsd.js:220
+msgid "Done"
+msgstr "Klaar"
+
+#: js/ui/padOsd.js:734
+msgid "Edit…"
+msgstr "Redigeer..."
+
+#: js/ui/padOsd.js:774 js/ui/padOsd.js:879
+msgid "None"
+msgstr "Geen"
+
+#: js/ui/padOsd.js:833
+msgid "Press a button to configure"
+msgstr "Druk 'n knoppie om in te stel"
+
+#: js/ui/padOsd.js:834
+msgid "Press Esc to exit"
+msgstr "Druk Esc om uit te gaan"
+
+#: js/ui/padOsd.js:837
+msgid "Press any key to exit"
+msgstr "Druk enige knoppie om uit te gaan"
+
+#: js/ui/panel.js:358
 msgid "Quit"
 msgstr "Sluit af"
 
 #. 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 "Aktiwiteite"
 
-#: ../js/ui/panel.js:695
-#| msgid "System"
+#: js/ui/panel.js:695
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "Stelsel"
 
-#: ../js/ui/panel.js:807
+#: js/ui/panel.js:812
 msgid "Top Bar"
 msgstr "Boonste balk"
 
@@ -1037,47 +1418,52 @@ msgstr "Boonste balk"
 #. "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:291
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
-#: ../js/ui/runDialog.js:71
+#: js/ui/runDialog.js:71
 msgid "Enter a Command"
 msgstr "Tik 'n opdrag"
 
-#: ../js/ui/runDialog.js:111 ../js/ui/windowMenu.js:162
+#: js/ui/runDialog.js:111 js/ui/windowMenu.js:160
 msgid "Close"
 msgstr "Sluit"
 
-#: ../js/ui/runDialog.js:282
+#: js/ui/runDialog.js:277
+#| msgid "Encryption is not available"
+msgid "Restart is not available on Wayland"
+msgstr "Herbegin is nie op Wayland beskikbaar nie"
+
+#: js/ui/runDialog.js:282
 msgid "Restarting…"
 msgstr "Herbegin tans…"
 
 #. 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 "%A %e %B"
 
-#: ../js/ui/screenShield.js:144
+#: js/ui/screenShield.js:147
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nuwe boodskap"
 msgstr[1] "%d nuwe boodskappe"
 
-#: ../js/ui/screenShield.js:146
+#: js/ui/screenShield.js:149
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d nuwe kennisgewing"
 msgstr[1] "%d nuwe kennisgewings"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
+#: js/ui/screenShield.js:452 js/ui/status/system.js:284
 msgid "Lock"
 msgstr "Sluit"
 
-#: ../js/ui/screenShield.js:684
+#: js/ui/screenShield.js:715
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME moet die skerm sluit"
 
@@ -1088,408 +1474,431 @@ msgstr "GNOME moet die skerm sluit"
 #.
 #. 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:836 js/ui/screenShield.js:1308
 msgid "Unable to lock"
 msgstr "Kan nie sluit nie"
 
-#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
+#: js/ui/screenShield.js:837 js/ui/screenShield.js:1309
 msgid "Lock was blocked by an application"
 msgstr "Sluit is gekeer deur 'n program"
 
-#: ../js/ui/search.js:617
+#: js/ui/search.js:651
 msgid "Searching…"
 msgstr "Soek tans…"
 
-#: ../js/ui/search.js:619
+#: js/ui/search.js:653
 msgid "No results."
 msgstr "Geen resultate nie."
 
-#: ../js/ui/shellEntry.js:25
+#: js/ui/search.js:777
+#, javascript-format
+msgid "%d more"
+msgid_plural "%d more"
+msgstr[0] "%d meer"
+msgstr[1] "%d meer"
+
+#: js/ui/shellEntry.js:25
 msgid "Copy"
 msgstr "Kopieer"
 
-#: ../js/ui/shellEntry.js:30
+#: js/ui/shellEntry.js:30
 msgid "Paste"
 msgstr "Plak"
 
-#: ../js/ui/shellEntry.js:97
+#: js/ui/shellEntry.js:97
 msgid "Show Text"
 msgstr "Vertoon teks"
 
-#: ../js/ui/shellEntry.js:99
+#: js/ui/shellEntry.js:99
 msgid "Hide Text"
 msgstr "Versteek teks"
 
-#: ../js/ui/shellMountOperation.js:370
+#: js/ui/shellMountOperation.js:315
 msgid "Password"
 msgstr "Wagwoord"
 
-#: ../js/ui/shellMountOperation.js:391
+#: js/ui/shellMountOperation.js:336
 msgid "Remember Password"
 msgstr "Onthou wagwoord"
 
-#: ../js/ui/status/accessibility.js:42
+#: js/ui/status/accessibility.js:42
 msgid "Accessibility"
 msgstr "Toeganklikheid"
 
-#: ../js/ui/status/accessibility.js:57
+#: js/ui/status/accessibility.js:57
 msgid "Zoom"
 msgstr "Zoem"
 
-#: ../js/ui/status/accessibility.js:64
+#: js/ui/status/accessibility.js:64
 msgid "Screen Reader"
 msgstr "Skermleser"
 
-#: ../js/ui/status/accessibility.js:68
+#: js/ui/status/accessibility.js:68
 msgid "Screen Keyboard"
 msgstr "Skermsleutelbord"
 
-#: ../js/ui/status/accessibility.js:72
+#: js/ui/status/accessibility.js:72
 msgid "Visual Alerts"
-msgstr "Visuele waarskuwing"
+msgstr "Visuele waarskuwings"
 
-#: ../js/ui/status/accessibility.js:75
+#: js/ui/status/accessibility.js:75
 msgid "Sticky Keys"
 msgstr "Kleefsleutels"
 
-#: ../js/ui/status/accessibility.js:78
+#: js/ui/status/accessibility.js:78
 msgid "Slow Keys"
 msgstr "Stadige sleutels"
 
-#: ../js/ui/status/accessibility.js:81
+#: js/ui/status/accessibility.js:81
 msgid "Bounce Keys"
 msgstr "Bonssleutels"
 
-#: ../js/ui/status/accessibility.js:84
+#: js/ui/status/accessibility.js:84
 msgid "Mouse Keys"
 msgstr "Muissleutels"
 
-#: ../js/ui/status/accessibility.js:167
+#: js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Hoë kontras"
 
-#: ../js/ui/status/accessibility.js:202
+#: js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Groot teks"
 
-#: ../js/ui/status/bluetooth.js:47
+#: js/ui/status/bluetooth.js:47
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:56
+#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:627
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-instellings"
 
 #. Translators: this is the number of connected bluetooth devices
-#: ../js/ui/status/bluetooth.js:136
+#: js/ui/status/bluetooth.js:136
 #, javascript-format
-#| msgid "Connected"
 msgid "%d Connected"
 msgid_plural "%d Connected"
 msgstr[0] "%d gekoppel"
 msgstr[1] "%d gekoppel"
 
-#: ../js/ui/status/bluetooth.js:138
+#: js/ui/status/bluetooth.js:138
 msgid "Off"
 msgstr "Af"
 
-#: ../js/ui/status/bluetooth.js:140
-#| msgid "In Use"
-msgid "Not In Use"
-msgstr "Nie in gebruik nie"
+#: js/ui/status/bluetooth.js:140
+msgid "On"
+msgstr "Aan"
 
-#: ../js/ui/status/bluetooth.js:142 ../js/ui/status/network.js:1279
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1299
 msgid "Turn On"
 msgstr "Skakel aan"
 
-#: ../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:170
+#: js/ui/status/network.js:356 js/ui/status/network.js:1299
+#: js/ui/status/network.js:1418 js/ui/status/nightLight.js:47
+#: js/ui/status/rfkill.js:90 js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "Skakel af"
 
-#: ../js/ui/status/brightness.js:44
+#: js/ui/status/brightness.js:44
 msgid "Brightness"
 msgstr "Helderheid"
 
-#: ../js/ui/status/keyboard.js:736
+#: js/ui/status/keyboard.js:805
 msgid "Show Keyboard Layout"
 msgstr "Wys sleutelborduitleg"
 
-#: ../js/ui/status/location.js:107 ../js/ui/status/location.js:215
-#| msgid "Location"
+#: js/ui/status/location.js:89 js/ui/status/location.js:197
 msgid "Location Enabled"
 msgstr "Ligging geaktiveer"
 
-#: ../js/ui/status/location.js:108 ../js/ui/status/location.js:216
+#: js/ui/status/location.js:90 js/ui/status/location.js:198
 msgid "Disable"
 msgstr "Deaktiveer"
 
-#: ../js/ui/status/location.js:109
+#: js/ui/status/location.js:91
 msgid "Privacy Settings"
 msgstr "Instellings vir privaatheid"
 
-#: ../js/ui/status/location.js:214
-#| msgid "Location"
+#: js/ui/status/location.js:196
 msgid "Location In Use"
 msgstr "Ligging in gebruik"
 
-#: ../js/ui/status/location.js:218
-#| msgid "Connection failed"
+#: js/ui/status/location.js:200
 msgid "Location Disabled"
 msgstr "Ligging gedeaktiveer"
 
-#: ../js/ui/status/location.js:219
+#: js/ui/status/location.js:201
 msgid "Enable"
 msgstr "Aktiveer"
 
-#: ../js/ui/status/location.js:434
-msgid "Deny Access"
-msgstr "Wyer toegang"
-
-#: ../js/ui/status/location.js:437
-#| msgid "Always grant access"
-msgid "Grant Access"
-msgstr "Verleen toegang"
-
 #. Translators: %s is an application name
-#: ../js/ui/status/location.js:443
+#: js/ui/status/location.js:388
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "Gee %s toegang tot u ligging?"
 
-#. Translators: %s is an application name
-#: ../js/ui/status/location.js:446
-#, javascript-format
-msgid "%s is requesting access to your location."
-msgstr "%s versoek toegang tot u ligging."
+#: js/ui/status/location.js:389
+msgid "Location access can be changed at any time from the privacy settings."
+msgstr ""
+"Toegang tot jou ligging kan enige tyd in privaatheid instellings verander "
+"word."
 
-#: ../js/ui/status/network.js:101
+#: js/ui/status/network.js:104
 msgid "<unknown>"
 msgstr "<onbekend>"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1308
+#: js/ui/status/network.js:454 js/ui/status/network.js:1328
 #, javascript-format
 msgid "%s Off"
-msgstr "%s af"
+msgstr "%s Af"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:454
+#: js/ui/status/network.js:457
 #, javascript-format
-#| msgid "Connected"
 msgid "%s Connected"
-msgstr "%s gekoppel"
+msgstr "%s Gekoppel"
 
 #. 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:462
 #, javascript-format
-#| msgid "Unmanaged"
 msgid "%s Unmanaged"
-msgstr "%s nie bestuur nie"
+msgstr "%s Nie bestuur nie"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:462
+#: js/ui/status/network.js:465
 #, javascript-format
-#| msgid "Disconnecting"
 msgid "%s Disconnecting"
-msgstr "%s ontkoppel tans"
+msgstr "%s Ontkoppel Tans"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1300
+#: js/ui/status/network.js:472 js/ui/status/network.js:1320
 #, javascript-format
-#| msgid "Connecting"
 msgid "%s Connecting"
-msgstr "%s koppel tans"
+msgstr "%s Koppel Tans"
 
 #. 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
-#, fuzzy, javascript-format
+#: js/ui/status/network.js:475
+#, javascript-format
 #| msgid "Wired 802.1X authentication"
 msgid "%s Requires Authentication"
-msgstr "Verifiëring vir 802.1X met kabel"
+msgstr "%s Benodig Identifisering"
 
 #. 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:483
 #, javascript-format
-#| msgid "Firmware missing"
 msgid "Firmware Missing For %s"
 msgstr "Fermware ontbreek vir %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:487
 #, javascript-format
-#| msgid "Unavailable"
 msgid "%s Unavailable"
 msgstr "%s nie beskikbaar nie"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:487
+#: js/ui/status/network.js:490
 #, javascript-format
-#| msgid "Connection failed"
 msgid "%s Connection Failed"
 msgstr "%s-verbinding het misluk"
 
-#: ../js/ui/status/network.js:503
+#: js/ui/status/network.js:506
 msgid "Wired Settings"
 msgstr "Kabelinstellings"
 
-#: ../js/ui/status/network.js:545 ../js/ui/status/network.js:624
+#: js/ui/status/network.js:548
 msgid "Mobile Broadband Settings"
 msgstr "Selfoonbreëband-instellings"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#: js/ui/status/network.js:591 js/ui/status/network.js:1325
 #, javascript-format
-#| msgid "Hardware Disabled"
 msgid "%s Hardware Disabled"
 msgstr "%s deur hardeware gedeaktiveer"
 
 #. 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:595
 #, javascript-format
-#| msgid "Disabled"
 msgid "%s Disabled"
 msgstr "%s gedeaktiveer"
 
-#: ../js/ui/status/network.js:632
-msgid "Use as Internet connection"
-msgstr "Gebruik as internetverbinding"
+#: js/ui/status/network.js:635
+#| msgid "Connect to..."
+msgid "Connect to Internet"
+msgstr "Koppel aan die internet"
 
-#: ../js/ui/status/network.js:813
+#: js/ui/status/network.js:833
 msgid "Airplane Mode is On"
 msgstr "Vliegtuigmodus is aan"
 
-#: ../js/ui/status/network.js:814
+#: js/ui/status/network.js:834
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Wi-Fi word gedeaktiveer tydens vliegtuigmodus."
 
-#: ../js/ui/status/network.js:815
+#: js/ui/status/network.js:835
 msgid "Turn Off Airplane Mode"
-msgstr "Skakel vliegtuigmodus af"
+msgstr "Skakel vlugmodus af"
 
-#: ../js/ui/status/network.js:824
+#: js/ui/status/network.js:844
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi is af"
 
-#: ../js/ui/status/network.js:825
+#: js/ui/status/network.js:845
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Wi-Fi moet aangeskakel wees om aan 'n netwerk te koppel."
 
-#: ../js/ui/status/network.js:826
+#: js/ui/status/network.js:846
 msgid "Turn On Wi-Fi"
-msgstr "Skakel Wi-Fi af"
+msgstr "Skakel Wi-Fi aan"
 
-#: ../js/ui/status/network.js:851
+#: js/ui/status/network.js:871
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi-netwerke"
 
-#: ../js/ui/status/network.js:853
+#: js/ui/status/network.js:873
 msgid "Select a network"
 msgstr "Kies 'n netwerk"
 
-#: ../js/ui/status/network.js:883
+#: js/ui/status/network.js:903
 msgid "No Networks"
 msgstr "Geen netwerke"
 
-#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:924 js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "Gebruik die hardewareskakelaar om mee af te skakel"
 
-#: ../js/ui/status/network.js:1171
+#: js/ui/status/network.js:1191
 msgid "Select Network"
-msgstr "Kies netwerk"
+msgstr "Kies Netwerk"
 
-#: ../js/ui/status/network.js:1177
+#: js/ui/status/network.js:1197
 msgid "Wi-Fi Settings"
 msgstr "Wi-Fi-instellings"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:1296
+#: js/ui/status/network.js:1316
 #, javascript-format
 msgid "%s Hotspot Active"
-msgstr ""
+msgstr "%s Kuberkol Aktief"
 
 #. Translators: %s is a network identifier
-#: ../js/ui/status/network.js:1311
+#: js/ui/status/network.js:1331
 #, javascript-format
-#| msgid "Not Connected"
 msgid "%s Not Connected"
 msgstr "%s nie gekoppel nie"
 
-#: ../js/ui/status/network.js:1411
-msgid "connecting..."
+#: js/ui/status/network.js:1435
+#| msgid "connecting..."
+msgid "connecting…"
 msgstr "verbind tans..."
 
 #. 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:1438
 msgid "authentication required"
 msgstr "verifiëring benodig"
 
-#: ../js/ui/status/network.js:1416
+#: js/ui/status/network.js:1440
 msgid "connection failed"
 msgstr "verbinding het misluk"
 
-#: ../js/ui/status/network.js:1482 ../js/ui/status/rfkill.js:93
-msgid "Network Settings"
-msgstr "Netwerkinstellings"
-
-#: ../js/ui/status/network.js:1484
+#: js/ui/status/network.js:1494
 msgid "VPN Settings"
 msgstr "VPN-instellings"
 
-#: ../js/ui/status/network.js:1503
+#: js/ui/status/network.js:1498
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1513
-#| msgid "Power Off"
+#: js/ui/status/network.js:1508
 msgid "VPN Off"
 msgstr "VPN af"
 
-#: ../js/ui/status/network.js:1697
+#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93
+msgid "Network Settings"
+msgstr "Netwerkinstellings"
+
+#: js/ui/status/network.js:1603
+#, javascript-format
+#| msgid "%s Connecting"
+msgid "%s Wired Connection"
+msgid_plural "%s Wired Connections"
+msgstr[0] "%s Gekabelde Verbinding"
+msgstr[1] "%s Gekabelde Verbindings"
+
+#: js/ui/status/network.js:1607
+#, javascript-format
+#| msgid "%s Connecting"
+msgid "%s Wi-Fi Connection"
+msgid_plural "%s Wi-Fi Connections"
+msgstr[0] "%s Wi-Fi Verbinding"
+msgstr[1] "%s Wi-Fi verbindings"
+
+#: js/ui/status/network.js:1611
+#, javascript-format
+#| msgid "%s Connecting"
+msgid "%s Modem Connection"
+msgid_plural "%s Modem Connections"
+msgstr[0] "%s Modem Verbinding"
+msgstr[1] "%s Modem Verbindings"
+
+#: js/ui/status/network.js:1759
 msgid "Connection failed"
 msgstr "Verbinding het misluk"
 
-#: ../js/ui/status/network.js:1698
+#: js/ui/status/network.js:1760
 msgid "Activation of network connection failed"
 msgstr "Aktivering van netwerkverbinding het misluk"
 
-#: ../js/ui/status/power.js:61
+#: js/ui/status/nightLight.js:68
+#| msgid "Networking is disabled"
+msgid "Night Light Disabled"
+msgstr "Naglig Af"
+
+#: js/ui/status/nightLight.js:69
+msgid "Night Light On"
+msgstr "Naglig Aan"
+
+#: js/ui/status/nightLight.js:70
+msgid "Resume"
+msgstr "Hervat"
+
+#: js/ui/status/nightLight.js:71
+msgid "Disable Until Tomorrow"
+msgstr "Skakel af tot more"
+
+#: js/ui/status/power.js:61
 msgid "Power Settings"
 msgstr "Kraginstellings"
 
-#: ../js/ui/status/power.js:77
+#: js/ui/status/power.js:77
 msgid "Fully Charged"
 msgstr "Volgelaai"
 
 #. 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 "Skat tans…"
 
 #. 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%%)"
 msgid "%d∶%02d Remaining (%d %%)"
 msgstr "%d∶%02d oor (%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%%)"
 msgid "%d∶%02d Until Full (%d %%)"
 msgstr "%d∶%02d tot vol (%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 %%"
@@ -1497,81 +1906,108 @@ 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
-#| msgid "Airplane Mode is On"
+#: js/ui/status/rfkill.js:88
 msgid "Airplane Mode On"
 msgstr "Vlugmodus is aan"
 
-#: ../js/ui/status/system.js:343
+#: js/ui/status/system.js:228
 msgid "Switch User"
 msgstr "Wissel gebruiker"
 
-#: ../js/ui/status/system.js:348
+#: js/ui/status/system.js:240
 msgid "Log Out"
 msgstr "Meld af"
 
-#: ../js/ui/status/system.js:353
-#| msgid "Sound Settings"
+#: js/ui/status/system.js:252
 msgid "Account Settings"
 msgstr "Rekeningopstelling"
 
-#: ../js/ui/status/system.js:370
+#: js/ui/status/system.js:269
 msgid "Orientation Lock"
 msgstr "Oriëntasieslot"
 
-#: ../js/ui/status/system.js:378
+#: js/ui/status/system.js:295
 msgid "Suspend"
 msgstr "Sluimer"
 
-#: ../js/ui/status/system.js:381
+#: js/ui/status/system.js:305
 msgid "Power Off"
 msgstr "Skakel af"
 
-#: ../js/ui/status/volume.js:127
+#: js/ui/status/volume.js:128
 msgid "Volume changed"
 msgstr "Volume het verander"
 
-#: ../js/ui/status/volume.js:162
+#: js/ui/status/volume.js:170
 msgid "Volume"
 msgstr "Volume"
 
-#: ../js/ui/unlockDialog.js:67
+#. Translators: this is for display mirroring i.e. cloning.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:21
+#| msgid "Error"
+msgid "Mirror"
+msgstr "Spieëlbeeld"
+
+#. Translators: this is for the desktop spanning displays.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:26
+msgid "Join Displays"
+msgstr "Koppel Skerms"
+
+#. Translators: this is for using only an external display.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:31
+msgid "External Only"
+msgstr "Slegs Ekstern"
+
+#. Translators: this is for using only the laptop display.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:36
+msgid "Built-in Only"
+msgstr "Slegs ingebou"
+
+#: js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "Meld aan as 'n ander gebruiker"
 
-#: ../js/ui/unlockDialog.js:84
+#: js/ui/unlockDialog.js:84
 msgid "Unlock Window"
 msgstr "Onsluit venster"
 
-#: ../js/ui/viewSelector.js:159
+#: js/ui/viewSelector.js:190
 msgid "Applications"
 msgstr "Toepassings"
 
-#: ../js/ui/viewSelector.js:163
+#: js/ui/viewSelector.js:194
 msgid "Search"
 msgstr "Soek"
 
-#: ../js/ui/windowAttentionHandler.js:20
+#: js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "“%s” is gereed"
 
-#: ../js/ui/windowManager.js:63
+#: js/ui/windowManager.js:72
 msgid "Do you want to keep these display settings?"
 msgstr "Wil u hierdie skerminstellings behou?"
 
 #. 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:84
 msgid "Revert Settings"
 msgstr "Stel instellings terug"
 
-#: ../js/ui/windowManager.js:85
+#: js/ui/windowManager.js:87
 msgid "Keep Changes"
 msgstr "Behou wysigings"
 
-#: ../js/ui/windowManager.js:103
+#: js/ui/windowManager.js:105
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1580,144 +2016,188 @@ msgstr[1] "Wysigings gaan teruggestel word oor %d sekondes"
 
 #. 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:660
 #, javascript-format
-msgid "%d x %d"
-msgstr "%d x %d"
+msgid "%d × %d"
+msgstr "%d × %d"
 
-#: ../js/ui/windowMenu.js:34
+#: js/ui/windowMenu.js:34
 msgid "Minimize"
 msgstr "Minimeer"
 
-#: ../js/ui/windowMenu.js:41
+#: js/ui/windowMenu.js:41
 msgid "Unmaximize"
-msgstr "Ontdoen maksimering"
+msgstr "Onmaksimeer"
 
-#: ../js/ui/windowMenu.js:45
+#: js/ui/windowMenu.js:45
 msgid "Maximize"
 msgstr "Maksimeer"
 
-#: ../js/ui/windowMenu.js:52
+#: js/ui/windowMenu.js:52
 msgid "Move"
 msgstr "Skuif"
 
-#: ../js/ui/windowMenu.js:58
+#: js/ui/windowMenu.js:58
 msgid "Resize"
 msgstr "Verander grootte"
 
-#: ../js/ui/windowMenu.js:65
+#: js/ui/windowMenu.js:65
 msgid "Move Titlebar Onscreen"
 msgstr "Skuif titelbalk na skerm"
 
-#: ../js/ui/windowMenu.js:70
+#: js/ui/windowMenu.js:70
 msgid "Always on Top"
 msgstr "Altyd bo-op"
 
-#: ../js/ui/windowMenu.js:89
+#: js/ui/windowMenu.js:89
 msgid "Always on Visible Workspace"
-msgstr "Altyd op sigbare werkruimte"
+msgstr "Altyd op sigbare werkspasie"
 
-#: ../js/ui/windowMenu.js:105
-#| msgid "Move to Workspace Up"
+#: js/ui/windowMenu.js:103
 msgid "Move to Workspace Left"
-msgstr "Skuif na werkruimte links"
+msgstr "Skuif na werkspasie links"
 
-#: ../js/ui/windowMenu.js:110
-#| msgid "Move to Workspace Up"
+#: js/ui/windowMenu.js:108
 msgid "Move to Workspace Right"
-msgstr "Skuif na werkruimte regs"
+msgstr "Skuif na werkspasie regs"
 
-#: ../js/ui/windowMenu.js:115
+#: js/ui/windowMenu.js:113
 msgid "Move to Workspace Up"
-msgstr "Skuif na hoër werkruimte"
+msgstr "Skuif na hoër werkspasie"
 
-#: ../js/ui/windowMenu.js:120
+#: js/ui/windowMenu.js:118
 msgid "Move to Workspace Down"
-msgstr "Skuif na laer werkruimte"
+msgstr "Skuif na laer werkspasie"
 
-#: ../js/ui/windowMenu.js:136
-#| msgid "Move to Workspace Up"
+#: js/ui/windowMenu.js:134
 msgid "Move to Monitor Up"
 msgstr "Skuif na hoër monitor"
 
-#: ../js/ui/windowMenu.js:142
-#| msgid "Move to Workspace Down"
+#: js/ui/windowMenu.js:140
 msgid "Move to Monitor Down"
 msgstr "Skuif na laer monitor"
 
-#: ../js/ui/windowMenu.js:148
+#: js/ui/windowMenu.js:146
 msgid "Move to Monitor Left"
 msgstr "Skuif na monitor links"
 
-#: ../js/ui/windowMenu.js:154
+#: js/ui/windowMenu.js:152
 msgid "Move to Monitor Right"
 msgstr "Skuif na monitor regs"
 
-#: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
+#: src/calendar-server/evolution-calendar.desktop.in:3
 msgid "Evolution Calendar"
-msgstr "Evolution-kalender"
-
-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1835
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u afvoer"
-msgstr[1] "%u afvoere"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1845
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u toevoer"
-msgstr[1] "%u toevoere"
+msgstr "Evolution-Kalender"
 
-#: ../src/gvc/gvc-mixer-control.c:2371
-msgid "System Sounds"
-msgstr "Stelselklanke"
+#. 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"
 
-#: ../src/main.c:381
+#: src/main.c:380
 msgid "Print version"
 msgstr "Druk weergawe"
 
-#: ../src/main.c:387
+#: src/main.c:386
 msgid "Mode used by GDM for login screen"
 msgstr "Modus deur GDM gebruik vir aanmeldskerm"
 
-#: ../src/main.c:393
-msgid "Use a specific mode, e.g. \"gdm\" for login screen"
+#: src/main.c:392
+#| msgid "Use a specific mode, e.g. \"gdm\" for login screen"
+msgid "Use a specific mode, e.g. “gdm” for login screen"
 msgstr "Gebruik 'n spesifieke modus, bv. \"gdm\" vir aanmeldskerm"
 
-#: ../src/main.c:399
+#: src/main.c:398
 msgid "List possible modes"
 msgstr "Lys van moontlike modusse"
 
-#: ../src/shell-app.c:246
+#: src/shell-app.c:270
 msgctxt "program"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/shell-app.c:487
+#: src/shell-app.c:511
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Kon nie “%s” lanseer nie"
 
-#: ../src/shell-keyring-prompt.c:730
+#: src/shell-keyring-prompt.c:730
 msgid "Passwords do not match."
 msgstr "Wagwoorde stem nie ooreen nie."
 
-#: ../src/shell-keyring-prompt.c:738
+#: src/shell-keyring-prompt.c:738
 msgid "Password cannot be blank"
 msgstr "Wagwoord kan nie leeg wees nie"
 
-#: ../src/shell-polkit-authentication-agent.c:353
-#, fuzzy
+#: src/shell-polkit-authentication-agent.c:353
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u Afvoer"
+msgstr[1] "%u Afvoere"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1883
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u Toevoer"
+msgstr[1] "%u Toevoere"
+
+#: subprojects/gvc/gvc-mixer-control.c:2738
+msgid "System Sounds"
+msgstr "Stelselklanke"
+
+#~ msgid "GNOME Shell Extension Preferences"
+#~ msgstr "Voorkeure vir GNOME Shell-uitbreidings"
+
+#~ msgid "Show the week date in the calendar"
+#~ msgstr "Wys die weekdatum in die kalender"
+
+#~ msgid "If true, display the ISO week date in the calendar."
+#~ msgstr "Indien waar, vertoon die ISO-weekdatum in die kalender."
+
+#, fuzzy
+#~| msgid "Authentication Required"
+#~ msgid "Web Authentication Redirect"
+#~ msgstr "Verifiëringsversoek"
+
+#~ msgid "Events"
+#~ msgstr "Gebeure"
+
+#~ msgid "Notifications"
+#~ msgstr "Kennisgewings"
+
+#~| msgid "Hide Text"
+#~ msgid "Hide tray"
+#~ msgstr "Versteek laai"
+
+#~ msgid "Status Icons"
+#~ msgstr "Statusikone"
+
+#~ msgid "Media"
+#~ msgstr "Media"
+
+#~| msgid "In Use"
+#~ msgid "Not In Use"
+#~ msgstr "Nie in gebruik nie"
+
+#~ msgid "%s is requesting access to your location."
+#~ msgstr "%s versoek toegang tot u ligging."
+
+#~ msgid "Use as Internet connection"
+#~ msgstr "Gebruik as internetverbinding"
+
+#~ msgid "%d x %d"
+#~ msgstr "%d x %d"
+
 #~ msgctxt "event list time"
 #~ msgid "%H∶%M"
 #~ msgstr "%H∶%M"
@@ -1765,9 +2245,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "%s would like permission to see when you are online"
 #~ msgstr "%s vra toestemming om te sien wanneer u aanlyn is"
 
-#~ msgid "Network error"
-#~ msgstr "Netwerkfout"
-
 #~ msgid "Authentication failed"
 #~ msgstr "Verifiëring het misluk"
 
@@ -1798,9 +2275,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "Status is set to offline"
 #~ msgstr "Status is nou vanlyn"
 
-#~ msgid "Encryption is not available"
-#~ msgstr "Enkripsie is nie beskikbaar nie"
-
 #~ msgid "Certificate is invalid"
 #~ msgstr "Sertifikaat is ongeldig"
 
@@ -1871,9 +2345,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "Airplane Mode"
 #~ msgstr "Vliegtuigmodus"
 
-#~ msgid "On"
-#~ msgstr "Aan"
-
 #~ msgid "Show the message tray"
 #~ msgstr "Wys die boodskaplaai"
 
@@ -1998,12 +2469,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "Device %s wants to pair with this computer"
 #~ msgstr "Die toestel %s wil met hierdie rekenaar oppaar"
 
-#~ msgid "Allow"
-#~ msgstr "Laat toe"
-
-#~ msgid "Deny"
-#~ msgstr "Weier"
-
 #~ msgid "Device %s wants access to the service '%s'"
 #~ msgstr "Toestel %s wil toegang hê tot die '%s'-diens"
 
@@ -2106,9 +2571,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "Show date in clock"
 #~ msgstr "Wys die datum in die horlosie"
 
-#~ msgid "Show the onscreen keyboard"
-#~ msgstr "Wys 'n sleutelbord op die skerm"
-
 #~ msgid "Show time with seconds"
 #~ msgstr "Wys die tyd met sekondes"
 
@@ -2168,9 +2630,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "Retry"
 #~ msgstr "Herprobeer"
 
-#~ msgid "Connect to..."
-#~ msgstr "Verbind aan..."
-
 #~ msgid "PLACES & DEVICES"
 #~ msgstr "PLEKKE EN TOESTELLE"
 
@@ -2244,9 +2703,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "You're no longer connected to the network"
 #~ msgstr "U is nie meer aan die netwerk verbind nie"
 
-#~ msgid "Networking is disabled"
-#~ msgstr "Netwerke is gedeaktiveer"
-
 #~ msgid "%d hour remaining"
 #~ msgid_plural "%d hours remaining"
 #~ msgstr[0] "%d uur bly oor"
@@ -2334,9 +2790,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "System Settings"
 #~ msgstr "Stelselinstellings"
 
-#~ msgid "Lock Screen"
-#~ msgstr "Sluit skerm"
-
 #~ msgid "Log Out..."
 #~ msgstr "Meld af..."
 
@@ -2367,26 +2820,6 @@ msgstr "Verifiëringsdialoog is gesluit deur gebruiker"
 #~ msgid "Less than a minute ago"
 #~ msgstr "Minder as 'n minuut gelede"
 
-#~ msgid "%d minute ago"
-#~ msgid_plural "%d minutes ago"
-#~ msgstr[0] "%d minuut gelede"
-#~ msgstr[1] "%d minute gelede"
-
-#~ msgid "%d hour ago"
-#~ msgid_plural "%d hours ago"
-#~ msgstr[0] "%d uur gelede"
-#~ msgstr[1] "%d ure gelede"
-
-#~ msgid "%d day ago"
-#~ msgid_plural "%d days ago"
-#~ msgstr[0] "%d dag gelede"
-#~ msgstr[1] "%d dae gelede"
-
-#~ msgid "%d week ago"
-#~ msgid_plural "%d weeks ago"
-#~ msgstr[0] "%d week gelede"
-#~ msgstr[1] "%d weke gelede"
-
 #~ msgid "Shut Down"
 #~ msgstr "Skakel af"
 
-- 
2.17.0


From 4d225bdeacf967c47a9e15c73f33c866b5f1137d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 6 Dec 2017 00:55:37 -0500
Subject: [PATCH 13/22] appDisplay: don't try to close the popup menu that is
 already destroyed

This would lead to a JS error otherwise, as we might end up
in deleting actors that have been already destructed.

https://bugzilla.gnome.org/show_bug.cgi?id=791233
---
 js/ui/appDisplay.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 9b92311ac..c309471a0 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1872,11 +1872,14 @@ var AppIconMenu = new Lang.Class({
         this.actor.add_style_class_name('app-well-menu');
 
         // Chain our visibility and lifecycle to that of the source
-        source.actor.connect('notify::mapped', Lang.bind(this, function () {
+        this._sourceMappedId = source.actor.connect('notify::mapped', () => {
             if (!source.actor.mapped)
                 this.close();
-        }));
-        source.actor.connect('destroy', Lang.bind(this, this.destroy));
+        });
+        source.actor.connect('destroy', () => {
+            source.actor.disconnect(this._sourceMappedId);
+            this.destroy();
+        });
 
         Main.uiGroup.add_actor(this.actor);
     },
-- 
2.17.0


From 64c857e3ff127cf6ef92fb2d837d49b679bf7412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 6 Dec 2017 19:03:51 -0500
Subject: [PATCH 14/22] dnd: Declare restore location variables

https://bugzilla.gnome.org/show_bug.cgi?id=791233
---
 js/ui/dnd.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index a64915bc8..33580ee94 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -583,7 +583,7 @@ var _Draggable = new Lang.Class({
 
     _restoreDragActor: function(eventTime) {
         this._dragInProgress = false;
-        [restoreX, restoreY, restoreScale] = this._getRestoreLocation();
+        let [restoreX, restoreY, restoreScale] = this._getRestoreLocation();
 
         // fade the actor back in at its original location
         this._dragActor.set_position(restoreX, restoreY);
-- 
2.17.0


From cb2e26ff10ce842531b207d632afcfed61b3bb50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 21 Dec 2017 16:51:28 +0100
Subject: [PATCH 15/22] network: Fix visibility of VPN section

Commit f2a9467f91b was too eager to simplify the code, and removed
the bits that hid the section in case no VPNs are set up - add them
back to fix the visibility.

https://bugzilla.gnome.org/show_bug.cgi?id=787845
---
 js/ui/status/network.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 9575af7de..ad373f6e6 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1492,6 +1492,15 @@ var NMVPNSection = new Lang.Class({
         this.parent(client);
 
         this.item.menu.addSettingsAction(_("VPN Settings"), 'gnome-network-panel.desktop');
+
+        this._sync();
+    },
+
+    _sync: function() {
+        let nItems = this._connectionItems.size;
+        this.item.actor.visible = (nItems > 0);
+
+        this.parent();
     },
 
     _getDescription: function() {
-- 
2.17.0


From 0d9c742127f4a79416478b46a9fa5273701d92e3 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Fri, 19 Jan 2018 10:45:50 +0100
Subject: [PATCH 16/22] padOsd: Ensure to pick pad devices only

If the underlying X11 input driver creates multiple devices from a single
device node, we may end up picking up the wrong device. So, instead of
picking the first device based on node and bailing out if it's not a pad,
pick the first pad that has that device node, and bail out if there is
none.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/10

Closes: #10
---
 js/ui/padOsd.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index 34ef96bb9..6e11ddfba 100644
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -977,12 +977,12 @@ var PadOsdService = new Lang.Class({
         let padDevice = null;
 
         devices.forEach(Lang.bind(this, function(device) {
-            if (deviceNode == device.get_device_node())
+            if (deviceNode == device.get_device_node() &&
+                device.get_device_type() == Clutter.InputDeviceType.PAD_DEVICE)
                 padDevice = device;
         }));
 
-        if (padDevice == null ||
-            padDevice.get_device_type() != Clutter.InputDeviceType.PAD_DEVICE) {
+        if (padDevice == null) {
             invocation.return_error_literal(Gio.IOErrorEnum,
                                             Gio.IOErrorEnum.CANCELLED,
                                             "Invalid params");
-- 
2.17.0


From b49b82e00c837ce7bf87b5a0aaed5b1089b750ba Mon Sep 17 00:00:00 2001
From: Pieter Schalk Schoeman <pieter@sonbesie.co.za>
Date: Sat, 10 Feb 2018 09:14:53 +0000
Subject: [PATCH 17/22] Update Afrikaans translation

---
 po/af.po | 191 +++++++++++++++++++------------------------------------
 1 file changed, 67 insertions(+), 124 deletions(-)

diff --git a/po/af.po b/po/af.po
index d0a888c5f..f17610ffb 100644
--- a/po/af.po
+++ b/po/af.po
@@ -8,18 +8,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-10-04 18:03+0000\n"
-"PO-Revision-Date: 2017-12-18 19:26+0200\n"
-"Last-Translator: Pieter Schoeman <pieter@sonbesie.co.za>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
+"POT-Creation-Date: 2018-01-30 15:45+0000\n"
+"PO-Revision-Date: 2018-02-10 11:12+0200\n"
+"Last-Translator: Pieter Schalk Schoeman <pieter@sonbesie.co.za>\n"
 "Language-Team: Afrikaans <pieter@sonbesie.co.za>\n"
 "Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.0.3\n"
 "X-DamnedLies-Scope: partial\n"
 "X-Project-Style: gnome\n"
 
@@ -49,13 +48,12 @@ msgstr "Open die toepassingkieslys"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:4
 #: js/extensionPrefs/main.js:152
-#| msgid "GNOME Shell Extensions"
 msgid "Shell Extensions"
-msgstr "Shell Uitbreidings"
+msgstr "Shell uitbreidings"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:5
 msgid "Configure GNOME Shell Extensions"
-msgstr "Stel GNOME Shell Uitbreidings op"
+msgstr "Stel GNOME Shell-uitbreidings op"
 
 #: data/org.gnome.Shell.desktop.in.in:4
 msgid "GNOME Shell"
@@ -136,11 +134,11 @@ msgstr ""
 
 #: data/org.gnome.shell.gschema.xml.in:51
 msgid "App Picker View"
-msgstr "Toepassing Kieser Oorsig"
+msgstr "Toepassingkieser oorsig"
 
 #: data/org.gnome.shell.gschema.xml.in:52
 msgid "Index of the currently selected view in the application picker."
-msgstr "Indeks van die huidige aansig in die toepassing kieser "
+msgstr "Indeks van die huidige aansig in die toepassing kieser."
 
 #: data/org.gnome.shell.gschema.xml.in:58
 msgid "History for command (Alt-F2) dialog"
@@ -152,14 +150,10 @@ msgid "History for the looking glass dialog"
 msgstr "Geskiedenis vir die \"looking glass\"-dialoogvenster"
 
 #: data/org.gnome.shell.gschema.xml.in:67
-#| msgid "Always show the 'Log out' menu item in the user menu."
 msgid "Always show the “Log out” menu item in the user menu."
 msgstr "Wys altyd die 'Meld af' opsie in die gebruikerkieslys."
 
 #: data/org.gnome.shell.gschema.xml.in:68
-#| msgid ""
-#| "This key overrides the automatic hiding of the 'Log out' menu item in "
-#| "single-user, single-session situations."
 msgid ""
 "This key overrides the automatic hiding of the “Log out” menu item in single-"
 "user, single-session situations."
@@ -175,11 +169,6 @@ msgstr ""
 "lêerstelsels"
 
 #: 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 "
-#| "state of the checkbox."
 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 "
@@ -196,7 +185,7 @@ msgid ""
 "Whether the default Bluetooth adapter had set up devices associated to it"
 msgstr ""
 "Of die verstek Bluetooth verwerker opgestelde toestelle het wat daarmee "
-"verband hou."
+"verband hou"
 
 #: data/org.gnome.shell.gschema.xml.in:86
 msgid ""
@@ -219,14 +208,10 @@ msgid "Keybinding to open the application menu."
 msgstr "Sleutelbinding om die toepassingskieslys oop te maak."
 
 #: data/org.gnome.shell.gschema.xml.in:108
-#| msgid "Keybinding to open the \"Show Applications\" view"
 msgid "Keybinding to open the “Show Applications” view"
 msgstr "Sleutelkortpad om die \"Vertoon toepassings\"-aansig oop te maak"
 
 #: data/org.gnome.shell.gschema.xml.in:109
-#| msgid ""
-#| "Keybinding to open the \"Show Applications\" view of the Activities "
-#| "Overview."
 msgid ""
 "Keybinding to open the “Show Applications” view of the Activities Overview."
 msgstr ""
@@ -262,7 +247,7 @@ msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
 "Sleutelkortpaaie wat alle uitvoerende tweens stop en weer begin vir "
-"ontvoutings doeleindes."
+"ontvoutings doeleindes"
 
 #: data/org.gnome.shell.gschema.xml.in:146
 msgid "Which keyboard to use"
@@ -290,10 +275,6 @@ msgid "The application icon mode."
 msgstr "Die toepassingsikoon-modus."
 
 #: 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'."
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are “thumbnail-only” (shows a thumbnail of the window), “app-icon-"
@@ -348,9 +329,8 @@ msgstr "Netwerkaanmelding"
 
 #. 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 error"
 msgid "network-workgroup"
-msgstr "netwerk werkgroep"
+msgstr "netwerk-werkgroep"
 
 #: js/extensionPrefs/main.js:120
 #, javascript-format
@@ -410,7 +390,6 @@ msgid "Login Window"
 msgstr "Aanmeldvenster"
 
 #: js/gdm/util.js:346
-#| msgid "Connection error"
 msgid "Authentication error"
 msgstr "Verifiëringsfout"
 
@@ -425,7 +404,6 @@ msgstr "(of veeg vinger)"
 
 #. Translators: The name of the power-off action in search
 #: js/misc/systemActions.js:99
-#| msgid "Power Off"
 msgctxt "search-result"
 msgid "Power off"
 msgstr "Skakel af"
@@ -433,24 +411,21 @@ msgstr "Skakel af"
 #. Translators: A list of keywords that match the power-off action, separated by semicolons
 #: js/misc/systemActions.js:102
 msgid "power off;shutdown"
-msgstr "power off;shutdown;skakel af;afskakel;"
+msgstr "skakel af;afskakel"
 
 #. Translators: The name of the lock screen action in search
 #: js/misc/systemActions.js:106
-#| msgid "Lock Screen"
 msgctxt "search-result"
 msgid "Lock screen"
 msgstr "Sluit skerm"
 
 #. Translators: A list of keywords that match the lock screen action, separated by semicolons
 #: js/misc/systemActions.js:109
-#| msgid "Lock Screen"
 msgid "lock screen"
 msgstr "sluit skerm"
 
 #. Translators: The name of the logout action in search
 #: js/misc/systemActions.js:113
-#| msgid "Log Out"
 msgctxt "search-result"
 msgid "Log out"
 msgstr "Meld af"
@@ -462,40 +437,34 @@ msgstr "meld af;teken af"
 
 #. Translators: The name of the suspend action in search
 #: js/misc/systemActions.js:120
-#| msgid "Suspend"
 msgctxt "search-result"
 msgid "Suspend"
 msgstr "Sluimer"
 
 #. Translators: A list of keywords that match the suspend action, separated by semicolons
 #: js/misc/systemActions.js:123
-#| msgid "Suspend"
 msgid "suspend;sleep"
 msgstr "suspend;sleep;sluimer;slaap"
 
 #. Translators: The name of the switch user action in search
 #: js/misc/systemActions.js:127
-#| msgid "Switch User"
 msgctxt "search-result"
 msgid "Switch user"
 msgstr "Wissel gebruiker"
 
 #. Translators: A list of keywords that match the switch user action, separated by semicolons
 #: js/misc/systemActions.js:130
-#| msgid "Switch User"
 msgid "switch user"
 msgstr "wissel gebruiker"
 
 #. Translators: The name of the lock orientation action in search
 #: js/misc/systemActions.js:134
-#| msgid "Orientation Lock"
 msgctxt "search-result"
 msgid "Lock orientation"
 msgstr "Sluit oriëntasie"
 
 #. Translators: A list of keywords that match the lock orientation action, separated by semicolons
 #: js/misc/systemActions.js:137
-#| msgid "Orientation Lock"
 msgid "lock orientation"
 msgstr "sluit oriëntasie"
 
@@ -533,7 +502,6 @@ msgstr[0] "%d uur gelede"
 msgstr[1] "%d ure gelede"
 
 #: js/misc/util.js:188
-#| msgid "Yesterday, %H∶%M"
 msgid "Yesterday"
 msgstr "Gister"
 
@@ -553,8 +521,6 @@ msgstr[1] "%d weke gelede"
 
 #: js/misc/util.js:196
 #, javascript-format
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d maand gelede"
@@ -562,8 +528,6 @@ msgstr[1] "%d maande gelede"
 
 #: js/misc/util.js:198
 #, javascript-format
-#| msgid "%d day ago"
-#| msgid_plural "%d days ago"
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d jaar gelede"
@@ -641,7 +605,6 @@ msgstr "%e %B %Y, %l:%M %p"
 
 #. TRANSLATORS: this is the title of the wifi captive portal login window
 #: js/portalHelper/main.js:66
-#| msgid "Network Login"
 msgid "Hotspot Login"
 msgstr "Kuberkolaanmelding"
 
@@ -675,23 +638,23 @@ msgstr "Gereeldes"
 msgid "All"
 msgstr "Almal"
 
-#: js/ui/appDisplay.js:1915
+#: js/ui/appDisplay.js:1918
 msgid "New Window"
 msgstr "Nuwe venster"
 
-#: js/ui/appDisplay.js:1929
+#: js/ui/appDisplay.js:1932
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Begin met 'n Toegewyde Grafika Kaart"
 
-#: js/ui/appDisplay.js:1956 js/ui/dash.js:289
+#: js/ui/appDisplay.js:1959 js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Verwyder uit gunstelinge"
 
-#: js/ui/appDisplay.js:1962
+#: js/ui/appDisplay.js:1965
 msgid "Add to Favorites"
 msgstr "Voeg by gunstelinge"
 
-#: js/ui/appDisplay.js:1972
+#: js/ui/appDisplay.js:1975
 msgid "Show Details"
 msgstr "Wys besonderhede"
 
@@ -840,7 +803,6 @@ msgstr "Maak als skoon"
 #. Translators: %s is an application name
 #: js/ui/closeDialog.js:44
 #, javascript-format
-#| msgid "“%s” is ready"
 msgid "“%s” is not responding."
 msgstr "“%s” reageer nie."
 
@@ -854,7 +816,7 @@ msgstr ""
 
 #: js/ui/closeDialog.js:61
 msgid "Force Quit"
-msgstr "Forseer Afsluit"
+msgstr "Forseer afsluit"
 
 #: js/ui/closeDialog.js:64
 msgid "Wait"
@@ -912,7 +874,7 @@ msgstr "Diens: "
 
 #: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:638
 msgid "Authentication required by wireless network"
-msgstr "Verifiëring vereis deur draadlose netwerk."
+msgstr "Verifiëring vereis deur draadlose netwerk"
 
 #: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:639
 #, javascript-format
@@ -957,7 +919,7 @@ msgstr "Selfoonbreëband se netwerkwagwoord"
 msgid "A password is required to connect to “%s”."
 msgstr "'n Wagwoord is nodig om te verbind aan “%s”."
 
-#: js/ui/components/networkAgent.js:627 js/ui/status/network.js:1720
+#: js/ui/components/networkAgent.js:627 js/ui/status/network.js:1729
 msgid "Network Manager"
 msgstr "Netwerkbestuurder"
 
@@ -978,7 +940,6 @@ msgstr "Verifieer"
 #. * because of an authentication error (like invalid password),
 #. * for instance.
 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:328
-#| msgid "Sorry, that didn't work. Please try again."
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Jammer, dit het nie gewerk nie. Probeer gerus weer."
 
@@ -993,13 +954,13 @@ msgstr "%s staan nou bekend as %s"
 msgid "Windows"
 msgstr "Vensters"
 
-#: js/ui/dash.js:250 js/ui/dash.js:291
+#: js/ui/dash.js:246 js/ui/dash.js:287
 msgid "Show Applications"
 msgstr "Wys toepassings"
 
 #. 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:445
 msgid "Dash"
 msgstr "Toeps"
 
@@ -1018,15 +979,15 @@ msgstr "%e %B %Y"
 msgid "%A %B %e %Y"
 msgstr "%A %e %B %Y"
 
-#: js/ui/dateMenu.js:145
+#: js/ui/dateMenu.js:148
 msgid "Add world clocks…"
 msgstr "Voeg wêreldhorlosies by…"
 
-#: js/ui/dateMenu.js:146
+#: js/ui/dateMenu.js:149
 msgid "World Clocks"
 msgstr "Wêreldhorlosies"
 
-#: js/ui/dateMenu.js:225
+#: js/ui/dateMenu.js:228
 msgid "Weather"
 msgstr "Weer"
 
@@ -1034,7 +995,7 @@ msgstr "Weer"
 #. 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:289
+#: js/ui/dateMenu.js:292
 #, javascript-format
 msgid "%s all day."
 msgstr "%s heeldag."
@@ -1043,7 +1004,7 @@ msgstr "%s heeldag."
 #. 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:295
+#: js/ui/dateMenu.js:298
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, dan %s later."
@@ -1052,33 +1013,30 @@ msgstr "%s, dan %s later."
 #. 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:301
+#: js/ui/dateMenu.js:304
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, dan %s, en later %s."
 
-#: js/ui/dateMenu.js:312
-#| msgid "Select a network"
+#: js/ui/dateMenu.js:315
 msgid "Select a location…"
-msgstr "Kies 'n ligging..."
+msgstr "Kies 'n ligging…"
 
-#: js/ui/dateMenu.js:315
-#| msgid "Searching…"
+#: js/ui/dateMenu.js:318
 msgid "Loading…"
 msgstr "Laai tans…"
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:321
+#: js/ui/dateMenu.js:324
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Voel soos %s."
 
-#: js/ui/dateMenu.js:324
+#: js/ui/dateMenu.js:327
 msgid "Go online for weather information"
 msgstr "Gaan aanlyn vir weer inligting"
 
-#: js/ui/dateMenu.js:326
-#| msgid "Encryption is not available"
+#: js/ui/dateMenu.js:329
 msgid "Weather information is currently unavailable"
 msgstr "Weer inligting is nie tans beskikbaar nie"
 
@@ -1189,8 +1147,6 @@ msgid "Power off after updates are installed"
 msgstr "Skakel af nadat bywerkings geïnstalleer is"
 
 #: js/ui/endSessionDialog.js:137
-#| msgctxt "title"
-#| msgid "Restart & Install Updates"
 msgctxt "title"
 msgid "Restart & Install Upgrade"
 msgstr "Herbegin en installeer bywerkings"
@@ -1265,7 +1221,7 @@ msgstr "Weier"
 msgid "Allow"
 msgstr "Laat toe"
 
-#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:782
+#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:783
 msgid "Keyboard"
 msgstr "Sleutelbord"
 
@@ -1311,7 +1267,7 @@ msgstr "Laai tans af"
 
 #: js/ui/lookingGlass.js:748
 msgid "View Source"
-msgstr "Bekyk bronkode"
+msgstr "Vertoon bronkode"
 
 #: js/ui/lookingGlass.js:757
 msgid "Web Page"
@@ -1349,20 +1305,17 @@ msgstr "Tik om te soek…"
 
 #: js/ui/padOsd.js:103
 msgid "New shortcut…"
-msgstr "Nuwe kortpad..."
+msgstr "Nuwe kortpad…"
 
 #: js/ui/padOsd.js:152
-#| msgid "Applications"
 msgid "Application defined"
 msgstr "Toepassings gedefinieer"
 
 #: js/ui/padOsd.js:153
-#| msgid "Show the onscreen keyboard"
 msgid "Show on-screen help"
 msgstr "Wys hulp op die skerm"
 
 #: js/ui/padOsd.js:154
-#| msgid "Switch User"
 msgid "Switch monitor"
 msgstr "Wissel skerms"
 
@@ -1376,7 +1329,7 @@ msgstr "Klaar"
 
 #: js/ui/padOsd.js:734
 msgid "Edit…"
-msgstr "Redigeer..."
+msgstr "Redigeer…"
 
 #: js/ui/padOsd.js:774 js/ui/padOsd.js:879
 msgid "None"
@@ -1431,7 +1384,6 @@ msgid "Close"
 msgstr "Sluit"
 
 #: js/ui/runDialog.js:277
-#| msgid "Encryption is not available"
 msgid "Restart is not available on Wayland"
 msgstr "Herbegin is nie op Wayland beskikbaar nie"
 
@@ -1604,7 +1556,7 @@ msgstr "Skakel af"
 msgid "Brightness"
 msgstr "Helderheid"
 
-#: js/ui/status/keyboard.js:805
+#: js/ui/status/keyboard.js:806
 msgid "Show Keyboard Layout"
 msgstr "Wys sleutelborduitleg"
 
@@ -1672,20 +1624,19 @@ msgstr "%s Nie bestuur nie"
 #: js/ui/status/network.js:465
 #, javascript-format
 msgid "%s Disconnecting"
-msgstr "%s Ontkoppel Tans"
+msgstr "%s Ontkoppel tans"
 
 #. Translators: %s is a network identifier
 #: js/ui/status/network.js:472 js/ui/status/network.js:1320
 #, javascript-format
 msgid "%s Connecting"
-msgstr "%s Koppel Tans"
+msgstr "%s Koppel tans"
 
 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
 #: js/ui/status/network.js:475
 #, javascript-format
-#| msgid "Wired 802.1X authentication"
 msgid "%s Requires Authentication"
-msgstr "%s Benodig Identifisering"
+msgstr "%s Benodig identifisering"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing; %s is a network identifier
@@ -1729,7 +1680,6 @@ msgid "%s Disabled"
 msgstr "%s gedeaktiveer"
 
 #: js/ui/status/network.js:635
-#| msgid "Connect to..."
 msgid "Connect to Internet"
 msgstr "Koppel aan die internet"
 
@@ -1775,7 +1725,7 @@ msgstr "Gebruik die hardewareskakelaar om mee af te skakel"
 
 #: js/ui/status/network.js:1191
 msgid "Select Network"
-msgstr "Kies Netwerk"
+msgstr "Kies netwerk"
 
 #: js/ui/status/network.js:1197
 msgid "Wi-Fi Settings"
@@ -1794,9 +1744,8 @@ msgid "%s Not Connected"
 msgstr "%s nie gekoppel nie"
 
 #: js/ui/status/network.js:1435
-#| msgid "connecting..."
 msgid "connecting…"
-msgstr "verbind tans..."
+msgstr "verbind tans…"
 
 #. Translators: this is for network connections that require some kind of key or password
 #: js/ui/status/network.js:1438
@@ -1811,58 +1760,54 @@ msgstr "verbinding het misluk"
 msgid "VPN Settings"
 msgstr "VPN-instellings"
 
-#: js/ui/status/network.js:1498
+#: js/ui/status/network.js:1507
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1508
+#: js/ui/status/network.js:1517
 msgid "VPN Off"
 msgstr "VPN af"
 
-#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93
+#: js/ui/status/network.js:1581 js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "Netwerkinstellings"
 
-#: js/ui/status/network.js:1603
+#: js/ui/status/network.js:1612
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
-msgstr[0] "%s Gekabelde Verbinding"
-msgstr[1] "%s Gekabelde Verbindings"
+msgstr[0] "%s Gekabelde verbinding"
+msgstr[1] "%s Gekabelde verbindings"
 
-#: js/ui/status/network.js:1607
+#: js/ui/status/network.js:1616
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
-msgstr[0] "%s Wi-Fi Verbinding"
+msgstr[0] "%s Wi-Fi verbinding"
 msgstr[1] "%s Wi-Fi verbindings"
 
-#: js/ui/status/network.js:1611
+#: js/ui/status/network.js:1620
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
-msgstr[0] "%s Modem Verbinding"
-msgstr[1] "%s Modem Verbindings"
+msgstr[0] "%s Modem verbinding"
+msgstr[1] "%s Modem verbindings"
 
-#: js/ui/status/network.js:1759
+#: js/ui/status/network.js:1768
 msgid "Connection failed"
 msgstr "Verbinding het misluk"
 
-#: js/ui/status/network.js:1760
+#: js/ui/status/network.js:1769
 msgid "Activation of network connection failed"
 msgstr "Aktivering van netwerkverbinding het misluk"
 
 #: js/ui/status/nightLight.js:68
-#| msgid "Networking is disabled"
 msgid "Night Light Disabled"
-msgstr "Naglig Af"
+msgstr "Naglig af"
 
 #: js/ui/status/nightLight.js:69
 msgid "Night Light On"
-msgstr "Naglig Aan"
+msgstr "Naglig aan"
 
 #: js/ui/status/nightLight.js:70
 msgid "Resume"
@@ -1946,7 +1891,6 @@ msgstr "Volume"
 #. * Try to keep it under around 15 characters.
 #.
 #: js/ui/switchMonitor.js:21
-#| msgid "Error"
 msgid "Mirror"
 msgstr "Spieëlbeeld"
 
@@ -1955,14 +1899,14 @@ msgstr "Spieëlbeeld"
 #.
 #: js/ui/switchMonitor.js:26
 msgid "Join Displays"
-msgstr "Koppel Skerms"
+msgstr "Koppel skerms"
 
 #. Translators: this is for using only an external display.
 #. * Try to keep it under around 15 characters.
 #.
 #: js/ui/switchMonitor.js:31
 msgid "External Only"
-msgstr "Slegs Ekstern"
+msgstr "Slegs ekstern"
 
 #. Translators: this is for using only the laptop display.
 #. * Try to keep it under around 15 characters.
@@ -2087,27 +2031,26 @@ msgstr "Skuif na monitor regs"
 
 #: src/calendar-server/evolution-calendar.desktop.in:3
 msgid "Evolution Calendar"
-msgstr "Evolution-Kalender"
+msgstr "Evolution-kalender"
 
 #. 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"
 
-#: src/main.c:380
+#: src/main.c:437
 msgid "Print version"
 msgstr "Druk weergawe"
 
-#: src/main.c:386
+#: src/main.c:443
 msgid "Mode used by GDM for login screen"
 msgstr "Modus deur GDM gebruik vir aanmeldskerm"
 
-#: src/main.c:392
-#| msgid "Use a specific mode, e.g. \"gdm\" for login screen"
+#: src/main.c:449
 msgid "Use a specific mode, e.g. “gdm” for login screen"
 msgstr "Gebruik 'n spesifieke modus, bv. \"gdm\" vir aanmeldskerm"
 
-#: src/main.c:398
+#: src/main.c:455
 msgid "List possible modes"
 msgstr "Lys van moontlike modusse"
 
-- 
2.17.0


From 5481d5822e5ee999cc14bc623bc7dc3e4cf2e73c Mon Sep 17 00:00:00 2001
From: Fabio Tomat <f.t.public@gmail.com>
Date: Mon, 19 Feb 2018 12:43:08 +0000
Subject: [PATCH 18/22] Update Friulian translation

---
 po/fur.po | 75 +++++++++++++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/po/fur.po b/po/fur.po
index 74262578d..48a58c2a0 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,10 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: video-subtitles master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-10-04 18:03+0000\n"
-"PO-Revision-Date: 2017-10-11 08:34+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
+"POT-Creation-Date: 2018-02-10 09:15+0000\n"
+"PO-Revision-Date: 2018-02-19 13:42+0100\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "Language: fur\n"
@@ -639,23 +638,23 @@ msgstr "Dispès"
 msgid "All"
 msgstr "Dutis"
 
-#: js/ui/appDisplay.js:1915
+#: js/ui/appDisplay.js:1918
 msgid "New Window"
 msgstr "Gnûf barcon"
 
-#: js/ui/appDisplay.js:1929
+#: js/ui/appDisplay.js:1932
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Invie doprant une schede grafiche dedicade"
 
-#: js/ui/appDisplay.js:1956 js/ui/dash.js:289
+#: js/ui/appDisplay.js:1959 js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Gjave dai preferîts"
 
-#: js/ui/appDisplay.js:1962
+#: js/ui/appDisplay.js:1965
 msgid "Add to Favorites"
 msgstr "Zonte tai preferîts"
 
-#: js/ui/appDisplay.js:1972
+#: js/ui/appDisplay.js:1975
 msgid "Show Details"
 msgstr "Mostre Detais"
 
@@ -920,7 +919,7 @@ msgstr "Passowrd rêt mobil a bande largje"
 msgid "A password is required to connect to “%s”."
 msgstr "A covente une password par tacâsi a '%s'."
 
-#: js/ui/components/networkAgent.js:627 js/ui/status/network.js:1720
+#: js/ui/components/networkAgent.js:627 js/ui/status/network.js:1729
 msgid "Network Manager"
 msgstr "Ministradôr di rêt"
 
@@ -955,13 +954,13 @@ msgstr "L'utent %s al è cognossût cumò come %s"
 msgid "Windows"
 msgstr "Barcons"
 
-#: js/ui/dash.js:250 js/ui/dash.js:291
+#: js/ui/dash.js:246 js/ui/dash.js:287
 msgid "Show Applications"
 msgstr "Mostre Aplicazions"
 
 #. 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:445
 msgid "Dash"
 msgstr "Dash"
 
@@ -980,15 +979,15 @@ msgstr "%e di %B dal %Y"
 msgid "%A %B %e %Y"
 msgstr "%A %e di %B dal %Y"
 
-#: js/ui/dateMenu.js:145
+#: js/ui/dateMenu.js:148
 msgid "Add world clocks…"
 msgstr "Zonte orlois mondiâi..."
 
-#: js/ui/dateMenu.js:146
+#: js/ui/dateMenu.js:149
 msgid "World Clocks"
 msgstr "Orlois mondiâi"
 
-#: js/ui/dateMenu.js:225
+#: js/ui/dateMenu.js:228
 msgid "Weather"
 msgstr "Timp"
 
@@ -996,7 +995,7 @@ msgstr "Timp"
 #. 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:289
+#: js/ui/dateMenu.js:292
 #, javascript-format
 msgid "%s all day."
 msgstr "%s dut il dì."
@@ -1005,7 +1004,7 @@ msgstr "%s dut il dì."
 #. 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:295
+#: js/ui/dateMenu.js:298
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, plui tart %s."
@@ -1014,30 +1013,30 @@ msgstr "%s, plui tart %s."
 #. 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:301
+#: js/ui/dateMenu.js:304
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, chi di un pôc %s, e plui tart %s."
 
-#: js/ui/dateMenu.js:312
+#: js/ui/dateMenu.js:315
 msgid "Select a location…"
 msgstr "Selezione une posizion..."
 
-#: js/ui/dateMenu.js:315
+#: js/ui/dateMenu.js:318
 msgid "Loading…"
 msgstr "Daûr a cjariâ..."
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:321
+#: js/ui/dateMenu.js:324
 #, javascript-format
 msgid "Feels like %s."
-msgstr "Si sint %s."
+msgstr "Si sintin %s."
 
-#: js/ui/dateMenu.js:324
+#: js/ui/dateMenu.js:327
 msgid "Go online for weather information"
 msgstr "Va in rêt pes informazions sul timp"
 
-#: js/ui/dateMenu.js:326
+#: js/ui/dateMenu.js:329
 msgid "Weather information is currently unavailable"
 msgstr "Lis informazions sul timp al moment no son disponibilis"
 
@@ -1224,7 +1223,7 @@ msgstr "Dinee"
 msgid "Allow"
 msgstr "Pemet"
 
-#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:782
+#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:783
 msgid "Keyboard"
 msgstr "Tastiere"
 
@@ -1562,7 +1561,7 @@ msgstr "Distude"
 msgid "Brightness"
 msgstr "Luminositât"
 
-#: js/ui/status/keyboard.js:805
+#: js/ui/status/keyboard.js:806
 msgid "Show Keyboard Layout"
 msgstr "Mostre la disposizion de tastiere"
 
@@ -1766,44 +1765,44 @@ msgstr "conession falide"
 msgid "VPN Settings"
 msgstr "Impostazions VPN"
 
-#: js/ui/status/network.js:1498
+#: js/ui/status/network.js:1507
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1508
+#: js/ui/status/network.js:1517
 msgid "VPN Off"
 msgstr "VPN distudât"
 
-#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93
+#: js/ui/status/network.js:1581 js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "Impostazions rêt"
 
-#: js/ui/status/network.js:1603
+#: js/ui/status/network.js:1612
 #, javascript-format
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
 msgstr[0] "%s conession cablade"
 msgstr[1] "%s conessions cabladis"
 
-#: js/ui/status/network.js:1607
+#: js/ui/status/network.js:1616
 #, javascript-format
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
 msgstr[0] "%s conession cence fîi"
 msgstr[1] "%s conessions cence fîi"
 
-#: js/ui/status/network.js:1611
+#: js/ui/status/network.js:1620
 #, javascript-format
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
 msgstr[0] "%s conession modem"
 msgstr[1] "%s conessions modem"
 
-#: js/ui/status/network.js:1759
+#: js/ui/status/network.js:1768
 msgid "Connection failed"
 msgstr "Conession falide"
 
-#: js/ui/status/network.js:1760
+#: js/ui/status/network.js:1769
 msgid "Activation of network connection failed"
 msgstr "Ativazion de conession di rêt falide"
 
@@ -2046,19 +2045,19 @@ msgstr "Calendari di Evolution"
 msgid "evolution"
 msgstr "evolution"
 
-#: src/main.c:380
+#: src/main.c:437
 msgid "Print version"
 msgstr "Stampe version"
 
-#: src/main.c:386
+#: src/main.c:443
 msgid "Mode used by GDM for login screen"
 msgstr "Modalitât doprade da GDM pe videade di acès"
 
-#: src/main.c:392
+#: src/main.c:449
 msgid "Use a specific mode, e.g. “gdm” for login screen"
 msgstr "Dopre une modalitât specifiche, par esempli “gdm” pe videade di acès"
 
-#: src/main.c:398
+#: src/main.c:455
 msgid "List possible modes"
 msgstr "Liste modalitâts pussibilis"
 
-- 
2.17.0


From e1b9babac57743bc1d5b745678cc04d7c79e1c71 Mon Sep 17 00:00:00 2001
From: GNOME Translation Robot <gnome-sysadmin@gnome.org>
Date: Mon, 26 Feb 2018 12:49:37 +0000
Subject: [PATCH 19/22] Update Scottish Gaelic translation

---
 po/gd.po | 1193 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 801 insertions(+), 392 deletions(-)

diff --git a/po/gd.po b/po/gd.po
index 0af746a02..7f6168adf 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -1,14 +1,13 @@
 # Scottish Gaelic translation for gnome-shell.
 # Copyright (C) 2015 gnome-shell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
-# GunChleoc <fios@foramnagaidhlig.net>, 2015, 2016, 2017.
+# GunChleoc <fios@foramnagaidhlig.net>, 2015, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product"
-"=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-02 17:53+0000\n"
-"PO-Revision-Date: 2017-03-07 12:03+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
+"POT-Creation-Date: 2018-01-27 16:52+0000\n"
+"PO-Revision-Date: 2018-02-26 12:48+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -31,7 +30,7 @@ msgstr "Seall liosta nam brathan"
 
 #: data/50-gnome-shell-system.xml:12
 msgid "Focus the active notification"
-msgstr "Cuir am fòcas air a' bhrath ghnìomhach"
+msgstr "Cuir am fòcas air a’ bhrath ghnìomhach"
 
 #: data/50-gnome-shell-system.xml:15
 msgid "Show the overview"
@@ -46,8 +45,10 @@ msgid "Open the application menu"
 msgstr "Fosgail clàr-taice nan aplacaidean"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:4
-msgid "GNOME Shell Extension Preferences"
-msgstr "Roghainnean airson leudachain na Slige GNOME"
+#: js/extensionPrefs/main.js:152
+#| msgid "GNOME Shell Extensions"
+msgid "Shell Extensions"
+msgstr "Leudachain na slige"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:5
 msgid "Configure GNOME Shell Extensions"
@@ -63,14 +64,14 @@ msgstr "Stiùireadh uinneagan is tòiseachadh aplacaidean"
 
 #: data/org.gnome.shell.gschema.xml.in:6
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr "Cuir an comas innealan an luchd-leasachaidh 's deuchainne o Alt-F2"
+msgstr "Cuir an comas innealan an luchd-leasachaidh ’s deuchainne o Alt-F2"
 
 #: data/org.gnome.shell.gschema.xml.in:9
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"Ceadaich inntrigeadh dha na h-innealan a chum dì-bhugachaidh 's sgrùdaidh le "
+"Ceadaich inntrigeadh dha na h-innealan a chum dì-bhugachaidh ’s sgrùdaidh le "
 "còmhradh Alt-F2."
 
 #: data/org.gnome.shell.gschema.xml.in:16
@@ -86,35 +87,34 @@ msgid ""
 msgstr ""
 "Tha buadh UUID aig leudachain na Slige GNOME; seallaidh an iuchair sin na "
 "leudachain a bu chòir luchdadh. Feumaidh gach leudachan a tha ag iarraidh "
-"luchdadh a bhith air an liosta seo. 'S urrainn dhut an liosta seo "
+"luchdadh a bhith air an liosta seo. ’S urrainn dhut an liosta seo "
 "atharrachadh cuideachd leis na modhan D-Bus EnableExtension agus "
 "DisableExtension air org.gnome.Shell."
 
-#: data/org.gnome.shell.gschema.xml.in:26
+#: data/org.gnome.shell.gschema.xml.in:34
 msgid "Disables the validation of extension version compatibility"
 msgstr ""
 "Cuiridh seo à comas dearbhadh na co-chòrdalachd airson tionndadh nan "
 "leudachan"
 
-#: 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 "
 "load all extensions regardless of the versions they claim to support."
 msgstr ""
-"Cha luchdaich an t-Slige GNOME ach leudachain a dh'innseas gu bheil iar co-"
-"chòrdail leis an tionndadh a tha 'ga ruith. Ma chuireas tu an roghainn seo "
+"Cha luchdaich an t-Slige GNOME ach leudachain a dh’innseas gu bheil iar co-"
+"chòrdail leis an tionndadh a tha ’ga ruith. Ma chuireas tu an roghainn seo "
 "an comas, thèid an dearbhadh a chur à comas agus feuchaidh sinn ris a h-uile "
-"leudachan a luchdadh ge b' e dè na tionndaidhean ris an cuir iad taic dhan "
+"leudachan a luchdadh ge b’ e dè na tionndaidhean ris an cuir iad taic dhan "
 "rèir-san."
 
-#: 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 ""
-"Liosta dhe IDan nam faidhlichean desktop airson nan aplacaidean as annsa "
-"leat"
+"Liosta dhe IDan nam faidhlichean desktop airson nan aplacaidean as annsa leat"
 
-#: 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."
@@ -122,203 +122,220 @@ msgstr ""
 "Thèid na h-aplacaidean a fhreagras ris na h-aithnichearan seo a shealltainn "
 "air raon nan annsachdan."
 
-#: data/org.gnome.shell.gschema.xml.in:43
+#: data/org.gnome.shell.gschema.xml.in:51
 msgid "App Picker View"
 msgstr "Sealladh roghnaichear nan aplacaid"
 
-#: 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 "Inneacs an t-seallaidh làithrich ann an roghnaichear nan aplacaid."
 
-#: data/org.gnome.shell.gschema.xml.in:50
+#: data/org.gnome.shell.gschema.xml.in:58
 msgid "History for command (Alt-F2) dialog"
-msgstr "Eachdraidh a' chòmhraidh-àithne (Alt-F2)"
+msgstr "Eachdraidh a’ chòmhraidh-àithne (Alt-F2)"
 
 #. 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 "Eachdraidh a' chomhraidh aig looking glass"
+msgstr "Eachdraidh a’ chòmhraidh aig 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."
+msgid "Always show the “Log out” menu item in the user menu."
 msgstr ""
-"Seall nì \"Clàraich a-mach\" air clàr-taice a' chleachdaiche an-còmhnaidh."
+"Seall nì “Clàraich a-mach” air clàr-taice a’ chleachdaiche an-còmhnaidh."
 
-#: 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-user, single-session situations."
 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 ""
-"Tar-àithnidh an iuchair seo am falach fèin-obrachail aig \"Clàraich a-mach\" "
-"air a' chlar-taice ann an suidheachaidhean le aon chleachdaiche 's aon "
+"Tar-àithnidh an iuchair seo am falach fèin-obrachail aig “Clàraich a-mach” "
+"air a’ chlàr-taice ann an suidheachaidhean le aon chleachdaiche ’s aon "
 "seisean a-mhàin."
 
-#: 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 ""
 "Co-dhiù an dèid am facal-faire a chuimhneachadh airson munntachadh "
 "shiostaman-fhaidhlichean crioptaichte no cèine"
 
-#: 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 "
+#| "state of the checkbox."
 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 ""
 "Iarraidh an t-slige facal-fàire ort nuair a thèid siostam-fhaidhlichean "
 "crioptaichte no cèin a mhunntachadh. Ma ghabhas am facal-faire sàbhaladh "
-"airson na h-ama ri teachd, bidh bogsa-còmhraige \"Cuimhnich am facal-fàire\" "
+"airson na h-ama ri teachd, bidh bogsa-còmhraige “Cuimhnich am facal-fàire” "
 "ann. Suidhichidh an iuchair seo staid tùsail na bogsa-còmhraige ud."
 
-#: 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 ""
 "Co-dhiù an robh uidheaman co-cheangailte ris an adaptar Bluetooth gus nach "
 "robh"
 
-#: 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 "
 "adapter. This will be reset if the default adapter is ever seen not to have "
 "devices associated to it."
 msgstr ""
-"Cha seall an t-slige nì clàir-taice \"Bluetooth\" ach ma tha cumhachd aig "
+"Cha seall an t-slige nì clàir-taice “Bluetooth” ach ma tha cumhachd aig "
 "adaptar Bluetooth na ma chaidh uidheaman co-cheangailte ris an adaptar "
 "tùsail roimhe. Thèid seo ath-shuidheachadh ma chithear an t-adaptar tùsail "
 "gun uidheam co-cheangailte ris."
 
-#: data/org.gnome.shell.gschema.xml.in:93
+#: data/org.gnome.shell.gschema.xml.in:101
 msgid "Keybinding to open the application menu"
 msgstr "Nasgadh iuchrach gus clàr-taice na h-aplacaid fhosgladh"
 
-#: data/org.gnome.shell.gschema.xml.in:94
+#: data/org.gnome.shell.gschema.xml.in:102
 msgid "Keybinding to open the application menu."
 msgstr "Nasgadh iuchrach gus clàr-taice na h-aplacaid fhosgladh."
 
-#: data/org.gnome.shell.gschema.xml.in:100
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Nasgadh iuchrach gus an sealladh \"Seall aplacaidean\" fhosgladh"
+#: data/org.gnome.shell.gschema.xml.in:108
+#| msgid "Keybinding to open the \"Show Applications\" view"
+msgid "Keybinding to open the “Show Applications” view"
+msgstr "Nasgadh iuchrach gus an sealladh “Seall aplacaidean” fhosgladh"
 
-#: data/org.gnome.shell.gschema.xml.in:101
+#: data/org.gnome.shell.gschema.xml.in:109
+#| msgid ""
+#| "Keybinding to open the \"Show Applications\" view of the Activities "
+#| "Overview."
 msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
+"Keybinding to open the “Show Applications” view of the Activities Overview."
 msgstr ""
-"Nasgadh iuchrach gus an sealladh \"Seall aplacaidean\" aig foir-shealladh na "
+"Nasgadh iuchrach gus an sealladh “Seall aplacaidean” aig foir-shealladh na "
 "gnìomhachd fhosgladh."
 
-#: data/org.gnome.shell.gschema.xml.in:108
+#: data/org.gnome.shell.gschema.xml.in:116
 msgid "Keybinding to open the overview"
 msgstr "Nasgadh iuchrach gus am foir-shealladh fhosgladh"
 
-#: data/org.gnome.shell.gschema.xml.in:109
+#: data/org.gnome.shell.gschema.xml.in:117
 msgid "Keybinding to open the Activities Overview."
 msgstr "Nasgadh iuchrach gus foir-shealladh na gnìomhachd fhosgladh."
 
-#: data/org.gnome.shell.gschema.xml.in:115
+#: data/org.gnome.shell.gschema.xml.in:123
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr ""
 "Nasgadh iuchrach gus an fhaicsinneachd air liosta nam brathan a thoglachadh"
 
-#: 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 ""
 "Nasgadh iuchrach gus an fhaicsinneachd air liosta nam brathan a thoglachadh."
 
-#: data/org.gnome.shell.gschema.xml.in:122
+#: data/org.gnome.shell.gschema.xml.in:130
 msgid "Keybinding to focus the active notification"
-msgstr "Nasgadh iuchrach gus am fòcas a chur air a' bhrath ghnìomhach"
+msgstr "Nasgadh iuchrach gus am fòcas a chur air a’ bhrath ghnìomhach"
 
-#: data/org.gnome.shell.gschema.xml.in:123
+#: data/org.gnome.shell.gschema.xml.in:131
 msgid "Keybinding to focus the active notification."
-msgstr "Nasgadh iuchrach gus am fòcas a chur air a' bhrath ghnìomhach."
+msgstr "Nasgadh iuchrach gus am fòcas a chur air a’ bhrath ghnìomhach."
 
-#: 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 ""
-"Nasgadh iuchrach a chuir gach tween a tha 'ga ruith 'na stad 's a "
+"Nasgadh iuchrach a chuir gach tween a tha ’ga ruith ’na stad ’s a "
 "thòisicheas orra a-rithist a chum dì-bhugachaidh"
 
-#: data/org.gnome.shell.gschema.xml.in:138
+#: data/org.gnome.shell.gschema.xml.in:146
 msgid "Which keyboard to use"
 msgstr "Am meur-chlàr ri chleachdadh"
 
-#: data/org.gnome.shell.gschema.xml.in:139
+#: data/org.gnome.shell.gschema.xml.in:147
 msgid "The type of keyboard to use."
 msgstr "An seòrsa de mheur-chlàr a thèid a chleachdadh."
 
-#: 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 "Cuingich an t-suidsear air an rum-obrach làithreach."
 
-#: 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 ""
-"Mas e true a th' ann, cha dèid a shealltainn san t-suidsear ach na "
+"Mas e true a th’ ann, cha dèid a shealltainn san t-suidsear ach na "
 "h-aplacaidean aig a bheil uinneag san rum-obrach làithreach. Mur e, thèid a "
 "h-uile aplacaid a ghabhail a-steach."
 
-#: data/org.gnome.shell.gschema.xml.in:168
+#: data/org.gnome.shell.gschema.xml.in:176
 msgid "The application icon mode."
 msgstr "Modh ìomhaigheag na h-aplacaid."
 
-#: 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'."
 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 ""
 "Rèitichidh seo an dòigh sa thèid na h-uinneagan a shealltainn san "
-"t-suidsear. 'S e \"thumbnail-only\" (seallaidh seo dealbhag na h-uinneige), "
-"\"app-icon-only\" (seallaidh seo ìomhaigheag na h-aplacaid) no \"both\" "
+"t-suidsear. ’S e “thumbnail-only” (seallaidh seo dealbhag na h-uinneige), "
+"“app-icon-only” (seallaidh seo ìomhaigheag na h-aplacaid) no “both” "
 "(seallaidh seo an dà chuid dhiubh) a tha sna luachan dligheach."
 
-#: 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 ""
-"Mas e true a th' ann, cha dèid a shealltainn san t-suidsear ach na "
+"Mas e true a th’ ann, cha dèid a shealltainn san t-suidsear ach na "
 "h-uinneagan a tha san rum-obrach làithreach. Mur e, thèid a h-uile uinneag a "
 "ghabhail a-steach."
 
-#: 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 "Ceangail còmhradh mòdach ris an uinneag-pàraint"
 
-#: 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 ""
 "Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.mutter nuair a thèid "
 "Slige GNOME a ruith."
 
-#: 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 ""
 "Cuir leacadh nan oirean an comas nuair a thèid uinneagan a leigeil às aig "
 "oir na sgrìn"
 
-#: data/org.gnome.shell.gschema.xml.in:206
+#: data/org.gnome.shell.gschema.xml.in:214
 msgid "Workspaces are managed dynamically"
 msgstr "Thèid na rumannan-obrach a stiùireadh a làimh"
 
-#: data/org.gnome.shell.gschema.xml.in:214
+#: data/org.gnome.shell.gschema.xml.in:222
 msgid "Workspaces only on primary monitor"
-msgstr "Rumannan-obrach air a' phrìomh-sgrìn a-mhàin"
+msgstr "Rumannan-obrach air a’ phrìomh-sgrìn a-mhàin"
 
-#: 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 ""
 "Cuir dàil air atharraichean an fòcais ann am modh luchaige gus an sguir an "
@@ -333,50 +350,46 @@ msgstr "Clàradh a-steach lìonraidh"
 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 "Thachair mearachd le luchdadh còmhradh nan roghainnean airson %s:"
 
-#: js/extensionPrefs/main.js:149
-msgid "GNOME Shell Extensions"
-msgstr "Leudachain na Slige GNOME"
-
-#: 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:926
+#: js/gdm/authPrompt.js:149 js/ui/audioDeviceSelection.js:71
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
+#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
+#: js/ui/shellMountOperation.js:344 js/ui/status/network.js:936
 msgid "Cancel"
 msgstr "Sguir dheth"
 
-#: 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 "Air adhart"
 
-#: js/gdm/authPrompt.js:212 js/ui/shellMountOperation.js:403
+#: js/gdm/authPrompt.js:214 js/ui/shellMountOperation.js:348
 #: js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Neo-ghlais"
 
-#: js/gdm/authPrompt.js:214
+#: js/gdm/authPrompt.js:216
 msgctxt "button"
 msgid "Sign In"
 msgstr "Clàraich a-steach"
 
-#: js/gdm/loginDialog.js:285
+#: js/gdm/loginDialog.js:308
 msgid "Choose Session"
 msgstr "Tagh seisean"
 
 #. 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:458
 msgid "Not listed?"
 msgstr "Nach eil e air an liosta?"
 
 #. 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:859
+#: js/gdm/loginDialog.js:888
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(m.e., cleachdaiche no %s)"
@@ -384,16 +397,16 @@ msgstr "(m.e., cleachdaiche no %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:864 js/ui/components/networkAgent.js:271
-#: js/ui/components/networkAgent.js:289
+#: js/gdm/loginDialog.js:893 js/ui/components/networkAgent.js:243
+#: js/ui/components/networkAgent.js:261
 msgid "Username: "
 msgstr "Ainm-cleachdaiche:"
 
-#: js/gdm/loginDialog.js:1201
+#: js/gdm/loginDialog.js:1236
 msgid "Login Window"
-msgstr "Uinneag a' chlàraidh a-steach"
+msgstr "Uinneag a’ chlàraidh a-steach"
 
-#: js/gdm/util.js:341
+#: js/gdm/util.js:346
 msgid "Authentication error"
 msgstr "Mearachd leis an dearbhadh"
 
@@ -402,40 +415,178 @@ msgstr "Mearachd leis an dearbhadh"
 #. 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 "(no suath do meur)"
 
-#: js/misc/util.js:119
+#. Translators: The name of the power-off action in search
+#: js/misc/systemActions.js:99
+#| msgid "Power Off"
+msgctxt "search-result"
+msgid "Power off"
+msgstr "Cuir a’ chumhachd dheth"
+
+#. Translators: A list of keywords that match the power-off action, separated by semicolons
+#: js/misc/systemActions.js:102
+msgid "power off;shutdown"
+msgstr ""
+"power off;shutdown;cumhachd;dheth;cur sìos;cuir sìos;cuir dheth;cur dheth;"
+
+#. Translators: The name of the lock screen action in search
+#: js/misc/systemActions.js:106
+msgctxt "search-result"
+msgid "Lock screen"
+msgstr "Glais an sgrìn"
+
+#. Translators: A list of keywords that match the lock screen action, separated by semicolons
+#: js/misc/systemActions.js:109
+msgid "lock screen"
+msgstr "sgrìn-ghlasaidh;glais;glas;sgrìn"
+
+#. Translators: The name of the logout action in search
+#: js/misc/systemActions.js:113
+#| msgid "Log Out"
+msgctxt "search-result"
+msgid "Log out"
+msgstr "Clàraich a-mach"
+
+#. Translators: A list of keywords that match the logout action, separated by semicolons
+#: js/misc/systemActions.js:116
+msgid "logout;sign off"
+msgstr "logout;sign off;clàraidh a-mach;clàradh a-mach;logadh a-mach;"
+
+#. Translators: The name of the suspend action in search
+#: js/misc/systemActions.js:120
+#| msgid "Suspend"
+msgctxt "search-result"
+msgid "Suspend"
+msgstr "Cuir ’na dhàil"
+
+#. Translators: A list of keywords that match the suspend action, separated by semicolons
+#: js/misc/systemActions.js:123
+#| msgid "Suspend"
+msgid "suspend;sleep"
+msgstr "suspend;sleep;cuir 'na dhàil;cur 'na dhàil;cuir na dhàil;cur na dhàil;"
+
+#. Translators: The name of the switch user action in search
+#: js/misc/systemActions.js:127
+#| msgid "Switch User"
+msgctxt "search-result"
+msgid "Switch user"
+msgstr "Dèan suids eadar cleachdaichean"
+
+#. Translators: A list of keywords that match the switch user action, separated by semicolons
+#: js/misc/systemActions.js:130
+#| msgid "Switch User"
+msgid "switch user"
+msgstr "switch user;suids;cleachdaiche"
+
+#. Translators: The name of the lock orientation action in search
+#: js/misc/systemActions.js:134
+#| msgid "Orientation Lock"
+msgctxt "search-result"
+msgid "Lock orientation"
+msgstr "Glais a’ chomhair"
+
+#. Translators: A list of keywords that match the lock orientation action, separated by semicolons
+#: js/misc/systemActions.js:137
+#| msgid "Orientation Lock"
+msgid "lock orientation"
+msgstr "lock orientation;glais;comhair;glais a' chomhair;"
+
+#: js/misc/util.js:122
 msgid "Command not found"
 msgstr "Cha deach an àithne a lorg"
 
 #. 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 "Cha b' urrainn dhuinn an àithne a pharsadh:"
+msgstr "Cha b’ urrainn dhuinn an àithne a pharsadh:"
 
-#: js/misc/util.js:160
+#: js/misc/util.js:163
 #, javascript-format
 msgid "Execution of “%s” failed:"
-msgstr "Cha b' urrainn dhuinn “%s” a ruith:"
+msgstr "Cha b’ urrainn dhuinn “%s” a ruith:"
+
+#: js/misc/util.js:180
+msgid "Just now"
+msgstr "An-dràsta fhèin"
+
+#: js/misc/util.js:182
+#, javascript-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d mhionaid air ais"
+msgstr[1] "%d mhionaid air ais"
+msgstr[2] "%d mionaidean air ais"
+msgstr[3] "%d mionaid air ais"
+
+#: js/misc/util.js:185
+#, javascript-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d uair a thìde air ais"
+msgstr[1] "%d uair a thìde air ais"
+msgstr[2] "%d uairean a thìde air ais"
+msgstr[3] "%d uair a thìde air ais"
+
+#: js/misc/util.js:188
+#| msgid "Yesterday, %H∶%M"
+msgid "Yesterday"
+msgstr "An-dè"
+
+#: js/misc/util.js:190
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d latha air ais"
+msgstr[1] "%d latha air ais"
+msgstr[2] "%d làithean air ais"
+msgstr[3] "%d latha air ais"
+
+#: js/misc/util.js:193
+#, javascript-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d seachdain air ais"
+msgstr[1] "%d sheachdain air ais"
+msgstr[2] "%d seachdainean air ais"
+msgstr[3] "%d seachdain air ais"
+
+#: js/misc/util.js:196
+#, javascript-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d mhìos air ais"
+msgstr[1] "%d mhìos air ais"
+msgstr[2] "%d mìosan air ais"
+msgstr[3] "%d mìos air ais"
+
+#: js/misc/util.js:198
+#, javascript-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d bhliadhna air ais"
+msgstr[1] "%d bhliadhna air ais"
+msgstr[2] "%d bliadhnaichean air ais"
+msgstr[3] "%d bliadhna air ais"
 
 #. Translators: Time in 24h format
-#: js/misc/util.js:191
+#: js/misc/util.js:228
 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:234
 #, no-c-format
 msgid "Yesterday, %H∶%M"
 msgstr "An-dè aig %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:240
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A, %H∶%M"
@@ -443,7 +594,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:246
 #, no-c-format
 msgid "%B %d, %H∶%M"
 msgstr "%d %B, %H∶%M"
@@ -451,26 +602,26 @@ msgstr "%d %B, %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:252
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
 msgstr "%d %B %Y, %H∶%M"
 
 #. Translators: Time in 12h format
-#: js/misc/util.js:220
+#: js/misc/util.js:257
 msgid "%l∶%M %p"
 msgstr "%l∶%M%p"
 
 #. 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:263
 #, no-c-format
 msgid "Yesterday, %l∶%M %p"
 msgstr "An-dè aig %l:%M%p"
 
 #. 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:269
 #, no-c-format
 msgid "%A, %l∶%M %p"
 msgstr "%A, %l∶%M%p"
@@ -478,7 +629,7 @@ msgstr "%A, %l∶%M%p"
 #. 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:275
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
 msgstr "%d %B, %l∶%M%p"
@@ -486,61 +637,74 @@ msgstr "%d %B, %l∶%M%p"
 #. 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:281
 #, no-c-format
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%d %B %Y, %l∶%M%p"
 
-#. 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 "Ath-stiùireadh an dearbhaidh-lìn"
+#. TRANSLATORS: this is the title of the wifi captive portal login window
+#: js/portalHelper/main.js:66
+#| msgid "Network Login"
+msgid "Hotspot Login"
+msgstr "Clàradh a-steach Hotspot"
+
+#: 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 ""
+"Chan eil an ceangal agad gu clàradh a-steach a’ hotspot seo tèarainte. Chì "
+"daoine a tha faisg ort na faclan-faire agus fiosrachadh sam bith eile a "
+"chuireas tu a-steach air an duilleag seo."
 
 #. 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:63 js/ui/status/location.js:395
 msgid "Deny Access"
 msgstr "Diùlt an t-inntrigeadh"
 
-#: js/ui/accessDialog.js:63 js/ui/status/location.js:429
+#: js/ui/accessDialog.js:64 js/ui/status/location.js:398
 msgid "Grant Access"
 msgstr "Ceadaich an t-inntrigeadh"
 
-#: js/ui/appDisplay.js:794
+#: js/ui/appDisplay.js:809
 msgid "Frequently used applications will appear here"
 msgstr "Nochdaidh aplacaidean a chleachdas tu gu tric an-seo"
 
-#: js/ui/appDisplay.js:914
+#: js/ui/appDisplay.js:930
 msgid "Frequent"
 msgstr "Tric"
 
-#: js/ui/appDisplay.js:921
+#: js/ui/appDisplay.js:937
 msgid "All"
 msgstr "Na h-uile"
 
-#: js/ui/appDisplay.js:1853
+#: js/ui/appDisplay.js:1918
 msgid "New Window"
 msgstr "Uinneag ùr"
 
-#: js/ui/appDisplay.js:1881 js/ui/dash.js:289
+#: js/ui/appDisplay.js:1932
+msgid "Launch using Dedicated Graphics Card"
+msgstr "Cuir gu dol le cairt-ghrafaigeachd shònraichte"
+
+#: js/ui/appDisplay.js:1959 js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Thoir air falbh o na h-annsachdan"
 
-#: js/ui/appDisplay.js:1887
+#: js/ui/appDisplay.js:1965
 msgid "Add to Favorites"
 msgstr "Cuir ris na h-annsachdan"
 
-#: js/ui/appDisplay.js:1897
+#: js/ui/appDisplay.js:1975
 msgid "Show Details"
 msgstr "Seall am mion-fhiosrachadh"
 
-#: js/ui/appFavorites.js:136
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Chaidh %s a chur ris na h-annsachdan agad."
 
-#: js/ui/appFavorites.js:170
+#: js/ui/appFavorites.js:175
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "Chaidh %s a toirt air falbh o na h-annsachdan agad."
@@ -561,7 +725,7 @@ msgstr "Headphones"
 msgid "Headset"
 msgstr "Headset"
 
-#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:213
+#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:221
 msgid "Microphone"
 msgstr "Micreofon"
 
@@ -569,11 +733,11 @@ msgstr "Micreofon"
 msgid "Change Background…"
 msgstr "Atharraich an cùlaibh…"
 
-#: js/ui/backgroundMenu.js:21
+#: js/ui/backgroundMenu.js:21 js/ui/status/nightLight.js:51
 msgid "Display Settings"
 msgstr "Roghainnean an t-seallaidh"
 
-#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:374
+#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:265
 msgid "Settings"
 msgstr "Roghainnean"
 
@@ -629,58 +793,77 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "Sa"
 
-#: js/ui/calendar.js:442
+#: js/ui/calendar.js:449
 msgid "Previous month"
 msgstr "Am mìos roimhe"
 
-#: js/ui/calendar.js:452
+#: js/ui/calendar.js:459
 msgid "Next month"
 msgstr "An ath mhìos"
 
-#: js/ui/calendar.js:605
+#: js/ui/calendar.js:612
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: js/ui/calendar.js:660
+#: js/ui/calendar.js:667
 msgid "Week %V"
 msgstr "Seachdain %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:736
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Fad an latha"
 
-#: js/ui/calendar.js:836
-msgid "Events"
-msgstr "Tachartasan"
-
-#: js/ui/calendar.js:845
+#: js/ui/calendar.js:869
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"
 
-#: js/ui/calendar.js:849
+#: js/ui/calendar.js:873
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-#: js/ui/calendar.js:931
-msgid "Notifications"
-msgstr "Brathan"
-
-#: js/ui/calendar.js:1082
+#: js/ui/calendar.js:1093
 msgid "No Notifications"
 msgstr "Chan eil brath ann"
 
-#: js/ui/calendar.js:1085
+#: js/ui/calendar.js:1096
 msgid "No Events"
 msgstr "Chan eil tachartas ann"
 
+#: js/ui/calendar.js:1124
+msgid "Clear All"
+msgstr "Falamhaich na h-uile"
+
+#. Translators: %s is an application name
+#: js/ui/closeDialog.js:44
+#, javascript-format
+#| msgid "“%s” is ready"
+msgid "“%s” is not responding."
+msgstr "Chan eil “%s” a’ freagairt."
+
+#: js/ui/closeDialog.js:45
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+"Faodaidh tu feitheamh greis gus an lean seo air adhart no sparradh air an "
+"aplacaid gum fàg i gu lèir."
+
+#: js/ui/closeDialog.js:61
+msgid "Force Quit"
+msgstr "Sparr fàgail air"
+
+#: js/ui/closeDialog.js:64
+msgid "Wait"
+msgstr "Fuirich"
+
 #: js/ui/components/automountManager.js:91
 msgid "External drive connected"
 msgstr "Chaidh draibh a-muigh a cheangal"
@@ -689,53 +872,53 @@ msgstr "Chaidh draibh a-muigh a cheangal"
 msgid "External drive disconnected"
 msgstr "Chaidh draibh a-muigh a dhì-cheangal"
 
-#: js/ui/components/autorunManager.js:355
+#: js/ui/components/autorunManager.js:358
 #, javascript-format
 msgid "Open with %s"
 msgstr "Fosgail le %s"
 
-#: js/ui/components/keyring.js:120 js/ui/components/polkitAgent.js:315
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "Facal-faire:"
 
-#: js/ui/components/keyring.js:153
+#: js/ui/components/keyring.js:140
 msgid "Type again:"
 msgstr "Am facal-faire a-rithist:"
 
-#: 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:112 js/ui/status/network.js:261
+#: js/ui/status/network.js:355 js/ui/status/network.js:939
 msgid "Connect"
 msgstr "Ceangail"
 
 #. 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:205 js/ui/components/networkAgent.js:217
+#: js/ui/components/networkAgent.js:245 js/ui/components/networkAgent.js:265
+#: js/ui/components/networkAgent.js:275
 msgid "Password: "
 msgstr "Facal-faire: "
 
 #. static WEP
-#: js/ui/components/networkAgent.js:238
+#: js/ui/components/networkAgent.js:210
 msgid "Key: "
 msgstr "Iuchair: "
 
-#: js/ui/components/networkAgent.js:277
+#: js/ui/components/networkAgent.js:249
 msgid "Identity: "
 msgstr "Dearbh-aithne: "
 
-#: js/ui/components/networkAgent.js:279
+#: js/ui/components/networkAgent.js:251
 msgid "Private key password: "
 msgstr "Facal-faire na h-iuchrach prìobhaidich: "
 
-#: js/ui/components/networkAgent.js:291
+#: js/ui/components/networkAgent.js:263
 msgid "Service: "
 msgstr "Seirbheis: "
 
-#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:666
+#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:638
 msgid "Authentication required by wireless network"
 msgstr "Tha an lìonra uèirleas ag iarraidh dearbhadh"
 
-#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:667
+#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:639
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -744,53 +927,53 @@ msgstr ""
 "Tha feum air faclan-faire no iuchraichean crioptachaidh gus an lìonra "
 "uèirleas “%s” inntrigeadh."
 
-#: js/ui/components/networkAgent.js:325 js/ui/components/networkAgent.js:670
+#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:642
 msgid "Wired 802.1X authentication"
 msgstr "Dearbhadh Wired 802.1X"
 
-#: js/ui/components/networkAgent.js:327
+#: js/ui/components/networkAgent.js:299
 msgid "Network name: "
 msgstr "Ainm an lìonraidh: "
 
-#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:674
+#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:646
 msgid "DSL authentication"
 msgstr "Dearbhadh DSL"
 
-#: js/ui/components/networkAgent.js:339 js/ui/components/networkAgent.js:680
+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:652
 msgid "PIN code required"
 msgstr "Tha feum air còd PIN"
 
-#: js/ui/components/networkAgent.js:340 js/ui/components/networkAgent.js:681
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:653
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Tha feum air còd PIN airson an inneil-làimhe banna-leathainn"
 
-#: js/ui/components/networkAgent.js:341
+#: js/ui/components/networkAgent.js:313
 msgid "PIN: "
 msgstr "PIN: "
 
-#: js/ui/components/networkAgent.js:348 js/ui/components/networkAgent.js:687
+#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:659
 msgid "Mobile broadband network password"
-msgstr "Facal-faire a' bhanna-leathainn inneil-làimhe"
+msgstr "Facal-faire a’ bhanna-leathainn inneil-làimhe"
 
-#: js/ui/components/networkAgent.js:349 js/ui/components/networkAgent.js:671
-#: js/ui/components/networkAgent.js:675 js/ui/components/networkAgent.js:688
+#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:643
+#: js/ui/components/networkAgent.js:647 js/ui/components/networkAgent.js:660
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "tha feum air facal-faire airson ceangal ri “%s”."
 
-#: js/ui/components/networkAgent.js:655 js/ui/status/network.js:1672
+#: js/ui/components/networkAgent.js:627 js/ui/status/network.js:1729
 msgid "Network Manager"
 msgstr "Manaidsear nan lìonra"
 
-#: js/ui/components/polkitAgent.js:60
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "Tha feum air dearbhadh"
 
-#: js/ui/components/polkitAgent.js:102
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "Rianaire"
 
-#: js/ui/components/polkitAgent.js:182
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "Dearbhaich"
 
@@ -798,36 +981,36 @@ msgstr "Dearbhaich"
 #. * 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 ""
-"Tha sinn duilich ach cha do dh'obraich seo. Am feuch thu ris a-rithist?"
+#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:328
+#| msgid "Sorry, that didn't work. Please try again."
+msgid "Sorry, that didn’t work. Please try again."
+msgstr "Tha sinn duilich ach cha do dh’obraich seo. Am feuch thu ris a-rithist?"
 
 #. 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 "thug %s %s air"
 
-#: js/ui/ctrlAltTab.js:29 js/ui/viewSelector.js:155
+#: js/ui/ctrlAltTab.js:29 js/ui/viewSelector.js:186
 msgid "Windows"
 msgstr "Uinneagan"
 
-#: js/ui/dash.js:250 js/ui/dash.js:291
+#: js/ui/dash.js:246 js/ui/dash.js:287
 msgid "Show Applications"
 msgstr "Seall na aplacaidean"
 
 #. 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:445
 msgid "Dash"
 msgstr "Deas-bhòrd"
 
 #. 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:76
 msgid "%B %e %Y"
 msgstr "%e %B %Y"
 
@@ -835,18 +1018,73 @@ msgstr "%e %B %Y"
 #. * 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:83
 msgid "%A %B %e %Y"
 msgstr "%A %e %B %Y"
 
-#: js/ui/dateMenu.js:160
+#: js/ui/dateMenu.js:148
 msgid "Add world clocks…"
 msgstr "Cuir uaireadairean an t-saoghail ris…"
 
-#: js/ui/dateMenu.js:161
+#: js/ui/dateMenu.js:149
 msgid "World Clocks"
 msgstr "Cuir uaireadairean an t-saoghail"
 
+#: js/ui/dateMenu.js:228
+msgid "Weather"
+msgstr "An aimsir"
+
+#. 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:292
+#, javascript-format
+msgid "%s all day."
+msgstr "%s fad an latha."
+
+#. 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:298
+#, javascript-format
+msgid "%s, then %s later."
+msgstr "%s ’s %s an uairsin."
+
+#. 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:304
+#, javascript-format
+msgid "%s, then %s, followed by %s later."
+msgstr "%s ’s %s an uairsin ’s %s an uairsin."
+
+#: js/ui/dateMenu.js:315
+#| msgid "Select a network"
+msgid "Select a location…"
+msgstr "Tagh ionad…"
+
+#: js/ui/dateMenu.js:318
+#| msgid "Searching…"
+msgid "Loading…"
+msgstr "’Ga luchdadh…"
+
+#. Translators: %s is a temperature with unit, e.g. "23℃"
+#: js/ui/dateMenu.js:324
+#, javascript-format
+msgid "Feels like %s."
+msgstr "A’ faireachdainn mar %s."
+
+#: js/ui/dateMenu.js:327
+msgid "Go online for weather information"
+msgstr "Rach air loidhne airson fiosrachadh mun aimsir"
+
+#: js/ui/dateMenu.js:329
+msgid "Weather information is currently unavailable"
+msgstr "Chan eil fiosrachadh mun aimsir ri fhaighinn an-dràsta"
+
 #: js/ui/endSessionDialog.js:64
 #, javascript-format
 msgctxt "title"
@@ -884,12 +1122,12 @@ msgstr "Clàraich a-mach"
 #: js/ui/endSessionDialog.js:84
 msgctxt "title"
 msgid "Power Off"
-msgstr "Cuir a' chumhachd dheth"
+msgstr "Cuir a’ chumhachd dheth"
 
 #: js/ui/endSessionDialog.js:85
 msgctxt "title"
 msgid "Install Updates & Power Off"
-msgstr "Stàlaich na h-ùrachaidhean ⁊ cuir a' chumhachd dheth"
+msgstr "Stàlaich na h-ùrachaidhean ⁊ cuir a’ chumhachd dheth"
 
 #: js/ui/endSessionDialog.js:87
 #, javascript-format
@@ -913,7 +1151,7 @@ msgstr "Tòisich às ùr"
 #: js/ui/endSessionDialog.js:96
 msgctxt "button"
 msgid "Power Off"
-msgstr "Cuir a' chumhachd dheth"
+msgstr "Cuir a’ chumhachd dheth"
 
 #: js/ui/endSessionDialog.js:103
 msgctxt "title"
@@ -964,12 +1202,12 @@ msgstr "Tòisich às ùr ⁊ stàlaich"
 #: js/ui/endSessionDialog.js:128
 msgctxt "button"
 msgid "Install &amp; Power Off"
-msgstr "Stàlaich ⁊ cuir a' chumhachd dheth"
+msgstr "Stàlaich ⁊ cuir a’ chumhachd dheth"
 
 #: js/ui/endSessionDialog.js:129
 msgctxt "checkbox"
 msgid "Power off after updates are installed"
-msgstr "Cuir a' chumhachd dheth nuair a bhios na h-ùrachaidhean air an stàladh"
+msgstr "Cuir a’ chumhachd dheth nuair a bhios na h-ùrachaidhean air an stàladh"
 
 #: js/ui/endSessionDialog.js:137
 msgctxt "title"
@@ -985,133 +1223,142 @@ 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 ""
-"Thèid %s %s a stàladh às dèid an ath-thòiseachaidh. dh'fhaoidte gun doir e "
+"Thèid %s %s a stàladh às dèid an ath-thòiseachaidh. Dh’fhaoidte gun doir e "
 "fada an t-àrdachadh a stàladh: dèan cinnteach gun do rinn thu lethbhreac-"
 "glèidhidh agus gu bheil an coimpiutair ceangailte ri bun-dealain."
 
 #: js/ui/endSessionDialog.js:361
 msgid "Running on battery power: please plug in before installing updates."
 msgstr ""
-"A' ruith air cumhachd a' bhataraidh: ceangail gu bun-dealan mus stàlaich thu "
+"A’ ruith air cumhachd a’ bhataraidh: ceangail gu bun-dealan mus stàlaich thu "
 "ùrachaidhean."
 
 #: js/ui/endSessionDialog.js:378
 msgid "Some applications are busy or have unsaved work."
 msgstr ""
-"Tha cuid a dh'aplacaidean trang no tha obair aca nach deach a shàbhaladh."
+"Tha cuid a dh’aplacaidean trang no tha obair aca nach deach a shàbhaladh."
 
 #: js/ui/endSessionDialog.js:385
 msgid "Other users are logged in."
 msgstr "Tha daoine eile air an clàradh a-steach."
 
 #. 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 (cèin)"
 
 #. 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 (consoil)"
 
-#: js/ui/extensionDownloader.js:199
+#: js/ui/extensionDownloader.js:201
 msgid "Install"
 msgstr "Stàlaich"
 
-#: js/ui/extensionDownloader.js:204
+#: js/ui/extensionDownloader.js:206
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr ""
 "A bheil thu airson “%s” a luchdadh a-nuas is a stàladh o extensions.gnome."
 "org?"
 
-#: js/ui/keyboard.js:742 js/ui/status/keyboard.js:782
-msgid "Keyboard"
-msgstr "Am meur-chlàr"
+#. Translators: %s is an application name like "Settings"
+#: js/ui/inhibitShortcutsDialog.js:59
+#, javascript-format
+msgid "%s wants to inhibit shortcuts"
+msgstr "Tha %s airson ath-ghoiridean a bhacadh"
+
+#: js/ui/inhibitShortcutsDialog.js:60
+msgid "Application wants to inhibit shortcuts"
+msgstr "Tha an t-aplacaid airson ath-ghoiridean a bhacadh"
+
+#. Translators: %s is a keyboard shortcut like "Super+x"
+#: js/ui/inhibitShortcutsDialog.js:69
+#, javascript-format
+msgid "You can restore shortcuts by pressing %s."
+msgstr "’S urrainn dut na h-ath-ghoiridean aiseag ’s gu a’ brùthadh air %s."
+
+#: js/ui/inhibitShortcutsDialog.js:74
+msgid "Deny"
+msgstr "Diùlt"
 
-#. translators: 'Hide' is a verb
-#: js/ui/legacyTray.js:65
-msgid "Hide tray"
-msgstr "Falaich an treidhe"
+#: js/ui/inhibitShortcutsDialog.js:80
+msgid "Allow"
+msgstr "Ceadaich"
 
-#: js/ui/legacyTray.js:106
-msgid "Status Icons"
-msgstr "Ìomhaigheagan staide"
+#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:783
+msgid "Keyboard"
+msgstr "Am meur-chlàr"
 
-#: js/ui/lookingGlass.js:643
+#: js/ui/lookingGlass.js:642
 msgid "No extensions installed"
 msgstr "Cha deach leudachan a stàladh"
 
 #. 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 "Cha robh mearachd sam bith aig %s."
 
-#: js/ui/lookingGlass.js:703
+#: js/ui/lookingGlass.js:702
 msgid "Hide Errors"
 msgstr "Falaich na mearachdan"
 
-#: js/ui/lookingGlass.js:707 js/ui/lookingGlass.js:767
+#: js/ui/lookingGlass.js:706 js/ui/lookingGlass.js:766
 msgid "Show Errors"
 msgstr "Seall na mearachadan"
 
-#: js/ui/lookingGlass.js:716
+#: js/ui/lookingGlass.js:715
 msgid "Enabled"
 msgstr "An comas"
 
 #. translators:
 #. * The device has been disabled
-#: js/ui/lookingGlass.js:719 src/gvc/gvc-mixer-control.c:1866
+#: js/ui/lookingGlass.js:718 subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "À comas"
 
-#: js/ui/lookingGlass.js:721
+#: js/ui/lookingGlass.js:720
 msgid "Error"
 msgstr "Mearachd"
 
-#: js/ui/lookingGlass.js:723
+#: js/ui/lookingGlass.js:722
 msgid "Out of date"
 msgstr "Ro shean"
 
-#: js/ui/lookingGlass.js:725
+#: js/ui/lookingGlass.js:724
 msgid "Downloading"
-msgstr "'Ga luchdadh a-nuas"
+msgstr "’Ga luchdadh a-nuas"
 
-#: js/ui/lookingGlass.js:749
+#: js/ui/lookingGlass.js:748
 msgid "View Source"
 msgstr "Seall am bun-tùs"
 
-#: js/ui/lookingGlass.js:758
+#: js/ui/lookingGlass.js:757
 msgid "Web Page"
 msgstr "Duilleag-lìn"
 
-#: js/ui/messageList.js:543
-msgid "Clear section"
-msgstr "Falamhaich an earrann"
-
-#: js/ui/messageTray.js:1486
+#: js/ui/messageTray.js:1494
 msgid "System Information"
 msgstr "Fiosrachadh an t-siostaim"
 
-#: js/ui/mpris.js:194
+#: js/ui/mpris.js:211
 msgid "Unknown artist"
 msgstr "Neach-ciùil nach aithne dhuinn"
 
-#: js/ui/mpris.js:195
+#: js/ui/mpris.js:212
 msgid "Unknown title"
 msgstr "Tiotal nach aithne dhuinn"
 
-#: js/ui/mpris.js:217
-msgid "Media"
-msgstr "Meadhanan"
-
 #: js/ui/overview.js:84
 msgid "Undo"
 msgstr "Neo-dhèan"
 
+#. Translators: This is the main view to select
+#. activities. See also note for "Activities" string.
 #: js/ui/overview.js:113
 msgid "Overview"
 msgstr "Foir-shealladh"
@@ -1124,6 +1371,52 @@ msgstr "Foir-shealladh"
 msgid "Type to search…"
 msgstr "Sgrìobh airson lorg…"
 
+#: js/ui/padOsd.js:103
+msgid "New shortcut…"
+msgstr "Ath-ghoirid ùr…"
+
+#: js/ui/padOsd.js:152
+#| msgid "Applications"
+msgid "Application defined"
+msgstr "A-rèir na h-aplacaid"
+
+#: js/ui/padOsd.js:153
+msgid "Show on-screen help"
+msgstr "Seall a’ chobhair air an sgrìn"
+
+#: js/ui/padOsd.js:154
+#| msgid "Switch User"
+msgid "Switch monitor"
+msgstr "Gearr leum gu monatair eile"
+
+#: js/ui/padOsd.js:155
+msgid "Assign keystroke"
+msgstr "Sònraich buille-iuchrach dha"
+
+#: js/ui/padOsd.js:220
+msgid "Done"
+msgstr "Deiseil"
+
+#: js/ui/padOsd.js:734
+msgid "Edit…"
+msgstr "Deasaich…"
+
+#: js/ui/padOsd.js:774 js/ui/padOsd.js:879
+msgid "None"
+msgstr "Chan eil gin"
+
+#: js/ui/padOsd.js:833
+msgid "Press a button to configure"
+msgstr "Brùth air putan gus a rèiteachadh"
+
+#: js/ui/padOsd.js:834
+msgid "Press Esc to exit"
+msgstr "Brùth air Esc airson fàgail"
+
+#: js/ui/padOsd.js:837
+msgid "Press any key to exit"
+msgstr "Brùth air iuchair sam bith airson fàgail"
+
 #: js/ui/panel.js:358
 msgid "Quit"
 msgstr "Fàg an-seo"
@@ -1139,16 +1432,16 @@ msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "An siostam"
 
-#: js/ui/panel.js:807
+#: js/ui/panel.js:812
 msgid "Top Bar"
-msgstr "Bàr a' bharra"
+msgstr "Bàr a’ bharra"
 
 #. Translators: this MUST be either "toggle-switch-us"
 #. (for toggle switches containing the English words
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: js/ui/popupMenu.js:289
+#: js/ui/popupMenu.js:291
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
@@ -1156,7 +1449,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Cuir a-steach àithne"
 
-#: js/ui/runDialog.js:111 js/ui/windowMenu.js:162
+#: js/ui/runDialog.js:111 js/ui/windowMenu.js:160
 msgid "Close"
 msgstr "Dùin"
 
@@ -1166,15 +1459,15 @@ msgstr "Chan eil ath-thòiseachadh ri làimh air Wayland"
 
 #: js/ui/runDialog.js:282
 msgid "Restarting…"
-msgstr "'Ga thòiseachadh às ùr…"
+msgstr "’Ga thòiseachadh às ùr…"
 
 #. 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 "%A, %d %B"
 
-#: js/ui/screenShield.js:144
+#: js/ui/screenShield.js:147
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1183,7 +1476,7 @@ msgstr[1] "%d theachdaireachd ùr"
 msgstr[2] "%d teachdaireachdan ùra"
 msgstr[3] "%d teachdaireachd ùr"
 
-#: js/ui/screenShield.js:146
+#: js/ui/screenShield.js:149
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1192,11 +1485,11 @@ msgstr[1] "%d bhrath ùr"
 msgstr[2] "%d brathan ùra"
 msgstr[3] "%d brath ùr"
 
-#: js/ui/screenShield.js:449 js/ui/status/system.js:382
+#: js/ui/screenShield.js:452 js/ui/status/system.js:284
 msgid "Lock"
 msgstr "Glais"
 
-#: js/ui/screenShield.js:704
+#: js/ui/screenShield.js:715
 msgid "GNOME needs to lock the screen"
 msgstr "Feumaidh GNOME an sgrìn a glasadh"
 
@@ -1207,22 +1500,31 @@ msgstr "Feumaidh GNOME an sgrìn a glasadh"
 #.
 #. 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 "Cha ghabh a ghlasadh"
 
-#: 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 "Chaidh a' ghlas a bhacadh le aplacaid"
+msgstr "Chaidh a’ ghlas a bhacadh le aplacaid"
 
-#: js/ui/search.js:617
+#: js/ui/search.js:651
 msgid "Searching…"
-msgstr "'Ga lorg…"
+msgstr "’Ga lorg…"
 
-#: js/ui/search.js:619
+#: js/ui/search.js:653
 msgid "No results."
 msgstr "Chan eil toradh ann."
 
+#: js/ui/search.js:777
+#, javascript-format
+msgid "%d more"
+msgid_plural "%d more"
+msgstr[0] "%d a bharrachd"
+msgstr[1] "%d a bharrachd"
+msgstr[2] "%d a bharrachd"
+msgstr[3] "%d a bharrachd"
+
 #: js/ui/shellEntry.js:25
 msgid "Copy"
 msgstr "Dèan lethbhreac"
@@ -1239,11 +1541,11 @@ msgstr "Seall an teacsa"
 msgid "Hide Text"
 msgstr "Falaich an teacsa"
 
-#: js/ui/shellMountOperation.js:370
+#: js/ui/shellMountOperation.js:315
 msgid "Password"
 msgstr "Facal-faire"
 
-#: js/ui/shellMountOperation.js:391
+#: js/ui/shellMountOperation.js:336
 msgid "Remember Password"
 msgstr "Cuimhnich am facal-faire"
 
@@ -1295,7 +1597,7 @@ msgstr "Teacsa mòr"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:625
+#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:627
 msgid "Bluetooth Settings"
 msgstr "Roghainnean Bluetooth"
 
@@ -1314,17 +1616,17 @@ msgid "Off"
 msgstr "Dheth"
 
 #: js/ui/status/bluetooth.js:140
-msgid "Not In Use"
-msgstr "Chan eil e 'ga chleachdadh"
+msgid "On"
+msgstr "Air"
 
-#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1289
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1299
 msgid "Turn On"
 msgstr "Cuir air"
 
-#: 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:170
+#: js/ui/status/network.js:356 js/ui/status/network.js:1299
+#: js/ui/status/network.js:1418 js/ui/status/nightLight.js:47
+#: js/ui/status/rfkill.js:90 js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "Cuir dheth"
 
@@ -1332,58 +1634,58 @@ msgstr "Cuir dheth"
 msgid "Brightness"
 msgstr "Soilleireachd"
 
-#: js/ui/status/keyboard.js:805
+#: js/ui/status/keyboard.js:806
 msgid "Show Keyboard Layout"
-msgstr "Seall co-dhealbhachd a' mheur-chlàir"
+msgstr "Seall co-dhealbhachd a’ mheur-chlàir"
 
-#: js/ui/status/location.js:107 js/ui/status/location.js:215
+#: js/ui/status/location.js:89 js/ui/status/location.js:197
 msgid "Location Enabled"
 msgstr "Tha an t-ionad an comas"
 
-#: js/ui/status/location.js:108 js/ui/status/location.js:216
+#: js/ui/status/location.js:90 js/ui/status/location.js:198
 msgid "Disable"
 msgstr "Cuir à comas"
 
-#: js/ui/status/location.js:109
+#: js/ui/status/location.js:91
 msgid "Privacy Settings"
 msgstr "Roghainnean na prìobhaideachd"
 
-#: js/ui/status/location.js:214
+#: js/ui/status/location.js:196
 msgid "Location In Use"
-msgstr "Tha an t-ionad 'ga chleachdadh"
+msgstr "Tha an t-ionad ’ga chleachdadh"
 
-#: js/ui/status/location.js:218
+#: js/ui/status/location.js:200
 msgid "Location Disabled"
 msgstr "Tha an t-ionad à comas"
 
-#: js/ui/status/location.js:219
+#: js/ui/status/location.js:201
 msgid "Enable"
 msgstr "Cuir an comas"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:435
+#: js/ui/status/location.js:388
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "A bheil thu airson inntrigeadh dhan ionad agad a thoirt dha %s?"
 
-#: js/ui/status/location.js:437
+#: js/ui/status/location.js:389
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr ""
-"'S urrainn dhut inntrigeadh an ionaid atharrachadh uair sam bith ann an "
+"’S urrainn dhut inntrigeadh an ionaid atharrachadh uair sam bith ann an "
 "roghainnean na prìobhaideachd."
 
-#: js/ui/status/network.js:102
+#: js/ui/status/network.js:104
 msgid "<unknown>"
 msgstr "<neo-aithnichte>"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:452 js/ui/status/network.js:1318
+#: js/ui/status/network.js:454 js/ui/status/network.js:1328
 #, javascript-format
 msgid "%s Off"
 msgstr "%s dheth"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:455
+#: js/ui/status/network.js:457
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s ceangailte"
@@ -1391,170 +1693,217 @@ msgstr "%s ceangailte"
 #. 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:462
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s gun stiùireadh"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:463
+#: js/ui/status/network.js:465
 #, javascript-format
 msgid "%s Disconnecting"
-msgstr "A' dì-cheangal %s"
+msgstr "A’ dì-cheangal %s"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:470 js/ui/status/network.js:1310
+#: js/ui/status/network.js:472 js/ui/status/network.js:1320
 #, javascript-format
 msgid "%s Connecting"
-msgstr "A' ceangal %s"
+msgstr "A’ ceangal %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:475
 #, javascript-format
 msgid "%s Requires Authentication"
 msgstr "Tha %s ag iarraidh dearbhadh"
 
 #. 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:483
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "Tha bathar-an-sàs a dhìth air %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:487
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "Chan eil %s ri fhaighinn"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:488
+#: js/ui/status/network.js:490
 #, javascript-format
 msgid "%s Connection Failed"
-msgstr "Dh'fhàillig le %s a cheangal"
+msgstr "Dh’fhàillig le %s a cheangal"
 
-#: js/ui/status/network.js:504
+#: js/ui/status/network.js:506
 msgid "Wired Settings"
 msgstr "Roghainnean le uèir"
 
-#: js/ui/status/network.js:546
+#: js/ui/status/network.js:548
 msgid "Mobile Broadband Settings"
 msgstr "Roghainnean banna-leathainn inneal-làimhe"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:589 js/ui/status/network.js:1315
+#: js/ui/status/network.js:591 js/ui/status/network.js:1325
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "Tha bathar-cruaidh %s à comas"
 
 #. 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:595
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s à comas"
 
-#: js/ui/status/network.js:633
+#: js/ui/status/network.js:635
 msgid "Connect to Internet"
 msgstr "Ceangail ris an eadar-lìon"
 
-#: js/ui/status/network.js:823
+#: js/ui/status/network.js:833
 msgid "Airplane Mode is On"
 msgstr "Tha am modh itealain air"
 
-#: js/ui/status/network.js:824
+#: js/ui/status/network.js:834
 msgid "Wi-Fi is disabled when airplane mode is on."
-msgstr "Tha WiFi à comas fhad 's a tha am modh itealain air."
+msgstr "Tha WiFi à comas fhad ’s a tha am modh itealain air."
 
-#: js/ui/status/network.js:825
+#: js/ui/status/network.js:835
 msgid "Turn Off Airplane Mode"
 msgstr "Cuir am modh itealain dheth"
 
-#: js/ui/status/network.js:834
+#: js/ui/status/network.js:844
 msgid "Wi-Fi is Off"
 msgstr "Tha WiFi dheth"
 
-#: js/ui/status/network.js:835
+#: js/ui/status/network.js:845
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Feumaidh tu WiFi a chur air gus ceangal ri lìonra."
 
-#: js/ui/status/network.js:836
+#: js/ui/status/network.js:846
 msgid "Turn On Wi-Fi"
 msgstr "Cuir WiFi air"
 
-#: js/ui/status/network.js:861
+#: js/ui/status/network.js:871
 msgid "Wi-Fi Networks"
 msgstr "Lìonraidhean WiFi"
 
-#: js/ui/status/network.js:863
+#: js/ui/status/network.js:873
 msgid "Select a network"
 msgstr "Tagh lìonra"
 
-#: js/ui/status/network.js:893
+#: js/ui/status/network.js:903
 msgid "No Networks"
 msgstr "Chan eil lìonra ann"
 
-#: js/ui/status/network.js:914 js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:924 js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "Cleachd suidse bathair-chruaidh gus a chur dheth"
 
-#: js/ui/status/network.js:1181
+#: js/ui/status/network.js:1191
 msgid "Select Network"
 msgstr "Tagh lìonra"
 
-#: js/ui/status/network.js:1187
+#: js/ui/status/network.js:1197
 msgid "Wi-Fi Settings"
 msgstr "Roghainnean WiFi"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1306
+#: js/ui/status/network.js:1316
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "Tha %s hotspot gnìomhach"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1321
+#: js/ui/status/network.js:1331
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "Chan eil %s ceangailte"
 
-#: js/ui/status/network.js:1421
-msgid "connecting..."
-msgstr "'ga cheangal..."
+#: js/ui/status/network.js:1435
+#| msgid "connecting..."
+msgid "connecting…"
+msgstr "’ga cheangal…"
 
 #. 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:1438
 msgid "authentication required"
 msgstr "tha feum air dearbhadh"
 
-#: js/ui/status/network.js:1426
+#: js/ui/status/network.js:1440
 msgid "connection failed"
-msgstr "dh'fhàillig leis a' cheangal"
-
-#: js/ui/status/network.js:1492 js/ui/status/rfkill.js:93
-msgid "Network Settings"
-msgstr "Roghainnean an lìonraidh"
+msgstr "dh’fhàillig leis a’ cheangal"
 
 #: js/ui/status/network.js:1494
 msgid "VPN Settings"
 msgstr "Roghainnean VPN"
 
-#: js/ui/status/network.js:1513
+#: js/ui/status/network.js:1507
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1523
+#: js/ui/status/network.js:1517
 msgid "VPN Off"
 msgstr "Tha VPN dheth"
 
-#: js/ui/status/network.js:1711
+#: js/ui/status/network.js:1581 js/ui/status/rfkill.js:93
+msgid "Network Settings"
+msgstr "Roghainnean an lìonraidh"
+
+#: js/ui/status/network.js:1612
+#, javascript-format
+#| msgid "%s Connecting"
+msgid "%s Wired Connection"
+msgid_plural "%s Wired Connections"
+msgstr[0] "%s cheangal uèirichte"
+msgstr[1] "%s cheangal uèirichte"
+msgstr[2] "%s ceanglaichean uèirichte"
+msgstr[3] "%s ceangal uèirichte"
+
+#: js/ui/status/network.js:1616
+#, javascript-format
+#| msgid "%s Connecting"
+msgid "%s Wi-Fi Connection"
+msgid_plural "%s Wi-Fi Connections"
+msgstr[0] "%s cheangal WiFi"
+msgstr[1] "%s cheangal WiFi"
+msgstr[2] "%s ceanglaichean WiFi"
+msgstr[3] "%s ceangal WiFi"
+
+#: js/ui/status/network.js:1620
+#, javascript-format
+#| msgid "%s Connecting"
+msgid "%s Modem Connection"
+msgid_plural "%s Modem Connections"
+msgstr[0] "%s cheangal mòdaim"
+msgstr[1] "%s cheangal mòdaim"
+msgstr[2] "%s ceanglaichean mòdaim"
+msgstr[3] "%s ceangal mòdaim"
+
+#: js/ui/status/network.js:1768
 msgid "Connection failed"
-msgstr "Dh'fhàillig leis a' cheangal"
+msgstr "Dh’fhàillig leis a’ cheangal"
 
-#: js/ui/status/network.js:1712
+#: js/ui/status/network.js:1769
 msgid "Activation of network connection failed"
-msgstr "Dh'fhàillig gnìomhachadh a' cheangail ris an lìonra"
+msgstr "Dh’fhàillig gnìomhachadh a’ cheangail ris an lìonra"
+
+#: js/ui/status/nightLight.js:68
+msgid "Night Light Disabled"
+msgstr "Tha an solas-oidhche à comas"
+
+#: js/ui/status/nightLight.js:69
+msgid "Night Light On"
+msgstr "Tha an solas-oidhche air"
+
+#: js/ui/status/nightLight.js:70
+msgid "Resume"
+msgstr "Lean air"
+
+#: js/ui/status/nightLight.js:71
+msgid "Disable Until Tomorrow"
+msgstr "Cuir à comas gus a-màireach"
 
 #: js/ui/status/power.js:61
 msgid "Power Settings"
@@ -1568,7 +1917,7 @@ msgstr "Air a làn-teairrdseadh"
 #. to estimate battery life
 #: js/ui/status/power.js:84 js/ui/status/power.js:90
 msgid "Estimating…"
-msgstr "'Ga thuairmeas…"
+msgstr "’Ga thuairmeas…"
 
 #. Translators: this is <hours>:<minutes> Remaining (<percentage>)
 #: js/ui/status/power.js:98
@@ -1594,51 +1943,80 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "Modh itealain air"
 
-#: js/ui/status/system.js:351
+#: js/ui/status/system.js:228
 msgid "Switch User"
 msgstr "Leum gu cleachdaiche eile"
 
-#: js/ui/status/system.js:356
+#: js/ui/status/system.js:240
 msgid "Log Out"
 msgstr "Clàraich a-mach"
 
-#: js/ui/status/system.js:361
+#: js/ui/status/system.js:252
 msgid "Account Settings"
-msgstr "Roghainnean a' chunntais"
+msgstr "Roghainnean a’ chunntais"
 
-#: js/ui/status/system.js:378
+#: js/ui/status/system.js:269
 msgid "Orientation Lock"
 msgstr "Glais na comhair"
 
-#: js/ui/status/system.js:386
+#: js/ui/status/system.js:295
 msgid "Suspend"
-msgstr "Cuir 'na dhàil"
+msgstr "Cuir ’na dhàil"
 
-#: js/ui/status/system.js:389
+#: js/ui/status/system.js:305
 msgid "Power Off"
-msgstr "Cuir a' chumhachd dheth"
+msgstr "Cuir a’ chumhachd dheth"
 
-#: js/ui/status/volume.js:127
+#: js/ui/status/volume.js:128
 msgid "Volume changed"
-msgstr "Dh'atharraich àirde na fuaime"
+msgstr "Dh’atharraich àirde na fuaime"
 
-#: js/ui/status/volume.js:162
+#: js/ui/status/volume.js:170
 msgid "Volume"
 msgstr "Àirde na fuaime"
 
+#. Translators: this is for display mirroring i.e. cloning.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:21
+#| msgid "Error"
+msgid "Mirror"
+msgstr "Sgàthanaich"
+
+#. Translators: this is for the desktop spanning displays.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:26
+msgid "Join Displays"
+msgstr "Cuir iad còmhla"
+
+#. Translators: this is for using only an external display.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:31
+msgid "External Only"
+msgstr "Taobh a-muigh a-mhàin"
+
+#. Translators: this is for using only the laptop display.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:36
+msgid "Built-in Only"
+msgstr "’Na bhroinn a-mhàin"
+
 #: js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "Clàraich an-steach mar chleachdaiche eile"
 
 #: js/ui/unlockDialog.js:84
 msgid "Unlock Window"
-msgstr "Thoir a' ghlas far na h-uinneige"
+msgstr "Thoir a’ ghlas far na h-uinneige"
 
-#: js/ui/viewSelector.js:159
+#: js/ui/viewSelector.js:190
 msgid "Applications"
 msgstr "Aplacaidean"
 
-#: js/ui/viewSelector.js:163
+#: js/ui/viewSelector.js:194
 msgid "Search"
 msgstr "Lorg"
 
@@ -1647,22 +2025,22 @@ msgstr "Lorg"
 msgid "“%s” is ready"
 msgstr "Tha “%s” deiseil"
 
-#: js/ui/windowManager.js:63
+#: js/ui/windowManager.js:72
 msgid "Do you want to keep these display settings?"
 msgstr "A bheil thu airson na roghainnean seallaidh seo a chumail?"
 
 #. 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:84
 msgid "Revert Settings"
 msgstr "Till na roghainnean"
 
-#: js/ui/windowManager.js:85
+#: js/ui/windowManager.js:87
 msgid "Keep Changes"
 msgstr "Cum na h-atharraichean"
 
-#: js/ui/windowManager.js:103
+#: js/ui/windowManager.js:105
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1677,10 +2055,10 @@ msgstr[3] ""
 
 #. 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:660
 #, javascript-format
-msgid "%d x %d"
-msgstr "%d x %d"
+msgid "%d × %d"
+msgstr "%d × %d"
 
 #: js/ui/windowMenu.js:34
 msgid "Minimize"
@@ -1708,41 +2086,41 @@ msgstr "Gluais bàr-tiotal air an sgrìn"
 
 #: js/ui/windowMenu.js:70
 msgid "Always on Top"
-msgstr "Air a' bharr an-còmhnaidh"
+msgstr "Air a’ bharr an-còmhnaidh"
 
 #: js/ui/windowMenu.js:89
 msgid "Always on Visible Workspace"
 msgstr "Air rum-obrach a tha ri fhaicinn an-còmhnaidh"
 
-#: js/ui/windowMenu.js:105
+#: js/ui/windowMenu.js:103
 msgid "Move to Workspace Left"
 msgstr "Gluais dhan rum-obrach air an taobh chlì"
 
-#: js/ui/windowMenu.js:110
+#: js/ui/windowMenu.js:108
 msgid "Move to Workspace Right"
 msgstr "Gluais dhan rum-obrach air an taobh deas"
 
-#: js/ui/windowMenu.js:115
+#: js/ui/windowMenu.js:113
 msgid "Move to Workspace Up"
-msgstr "Gluais dhan rum-obrach aig a' bharr"
+msgstr "Gluais dhan rum-obrach aig a’ bharr"
 
-#: js/ui/windowMenu.js:120
+#: js/ui/windowMenu.js:118
 msgid "Move to Workspace Down"
-msgstr "Gluais dhan rum-obrach aig a' bhonn"
+msgstr "Gluais dhan rum-obrach aig a’ bhonn"
 
-#: js/ui/windowMenu.js:136
+#: js/ui/windowMenu.js:134
 msgid "Move to Monitor Up"
-msgstr "Gluais dhan sgrìn aig a' bharr"
+msgstr "Gluais dhan sgrìn aig a’ bharr"
 
-#: js/ui/windowMenu.js:142
+#: js/ui/windowMenu.js:140
 msgid "Move to Monitor Down"
-msgstr "Gluais dhan sgrìn aig a' bhonn"
+msgstr "Gluais dhan sgrìn aig a’ bhonn"
 
-#: js/ui/windowMenu.js:148
+#: js/ui/windowMenu.js:146
 msgid "Move to Monitor Left"
 msgstr "Gluais dhan sgrìn air an taobh chlì"
 
-#: js/ui/windowMenu.js:154
+#: js/ui/windowMenu.js:152
 msgid "Move to Monitor Right"
 msgstr "Gluais dhan sgrìn air an taobh deas"
 
@@ -1755,9 +2133,48 @@ msgstr "Mìosachan Evolution"
 msgid "evolution"
 msgstr "evolution"
 
+#: src/main.c:437
+msgid "Print version"
+msgstr "Seall an tionndadh"
+
+#: src/main.c:443
+msgid "Mode used by GDM for login screen"
+msgstr "Am modh a chleachdas GDM airson na sgrìn clàraidh a-steach"
+
+#: src/main.c:449
+#| msgid "Use a specific mode, e.g. \"gdm\" for login screen"
+msgid "Use a specific mode, e.g. “gdm” for login screen"
+msgstr "Cleachd modh sònraichte airson na sgrìn clàraidh a-steach, can “gdm”"
+
+#: src/main.c:455
+msgid "List possible modes"
+msgstr "Seall liosta dhe na modhan a tha ann"
+
+#: src/shell-app.c:270
+msgctxt "program"
+msgid "Unknown"
+msgstr "Chan eil fhios"
+
+#: src/shell-app.c:511
+#, c-format
+msgid "Failed to launch “%s”"
+msgstr "Cha b’ urrainn dhuinn “%s” a chur gu dol"
+
+#: src/shell-keyring-prompt.c:730
+msgid "Passwords do not match."
+msgstr "Chan eil an dà fhacal-faire co-ionann."
+
+#: src/shell-keyring-prompt.c:738
+msgid "Password cannot be blank"
+msgstr "Chan fhaod am facal-faire a bhith bàn"
+
+#: src/shell-polkit-authentication-agent.c:353
+msgid "Authentication dialog was dismissed by the user"
+msgstr "Leig an cleachdaiche an dearbhaidh seachad"
+
 #. translators:
 #. * The number of sound outputs on a particular device
-#: src/gvc/gvc-mixer-control.c:1873
+#: subprojects/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1768,7 +2185,7 @@ msgstr[3] "%u às-chur"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: src/gvc/gvc-mixer-control.c:1883
+#: subprojects/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
@@ -1777,47 +2194,39 @@ msgstr[1] "%u ion-chur"
 msgstr[2] "%u ion-chuir"
 msgstr[3] "%u ion-chur"
 
-#: src/gvc/gvc-mixer-control.c:2738
+#: subprojects/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Fuaimean an t-siostaim"
 
-#: src/main.c:381
-msgid "Print version"
-msgstr "Seall an tionndadh"
+#~ msgid "GNOME Shell Extension Preferences"
+#~ msgstr "Roghainnean airson leudachain na Slige GNOME"
 
-#: src/main.c:387
-msgid "Mode used by GDM for login screen"
-msgstr "Am modh a chleachdas GDM airson na sgrìn clàraidh a-steach"
+#~ msgid "Web Authentication Redirect"
+#~ msgstr "Ath-stiùireadh an dearbhaidh-lìn"
 
-#: src/main.c:393
-msgid "Use a specific mode, e.g. \"gdm\" for login screen"
-msgstr "Cleachd modh sònraichte airson na sgrìn clàraidh a-steach, can \"gdm\""
+#~ msgid "Events"
+#~ msgstr "Tachartasan"
 
-#: src/main.c:399
-msgid "List possible modes"
-msgstr "Seall liosta dhe na modhan a tha ann"
+#~ msgid "Notifications"
+#~ msgstr "Brathan"
 
-#: src/shell-app.c:270
-msgctxt "program"
-msgid "Unknown"
-msgstr "Chan eil fhios"
+#~ msgid "Hide tray"
+#~ msgstr "Falaich an treidhe"
 
-#: src/shell-app.c:511
-#, c-format
-msgid "Failed to launch “%s”"
-msgstr "Cha b' urrainn dhuinn “%s” a chur gu dol"
+#~ msgid "Status Icons"
+#~ msgstr "Ìomhaigheagan staide"
 
-#: src/shell-keyring-prompt.c:730
-msgid "Passwords do not match."
-msgstr "Chan eil an dà fhacal-faire co-ionann."
+#~ msgid "Clear section"
+#~ msgstr "Falamhaich an earrann"
 
-#: src/shell-keyring-prompt.c:738
-msgid "Password cannot be blank"
-msgstr "Chan fhaod am facal-faire a bhith bàn"
+#~ msgid "Media"
+#~ msgstr "Meadhanan"
 
-#: src/shell-polkit-authentication-agent.c:353
-msgid "Authentication dialog was dismissed by the user"
-msgstr "Leig an cleachdaiche an dearbhaidh seachad"
+#~ msgid "Not In Use"
+#~ msgstr "Chan eil e 'ga chleachdadh"
+
+#~ msgid "%d x %d"
+#~ msgstr "%d x %d"
 
 #~ msgid "Use as Internet connection"
 #~ msgstr "Cleachd e mar cheangal ris an eadar-lìon"
-- 
2.17.0


From 4d598b32949a23bc6120ff544ec7aec5117b0bb5 Mon Sep 17 00:00:00 2001
From: GNOME Translation Robot <gnome-sysadmin@gnome.org>
Date: Mon, 26 Feb 2018 12:55:58 +0000
Subject: [PATCH 20/22] Update Scottish Gaelic translation

---
 po/gd.po | 77 ++++++++++++++++++--------------------------------------
 1 file changed, 25 insertions(+), 52 deletions(-)

diff --git a/po/gd.po b/po/gd.po
index 7f6168adf..665134069 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-01-27 16:52+0000\n"
-"PO-Revision-Date: 2018-02-26 12:48+0100\n"
+"POT-Creation-Date: 2018-02-26 12:51+0000\n"
+"PO-Revision-Date: 2018-02-26 12:55+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -46,7 +46,6 @@ msgstr "Fosgail clàr-taice nan aplacaidean"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:4
 #: js/extensionPrefs/main.js:152
-#| msgid "GNOME Shell Extensions"
 msgid "Shell Extensions"
 msgstr "Leudachain na slige"
 
@@ -91,6 +90,18 @@ msgstr ""
 "atharrachadh cuideachd leis na modhan D-Bus EnableExtension agus "
 "DisableExtension air org.gnome.Shell."
 
+#: data/org.gnome.shell.gschema.xml.in:26
+msgid "Disable user extensions"
+msgstr "Cuir à comas leudachain a’ chleachdaiche"
+
+#: data/org.gnome.shell.gschema.xml.in:27
+msgid ""
+"Disable all extensions the user has enabled without affecting the “enabled-"
+"extension” setting."
+msgstr ""
+"Cuir à comas gach leudachan a chuir an cleachdaiche an comas gun bhuaidh air "
+"an roghainn “enabled-extension”."
+
 #: data/org.gnome.shell.gschema.xml.in:34
 msgid "Disables the validation of extension version compatibility"
 msgstr ""
@@ -140,15 +151,11 @@ msgid "History for the looking glass dialog"
 msgstr "Eachdraidh a’ chòmhraidh aig looking glass"
 
 #: data/org.gnome.shell.gschema.xml.in:67
-#| msgid "Always show the 'Log out' menu item in the user menu."
 msgid "Always show the “Log out” menu item in the user menu."
 msgstr ""
 "Seall nì “Clàraich a-mach” air clàr-taice a’ chleachdaiche an-còmhnaidh."
 
 #: data/org.gnome.shell.gschema.xml.in:68
-#| msgid ""
-#| "This key overrides the automatic hiding of the 'Log out' menu item in "
-#| "single-user, single-session situations."
 msgid ""
 "This key overrides the automatic hiding of the “Log out” menu item in single-"
 "user, single-session situations."
@@ -165,11 +172,6 @@ msgstr ""
 "shiostaman-fhaidhlichean crioptaichte no cèine"
 
 #: 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 "
-#| "state of the checkbox."
 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 "
@@ -209,14 +211,10 @@ msgid "Keybinding to open the application menu."
 msgstr "Nasgadh iuchrach gus clàr-taice na h-aplacaid fhosgladh."
 
 #: data/org.gnome.shell.gschema.xml.in:108
-#| msgid "Keybinding to open the \"Show Applications\" view"
 msgid "Keybinding to open the “Show Applications” view"
 msgstr "Nasgadh iuchrach gus an sealladh “Seall aplacaidean” fhosgladh"
 
 #: data/org.gnome.shell.gschema.xml.in:109
-#| msgid ""
-#| "Keybinding to open the \"Show Applications\" view of the Activities "
-#| "Overview."
 msgid ""
 "Keybinding to open the “Show Applications” view of the Activities Overview."
 msgstr ""
@@ -274,36 +272,32 @@ msgid ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
 msgstr ""
-"Mas e true a th’ ann, cha dèid a shealltainn san t-suidsear ach na "
-"h-aplacaidean aig a bheil uinneag san rum-obrach làithreach. Mur e, thèid a "
-"h-uile aplacaid a ghabhail a-steach."
+"Mas e true a th’ ann, cha dèid a shealltainn san t-suidsear ach na h-"
+"aplacaidean aig a bheil uinneag san rum-obrach làithreach. Mur e, thèid a h-"
+"uile aplacaid a ghabhail a-steach."
 
 #: data/org.gnome.shell.gschema.xml.in:176
 msgid "The application icon mode."
 msgstr "Modh ìomhaigheag na h-aplacaid."
 
 #: 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'."
 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”."
 msgstr ""
-"Rèitichidh seo an dòigh sa thèid na h-uinneagan a shealltainn san "
-"t-suidsear. ’S e “thumbnail-only” (seallaidh seo dealbhag na h-uinneige), "
-"“app-icon-only” (seallaidh seo ìomhaigheag na h-aplacaid) no “both” "
-"(seallaidh seo an dà chuid dhiubh) a tha sna luachan dligheach."
+"Rèitichidh seo an dòigh sa thèid na h-uinneagan a shealltainn san t-"
+"suidsear. ’S e “thumbnail-only” (seallaidh seo dealbhag na h-uinneige), “app-"
+"icon-only” (seallaidh seo ìomhaigheag na h-aplacaid) no “both” (seallaidh "
+"seo an dà chuid dhiubh) a tha sna luachan dligheach."
 
 #: 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 ""
-"Mas e true a th’ ann, cha dèid a shealltainn san t-suidsear ach na "
-"h-uinneagan a tha san rum-obrach làithreach. Mur e, thèid a h-uile uinneag a "
+"Mas e true a th’ ann, cha dèid a shealltainn san t-suidsear ach na h-"
+"uinneagan a tha san rum-obrach làithreach. Mur e, thèid a h-uile uinneag a "
 "ghabhail a-steach."
 
 #: data/org.gnome.shell.gschema.xml.in:197
@@ -421,7 +415,6 @@ msgstr "(no suath do meur)"
 
 #. Translators: The name of the power-off action in search
 #: js/misc/systemActions.js:99
-#| msgid "Power Off"
 msgctxt "search-result"
 msgid "Power off"
 msgstr "Cuir a’ chumhachd dheth"
@@ -445,7 +438,6 @@ msgstr "sgrìn-ghlasaidh;glais;glas;sgrìn"
 
 #. Translators: The name of the logout action in search
 #: js/misc/systemActions.js:113
-#| msgid "Log Out"
 msgctxt "search-result"
 msgid "Log out"
 msgstr "Clàraich a-mach"
@@ -457,40 +449,34 @@ msgstr "logout;sign off;clàraidh a-mach;clàradh a-mach;logadh a-mach;"
 
 #. Translators: The name of the suspend action in search
 #: js/misc/systemActions.js:120
-#| msgid "Suspend"
 msgctxt "search-result"
 msgid "Suspend"
 msgstr "Cuir ’na dhàil"
 
 #. Translators: A list of keywords that match the suspend action, separated by semicolons
 #: js/misc/systemActions.js:123
-#| msgid "Suspend"
 msgid "suspend;sleep"
 msgstr "suspend;sleep;cuir 'na dhàil;cur 'na dhàil;cuir na dhàil;cur na dhàil;"
 
 #. Translators: The name of the switch user action in search
 #: js/misc/systemActions.js:127
-#| msgid "Switch User"
 msgctxt "search-result"
 msgid "Switch user"
 msgstr "Dèan suids eadar cleachdaichean"
 
 #. Translators: A list of keywords that match the switch user action, separated by semicolons
 #: js/misc/systemActions.js:130
-#| msgid "Switch User"
 msgid "switch user"
 msgstr "switch user;suids;cleachdaiche"
 
 #. Translators: The name of the lock orientation action in search
 #: js/misc/systemActions.js:134
-#| msgid "Orientation Lock"
 msgctxt "search-result"
 msgid "Lock orientation"
 msgstr "Glais a’ chomhair"
 
 #. Translators: A list of keywords that match the lock orientation action, separated by semicolons
 #: js/misc/systemActions.js:137
-#| msgid "Orientation Lock"
 msgid "lock orientation"
 msgstr "lock orientation;glais;comhair;glais a' chomhair;"
 
@@ -532,7 +518,6 @@ msgstr[2] "%d uairean a thìde air ais"
 msgstr[3] "%d uair a thìde air ais"
 
 #: js/misc/util.js:188
-#| msgid "Yesterday, %H∶%M"
 msgid "Yesterday"
 msgstr "An-dè"
 
@@ -644,7 +629,6 @@ msgstr "%d %B %Y, %l∶%M%p"
 
 #. TRANSLATORS: this is the title of the wifi captive portal login window
 #: js/portalHelper/main.js:66
-#| msgid "Network Login"
 msgid "Hotspot Login"
 msgstr "Clàradh a-steach Hotspot"
 
@@ -844,7 +828,6 @@ msgstr "Falamhaich na h-uile"
 #. Translators: %s is an application name
 #: js/ui/closeDialog.js:44
 #, javascript-format
-#| msgid "“%s” is ready"
 msgid "“%s” is not responding."
 msgstr "Chan eil “%s” a’ freagairt."
 
@@ -982,9 +965,9 @@ msgstr "Dearbhaich"
 #. * because of an authentication error (like invalid password),
 #. * for instance.
 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:328
-#| msgid "Sorry, that didn't work. Please try again."
 msgid "Sorry, that didn’t work. Please try again."
-msgstr "Tha sinn duilich ach cha do dh’obraich seo. Am feuch thu ris a-rithist?"
+msgstr ""
+"Tha sinn duilich ach cha do dh’obraich seo. Am feuch thu ris a-rithist?"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
@@ -1062,12 +1045,10 @@ msgid "%s, then %s, followed by %s later."
 msgstr "%s ’s %s an uairsin ’s %s an uairsin."
 
 #: js/ui/dateMenu.js:315
-#| msgid "Select a network"
 msgid "Select a location…"
 msgstr "Tagh ionad…"
 
 #: js/ui/dateMenu.js:318
-#| msgid "Searching…"
 msgid "Loading…"
 msgstr "’Ga luchdadh…"
 
@@ -1376,7 +1357,6 @@ msgid "New shortcut…"
 msgstr "Ath-ghoirid ùr…"
 
 #: js/ui/padOsd.js:152
-#| msgid "Applications"
 msgid "Application defined"
 msgstr "A-rèir na h-aplacaid"
 
@@ -1385,7 +1365,6 @@ msgid "Show on-screen help"
 msgstr "Seall a’ chobhair air an sgrìn"
 
 #: js/ui/padOsd.js:154
-#| msgid "Switch User"
 msgid "Switch monitor"
 msgstr "Gearr leum gu monatair eile"
 
@@ -1822,7 +1801,6 @@ msgid "%s Not Connected"
 msgstr "Chan eil %s ceangailte"
 
 #: js/ui/status/network.js:1435
-#| msgid "connecting..."
 msgid "connecting…"
 msgstr "’ga cheangal…"
 
@@ -1853,7 +1831,6 @@ msgstr "Roghainnean an lìonraidh"
 
 #: js/ui/status/network.js:1612
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Wired Connection"
 msgid_plural "%s Wired Connections"
 msgstr[0] "%s cheangal uèirichte"
@@ -1863,7 +1840,6 @@ msgstr[3] "%s ceangal uèirichte"
 
 #: js/ui/status/network.js:1616
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Wi-Fi Connection"
 msgid_plural "%s Wi-Fi Connections"
 msgstr[0] "%s cheangal WiFi"
@@ -1873,7 +1849,6 @@ msgstr[3] "%s ceangal WiFi"
 
 #: js/ui/status/network.js:1620
 #, javascript-format
-#| msgid "%s Connecting"
 msgid "%s Modem Connection"
 msgid_plural "%s Modem Connections"
 msgstr[0] "%s cheangal mòdaim"
@@ -1979,7 +1954,6 @@ msgstr "Àirde na fuaime"
 #. * Try to keep it under around 15 characters.
 #.
 #: js/ui/switchMonitor.js:21
-#| msgid "Error"
 msgid "Mirror"
 msgstr "Sgàthanaich"
 
@@ -2142,7 +2116,6 @@ msgid "Mode used by GDM for login screen"
 msgstr "Am modh a chleachdas GDM airson na sgrìn clàraidh a-steach"
 
 #: src/main.c:449
-#| msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgid "Use a specific mode, e.g. “gdm” for login screen"
 msgstr "Cleachd modh sònraichte airson na sgrìn clàraidh a-steach, can “gdm”"
 
-- 
2.17.0


From 4900eea72dcc7792a482d88d5b0b5ed36b371f71 Mon Sep 17 00:00:00 2001
From: Dz Chen <wsxy162@gmail.com>
Date: Tue, 20 Mar 2018 17:04:20 +0800
Subject: [PATCH 21/22] Update zh_CN translation

---
 po/zh_CN.po | 1021 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 682 insertions(+), 339 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e7cd6a5ed..f46c29b1a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,5 @@
 # Chinese (China) translation for gnome-shell.
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-shell package.
 # jiero <lililjlj@gmail.com>, 2010.
 # Jessica Ban <bancage@gmail.com>, 2010.
@@ -15,23 +15,23 @@
 # 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.
+# liushuyu <liushuyu_011@126.com>, 2015, 2016.
+# Mingcong Bai <jeffbai@aosc.xyz>, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 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"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Project-Id-Version: gnome-shell 3.26\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
+"POT-Creation-Date: 2018-01-27 16:52+0000\n"
+"PO-Revision-Date: 2017-09-02 02:09+0800\n"
+"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
+"Language-Team: Chinese (China) <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 2.0.2\n"
 
 #: data/50-gnome-shell-system.xml:6
 msgid "System"
@@ -58,8 +58,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 "GNOME Shell 扩展"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:5
 msgid "Configure GNOME Shell Extensions"
@@ -99,11 +100,21 @@ msgstr ""
 "EnableExtension 和 DisableExtension 的值进行修改，以修改此列表。"
 
 #: data/org.gnome.shell.gschema.xml.in:26
-msgid "Disables the validation of extension version compatibility"
-msgstr "禁止检查扩展版本兼容性"
+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 "禁用所有用户启用的扩展而不影响“enabled-extension”键值的设置。"
+
+#: data/org.gnome.shell.gschema.xml.in:34
+msgid "Disables the validation of extension version compatibility"
+msgstr "禁用检查扩展版本兼容性"
+
+#: 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 "
 "load all extensions regardless of the versions they claim to support."
@@ -111,66 +122,66 @@ 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 ""
 "单用户、单会话情形下，“注销”菜单项默认隐藏，使用这个按键会覆盖这种行为。"
 
-#: 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 将要求输入密码。如果该密码可以记住并"
+"挂载加密设备或远程文件系统时 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 +191,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:108
+msgid "Keybinding to open the “Show Applications” view"
+msgstr "用于打开“显示应用程序”视图的快捷键"
 
-#: data/org.gnome.shell.gschema.xml.in:101
+#: data/org.gnome.shell.gschema.xml.in:109
 msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "用于在活动视图中打开“显示应用程序”视图的快捷键。 "
+"Keybinding to open the “Show Applications” view of the Activities Overview."
+msgstr "用于在活动视图中打开“显示应用程序”视图的快捷键。"
 
-#: data/org.gnome.shell.gschema.xml.in:108
+#: data/org.gnome.shell.gschema.xml.in:116
 msgid "Keybinding to open the overview"
 msgstr "用于打开概览的快捷键 "
 
-#: data/org.gnome.shell.gschema.xml.in:109
+#: data/org.gnome.shell.gschema.xml.in:117
 msgid "Keybinding to open the Activities Overview."
 msgstr "用于打开活动概览的快捷键。 "
 
-#: data/org.gnome.shell.gschema.xml.in:115
+#: 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 "暂停和恢复所有执行中动画的快捷键，用于调试 "
 
-#: 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”。"
 
-#: 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,50 +313,46 @@ 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/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/gdm/authPrompt.js:149 js/ui/audioDeviceSelection.js:71
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
+#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
+#: js/ui/shellMountOperation.js:344 js/ui/status/network.js:936
 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:348
 #: js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "解锁"
 
-#: js/gdm/authPrompt.js:214
+#: js/gdm/authPrompt.js:216
 msgctxt "button"
 msgid "Sign In"
 msgstr "登录"
 
-#: js/gdm/loginDialog.js:285
+#: js/gdm/loginDialog.js:308
 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:458
 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:859
+#: js/gdm/loginDialog.js:888
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(如 user 或 %s)"
@@ -353,16 +360,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:864 js/ui/components/networkAgent.js:271
-#: js/ui/components/networkAgent.js:289
+#: js/gdm/loginDialog.js:893 js/ui/components/networkAgent.js:243
+#: js/ui/components/networkAgent.js:261
 msgid "Username: "
 msgstr "用户名："
 
-#: js/gdm/loginDialog.js:1201
+#: js/gdm/loginDialog.js:1236
 msgid "Login Window"
 msgstr "登录窗口"
 
-#: js/gdm/util.js:341
+#: js/gdm/util.js:346
 msgid "Authentication error"
 msgstr "认证出错"
 
@@ -371,40 +378,150 @@ 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 "(或滑动手指)"
 
-#: js/misc/util.js:119
+#. Translators: The name of the power-off action in search
+#: js/misc/systemActions.js:99
+msgctxt "search-result"
+msgid "Power off"
+msgstr "关机"
+
+#. Translators: A list of keywords that match the power-off action, separated by semicolons
+#: js/misc/systemActions.js:102
+msgid "power off;shutdown"
+msgstr "关机;断电"
+
+#. Translators: The name of the lock screen action in search
+#: js/misc/systemActions.js:106
+msgctxt "search-result"
+msgid "Lock screen"
+msgstr "锁屏"
+
+#. Translators: A list of keywords that match the lock screen action, separated by semicolons
+#: js/misc/systemActions.js:109
+msgid "lock screen"
+msgstr "锁屏"
+
+#. Translators: The name of the logout action in search
+#: js/misc/systemActions.js:113
+msgctxt "search-result"
+msgid "Log out"
+msgstr "注销"
+
+#. Translators: A list of keywords that match the logout action, separated by semicolons
+#: js/misc/systemActions.js:116
+msgid "logout;sign off"
+msgstr "登出;注销"
+
+#. Translators: The name of the suspend action in search
+#: js/misc/systemActions.js:120
+msgctxt "search-result"
+msgid "Suspend"
+msgstr "挂起"
+
+#. Translators: A list of keywords that match the suspend action, separated by semicolons
+#: js/misc/systemActions.js:123
+msgid "suspend;sleep"
+msgstr "挂起;睡眠"
+
+#. Translators: The name of the switch user action in search
+#: js/misc/systemActions.js:127
+msgctxt "search-result"
+msgid "Switch user"
+msgstr "切换用户"
+
+#. Translators: A list of keywords that match the switch user action, separated by semicolons
+#: js/misc/systemActions.js:130
+msgid "switch user"
+msgstr "切换用户"
+
+#. Translators: The name of the lock orientation action in search
+#: js/misc/systemActions.js:134
+msgctxt "search-result"
+msgid "Lock orientation"
+msgstr "方向锁定"
+
+#. Translators: A list of keywords that match the lock orientation action, separated by semicolons
+#: js/misc/systemActions.js:137
+msgid "lock orientation"
+msgstr "方向锁定"
+
+#: 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:228
 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:234
 #, 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:240
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A %H:%M"
@@ -412,7 +529,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:246
 #, no-c-format
 msgid "%B %d, %H∶%M"
 msgstr "%m月%d日, %H:%M"
@@ -420,26 +537,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:252
 #, 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:257
 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:263
 #, 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:269
 #, no-c-format
 msgid "%A, %l∶%M %p"
 msgstr "%A%p %-l:%M"
@@ -447,7 +564,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:275
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
 msgstr "%m月%d日%p %-l:%M"
@@ -455,61 +572,70 @@ 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:281
 #, 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:63 js/ui/status/location.js:395
 msgid "Deny Access"
 msgstr "拒绝访问"
 
-#: js/ui/accessDialog.js:63 js/ui/status/location.js:429
+#: js/ui/accessDialog.js:64 js/ui/status/location.js:398
 msgid "Grant Access"
 msgstr "允许访问"
 
-#: js/ui/appDisplay.js:794
+#: js/ui/appDisplay.js:809
 msgid "Frequently used applications will appear here"
 msgstr "常用的应用程序会出现在这里"
 
-#: js/ui/appDisplay.js:914
+#: js/ui/appDisplay.js:930
 msgid "Frequent"
 msgstr "常用"
 
-#: js/ui/appDisplay.js:921
+#: js/ui/appDisplay.js:937
 msgid "All"
 msgstr "全部"
 
-#: js/ui/appDisplay.js:1853
+#: js/ui/appDisplay.js:1918
 msgid "New Window"
 msgstr "新窗口"
 
-#: js/ui/appDisplay.js:1881 js/ui/dash.js:289
+#: js/ui/appDisplay.js:1932
+msgid "Launch using Dedicated Graphics Card"
+msgstr "使用独立显卡启动"
+
+#: js/ui/appDisplay.js:1959 js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: js/ui/appDisplay.js:1887
+#: js/ui/appDisplay.js:1965
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
-#: js/ui/appDisplay.js:1897
+#: js/ui/appDisplay.js:1975
 msgid "Show Details"
 msgstr "显示细节"
 
-#: js/ui/appFavorites.js:135
+#: js/ui/appFavorites.js:141
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s 已经添加到了您的收藏夹。"
 
-#: js/ui/appFavorites.js:169
+#: js/ui/appFavorites.js:175
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"
@@ -530,19 +656,19 @@ msgstr "耳机"
 msgid "Headset"
 msgstr "耳麦"
 
-#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:213
+#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:221
 msgid "Microphone"
 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:265
 msgid "Settings"
 msgstr "设置"
 
@@ -598,58 +724,74 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "六"
 
-#: js/ui/calendar.js:442
+#: js/ui/calendar.js:449
 msgid "Previous month"
 msgstr "上个月"
 
-#: js/ui/calendar.js:452
+#: js/ui/calendar.js:459
 msgid "Next month"
 msgstr "下个月"
 
-#: js/ui/calendar.js:605
+#: js/ui/calendar.js:612
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: js/ui/calendar.js:660
+#: js/ui/calendar.js:667
 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:721
+#: js/ui/calendar.js:736
 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:869
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%m月%d日 %A"
 
-#: js/ui/calendar.js:849
+#: js/ui/calendar.js:873
 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:1093
 msgid "No Notifications"
 msgstr "无提示"
 
-#: js/ui/calendar.js:1085
+#: js/ui/calendar.js:1096
 msgid "No Events"
 msgstr "无事件"
 
+#: js/ui/calendar.js:1124
+msgid "Clear All"
+msgstr "全部清除"
+
+#. Translators: %s is an application name
+#: js/ui/closeDialog.js:44
+#, javascript-format
+msgid "“%s” is not responding."
+msgstr "“%s”无响应。"
+
+#: js/ui/closeDialog.js:45
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr "您可以尝试等待其响应或强制退出此应用程序。"
+
+#: js/ui/closeDialog.js:61
+msgid "Force Quit"
+msgstr "强制退出"
+
+#: js/ui/closeDialog.js:64
+msgid "Wait"
+msgstr "等待"
+
 #: js/ui/components/automountManager.js:91
 msgid "External drive connected"
 msgstr "外部驱动器已连接"
@@ -658,106 +800,106 @@ msgstr "外部驱动器已连接"
 msgid "External drive disconnected"
 msgstr "外部驱动器已断开"
 
-#: js/ui/components/autorunManager.js:355
+#: js/ui/components/autorunManager.js:358
 #, 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:107 js/ui/components/polkitAgent.js:284
 msgid "Password:"
 msgstr "密码："
 
-#: js/ui/components/keyring.js:153
+#: js/ui/components/keyring.js:140
 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:112 js/ui/status/network.js:261
+#: js/ui/status/network.js:355 js/ui/status/network.js:939
 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:205 js/ui/components/networkAgent.js:217
+#: js/ui/components/networkAgent.js:245 js/ui/components/networkAgent.js:265
+#: js/ui/components/networkAgent.js:275
 msgid "Password: "
 msgstr "密码："
 
 #. static WEP
-#: js/ui/components/networkAgent.js:238
+#: js/ui/components/networkAgent.js:210
 msgid "Key: "
 msgstr "密钥："
 
-#: js/ui/components/networkAgent.js:277
+#: js/ui/components/networkAgent.js:249
 msgid "Identity: "
 msgstr "身份："
 
-#: js/ui/components/networkAgent.js:279
+#: js/ui/components/networkAgent.js:251
 msgid "Private key password: "
 msgstr "私人密钥密码："
 
-#: js/ui/components/networkAgent.js:291
+#: js/ui/components/networkAgent.js:263
 msgid "Service: "
 msgstr "服务："
 
-#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:666
+#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:638
 msgid "Authentication required by wireless network"
 msgstr "无线网络要求身份认证"
 
-#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:667
+#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:639
 #, 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:670
+#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:642
 msgid "Wired 802.1X authentication"
 msgstr "有线 802.1X 认证"
 
-#: js/ui/components/networkAgent.js:327
+#: js/ui/components/networkAgent.js:299
 msgid "Network name: "
 msgstr "网络名称："
 
-#: js/ui/components/networkAgent.js:332 js/ui/components/networkAgent.js:674
+#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:646
 msgid "DSL authentication"
 msgstr "DSL 认证"
 
-#: js/ui/components/networkAgent.js:339 js/ui/components/networkAgent.js:680
+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:652
 msgid "PIN code required"
 msgstr "需要 PIN 码"
 
-#: js/ui/components/networkAgent.js:340 js/ui/components/networkAgent.js:681
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:653
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码"
 
-#: js/ui/components/networkAgent.js:341
+#: js/ui/components/networkAgent.js:313
 msgid "PIN: "
 msgstr "PIN："
 
-#: js/ui/components/networkAgent.js:348 js/ui/components/networkAgent.js:687
+#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:659
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: js/ui/components/networkAgent.js:349 js/ui/components/networkAgent.js:671
-#: js/ui/components/networkAgent.js:675 js/ui/components/networkAgent.js:688
+#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:643
+#: js/ui/components/networkAgent.js:647 js/ui/components/networkAgent.js:660
 #, javascript-format
 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:627 js/ui/status/network.js:1729
 msgid "Network Manager"
 msgstr "网络管理器"
 
-#: js/ui/components/polkitAgent.js:60
+#: js/ui/components/polkitAgent.js:43
 msgid "Authentication Required"
 msgstr "需要认证"
 
-#: js/ui/components/polkitAgent.js:102
+#: js/ui/components/polkitAgent.js:71
 msgid "Administrator"
 msgstr "管理员"
 
-#: js/ui/components/polkitAgent.js:182
+#: js/ui/components/polkitAgent.js:151
 msgid "Authenticate"
 msgstr "认证"
 
@@ -765,35 +907,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
-msgid "Sorry, that didn't work. Please try again."
-msgstr "抱歉，您的输入有误。请重试。"
+#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:328
+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:186
 msgid "Windows"
 msgstr "窗口"
 
-#: js/ui/dash.js:250 js/ui/dash.js:291
+#: js/ui/dash.js:246 js/ui/dash.js:287
 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:445
 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:76
 msgid "%B %e %Y"
 msgstr "%Y年%m月%d日"
 
@@ -801,18 +943,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:83
 msgid "%A %B %e %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: js/ui/dateMenu.js:160
+#: js/ui/dateMenu.js:148
 msgid "Add world clocks…"
-msgstr "添加世界时钟..."
+msgstr "添加世界时钟…"
 
-#: js/ui/dateMenu.js:161
+#: js/ui/dateMenu.js:149
 msgid "World Clocks"
 msgstr "世界时钟"
 
+#: js/ui/dateMenu.js:228
+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:292
+#, 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:298
+#, 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:304
+#, javascript-format
+msgid "%s, then %s, followed by %s later."
+msgstr "%s转%s，随后转%s。"
+
+#: js/ui/dateMenu.js:315
+msgid "Select a location…"
+msgstr "选择地点…"
+
+#: js/ui/dateMenu.js:318
+msgid "Loading…"
+msgstr "正在载入…"
+
+#. Translators: %s is a temperature with unit, e.g. "23℃"
+#: js/ui/dateMenu.js:324
+#, javascript-format
+msgid "Feels like %s."
+msgstr "体感温度 %s。"
+
+#: js/ui/dateMenu.js:327
+msgid "Go online for weather information"
+msgstr "通过互联网查看天气信息"
+
+#: js/ui/dateMenu.js:329
+msgid "Weather information is currently unavailable"
+msgstr "天气信息目前不可用"
+
 #: js/ui/endSessionDialog.js:64
 #, javascript-format
 msgctxt "title"
@@ -940,111 +1135,120 @@ 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 (远程)"
 
 #. 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 (控制台)"
 
-#: js/ui/extensionDownloader.js:199
+#: js/ui/extensionDownloader.js:201
 msgid "Install"
 msgstr "安装"
 
-#: js/ui/extensionDownloader.js:204
+#: js/ui/extensionDownloader.js:206
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "从 extensions.gnome.org 下载并安装“%s”？"
 
-#: js/ui/keyboard.js:742 js/ui/status/keyboard.js:782
-msgid "Keyboard"
-msgstr "键盘"
+#. Translators: %s is an application name like "Settings"
+#: js/ui/inhibitShortcutsDialog.js:59
+#, javascript-format
+msgid "%s wants to inhibit shortcuts"
+msgstr "%s 希望禁用快捷键"
 
-#. translators: 'Hide' is a verb
-#: js/ui/legacyTray.js:65
-msgid "Hide tray"
-msgstr "隐藏托盘"
+#: js/ui/inhibitShortcutsDialog.js:60
+msgid "Application wants to inhibit shortcuts"
+msgstr "应用程序希望禁用快捷键"
 
-#: js/ui/legacyTray.js:106
-msgid "Status Icons"
-msgstr "状态图标"
+#. Translators: %s is a keyboard shortcut like "Super+x"
+#: js/ui/inhibitShortcutsDialog.js:69
+#, javascript-format
+msgid "You can restore shortcuts by pressing %s."
+msgstr "按 %s 以恢复快捷键。"
+
+#: js/ui/inhibitShortcutsDialog.js:74
+msgid "Deny"
+msgstr "拒绝"
+
+#: js/ui/inhibitShortcutsDialog.js:80
+msgid "Allow"
+msgstr "允许"
+
+#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:783
+msgid "Keyboard"
+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 subprojects/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:1494
 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 +1259,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 +1320,7 @@ msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "系统"
 
-#: js/ui/panel.js:807
+#: js/ui/panel.js:812
 msgid "Top Bar"
 msgstr "顶栏"
 
@@ -1081,7 +1329,7 @@ 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:291
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"
 
@@ -1089,7 +1337,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 +1347,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:284
 msgid "Lock"
 msgstr "锁定"
 
-#: js/ui/screenShield.js:704
+#: js/ui/screenShield.js:715
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME 需要锁定屏幕"
 
@@ -1134,22 +1382,28 @@ 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:651
 msgid "Searching…"
-msgstr "正在搜索..."
+msgstr "正在搜索…"
 
-#: js/ui/search.js:619
+#: js/ui/search.js:653
 msgid "No results."
 msgstr "无结果。"
 
+#: js/ui/search.js:777
+#, javascript-format
+msgid "%d more"
+msgid_plural "%d more"
+msgstr[0] "还有另外 %d 项"
+
 #: js/ui/shellEntry.js:25
 msgid "Copy"
 msgstr "复制"
@@ -1166,11 +1420,11 @@ msgstr "显示文本"
 msgid "Hide Text"
 msgstr "隐藏文本"
 
-#: js/ui/shellMountOperation.js:370
+#: js/ui/shellMountOperation.js:315
 msgid "Password"
 msgstr "密码"
 
-#: js/ui/shellMountOperation.js:391
+#: js/ui/shellMountOperation.js:336
 msgid "Remember Password"
 msgstr "记住密码"
 
@@ -1222,7 +1476,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:627
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
@@ -1238,17 +1492,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:1299
 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:170
+#: js/ui/status/network.js:356 js/ui/status/network.js:1299
+#: js/ui/status/network.js:1418 js/ui/status/nightLight.js:47
+#: js/ui/status/rfkill.js:90 js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "关闭"
 
@@ -1256,56 +1510,56 @@ msgstr "关闭"
 msgid "Brightness"
 msgstr "亮度"
 
-#: js/ui/status/keyboard.js:805
+#: js/ui/status/keyboard.js:806
 msgid "Show Keyboard Layout"
 msgstr "显示键盘布局"
 
-#: js/ui/status/location.js:107 js/ui/status/location.js:215
+#: js/ui/status/location.js:89 js/ui/status/location.js:197
 msgid "Location Enabled"
 msgstr "定位服务已启用"
 
-#: js/ui/status/location.js:108 js/ui/status/location.js:216
+#: js/ui/status/location.js:90 js/ui/status/location.js:198
 msgid "Disable"
 msgstr "禁用"
 
-#: js/ui/status/location.js:109
+#: js/ui/status/location.js:91
 msgid "Privacy Settings"
 msgstr "隐私设置"
 
-#: js/ui/status/location.js:214
+#: js/ui/status/location.js:196
 msgid "Location In Use"
 msgstr "定位服务正被使用"
 
-#: js/ui/status/location.js:218
+#: js/ui/status/location.js:200
 msgid "Location Disabled"
 msgstr "定位服务已禁用"
 
-#: js/ui/status/location.js:219
+#: js/ui/status/location.js:201
 msgid "Enable"
 msgstr "启用"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:435
+#: js/ui/status/location.js:388
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "允许 %s 访问您的位置信息？"
 
-#: js/ui/status/location.js:437
+#: js/ui/status/location.js:389
 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:454 js/ui/status/network.js:1328
 #, javascript-format
 msgid "%s Off"
 msgstr "%s 已关闭"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:455
+#: js/ui/status/network.js:457
 #, javascript-format
 msgid "%s Connected"
 msgstr "%s 已连接"
@@ -1313,171 +1567,205 @@ 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:462
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "%s 未托管"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:463
+#: js/ui/status/network.js:465
 #, 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:472 js/ui/status/network.js:1320
 #, 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:475
 #, 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:483
 #, 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:487
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "%s 不可用"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:488
+#: js/ui/status/network.js:490
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "%s 连接失败"
 
-#: js/ui/status/network.js:504
+#: js/ui/status/network.js:506
 msgid "Wired Settings"
 msgstr "有线设置"
 
-#: js/ui/status/network.js:546
+#: js/ui/status/network.js:548
 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:591 js/ui/status/network.js:1325
 #, 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:595
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s 已禁用"
 
-#: js/ui/status/network.js:633
+#: js/ui/status/network.js:635
 msgid "Connect to Internet"
 msgstr "连接到互联网"
 
-#: js/ui/status/network.js:823
+#: js/ui/status/network.js:833
 msgid "Airplane Mode is On"
 msgstr "已开启飞行模式"
 
-#: js/ui/status/network.js:824
+#: js/ui/status/network.js:834
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "启用飞行模式时 Wi-Fi 会关闭"
 
-#: js/ui/status/network.js:825
+#: js/ui/status/network.js:835
 msgid "Turn Off Airplane Mode"
 msgstr "关闭飞行模式"
 
-#: js/ui/status/network.js:834
+#: js/ui/status/network.js:844
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi 关闭"
 
-#: js/ui/status/network.js:835
+#: js/ui/status/network.js:845
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "连接网络需要开启 Wi-Fi"
 
-#: js/ui/status/network.js:836
+#: js/ui/status/network.js:846
 msgid "Turn On Wi-Fi"
 msgstr "开启 Wi-Fi"
 
-#: js/ui/status/network.js:861
+#: js/ui/status/network.js:871
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi 网络"
 
-#: js/ui/status/network.js:863
+#: js/ui/status/network.js:873
 msgid "Select a network"
 msgstr "选择网络"
 
-#: js/ui/status/network.js:893
+#: js/ui/status/network.js:903
 msgid "No Networks"
 msgstr "无网络"
 
-#: js/ui/status/network.js:914 js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:924 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:1191
 msgid "Select Network"
 msgstr "选择网络"
 
-#: js/ui/status/network.js:1187
+#: js/ui/status/network.js:1197
 msgid "Wi-Fi Settings"
 msgstr "Wi-Fi 设置"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1306
+#: js/ui/status/network.js:1316
 #, 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:1331
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s 无连接"
 
-#: js/ui/status/network.js:1421
-msgid "connecting..."
-msgstr "正在连接..."
+#: js/ui/status/network.js:1435
+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:1438
 msgid "authentication required"
 msgstr "需要认证"
 
-#: js/ui/status/network.js:1426
+#: js/ui/status/network.js:1440
 msgid "connection failed"
 msgstr "连接失败"
 
-#: js/ui/status/network.js:1492 js/ui/status/rfkill.js:93
-msgid "Network Settings"
-msgstr "网络设置"
-
 #: js/ui/status/network.js:1494
 msgid "VPN Settings"
 msgstr "VPN 设置"
 
-#: js/ui/status/network.js:1513
+#: js/ui/status/network.js:1507
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1523
+#: js/ui/status/network.js:1517
 msgid "VPN Off"
 msgstr "VPN 已关闭"
 
-#: js/ui/status/network.js:1711
+#: js/ui/status/network.js:1581 js/ui/status/rfkill.js:93
+msgid "Network Settings"
+msgstr "网络设置"
+
+#: js/ui/status/network.js:1612
+#, javascript-format
+msgid "%s Wired Connection"
+msgid_plural "%s Wired Connections"
+msgstr[0] "%s 个有线连接"
+
+#: js/ui/status/network.js:1616
+#, javascript-format
+msgid "%s Wi-Fi Connection"
+msgid_plural "%s Wi-Fi Connections"
+msgstr[0] "%s 个 Wi-Fi 连接"
+
+#: js/ui/status/network.js:1620
+#, javascript-format
+msgid "%s Modem Connection"
+msgid_plural "%s Modem Connections"
+msgstr[0] "%s 个调制解调器连接"
+
+#: js/ui/status/network.js:1768
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: js/ui/status/network.js:1712
+#: js/ui/status/network.js:1769
 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 +1778,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
@@ -1516,38 +1804,66 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "已开启飞行模式"
 
-#: js/ui/status/system.js:351
+#: js/ui/status/system.js:228
 msgid "Switch User"
 msgstr "切换用户"
 
-#: js/ui/status/system.js:356
+#: js/ui/status/system.js:240
 msgid "Log Out"
 msgstr "注销"
 
-#: js/ui/status/system.js:361
+#: js/ui/status/system.js:252
 msgid "Account Settings"
 msgstr "帐号设置"
 
-#: js/ui/status/system.js:378
+#: js/ui/status/system.js:269
 msgid "Orientation Lock"
 msgstr "方向锁定"
 
-#: js/ui/status/system.js:386
+#: js/ui/status/system.js:295
 msgid "Suspend"
 msgstr "挂起"
 
-#: js/ui/status/system.js:389
+#: js/ui/status/system.js:305
 msgid "Power Off"
 msgstr "关机"
 
-#: js/ui/status/volume.js:127
+#: js/ui/status/volume.js:128
 msgid "Volume changed"
 msgstr "音量已变更"
 
-#: js/ui/status/volume.js:162
+#: js/ui/status/volume.js:170
 msgid "Volume"
 msgstr "音量"
 
+#. Translators: this is for display mirroring i.e. cloning.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:21
+msgid "Mirror"
+msgstr "镜像"
+
+#. Translators: this is for the desktop spanning displays.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:26
+msgid "Join Displays"
+msgstr "拼接显示器"
+
+#. Translators: this is for using only an external display.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:31
+msgid "External Only"
+msgstr "只使用外部"
+
+#. Translators: this is for using only the laptop display.
+#. * Try to keep it under around 15 characters.
+#.
+#: js/ui/switchMonitor.js:36
+msgid "Built-in Only"
+msgstr "只使用内置"
+
 #: js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "以另一个用户身份登录"
@@ -1556,11 +1872,11 @@ msgstr "以另一个用户身份登录"
 msgid "Unlock Window"
 msgstr "解锁窗口"
 
-#: js/ui/viewSelector.js:159
+#: js/ui/viewSelector.js:190
 msgid "Applications"
 msgstr "应用程序"
 
-#: js/ui/viewSelector.js:163
+#: js/ui/viewSelector.js:194
 msgid "Search"
 msgstr "搜索"
 
@@ -1569,22 +1885,22 @@ msgstr "搜索"
 msgid "“%s” is ready"
 msgstr "“%s”已就绪"
 
-#: js/ui/windowManager.js:63
+#: js/ui/windowManager.js:72
 msgid "Do you want to keep these display settings?"
-msgstr "你想保留这些显示设置吗？"
+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:84
 msgid "Revert Settings"
 msgstr "还原设置"
 
-#: js/ui/windowManager.js:85
+#: js/ui/windowManager.js:87
 msgid "Keep Changes"
 msgstr "保留更改"
 
-#: js/ui/windowManager.js:103
+#: js/ui/windowManager.js:105
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1592,10 +1908,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:660
 #, 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 +1945,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 "移至显示器的右侧"
 
@@ -1670,39 +1986,19 @@ msgstr "Evolution 日历"
 msgid "evolution"
 msgstr "evolution"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: src/gvc/gvc-mixer-control.c:1873
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u 个输出"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: 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:2738
-msgid "System Sounds"
-msgstr "系统声音"
-
-#: src/main.c:381
+#: src/main.c:437
 msgid "Print version"
 msgstr "打印版本"
 
-#: src/main.c:387
+#: src/main.c:443
 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:449
+msgid "Use a specific mode, e.g. “gdm” for login screen"
+msgstr "使用指定模式，如“gdm”用于登录屏幕的模式"
 
-#: src/main.c:399
+#: src/main.c:455
 msgid "List possible modes"
 msgstr "列出可用的模式"
 
@@ -1728,6 +2024,56 @@ msgstr "密码不能为空"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "认证对话框被用户驳回"
 
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u 个输出"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1883
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u 个输入"
+
+#: subprojects/gvc/gvc-mixer-control.c:2738
+msgid "System Sounds"
+msgstr "系统声音"
+
+#~ msgid "GNOME Shell Extension Preferences"
+#~ msgstr "GNOME Shell 扩展首选项"
+
+#~ msgid "Web Authentication Redirect"
+#~ msgstr "网页认证重定向"
+
+#~ msgid "Events"
+#~ msgstr "事件"
+
+#~ msgid "Notifications"
+#~ msgstr "提示"
+
+#~ msgid "Hide tray"
+#~ msgstr "隐藏托盘"
+
+#~ msgid "Status Icons"
+#~ 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 +2105,6 @@ msgstr "认证对话框被用户驳回"
 #~ msgid "Airplane Mode"
 #~ msgstr "乘机模式"
 
-#~ msgid "On"
-#~ msgstr "开"
-
 #~ msgctxt "event list time"
 #~ msgid "%H∶%M"
 #~ msgstr "%H∶%M"
-- 
2.17.0


From e6ba36062de4dcda40b62ce0318c20805987a954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 23 Feb 2018 17:29:54 +0100
Subject: [PATCH 22/22] st: Do not force allocation updates during shadow
 creation

If an actor is pending a relayout when get_allocation_box() is called,
the method forces an allocation update. In case of StWidget, this might
then result in a style update and a consecutive invalidation of the
shadow spec.

A helper method that invalidates one of its parameters as a side effect
(and by extension its return value as well) is most unexpected, so cur-
rently _st_create_shadow_pipeline_from_actor() poses an easy trap to
callers to run into.

Remove that trap by calling get_size()/get_position() instead, which
don't have the unintended side effect - it is still a good idea to fix
callers who were running into this to not waste resources on creating
shadows that are invalidated before the next paint, but throwing un-
defined behavior at them is harsh ...

https://bugzilla.gnome.org/show_bug.cgi?id=788908
---
 src/st/st-private.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/st/st-private.c b/src/st/st-private.c
index d62586068..210496faa 100644
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@@ -414,11 +414,9 @@ _st_create_shadow_pipeline_from_actor (StShadow     *shadow_spec,
                                        ClutterActor *actor)
 {
   CoglPipeline *shadow_pipeline = NULL;
-  ClutterActorBox box;
   float width, height;
 
-  clutter_actor_get_allocation_box (actor, &box);
-  clutter_actor_box_get_size (&box, &width, &height);
+  clutter_actor_get_size (actor, &width, &height);
 
   if (width == 0 || height == 0)
     return NULL;
@@ -441,6 +439,7 @@ _st_create_shadow_pipeline_from_actor (StShadow     *shadow_spec,
       CoglFramebuffer *fb;
       CoglColor clear_color;
       CoglError *catch_error = NULL;
+      float x, y;
 
       buffer = cogl_texture_new_with_size (width,
                                            height,
@@ -462,6 +461,7 @@ _st_create_shadow_pipeline_from_actor (StShadow     *shadow_spec,
         }
 
       cogl_color_init_from_4ub (&clear_color, 0, 0, 0, 0);
+      clutter_actor_get_position (actor, &x, &y);
 
       /* XXX: There's no way to render a ClutterActor to an offscreen
        * as it uses the implicit API. */
@@ -470,7 +470,7 @@ _st_create_shadow_pipeline_from_actor (StShadow     *shadow_spec,
       G_GNUC_END_IGNORE_DEPRECATIONS;
 
       cogl_framebuffer_clear (fb, COGL_BUFFER_BIT_COLOR, &clear_color);
-      cogl_framebuffer_translate (fb, -box.x1, -box.y1, 0);
+      cogl_framebuffer_translate (fb, -x, -y, 0);
       cogl_framebuffer_orthographic (fb, 0, 0, width, height, 0, 1.0);
 
       clutter_actor_set_opacity_override (actor, 255);
-- 
2.17.0