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"
-
-#: data/org.gnome.shell.gschema.xml.in:59
-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:60
-msgid ""
-"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 "
-"seisean a-mhàin."
+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."
+msgstr ""
+"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: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
-msgid "Workspaces only on primary monitor"
-msgstr "Rumannan-obrach air a' phrìomh-sgrìn a-mhàin"
-
 #: 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"
+
+#: 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
+#. 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"
+
+#: js/ui/inhibitShortcutsDialog.js:80
+msgid "Allow"
+msgstr "Ceadaich"
+
+#: js/ui/keyboard.js:738 js/ui/status/keyboard.js:783
 msgid "Keyboard"
 msgstr "Am meur-chlàr"
 
-#. translators: 'Hide' is a verb
-#: js/ui/legacyTray.js:65
-msgid "Hide tray"
-msgstr "Falaich an treidhe"
-
-#: js/ui/legacyTray.js:106
-msgid "Status Icons"
-msgstr "Ìomhaigheagan staide"
-
-#: 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
-msgid "Connection failed"
-msgstr "Dh'fhàillig leis a' cheangal"
+#: 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:1712
+#: 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"
+
+#: 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,45 +2133,20 @@ msgstr "Mìosachan 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 às-chur"
-msgstr[1] "%u às-chur"
-msgstr[2] "%u às-chuir"
-msgstr[3] "%u às-chur"
-
-#. 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 ion-chur"
-msgstr[1] "%u ion-chur"
-msgstr[2] "%u ion-chuir"
-msgstr[3] "%u ion-chur"
-
-#: src/gvc/gvc-mixer-control.c:2738
-msgid "System Sounds"
-msgstr "Fuaimean an t-siostaim"
-
-#: src/main.c:381
+#: src/main.c:437
 msgid "Print version"
 msgstr "Seall an tionndadh"
 
-#: src/main.c:387
+#: 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: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\""
+#: 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:399
+#: src/main.c:455
 msgid "List possible modes"
 msgstr "Seall liosta dhe na modhan a tha ann"
 
@@ -1805,7 +2158,7 @@ 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"
+msgstr "Cha b’ urrainn dhuinn “%s” a chur gu dol"
 
 #: src/shell-keyring-prompt.c:730
 msgid "Passwords do not match."
@@ -1819,6 +2172,62 @@ msgstr "Chan fhaod am facal-faire a bhith bàn"
 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
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u às-chur"
+msgstr[1] "%u às-chur"
+msgstr[2] "%u às-chuir"
+msgstr[3] "%u às-chur"
+
+#. 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 ion-chur"
+msgstr[1] "%u ion-chur"
+msgstr[2] "%u ion-chuir"
+msgstr[3] "%u ion-chur"
+
+#: subprojects/gvc/gvc-mixer-control.c:2738
+msgid "System Sounds"
+msgstr "Fuaimean an t-siostaim"
+
+#~ msgid "GNOME Shell Extension Preferences"
+#~ msgstr "Roghainnean airson leudachain na Slige GNOME"
+
+#~ msgid "Web Authentication Redirect"
+#~ msgstr "Ath-stiùireadh an dearbhaidh-lìn"
+
+#~ msgid "Events"
+#~ msgstr "Tachartasan"
+
+#~ msgid "Notifications"
+#~ msgstr "Brathan"
+
+#~ msgid "Hide tray"
+#~ msgstr "Falaich an treidhe"
+
+#~ msgid "Status Icons"
+#~ msgstr "Ìomhaigheagan staide"
+
+#~ msgid "Clear section"
+#~ msgstr "Falamhaich an earrann"
+
+#~ msgid "Media"
+#~ msgstr "Meadhanan"
+
+#~ 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"