[gnome-control-center/gnome-3-26] Update Scottish Gaelic translation



commit 05ccb72e9a2407c8d23f12288154c30523686411
Author: GNOME Translation Robot <gnome-sysadmin gnome org>
Date:   Mon Feb 26 12:10:44 2018 +0000

    Update Scottish Gaelic translation

 po/gd.po | 3091 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1673 insertions(+), 1418 deletions(-)
---
diff --git a/po/gd.po b/po/gd.po
index 70b8813..75e07b5 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the gnome-control-center package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
 # Michael Bauer <fios akerbeltz org>, 2014.
-# GunChleoc <fios foramnagaidhlig net>, 2016, 2017.
+# GunChleoc <fios foramnagaidhlig net>, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product";
-"=gnome-control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-07-05 21:54+0000\n"
-"PO-Revision-Date: 2017-07-06 16:54+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-";
+"center/issues\n"
+"POT-Creation-Date: 2018-02-19 12:11+0000\n"
+"PO-Revision-Date: 2018-02-26 12:09+0100\n"
 "Last-Translator: GunChleoc <fios foramnagaidhlig net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -67,75 +67,75 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "Ruigheachd"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:430
 msgid "Wallpapers"
 msgstr "Pàipearan-balla"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:439
 msgid "Colors"
 msgstr "Dathan"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: ../panels/background/cc-background-chooser-dialog.c:476
 msgid "Select Background"
 msgstr "Tagh an cùlaibh"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:504
 msgid "Pictures"
 msgstr "Dealbhan"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: ../panels/background/cc-background-chooser-dialog.c:536
 msgid "No Pictures Found"
 msgstr "Cha deach dealbh a lorg"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
+#: ../panels/background/cc-background-chooser-dialog.c:554
 #: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "Dhachaigh"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: ../panels/background/cc-background-chooser-dialog.c:566
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr ""
-"'S urrainn dhut dealbhan a chur ris a' phasgan %s agad agus nochdaidh iad "
+"’S urrainn dhut dealbhan a chur ris a’ phasgan %s agad agus nochdaidh iad "
 "an-seo"
 
-#: ../panels/background/cc-background-chooser-dialog.c:580
+#: ../panels/background/cc-background-chooser-dialog.c:573
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1580
-#: ../panels/display/cc-display-panel.c:2226
+#: ../panels/display/cc-display-panel.c:2744
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 #: ../panels/network/connection-editor/vpn-helpers.c:181
 #: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1346
-#: ../panels/network/net-device-wifi.c:1585
+#: ../panels/network/net-device-wifi.c:1325
+#: ../panels/network/net-device-wifi.c:1405
+#: ../panels/network/net-device-wifi.c:1641
 #: ../panels/network/network-wifi.ui.h:1
 #: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/printers/pp-details-dialog.c:319
-#: ../panels/privacy/cc-privacy-panel.c:1049
+#: ../panels/privacy/cc-privacy-panel.c:1053
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:637
-#: ../panels/sharing/cc-sharing-panel.c:375
+#: ../panels/search/cc-search-locations-dialog.c:642
+#: ../panels/sharing/cc-sharing-panel.c:382
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
 #: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
 #: ../panels/user-accounts/um-fingerprint-dialog.c:264
 #: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/user-accounts/um-photo-dialog.c:221
 #: ../panels/user-accounts/um-user-panel.c:644
 #: ../panels/user-accounts/um-user-panel.c:662
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: ../panels/background/cc-background-chooser-dialog.c:574
 msgid "_Select"
 msgstr "_Tagh"
 
@@ -154,7 +154,7 @@ msgstr "%d × %d"
 msgid "No Desktop Background"
 msgstr "Chan eil cùlaibh aig an deasga"
 
-#: ../panels/background/cc-background-panel.c:493
+#: ../panels/background/cc-background-panel.c:292
 msgid "Current background"
 msgstr "An cùlaibh làithreach"
 
@@ -172,42 +172,42 @@ msgstr "Cleachd pàipear-balla no dealbh mar chùlaibh"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;pàipear-balla;sgrìn;deasg;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: ../panels/bluetooth/cc-bluetooth-panel.c:268
 msgid "Turn Off Airplane Mode"
 msgstr "Cuir am modh itealain dheth"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "No Bluetooth Found"
 msgstr "Cha deach Bluetooth a lorg"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Ceangail dongle gus Bluetooth a chleachdadh."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Bluetooth Turned Off"
 msgstr "Tha Bluetooth dheth"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Turn on to connect devices and receive file transfers."
 msgstr ""
 "Cuir air e gus uidheaman a cheangal is tar-chuir fhaidhlichean fhaighinn."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Airplane Mode is on"
 msgstr "Tha am modh itealain air"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Bluetooth is disabled when airplane mode is on."
-msgstr "Tha Bluetooth à comas fhad 's a tha am modh itealain air."
+msgstr "Tha Bluetooth à comas fhad ’s a tha am modh itealain air."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Hardware Airplane Mode is on"
-msgstr "Tha modh itealain a' bhathair-chruaidh air"
+msgstr "Tha modh itealain a’ bhathair-chruaidh air"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
-msgstr "Cuir suidse a' mhodh itealain dheth gus Bluetooth a chur an comas."
+msgstr "Cuir suidse a’ mhodh itealain dheth gus Bluetooth a chur an comas."
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
@@ -225,36 +225,30 @@ msgstr "share;sharing;bluetooth;obex;co-roinn;co-roinneadh;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: ../panels/color/cc-color-calibrate.c:361
-#| msgid "Place your calibration device over the square and press 'Start'"
 msgid "Place your calibration device over the square and press “Start”"
 msgstr ""
 "Cuir an t-uidheam cailbhreachaidh agad os cionn na ceàrnaige is brùth air "
-"\"Tòisich\""
+"“Tòisich”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
 #: ../panels/color/cc-color-calibrate.c:367
-#| msgid ""
-#| "Move your calibration device to the calibrate position and press "
-#| "'Continue'"
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr ""
 "Gluais an t-uidheam cailbhreachaidh agad dhan ionad chailbhreachaidh is "
-"brùth air \"Air adhart\""
+"brùth air “Air adhart”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
 #: ../panels/color/cc-color-calibrate.c:373
-#| msgid ""
-#| "Move your calibration device to the surface position and press 'Continue'"
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr ""
 "Gluais an t-uidheam cailbhreachaidh agad dhan ionad uachdair is brùth air "
-"\"Air adhart\""
+"“Air adhart”"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
@@ -267,7 +261,7 @@ msgstr "Dùin mullach an laptop"
 #. * good idea why or any suggestions
 #: ../panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
-msgstr "Thachair mearachd inntearnail nach b' urrainn dhuinn càradh."
+msgstr "Thachair mearachd inntearnail nach b’ urrainn dhuinn càradh."
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
@@ -279,14 +273,14 @@ msgstr ""
 #. TRANSLATORS: The profile failed for some reason
 #: ../panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
-msgstr "Cha b' urrainn dhuinn a' phròifil a ghintinn."
+msgstr "Cha b’ urrainn dhuinn a’ phròifil a ghintinn."
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
 #: ../panels/color/cc-color-calibrate.c:427
 msgid "The target whitepoint was not obtainable."
-msgstr "Cha d'fhuair sinn greim air geal-phuing na targaide."
+msgstr "Cha d’fhuair sinn greim air geal-phuing na targaide."
 
 #. TRANSLATORS: the display calibration process is finished
 #: ../panels/color/cc-color-calibrate.c:467
@@ -297,19 +291,19 @@ msgstr "Deiseil!"
 #. * the translated (or untranslated) error string after this
 #: ../panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
-msgstr "Dh'fhàillig an cailbhreachadh!"
+msgstr "Dh’fhàillig an cailbhreachadh!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
 #: ../panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
-msgstr "'S urrainn dhut an t-uidheam cailbhreachaidh a thoirt air falbh a-nis."
+msgstr "’S urrainn dhut an t-uidheam cailbhreachaidh a thoirt air falbh a-nis."
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
 #: ../panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
-msgstr "Na bean ris an uidheam chailbhreachaidh fhad 's a tha e trang"
+msgstr "Na bean ris an uidheam chailbhreachaidh fhad ’s a tha e trang"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: ../panels/color/cc-color-common.c:41
@@ -319,7 +313,7 @@ msgstr "Sgrìn laptop"
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
 #: ../panels/color/cc-color-common.c:50
 msgid "Built-in Webcam"
-msgstr "Camara-lìn 'na bhroinn"
+msgstr "Camara-lìn ’na bhroinn"
 
 #. TRANSLATORS: an externally connected display, where %s is either the
 #. * model, vendor or ID, e.g. 'LP2480zx Monitor'
@@ -413,14 +407,14 @@ msgstr "Sgrìn"
 #: ../panels/color/cc-color-panel.c:908
 #, c-format
 msgid "Failed to upload file: %s"
-msgstr "Cha b' urrainn dhuinn am faidhle a leanas a luchdadh suas: %s"
+msgstr "Cha b’ urrainn dhuinn am faidhle a leanas a luchdadh suas: %s"
 
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
 #: ../panels/color/cc-color-panel.c:922
 msgid "The profile has been uploaded to:"
-msgstr "Chaidh a' phròifil a luchdadh suas gu:"
+msgstr "Chaidh a’ phròifil a luchdadh suas gu:"
 
 #: ../panels/color/cc-color-panel.c:924
 msgid "Write down this URL."
@@ -435,13 +429,13 @@ msgstr ""
 #: ../panels/color/cc-color-panel.c:926
 msgid "Type the URL into your browser to download and install the profile."
 msgstr ""
-"Cuir an URL seo a-steach dhan bhrabhsair agad gus a' phròifil a luchdadh "
+"Cuir an URL seo a-steach dhan bhrabhsair agad gus a’ phròifil a luchdadh "
 "a-nuas is a stàladh."
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
 #: ../panels/color/cc-color-panel.c:960
 msgid "Save Profile"
-msgstr "Sàbhail a' phròifil"
+msgstr "Sàbhail a’ phròifil"
 
 #: ../panels/color/cc-color-panel.c:964
 #: ../panels/network/connection-editor/vpn-helpers.c:311
@@ -466,12 +460,12 @@ msgstr ""
 #: ../panels/color/cc-color-panel.c:1373
 msgid "The measuring instrument does not support printer profiling."
 msgstr ""
-"Chan eil an t-inneal tomhais a' cur taic ri pròifileadh chlò-bhualadairean."
+"Chan eil an t-inneal tomhais a’ cur taic ri pròifileadh chlò-bhualadairean."
 
 #. TRANSLATORS: this is when the button is insensitive
 #: ../panels/color/cc-color-panel.c:1384
 msgid "The device type is not currently supported."
-msgstr "Chan eil taic ris an t-seòrsa seo a dh'uidheam aig an àm seo."
+msgstr "Chan eil taic ris an t-seòrsa seo a dh’uidheam aig an àm seo."
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
@@ -547,7 +541,7 @@ msgstr "Cha ghabh ceartachadh taisbeanadh làn-sgrìn a dhèanamh sa phròifil s
 
 #: ../panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
-msgstr "Dh'fhaoidte nach eil a' phròifil seo ceart tuilleadh"
+msgstr "Dh’fhaoidte nach eil a’ phròifil seo ceart tuilleadh"
 
 #: ../panels/color/color-calibrate.ui.h:1
 msgid "Display Calibration"
@@ -586,14 +580,14 @@ msgid ""
 msgstr ""
 "Cruthaichidh an cailbhreachadh pròifil leis an urrainn dhut na dathan air an "
 "sgrìn agad a stiùireadh. Mar as fhaide a bheir thu seachad air a "
-"chailbhreachadh, 's ann as fhearr a bhios pròifil nan dathan agad."
+"chailbhreachadh, ’s ann as fhearr a bhios pròifil nan dathan agad."
 
 #: ../panels/color/color.ui.h:3
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr ""
-"Chan urrainn dhut an coimpiutair agad a chleachdadh fhad 's a bhios an "
-"cailbhreachadh a' dol air adhart."
+"Chan urrainn dhut an coimpiutair agad a chleachdadh fhad ’s a bhios an "
+"cailbhreachadh a’ dol air adhart."
 
 #. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:5
@@ -603,11 +597,11 @@ msgstr "Càileachd"
 #. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:7
 msgid "Approximate Time"
-msgstr "Tuairmeas air dè cho fad 's a bheir e"
+msgstr "Tuairmeas air dè cho fad ’s a bheir e"
 
 #: ../panels/color/color.ui.h:8
 msgid "Calibration Quality"
-msgstr "Càileachd a' chailbhreachaidh"
+msgstr "Càileachd a’ chailbhreachaidh"
 
 #: ../panels/color/color.ui.h:9
 msgid "Select the sensor device you want to use for calibration."
@@ -653,7 +647,7 @@ msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
 msgstr ""
-"Air neo 's urrainn dhut ìre soilleireachd o phròifil eile aig an uidheam seo "
+"Air neo ’s urrainn dhut ìre soilleireachd o phròifil eile aig an uidheam seo "
 "a chleachdadh."
 
 #: ../panels/color/color.ui.h:17
@@ -665,7 +659,7 @@ msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
 msgstr ""
-"'S urrainn dhut pròifil dhathan a chleachdadh air diofar choimpiutairean no "
+"’S urrainn dhut pròifil dhathan a chleachdadh air diofar choimpiutairean no "
 "fiù pròifilean a chleachdadh airson diofar ìrean de sholas."
 
 #: ../panels/color/color.ui.h:19
@@ -678,7 +672,7 @@ msgstr "Ainm na pròifile"
 
 #: ../panels/color/color.ui.h:21
 msgid "Profile successfully created!"
-msgstr "Chaidh a' phròifil a chruthachadh!"
+msgstr "Chaidh a’ phròifil a chruthachadh!"
 
 #: ../panels/color/color.ui.h:22
 msgid "Copy profile"
@@ -702,7 +696,7 @@ msgid ""
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
 "\">Microsoft Windows</a> systems useful."
 msgstr ""
-"Dh'fhaoidte gum bi an stiùireadh seo a thaobh mar a chleachdar na pròifilean "
+"Dh’fhaoidte gum bi an stiùireadh seo a thaobh mar a chleachdar na pròifilean "
 "seo air <a href=\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> agus <a "
 "href=\"windows\">Microsoft Windows</a> feumail dhut."
 
@@ -712,7 +706,6 @@ msgid "Summary"
 msgstr "Gearr-chunntas"
 
 #: ../panels/color/color.ui.h:28
-#| msgid "Add profile"
 msgid "Add Profile"
 msgstr "Cuir ris pròifil"
 
@@ -721,7 +714,7 @@ msgid "_Import File…"
 msgstr "_Ion-phortaich faidhle…"
 
 #: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
+#: ../panels/network/connection-editor/net-connection-editor.c:519
 #: ../panels/printers/new-printer-dialog.ui.h:4
 #: ../panels/region/input-chooser.ui.h:3
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
@@ -733,13 +726,13 @@ msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 msgstr ""
-"Mhothaich sinn do dhuilgheadasan. Dh'fhaoidte nach obraich a' phròifil mar "
+"Mhothaich sinn do dhuilgheadasan. Dh’fhaoidte nach obraich a’ phròifil mar "
 "bu chòir. <a href=\"\">Seall am mion-fhiosrachadh.</a>"
 
 #: ../panels/color/color.ui.h:33
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr ""
-"Feumaidh pròifil dhathan cho ùr 's a ghabhas a bhith aig gach uidheam mus "
+"Feumaidh pròifil dhathan cho ùr ’s a ghabhas a bhith aig gach uidheam mus "
 "gabh an dath a stiùireadh."
 
 #: ../panels/color/color.ui.h:34
@@ -757,7 +750,7 @@ msgstr "_Suidhich airson a h-uile cleachdaiche"
 #: ../panels/color/color.ui.h:37
 msgid "Set this profile for all users on this computer"
 msgstr ""
-"Suidhich a' phròifil seo airson na h-uile cleachdaiche air a' choimpiutair "
+"Suidhich a’ phròifil seo airson na h-uile cleachdaiche air a’ choimpiutair "
 "seo"
 
 #: ../panels/color/color.ui.h:38
@@ -778,7 +771,7 @@ msgstr "Cailbhrich an t-uidheam"
 
 #: ../panels/color/color.ui.h:42
 msgid "_Remove profile"
-msgstr "Thoi_r air falbh a' phròifil"
+msgstr "Thoi_r air falbh a’ phròifil"
 
 #: ../panels/color/color.ui.h:43
 msgid "_View details"
@@ -787,7 +780,7 @@ msgstr "_Seall am mion-fhiosrachadh"
 #: ../panels/color/color.ui.h:44
 msgid "Unable to detect any devices that can be color managed"
 msgstr ""
-"Cha do mhothaich sinn dha dh'uidheam sam bith a ghabhas na dathan a "
+"Cha do mhothaich sinn dha dh’uidheam sam bith a ghabhas na dathan a "
 "stiùireadh dha"
 
 #: ../panels/color/color.ui.h:45
@@ -894,15 +887,15 @@ msgstr ""
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:5
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr ""
-"Color;ICC;Profile;Calibrate;Printer;Display;dath;ICC;pròifil;cailbhrich;cail"
-"bhreachadh;clò-bhualadair;taisbeanadh;uidheam-taisbenaidh;sgrìn;"
+"Color;ICC;Profile;Calibrate;Printer;Display;dath;ICC;pròifil;cailbhrich;"
+"cailbhreachadh;clò-bhualadair;taisbeanadh;uidheam-taisbenaidh;sgrìn;"
 
 #: ../panels/common/cc-common-language.c:323
 msgid "Other…"
 msgstr "Eile…"
 
 #: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-format-chooser.c:269
 #: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "Barrachd…"
@@ -912,12 +905,12 @@ msgid "No languages found"
 msgstr "Cha deach cànan a lorg"
 
 #: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: ../panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "An-diugh"
 
 #: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "An-dè"
 
@@ -951,17 +944,17 @@ msgid "Year"
 msgstr "Bliadhna"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: ../panels/datetime/cc-datetime-panel.c:339
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%e %B %Y, %l:%M %P"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:345
+#: ../panels/datetime/cc-datetime-panel.c:344
 msgid "%e %B %Y, %R"
 msgstr "%e %B %Y, %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: ../panels/datetime/cc-datetime-panel.c:522
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -969,7 +962,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: ../panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -977,23 +970,23 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:561
+#: ../panels/datetime/cc-datetime-panel.c:560
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: ../panels/datetime/cc-datetime-panel.c:565
 msgid "%l:%M %p"
 msgstr "%l:%M %P"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:571
+#: ../panels/datetime/cc-datetime-panel.c:570
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: ../panels/datetime/cc-datetime-panel.c:575
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
@@ -1108,7 +1101,7 @@ msgstr "m/f"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
 msgid "Change the date and time, including time zone"
-msgstr "Atharraich an ceann-là 's an t-àm, a' gabhail a-steach na roinne-tìde"
+msgstr "Atharraich an ceann-là ’s an t-àm, a’ gabhail a-steach na roinne-tìde"
 
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
@@ -1117,185 +1110,161 @@ msgstr "Clock;Timezone;Location;gleoc;cleoc;roinn-tìde;ionad;àite;"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
 msgid "Change system time and date settings"
-msgstr "Atharraich roghainnean àm 's ceann-là an t-siostaim"
+msgstr "Atharraich roghainnean àm ’s ceann-là an t-siostaim"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
 msgid "To change time or date settings, you need to authenticate."
 msgstr ""
-"Feumaidh tu dearbhadh a dhèanamh gus roghainnean an ama no a' chinn-là "
+"Feumaidh tu dearbhadh a dhèanamh gus roghainnean an ama no a’ chinn-là "
 "atharrachadh."
 
-#: ../panels/display/cc-display-panel.c:592
-msgid "Lid Closed"
-msgstr "Mullach dùinte"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:595
-msgid "Mirrored"
-msgstr "Sgàthanaichte"
-
-#: ../panels/display/cc-display-panel.c:597
-#: ../panels/display/cc-display-panel.c:2449
-msgid "Primary"
-msgstr "Prìomh-phanail"
-
-#: ../panels/display/cc-display-panel.c:599
-#: ../panels/display/cc-display-panel.c:2786
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-#: ../panels/universal-access/uap.ui.h:6
-msgid "Off"
-msgstr "Dheth"
-
-#: ../panels/display/cc-display-panel.c:602
-msgid "Secondary"
-msgstr "Panail dhàrnach"
-
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1577
-msgid "Arrange Combined Displays"
-msgstr "Cuir air gleus na co-thaisbeanaidhean"
-
-#: ../panels/display/cc-display-panel.c:1581
-#: ../panels/display/cc-display-panel.c:2227
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "Cuir _an sàs"
-
-#: ../panels/display/cc-display-panel.c:1605
-msgid "Drag displays to rearrange them"
-msgstr ""
-"Slaod na h-uidheaman-taisbeanaidh mun cuairt gus an t-òrdugh atharrachadh"
-
-#. translators: example string is "60 Hz (NTSC)"
-#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1812
-#, c-format
-msgid "%d Hz (NTSC)"
-msgstr "%d Hz (NTSC)"
-
-#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1818
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
-#: ../panels/display/cc-display-panel.c:2279
-msgid "Rotate counterclockwise by 90°"
-msgstr "Cuairtich gu tuathail le 90°"
+#: ../panels/display/cc-display-panel.c:747
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Dreach-tìre"
 
-#: ../panels/display/cc-display-panel.c:2297
-msgid "Rotate by 180°"
-msgstr "Cuairtich le 180°"
+#: ../panels/display/cc-display-panel.c:750
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Portraid dheas"
 
-#: ../panels/display/cc-display-panel.c:2315
-msgid "Rotate clockwise by 90°"
-msgstr "Cuairtich gu deiseil le 90°"
+#: ../panels/display/cc-display-panel.c:753
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Portraid chlì"
 
-#: ../panels/display/cc-display-panel.c:2336
-msgid "Size"
-msgstr "Meud"
+#: ../panels/display/cc-display-panel.c:756
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Dreach-tìre (air a chuairteachadh)"
 
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2351
-msgid "Aspect Ratio"
-msgstr "Co-mheas an deilbh"
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/display/cc-display-panel.c:797
+#: ../panels/display/cc-display-panel.c:847
+#: ../panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "Comhair"
 
-#: ../panels/display/cc-display-panel.c:2374
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/display/cc-display-panel.c:890
+#: ../panels/display/cc-display-panel.c:942
+#: ../panels/display/cc-display-panel.c:1769
+#: ../panels/display/cc-display-panel.c:1815
+#: ../panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "Dùmhlachd-bhreacaidh"
 
-#: ../panels/display/cc-display-panel.c:2394
-msgid "Adjust for TV"
-msgstr "Gleus airson TBh"
-
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:987
+#: ../panels/display/cc-display-panel.c:1058
 msgid "Refresh Rate"
 msgstr "Tricead an ath-nuadhachaidh"
 
-#: ../panels/display/cc-display-panel.c:2450
-msgid "Show the top bar and Activities Overview on this display"
-msgstr ""
-"Seall am bàr mullaich is foir-shealladh na gnìomhachd air an uidheam-"
-"taisbeanaidh seo"
+#: ../panels/display/cc-display-panel.c:1195
+#| msgctxt "background, style"
+#| msgid "Scale"
+msgid "Scale"
+msgstr "Sgèile"
 
-#: ../panels/display/cc-display-panel.c:2456
-msgid "Secondary Display"
-msgstr "Uidheam-taisbeanaidh dàrnach"
+#: ../panels/display/cc-display-panel.c:1248
+msgid "Adjust for TV"
+msgstr "Gleus airson TBh"
 
-#: ../panels/display/cc-display-panel.c:2457
-msgid "Join this display with another to create an extra workspace"
+#: ../panels/display/cc-display-panel.c:1486
+#: ../panels/display/cc-display-panel.c:1535
+#| msgid "Secondary Display"
+msgid "Primary Display"
+msgstr "Am prìomh uidheam-taisbeanaidh"
+
+#: ../panels/display/cc-display-panel.c:1564
+#| msgid "Display Mapping"
+msgid "Display Arrangement"
+msgstr "Rian nan uidheaman-taisbeanaidh"
+
+#: ../panels/display/cc-display-panel.c:1565
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
 msgstr ""
-"Cuir an t-uidheam-taisbeanaidh seo còmhla ri fear eile airson rum-obrach a "
-"bharrachd a chruthachadh"
+"Slaod na h-uidheaman-taisbeanaidh gus am bidh iad a-rèir an t-suidheachaidh "
+"agad. Thèid am bàr-barra a chur air a’ phrìomh uidheam-taisbeanaidh"
 
-#: ../panels/display/cc-display-panel.c:2464
-msgid "Presentation"
-msgstr "Taisbeanadh"
+#: ../panels/display/cc-display-panel.c:2005
+#| msgid "Display Type"
+msgid "Display Mode"
+msgstr "Modh an taisbeanaidh"
 
-#: ../panels/display/cc-display-panel.c:2465
-msgid "Show slideshows and media only"
-msgstr "Na seall ach taisbeanaidhean-shleamhnagan is meadhanan"
+#: ../panels/display/cc-display-panel.c:2021
+#| msgid "Dis­plays"
+msgid "Join Displays"
+msgstr "Cuir na h-uidheaman-taisbeanaidh còmhla"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2470
+#: ../panels/display/cc-display-panel.c:2024
 msgid "Mirror"
 msgstr "Sgàthanaich"
 
-#: ../panels/display/cc-display-panel.c:2471
-msgid "Show your existing view on both displays"
-msgstr "Seall an sealladh làithreach agad air an dà uidheam-taisbeanaidh"
+#: ../panels/display/cc-display-panel.c:2027
+#| msgid "Secondary Display"
+msgid "Single Display"
+msgstr "Mar aon uidheam-taisbeanaidh"
 
-#: ../panels/display/cc-display-panel.c:2477
-msgid "Turn Off"
-msgstr "Cuir dheth"
+#: ../panels/display/cc-display-panel.c:2740
+msgid "Apply Changes?"
+msgstr "A bheil thu airson na h-atharraichean a chur an sàs?"
 
-#: ../panels/display/cc-display-panel.c:2478
-#| msgid "Don't use this display"
-msgid "Don’t use this display"
-msgstr "Na cleachd an t-uidheam-taisbeanaidh seo"
+#: ../panels/display/cc-display-panel.c:2754
+#: ../panels/network/connection-editor/connection-editor.ui.h:2
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Apply"
+msgstr "Cuir _an sàs"
+
+#: ../panels/display/cc-display-panel.c:3129
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:2786
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/display/cc-display-panel.c:3345
+#: ../panels/notifications/cc-notifications-panel.c:292
+#: ../panels/power/cc-power-panel.c:1976 ../panels/power/cc-power-panel.c:1983
 #: ../panels/privacy/cc-privacy-panel.c:190
 #: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
 msgid "On"
 msgstr "Air"
 
-#: ../panels/display/cc-display-panel.c:2826
-msgid "Could not get screen information"
-msgstr "Cha b' urrainn dhuinn fiosrachadh na sgrìn fhaighinn"
-
-#: ../panels/display/cc-display-panel.c:2857
-msgid "_Arrange Combined Displays"
-msgstr "Cuir _air gleus na co-thaisbeanaidhean"
+#: ../panels/display/cc-display-panel.c:3345 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:292
+#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1981
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+#: ../panels/universal-access/uap.ui.h:7
+msgid "Off"
+msgstr "Dheth"
 
-#: ../panels/display/cc-display-panel.c:2878
-#| msgid "Right Ring"
+#: ../panels/display/cc-display-panel.c:3366
 msgid "_Night Light"
 msgstr "Solas _oidhche"
 
+#: ../panels/display/cc-display-panel.c:3431
+msgid "Could not get screen information"
+msgstr "Cha b’ urrainn dhuinn fiosrachadh na sgrìn fhaighinn"
+
 #. This cancels the redshift inhibit.
 #: ../panels/display/display.ui.h:2
-#| msgid "Restart Now"
 msgid "Restart Filter"
-msgstr "Ath-thòisich a' chriathrag"
+msgstr "Ath-thòisich a’ chriathrag"
 
 #. Inhibit the redshift functionality until the next day starts
 #: ../panels/display/display.ui.h:4
@@ -1312,7 +1281,6 @@ msgstr ""
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
 #: ../panels/display/display.ui.h:7
-#| msgid "Right Ring"
 msgid "Night Light"
 msgstr "Solas oidhche"
 
@@ -1325,8 +1293,9 @@ msgid "Sunset to Sunrise"
 msgstr "O laighe gu èirigh na grèine"
 
 #: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
 #: ../panels/network/network-wifi.ui.h:26
 #: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
@@ -1367,81 +1336,99 @@ msgstr ""
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:5
-#| msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
 msgid ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
 "redshift;color;sunset;sunrise;"
 msgstr ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;panail;proiseactar;"
-"tilgear;sgrìn;dùmhlachd-bhreacaidh;ath-nuadhaich;ath-"
-"nuadhachadh;monatar;solar;oidhche;gorm;dearg;dath;laighe na grèine;èirigh na "
-"grèine;"
+"tilgear;sgrìn;dùmhlachd-bhreacaidh;ath-nuadhaich;ath-nuadhachadh;monatar;"
+"solar;oidhche;gorm;dearg;dath;laighe na grèine;èirigh na grèine;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:384 ../panels/network/panel-common.c:123
+#: ../panels/info/cc-info-overview-panel.c:381
+#: ../panels/info/cc-info-overview-panel.c:468
+#: ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Chan eil fhios"
 
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture and the build id, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or
-#. * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)"
-#: ../panels/info/cc-info-panel.c:517
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: ../panels/info/cc-info-overview-panel.c:476
 #, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d-biod (ID na togail: %s)"
+#| msgid "%d-bit (Build ID: %s)"
+msgid "%s; Build ID: %s"
+msgstr "%s; ID na togail: %s"
 
-#: ../panels/info/cc-info-panel.c:519
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
 #, c-format
-msgid "%d-bit (Build ID: %s)"
-msgstr "%d-biod (ID na togail: %s)"
+#| msgid "%d-bit"
+msgid "64-bit"
+msgstr "64-biod"
 
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit"
-#: ../panels/info/cc-info-panel.c:527
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
 #, c-format
-msgid "%s %d-bit"
-msgstr "%s %d-biod"
+#| msgid "%d-bit"
+msgid "32-bit"
+msgstr "32-biod"
 
-#: ../panels/info/cc-info-panel.c:529
+#: ../panels/info/cc-info-overview-panel.c:807
 #, c-format
-msgid "%d-bit"
-msgstr "%d-biod"
+msgid "Version %s"
+msgstr "Tionndadh %s"
+
+#: ../panels/info/cc-info-panel.c:138
+msgid "Section"
+msgstr "Earrann"
+
+#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "Foir-shealladh"
+
+#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "Aplacaidean tùsail"
 
-#: ../panels/info/cc-info-panel.c:1175
+#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "Meadhan so-ghiùlain"
+
+#: ../panels/info/cc-info-removable-media-panel.c:312
 msgid "Ask what to do"
 msgstr "Faighnich dhìom"
 
-#: ../panels/info/cc-info-panel.c:1179
+#: ../panels/info/cc-info-removable-media-panel.c:316
 msgid "Do nothing"
 msgstr "Na dèan dad"
 
-#: ../panels/info/cc-info-panel.c:1183
+#: ../panels/info/cc-info-removable-media-panel.c:320
 msgid "Open folder"
 msgstr "Fosgail am pasgan"
 
-#: ../panels/info/cc-info-panel.c:1274
+#: ../panels/info/cc-info-removable-media-panel.c:411
 msgid "Other Media"
 msgstr "Meadhanan eile"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-removable-media-panel.c:444
 msgid "Select an application for audio CDs"
 msgstr "Tagh aplacaid airson CDan fuaime"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-removable-media-panel.c:445
 msgid "Select an application for video DVDs"
 msgstr "Tagh aplacaid airson DVDan video"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-removable-media-panel.c:446
 msgid "Select an application to run when a music player is connected"
 msgstr "Tagh aplacaid a thèid a ruith nuair a cheanglar cluicheadair ciùil ris"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-removable-media-panel.c:447
 msgid "Select an application to run when a camera is connected"
 msgstr "Tagh aplacaid a thèid a ruith nuair a cheanglar camara ris"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-removable-media-panel.c:448
 msgid "Select an application for software CDs"
 msgstr "Tagh aplacaid airson CDan bathair-bhog"
 
@@ -1450,196 +1437,231 @@ msgstr "Tagh aplacaid airson CDan bathair-bhog"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1321
+#: ../panels/info/cc-info-removable-media-panel.c:460
 msgid "audio DVD"
 msgstr "DVD fuaime"
 
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-removable-media-panel.c:461
 msgid "blank Blu-ray disc"
 msgstr "diosg Blu-ray bàn"
 
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-removable-media-panel.c:462
 msgid "blank CD disc"
 msgstr "diosg CD bàn"
 
-#: ../panels/info/cc-info-panel.c:1324
+#: ../panels/info/cc-info-removable-media-panel.c:463
 msgid "blank DVD disc"
 msgstr "diosg DVD bàn"
 
-#: ../panels/info/cc-info-panel.c:1325
+#: ../panels/info/cc-info-removable-media-panel.c:464
 msgid "blank HD DVD disc"
 msgstr "diosg DVD HD bàn"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-removable-media-panel.c:465
 msgid "Blu-ray video disc"
 msgstr "diosg video Blu-ray bàn"
 
-#: ../panels/info/cc-info-panel.c:1327
+#: ../panels/info/cc-info-removable-media-panel.c:466
 msgid "e-book reader"
 msgstr "leughadair leabhair-d"
 
-#: ../panels/info/cc-info-panel.c:1328
+#: ../panels/info/cc-info-removable-media-panel.c:467
 msgid "HD DVD video disc"
 msgstr "diosg video DVD HD"
 
-#: ../panels/info/cc-info-panel.c:1329
+#: ../panels/info/cc-info-removable-media-panel.c:468
 msgid "Picture CD"
 msgstr "CD dhealbhan"
 
-#: ../panels/info/cc-info-panel.c:1330
+#: ../panels/info/cc-info-removable-media-panel.c:469
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1331
+#: ../panels/info/cc-info-removable-media-panel.c:470
 msgid "Video CD"
 msgstr "Video CD"
 
-#: ../panels/info/cc-info-panel.c:1332
+#: ../panels/info/cc-info-removable-media-panel.c:471
 msgid "Windows software"
 msgstr "Bathar-bog Windows"
 
-#: ../panels/info/cc-info-panel.c:1455
-msgid "Section"
-msgstr "Earrann"
-
-#: ../panels/info/cc-info-panel.c:1464 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "Foir-shealladh"
-
-#: ../panels/info/cc-info-panel.c:1470 ../panels/info/info.ui.h:21
-msgid "Default Applications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
+#| msgid "Default Applications"
+msgid "Defa­ult Applications"
 msgstr "Aplacaidean tùsail"
 
-#: ../panels/info/cc-info-panel.c:1475 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "Meadhan so-ghiùlain"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+#| msgid "Default Applications"
+msgid "Configure Default Applications"
+msgstr "Rèitich na h-placaidean tùsail"
 
-#: ../panels/info/cc-info-panel.c:1500
-#, c-format
-msgid "Version %s"
-msgstr "Tionndadh %s"
+#. Translators: those are keywords for the Default Applications panel
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+msgid "default;application;preferred;media;"
+msgstr ""
+"default;application;preferred;media;tùsail;bun-"
+"roghainn;bunaiteach;aplacaid;nas fheass;as fhearr;meadhan;meadhanan;"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "Mion-fhiosrachadh"
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
+msgid "Ab­out"
+msgstr "Mu dhèidhinn"
 
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 msgid "View information about your system"
 msgstr "Seall fiosrachadh mun t-siostam agad"
 
 #. sure that you use the same "translation" for those keywords
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"uidheam;siostam;fiosrachadh;cuimhne;pròiseasar;tionndadh;bunaiteach;aplacaid"
-";as fhearr;cd;dvd;usb;fuaim;video;diosg;so-ghiùlain;meadhanan;fèin-ruith;dev"
-"ice;system;information;memory;processor;version;default;application;preferre"
-"d;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "Tagh mar a thèid meadhanan eile a làimhseachadh"
-
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "_Gnìomh:"
-
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "_Seòrsa:"
-
-#: ../panels/info/info.ui.h:4
-msgid "Device name"
-msgstr "Ainm an uidheim"
-
-#: ../panels/info/info.ui.h:5
-msgid "Memory"
-msgstr "Cuimhne"
-
-#: ../panels/info/info.ui.h:6
-msgid "Processor"
-msgstr "Pròiseasar"
-
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "Bun-shiostam"
-
-#: ../panels/info/info.ui.h:9
-msgid "Disk"
-msgstr "Diosga"
+"uidheam;siostam;fiosrachadh;cuimhne;pròiseasar;tionndadh;bunaiteach;aplacaid;"
+"as fhearr;cd;dvd;usb;fuaim;video;diosg;so-ghiùlain;meadhanan;fèin-ruith;"
+"device;system;information;memory;processor;version;default;application;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 
-#: ../panels/info/info.ui.h:10
-msgid "Calculating…"
-msgstr "'Ga àireamhachadh…"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "De­tails"
+msgstr "Mion-fhiosrachadh"
 
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-msgstr "Grafaigeachd"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
+#| msgid "Removable Media"
+msgid "Remo­vable Media"
+msgstr "Meadhan so-ghiùlain"
 
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "Biortaileachadh"
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#| msgid "Removable Media"
+msgid "Configure Removable Media settings"
+msgstr "Rèitich roghainnean nam meadhanan so-ghiùlain"
 
-#: ../panels/info/info.ui.h:13
-msgid "Check for updates"
-msgstr "Thoir sùil airson ùrachaidhean"
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"uidheam;siostam;bunaiteach;aplacaid;as fhearr;cd;dvd;usb;fuaim;video;diosg"
+";so-ghiùlain;meadhanan;fèin-ruith;device;system;default;application;preferre"
+"d;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info-default-apps.ui.h:1
 msgid "_Web"
 msgstr "_Lìon"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info-default-apps.ui.h:2
 msgid "_Mail"
 msgstr "_Post"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info-default-apps.ui.h:3
 msgid "_Calendar"
 msgstr "_Mìosachan"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info-default-apps.ui.h:4
 msgid "M_usic"
 msgstr "C_eòl"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info-default-apps.ui.h:5
 msgid "_Video"
 msgstr "_Video"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info-default-apps.ui.h:6
+#: ../panels/info/info-removable-media.ui.h:5
 msgid "_Photos"
 msgstr "_Dealbhan"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-overview.ui.h:1
+msgid "Device name"
+msgstr "Ainm an uidheim"
+
+#: ../panels/info/info-overview.ui.h:2
+msgid "Memory"
+msgstr "Cuimhne"
+
+#: ../panels/info/info-overview.ui.h:3
+msgid "Processor"
+msgstr "Pròiseasar"
+
+#: ../panels/info/info-overview.ui.h:4
+msgid "Graphics"
+msgstr "Grafaigeachd"
+
+#. To translators: this field contains the distro name and version
+#: ../panels/info/info-overview.ui.h:6
+msgid "OS name"
+msgstr "Ainm an t-siostam-obrachaidh"
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+#| msgid "Security type"
+msgid "OS type"
+msgstr "Seòrsa an t-siostam-obrachaidh"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "Biortaileachadh"
+
+#: ../panels/info/info-overview.ui.h:10
+msgid "Disk"
+msgstr "Diosga"
+
+#: ../panels/info/info-overview.ui.h:11
+msgid "Calculating…"
+msgstr "’Ga àireamhachadh…"
+
+#: ../panels/info/info-overview.ui.h:12
+msgid "Check for updates"
+msgstr "Thoir sùil airson ùrachaidhean"
+
+#: ../panels/info/info-removable-media.ui.h:1
 msgid "Select how media should be handled"
 msgstr "Tagh mar a thèid am meadhan a làimhseachadh"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
 msgid "CD _audio"
 msgstr "CD _fuaime"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info-removable-media.ui.h:3
 msgid "_DVD video"
 msgstr "_DVD video"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info-removable-media.ui.h:4
 msgid "_Music player"
 msgstr "_Cluicheadair ciùil"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
 msgid "_Software"
 msgstr "_Bathar-bog"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
 msgid "_Other Media…"
 msgstr "_Meadhanan eile…"
 
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info-removable-media.ui.h:8
 msgid "_Never prompt or start programs on media insertion"
 msgstr ""
-"_Na dèan brodadh 's na tòisich prògraman ma thèid meadhan a chur a-steach"
+"_Na dèan brodadh ’s na tòisich prògraman ma thèid meadhan a chur a-steach"
+
+#: ../panels/info/info-removable-media.ui.h:9
+msgid "Select how other media should be handled"
+msgstr "Tagh mar a thèid meadhanan eile a làimhseachadh"
+
+#: ../panels/info/info-removable-media.ui.h:10
+msgid "_Action:"
+msgstr "_Gnìomh:"
+
+#: ../panels/info/info-removable-media.ui.h:11
+msgid "_Type:"
+msgstr "_Seòrsa:"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
@@ -1663,11 +1685,11 @@ msgstr "Cuir gu dol cluicheadair nam meadhanan"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:6
 msgid "Play (or play/pause)"
-msgstr "Cluich (no cluich/cuir 'na stad)"
+msgstr "Cluich (no cluich/cuir ’na stad)"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:7
 msgid "Pause playback"
-msgstr "Cuir a chluich 'na stad"
+msgstr "Cuir a chluich ’na stad"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:8
 msgid "Stop playback"
@@ -1686,7 +1708,7 @@ msgid "Eject"
 msgstr "Gluais a-mach"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:12
 msgid "Typing"
 msgstr "Sgrìobhadh"
 
@@ -1706,8 +1728,8 @@ msgstr "Lòinsearan"
 msgid "Launch help browser"
 msgstr "Cuir gu dol brabhsair na cobharach"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:277
-#: ../shell/alt/cc-window.c:830 ../shell/cc-window.c:1590
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
+#: ../shell/cc-window.c:251 ../shell/cc-window.c:835
 #: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "Roghainnean"
@@ -1718,7 +1740,7 @@ msgstr "Cuir gu dol an t-àireamhair"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:5
 msgid "Launch email client"
-msgstr "Cuir gu dol cliant a' phuist-d"
+msgstr "Cuir gu dol cliant a’ phuist-d"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launch web browser"
@@ -1816,9 +1838,9 @@ msgstr "Dèan an teacsa nas lugha"
 msgid "High contrast on or off"
 msgstr "Iomsgaradh àrd air no dheth"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:512
-#: ../panels/keyboard/cc-keyboard-manager.c:520
-#: ../panels/keyboard/cc-keyboard-manager.c:828
+#: ../panels/keyboard/cc-keyboard-manager.c:506
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "Ath-ghoiridean gnàthaichte"
 
@@ -1829,8 +1851,9 @@ msgstr "Ath-ghoiridean gnàthaichte"
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/keyboard-shortcuts.c:435
 #: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/network-proxy.ui.h:4
 #: ../panels/network/network-wifi.ui.h:31
 #: ../panels/sound/gvc/gvc-mixer-control.c:1866
 #: ../panels/user-accounts/um-fingerprint-dialog.c:214
@@ -1843,7 +1866,7 @@ msgstr "À comas"
 #.
 #: ../panels/keyboard/cc-keyboard-option.c:354
 msgid "Alternative Characters Key"
-msgstr "Roghainn eile de dh'iuchair caractair"
+msgstr "Roghainn eile de dh’iuchair caractair"
 
 #. Translators: The Compose key is used to initiate key
 #. * sequences that are combined to form a single character.
@@ -1858,7 +1881,6 @@ msgid "Modifiers-only switch to next source"
 msgstr "Gluaisidh na h-iuchraichean atharrachaidh dhan ath-thùs thu"
 
 #: ../panels/keyboard/cc-keyboard-panel.c:181
-#| msgid "Set Shortcut"
 msgid "Reset All Shortcuts?"
 msgstr "A bheil thu airson na h-ath-ghoiridean uile ath-shuidheachadh?"
 
@@ -1867,48 +1889,50 @@ msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 msgstr ""
+"Ma nì thu ath-shuidheachadh air na h-ath-ghoiridean agad, dh’fhaoidte gum bi "
+"buaidh air sin air na h-ath-ghoiridean gnàthaichte agad. Cha ghabh sin a "
+"neo-dhèanamh."
 
 #: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/keyboard/shortcut-editor.ui.h:9
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 msgid "Cancel"
 msgstr "Sguir dheth"
 
 #: ../panels/keyboard/cc-keyboard-panel.c:189
-#, fuzzy
 #| msgid "Reset"
 msgid "Reset All"
-msgstr "Ath-shuidhich"
+msgstr "Ath-shuidhich na h-uile"
 
 #: ../panels/keyboard/cc-keyboard-panel.c:281
 msgid "Reset the shortcut to its default value"
 msgstr "Ath-shuidhich an ath-ghoirid air a luach tùsail"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:433
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
 msgstr ""
-"Tha %s 'ga chleachdadh airson <b>%s</b> mar-thà. Ma chuireas tu rud 'na "
+"Tha %s ’ga chleachdadh airson <b>%s</b> mar-thà. Ma chuireas tu rud ’na "
 "àite, thèid %s a chur à comas"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Custom Shortcut"
 msgstr "Suidhich ath-ghoirid ghnàthaichte"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Shortcut"
 msgstr "Suidhich ath-ghoirid"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:608
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
-msgstr "Cuir a-steach an ath-ghoirid a dh'atharrachadh <b>%s</b>."
+msgstr "Cuir a-steach an ath-ghoirid a dh’atharrachadh <b>%s</b>."
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1036
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
 msgid "Add Custom Shortcut"
 msgstr "Cuir ath-ghoirid ghnàthaichte ris"
 
@@ -1920,44 +1944,50 @@ msgstr "Meur-chlàr"
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr ""
-"Seall is atharraich ath-ghoiridean a' mheur-chlàir agad is suidhich na "
+"Seall is atharraich ath-ghoiridean a’ mheur-chlàir agad is suidhich na "
 "roghainnean sgrìobhaidh agad"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Ath-ghoirid;Ath-dhèan;Priobadh;"
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;ath-"
+"ghoirid;rum-obrach;uinneag;meud;meudaich;ath-mheudaich;ath-"
+"mheudachadh;sùm;iomsgaradh;ion-chur;cur a-steach;cuir "
+"a-steach;tùs;glas;glais;iom-dhraibh;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
 #: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
 msgid "Keyboard Shortcuts"
-msgstr "Ath-ghoiridean a' mheur-chlàir"
+msgstr "Ath-ghoiridean a’ mheur-chlàir"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 msgid "Reset All…"
-msgstr ""
+msgstr "Ath-shuidhich na h-uile…"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#, fuzzy
 #| msgid "Reset the shortcut to its default value"
 msgid "Reset all shortcuts to their default keybindings"
-msgstr "Ath-shuidhich an ath-ghoirid air a luach tùsail"
+msgstr "Ath-shuidhich na h-ath-ghoiridean uile air an luachan tùsail"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "No keyboard shortcut found"
-msgstr "Cha deach ath-ghoirid a' mheur-chlàir a lorg"
+msgstr "Cha deach ath-ghoirid a’ mheur-chlàir a lorg"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
 msgid "Try a different search"
 msgstr "Feuch lorg eile"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "Brùth air Esc airson sgur dheth."
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgstr ""
+"Brùth air Esc airson sgud dheth no air Backspace gus ath-ghoirid a’ mheur-"
+"chlàir ath-shuidheachadh."
 
 #: ../panels/keyboard/shortcut-editor.ui.h:3
 #: ../panels/printers/details-dialog.ui.h:1
-#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-mixer-dialog.c:1499
 #: ../panels/sound/gvc-sound-theme-chooser.c:564
 msgid "Name"
 msgstr "Ainm"
@@ -1971,10 +2001,9 @@ msgid "Shortcut"
 msgstr "Ath-ghoirid"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:6
-#, fuzzy
 #| msgid "Set Shortcut"
 msgid "Set Shortcut…"
-msgstr "Suidhich ath-ghoirid"
+msgstr "Suidhich ath-ghoirid…"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:7
 #: ../panels/network/network-wifi.ui.h:20
@@ -1982,22 +2011,20 @@ msgid "None"
 msgstr "Chan eil gin"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:8
-msgid "Remove"
-msgstr "Thoir air falbh"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:9
 msgid "Enter the new shortcut"
 msgstr "Cuir an-steach an ath-ghoirid ùr"
 
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Remove"
+msgstr "Thoir air falbh"
+
 #: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
 msgid "Add"
 msgstr "Cuir ris"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:12
 msgid "Replace"
-msgstr "Cuir 'na àite"
+msgstr "Cuir ’na àite"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:13
 msgid "Set"
@@ -2016,7 +2043,7 @@ msgstr "An luchag ⁊ am pada-suathaidh"
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr ""
-"Atharraich mothalachd na luchaige no a' phada-suathaidh agad is tagh tè "
+"Atharraich mothalachd na luchaige no a’ phada-suathaidh agad is tagh tè "
 "deas- no chlì-làmhach"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
@@ -2058,7 +2085,7 @@ msgstr "Luaths na luchaige"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgid "Double-click timeout"
-msgstr "Crìoch-ùine a' bhriogaidh dhùbailte"
+msgstr "Crìoch-ùine a’ bhriogaidh dhùbailte"
 
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
 #: ../panels/mouse/gnome-mouse-properties.ui.h:10
@@ -2067,7 +2094,7 @@ msgstr "Sgroladh nàdarra"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgid "Scrolling moves the content, not the view."
-msgstr "Gluaisidh an sgroladh an t-susbaint 's cha ghluais an sealladh."
+msgstr "Gluaisidh an sgroladh an t-susbaint ’s cha ghluais an sealladh."
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgid "Touchpad"
@@ -2075,7 +2102,7 @@ msgstr "Pada-suathaidh"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Touchpad Speed"
-msgstr "Luaths a' phada-shuathaidh"
+msgstr "Luaths a’ phada-shuathaidh"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Tap to Click"
@@ -2122,13 +2149,8 @@ msgstr "Briogadh dùbailte, an dàrna putan"
 msgid "Single click, secondary button"
 msgstr "Briogadh singilte, an dàrna putan"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:347
-msgid "Air_plane Mode"
-msgstr "Modh ite_alain"
-
-#: ../panels/network/cc-network-panel.c:1017
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:579
 msgid "Network proxy"
 msgstr "Progsaidh lìonraidh"
 
@@ -2136,52 +2158,59 @@ msgstr "Progsaidh lìonraidh"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1196 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192
+#: ../panels/network/net-vpn.c:321
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1263
+#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr ""
-"Ìoc, chaidh rudeigin cearr. Cuir fios gu reiceadair a' bhathair-bhog agad."
+"Ìoc, chaidh rudeigin cearr. Cuir fios gu reiceadair a’ bhathair-bhog agad."
 
-#: ../panels/network/cc-network-panel.c:1269
+#: ../panels/network/cc-network-panel.c:785
 msgid "NetworkManager needs to be running."
-msgstr "Feumaidh NetworkManager a bhith a' ruith."
+msgstr "Feumaidh NetworkManager a bhith a’ ruith."
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/cc-wifi-panel.c:212
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
+#: ../panels/network/network-wifi.ui.h:58
+msgid "Wi-Fi"
+msgstr "WiFi"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:1
 msgid "802.1x _Security"
 msgstr "_Tèarainteachd 802.1x"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/connection-editor/security-page.ui.h:2
 #: ../panels/wacom/wacom-stylus-page.ui.h:8
 msgid "page 1"
 msgstr "duilleag 1"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 msgid "Anony_mous identity"
 msgstr "Gun _urra"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:4
 msgid "Inner _authentication"
 msgstr "De_arbhadh a-staigh"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
+#: ../panels/network/connection-editor/security-page.ui.h:5
 #: ../panels/wacom/wacom-stylus-page.ui.h:16
 msgid "page 2"
 msgstr "duilleag 2"
 
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
+#: ../panels/network/connection-editor/ce-page-security.c:445
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
@@ -2197,47 +2226,47 @@ msgid "Profile %d"
 msgstr "Pròifil %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:215
-#: ../panels/network/net-device-wifi.c:391
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/net-device-wifi.c:407
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:396
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:412
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:223
+#: ../panels/network/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:239
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:228
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:233
-#: ../panels/network/net-device-wifi.c:381
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:249
+#: ../panels/network/net-device-wifi.c:397
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/network/connection-editor/ce-page-details.c:95
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "Chan ann idir"
 
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:110
 #: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:486
+#: ../panels/network/net-device-wifi.c:506
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2247,173 +2276,118 @@ msgstr[2] "%i làithean air ais"
 msgstr[3] "%i latha air ais"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/connection-editor/ce-page-details.c:176
 #: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:544
+#: ../panels/network/net-device-wifi.c:562
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:591
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:593
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Lag"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:595
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ceart ma-thà"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:597
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Math"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:581
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:599
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Fìor-mhath"
 
-#: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:269
+#: ../panels/network/connection-editor/ce-page-details.c:248
+#| msgid "Export VPN connection"
+msgid "Forget Connection"
+msgstr "Dìochuimhnich an ceangal"
+
+#: ../panels/network/connection-editor/ce-page-details.c:250
+#| msgid "Connection failed"
+msgid "Remove Connection Profile"
+msgstr "Thoir air falbh pròifil a’ cheangail"
+
+#: ../panels/network/connection-editor/ce-page-details.c:252
+#| msgid "Remove"
+msgid "Remove VPN"
+msgstr "Thoir air falbh a’ VPN"
+
+#: ../panels/network/connection-editor/ce-page-details.c:280
+#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
 #: ../shell/panel-list.ui.h:2
 msgid "Details"
 msgstr "Mion-fhiosrachadh"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:215
-#: ../panels/network/connection-editor/ce-page-vpn.c:221
-#: ../panels/network/connection-editor/ce-page-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-ethernet.c:174
+#: ../panels/network/connection-editor/ce-page-vpn.c:188
+#: ../panels/network/connection-editor/ce-page-wifi.c:194
 #: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "Dearbh-aithne"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-#: ../panels/printers/details-dialog.ui.h:3
-msgid "Address"
-msgstr "Seòladh"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
-msgid "Netmask"
-msgstr "Netmask"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "Bealach"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: ../panels/network/connection-editor/ce-page-ip4.c:251
+#: ../panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "Sguab às an seòladh"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "Frithealaiche"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
-msgid "Delete DNS Server"
-msgstr "Sguab às am frithealaiche DNS"
-
-#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "Meatraigeachd"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: ../panels/network/connection-editor/ce-page-ip4.c:422
+#: ../panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "Sguab às an t-slighe"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "Fèin-obrachail (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "Link-Local a-mhàin"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:980
+#: ../panels/network/connection-editor/ce-page-ip4.c:896
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
-msgid "Prefix"
-msgstr "Ro-leasachan"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "Fèin-obrachail"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "Fèin-obrachail, DHCP a-mhàin"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
+#: ../panels/network/connection-editor/ce-page-ip6.c:828
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-msgid "Reset"
-msgstr "Ath-shuidhich"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: ../panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../panels/network/connection-editor/ce-page-security.c:271
+#: ../panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Iuchair WEP 40/128-bit (Hex no ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:281
+#: ../panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "Abairt-fhaire WEP 128-bit"
 
-#: ../panels/network/connection-editor/ce-page-security.c:294
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: ../panels/network/connection-editor/ce-page-security.c:291
+#: ../panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: ../panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:321
+#: ../panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
 
-#: ../panels/network/connection-editor/ce-page-security.c:335
+#: ../panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ⁊ WPA2 Enterprise"
 
@@ -2425,11 +2399,10 @@ msgstr "Neart an t-siognail"
 #: ../panels/network/connection-editor/details-page.ui.h:2
 #: ../panels/network/network-wifi.ui.h:5
 msgid "Link speed"
-msgstr "Astar a' cheangail"
+msgstr "Astar a’ cheangail"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
 #: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "Seòladh IPv4"
@@ -2438,14 +2411,12 @@ msgstr "Seòladh IPv4"
 #: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "Seòladh IPv6"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
 #: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "Seòladh bathair-chruaidh"
@@ -2453,17 +2424,15 @@ msgstr "Seòladh bathair-chruaidh"
 #: ../panels/network/connection-editor/details-page.ui.h:7
 #: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Default Route"
 msgstr "An t-slighe bhunaiteach"
 
 #: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: ../panels/network/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
 #: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
 msgid "DNS"
 msgstr "DNS"
@@ -2472,6 +2441,23 @@ msgstr "DNS"
 msgid "Last Used"
 msgstr "Air a chleachdadh an turas mu dheireadh"
 
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "Ce_angail gu fèin-obrachail"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "Cuir ri lài_mh chleachdaichean eile"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "Fèin-obrachail"
+
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
@@ -2528,117 +2514,117 @@ msgstr "Seòladh _clònaichte"
 msgid "bytes"
 msgstr "bytes"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "C_uir ri làimh chleachdaichean eile"
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#| msgid "_Method"
+msgid "IPv_4 Method"
+msgstr "Modh IPv_4"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "Ce_angail gu fèin-obrachail"
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "Fèin-obrachail (DHCP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "_Sòn na cachaileith-teine"
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "Link-Local a-mhàin"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-#: ../panels/network/connection-editor/firewall-helpers.c:118
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "Bun-roghainn"
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#| msgid "Disabled"
+msgid "Disable"
+msgstr "Cuir à comas"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "Tha an sòn seo a' sònrachadh ìre earbsa a' cheangail"
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#| msgid "_Addresses"
+msgid "Addresses"
+msgstr "Seòlaidhean"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/printers/details-dialog.ui.h:3
+msgid "Address"
+msgstr "Seòladh"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "Seòl_aidhean"
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+msgid "Netmask"
+msgstr "Netmask"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "Bealach"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
 msgid "Automatic DNS"
 msgstr "DNS fèin-obrachail"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:13
+#: ../panels/network/connection-editor/ip6-page.ui.h:13
+msgid "Separate IP addresses with commas"
+msgstr "Sgaraich seòlaichean IP le cromagan"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:14
+#: ../panels/network/connection-editor/ip6-page.ui.h:14
 #: ../panels/network/network-wifi.ui.h:32
 msgid "Routes"
 msgstr "Slighean"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:15
+#: ../panels/network/connection-editor/ip6-page.ui.h:15
 msgid "Automatic Routes"
 msgstr "Slighean fèin-obrachail"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ip4-page.ui.h:17
+#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#| msgctxt "network parameters"
+#| msgid "Metric"
+msgid "Metric"
+msgstr "Meatraigeachd"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:18
+#: ../panels/network/connection-editor/ip6-page.ui.h:18
 #: ../panels/network/network-wifi.ui.h:34
 msgid "Use this connection _only for resources on its network"
 msgstr "Na cleachd an ceangal se_o ach airson goireasan air a lìonra fhèin"
 
 #: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv_6"
+#| msgid "_Method"
+msgid "IPv_6 Method"
+msgstr "Modh IPv_6"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "Fèin-obrachail, DHCP a-mhàin"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "Ro-leasachan"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "Chan urrainn dhuinn deasaiche nan ceanglaichean fhosgladh"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: ../panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "Pròifil ùr"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: ../panels/network/connection-editor/net-connection-editor.c:603
+#: ../panels/network/network.ui.h:2
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: ../panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "Ion-phortaich o fhaidhle…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: ../panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "Cuir ris VPN"
 
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "_Ath-shuidhich"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1586
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "_Dìochuimhnich"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr ""
-"Ath-shuidhich roghainnean an lìonraidh seo, a' gabhail a-steach nam faclan-"
-"faire, ach cuimhnich e mar lìonra as fhearr leat"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr ""
-"Thoir air falbh fiosrachadh sam bith mun lìonra seo 's na dèan ceangal ris "
-"gu fèin-obrachail a-rithist"
-
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
@@ -2649,7 +2635,7 @@ msgid "Cannot import VPN connection"
 msgstr "Chan urrainn dhuinn an ceangal VPN ion-phortadh"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:143
-#, fuzzy, c-format
+#, c-format
 #| msgid ""
 #| "The file '%s' could not be read or does not contain recognized VPN "
 #| "connection information\n"
@@ -2661,8 +2647,8 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"Cha b' urrainn dhuinn am faidhle \"%s\" a leughadh no chan eil dàta sam bith "
-"'na bhroinn leis an dèanar ceangal VPN\n"
+"Cha b’ urrainn dhuinn am faidhle “%s” a leughadh no chan eil dàta sam bith "
+"’na bhroinn leis an dèanar ceangal VPN\n"
 "\n"
 "Mearachd: %s."
 
@@ -2672,34 +2658,34 @@ msgstr "Tagh faidhle a thèid ion-phortadh"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:182
 #: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:376
-#: ../panels/user-accounts/um-photo-dialog.c:219
+#: ../panels/sharing/cc-sharing-panel.c:383
+#: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "F_osgail"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:230
-#, fuzzy, c-format
+#, c-format
 #| msgid "A file named \"%s\" already exists."
 msgid "A file named “%s” already exists."
-msgstr "Tha faidhle air a bheil \"%s\" ann mu thràth."
+msgstr "Tha faidhle air a bheil “%s” ann mu thràth."
 
 #: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
-msgstr "Cui_r 'na àite"
+msgstr "Cui_r ’na àite"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
-"A bheil thu airson an ceangal VPN a tha thu a' sàbhaladh a chur an àite \"%s"
-"\"?"
+"A bheil thu airson an ceangal VPN a tha thu a’ sàbhaladh a chur an àite “%"
+"s”?"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "Chan urrainn dhuinn an ceangal VPN às-phortadh"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:272
-#, fuzzy, c-format
+#, c-format
 #| msgid ""
 #| "The VPN connection '%s' could not be exported to %s.\n"
 #| "\n"
@@ -2709,7 +2695,7 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"Cha b' urrainn dhuinn an ceangal VPN \"%s\" às-phortadh gu %s.\n"
+"Cha b’ urrainn dhuinn an ceangal VPN “%s” às-phortadh gu %s.\n"
 "\n"
 "Mearachd: %s."
 
@@ -2717,7 +2703,7 @@ msgstr ""
 msgid "Export VPN connection"
 msgstr "Às-phortaich ceangal VPN"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
 msgid "(Error: unable to load VPN connection editor)"
 msgstr ""
 "(Mearachd: Chan urrainn dhuinn deasaiche nan ceanglaichean VPN a luchdadh)"
@@ -2737,10 +2723,6 @@ msgstr "_BSSID"
 msgid "My Home Network"
 msgstr "An lìonra-dhachaidh agam"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "Cuir ri lài_mh chleachdaichean eile"
-
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Net­work"
@@ -2759,18 +2741,33 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;lìonra,uèirleas,progsaidh;bann-leathann;drochaid;"
 
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#| msgid "Control how you connect to the Internet"
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "Stiùirich an dòigh a cheanglas tu ri lìonraidhean WiFi"
+
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;DNS;"
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;lìonra;uèirleas,bann-"
+"leathann;"
+
 #: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:472
+#: ../panels/network/net-device-wifi.c:492
 msgid "never"
 msgstr "Chan ann idir"
 
 #: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:482
+#: ../panels/network/net-device-wifi.c:502
 msgid "today"
 msgstr "an-diugh"
 
 #: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:484
+#: ../panels/network/net-device-wifi.c:504
 msgid "yesterday"
 msgstr "an-dè"
 
@@ -2790,17 +2787,17 @@ msgstr "Air a chleachdadh an turas mu dheireadh"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:280
+#: ../panels/network/net-device-ethernet.c:275
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "Uèirichte"
 
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1744
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1800
+#: ../panels/network/network-ethernet.ui.h:2
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
 msgid "Options…"
 msgstr "Roghainnean…"
 
@@ -2808,99 +2805,98 @@ msgstr "Roghainnean…"
 msgid "Add new connection"
 msgstr "Cuir ceangal ùr ris"
 
-#: ../panels/network/net-device-wifi.c:1254
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"Ma tha ceangal agad ris an eadar-lìon a bharrachd air a' cheangal uèirleas, "
-"'s urrainn dhut hotspot uèirleas a shuidheachadh gus an ceangal agad a cho-"
-"roinneadh le daoine eile."
-
-#: ../panels/network/net-device-wifi.c:1258
+#: ../panels/network/net-device-wifi.c:1282
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr ""
 "Ma chuireas tu air an hotspot uèirleas, thèid an ceangal ri <b>%s</b> a "
 "bhriseadh."
 
-#: ../panels/network/net-device-wifi.c:1262
+#: ../panels/network/net-device-wifi.c:1286
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr ""
-"Chan fhaigh thu cothrom air an eadar-lìon slighe a' cheangal uèirleas agad "
-"fhad 's a bhios an hotspot gnìomhach."
+"Chan fhaigh thu cothrom air an eadar-lìon slighe a’ cheangal uèirleas agad "
+"fhad ’s a bhios an hotspot gnìomhach."
+
+#: ../panels/network/net-device-wifi.c:1293
+#| msgid "Wi-Fi Hotspot"
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "A bheil thu airson an WiFi Hotspot a chur air?"
 
-#: ../panels/network/net-device-wifi.c:1344
+#: ../panels/network/net-device-wifi.c:1315
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr ""
+"Tha WiFi hotspots ’gan cleachdadh mar as trice gus ceangal a bharrachd dhan "
+"eadar-lìn a cho-roinneadh slighe WiFi."
+
+#: ../panels/network/net-device-wifi.c:1326
+msgid "_Turn On"
+msgstr "_Cuir air"
+
+#: ../panels/network/net-device-wifi.c:1403
 msgid "Stop hotspot and disconnect any users?"
 msgstr ""
 "A bheil thu airson stad a chur air an hotspot is cleachdaiche sam bith eile "
 "a dhì-cheangal?"
 
-#: ../panels/network/net-device-wifi.c:1347
+#: ../panels/network/net-device-wifi.c:1406
 msgid "_Stop Hotspot"
 msgstr "_Cuir stad air an hotspot"
 
-#: ../panels/network/net-device-wifi.c:1447
+#: ../panels/network/net-device-wifi.c:1503
 msgid "System policy prohibits use as a Hotspot"
 msgstr ""
 "Chan eil e ceadaichte a chleachdadh mar hotspot ri linn poileasaidh an t-"
 "siostaim"
 
-#: ../panels/network/net-device-wifi.c:1450
+#: ../panels/network/net-device-wifi.c:1506
 msgid "Wireless device does not support Hotspot mode"
-msgstr "Chan eil an t-uidheam uèirleas a' cur taic ris a' mhodh hotspot"
+msgstr "Chan eil an t-uidheam uèirleas a’ cur taic ris a’ mhodh hotspot"
 
-#: ../panels/network/net-device-wifi.c:1582
+#: ../panels/network/net-device-wifi.c:1638
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr ""
-"Thèid fiosrachadh nan lìonraidhean a thagh thu, a' gabhail a-steach an "
-"fhacail-fhaire 's rèiteachadh gnàthaichte sam bith, air chall."
+"Thèid fiosrachadh nan lìonraidhean a thagh thu, a’ gabhail a-steach an "
+"fhacail-fhaire ’s rèiteachadh gnàthaichte sam bith, air chall."
 
-#: ../panels/network/net-device-wifi.c:1892
-msgid "History"
-msgstr "An eachdraidh"
+#: ../panels/network/net-device-wifi.c:1642
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "_Dìochuimhnich"
 
-#: ../panels/network/net-device-wifi.c:1896
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "_Dùin"
+#: ../panels/network/net-device-wifi.c:1951
+#: ../panels/network/net-device-wifi.c:1958
+msgid "Known Wi-Fi Networks"
+msgstr "Lìonraidhean WiFi as aithne dhuinn"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1904
+#: ../panels/network/net-device-wifi.c:1991
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Dìochuimhnich"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
+#: ../panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
-"Nuair nach eil URL rèiteachaidh 'ga thoirt seachad, thèid fhèin-lorg "
+"Nuair nach eil URL rèiteachaidh ’ga thoirt seachad, thèid fhèin-lorg "
 "progsaidh lìonraidh a chleachdadh."
 
 #. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:75
+#: ../panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "Cha mholamaid seo air lìonraidhean poblach anns nach eil earbsa."
 
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "Progsaidh"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "Cui_r pròifil ris…"
-
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -2914,95 +2910,65 @@ msgid "Network"
 msgstr "Lìonra"
 
 #: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "Chan eil gin"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "A làimh"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "Gu fèin-obrachail"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "_Dòigh"
+#| msgid "Network proxy"
+msgid "Network Proxy"
+msgstr "Progsaidh lìonraidh"
 
 #: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "An URL _rèiteachaidh"
-
-#: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
 msgstr "Progsaidh _HTTP"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
 msgid "H_TTPS Proxy"
 msgstr "Progsaidh H_TTPS"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
 msgid "_FTP Proxy"
 msgstr "Progsaidh _FTP"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
 msgid "_Socks Host"
 msgstr "Òstair _Socks"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
 msgid "_Ignore Hosts"
 msgstr "Le_ig seachad òstairean"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
 msgid "HTTP proxy port"
 msgstr "Port progsaidh HTTP"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
 msgid "HTTPS proxy port"
 msgstr "Port progsaidh HTTPS"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
 msgid "FTP proxy port"
 msgstr "Port progsaidh FTP"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
 msgid "Socks proxy port"
 msgstr "Port progsaidh Socks"
 
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "An URL _rèiteachaidh"
+
+#: ../panels/network/network-simple.ui.h:2
 msgid "Turn device off"
 msgstr "Cuir an t-uidheam dheth"
 
+#. Translators: The found device is a printer connected via Bluetooth
 #: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "Cuir uidheam ris"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "Thoirt an t-uidheam air falbh"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr "Cha deach seo a shuidheachadh"
 
 #: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "Seòrsa an VPN"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "Ainm a' bhuidhinn"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "Facal-faire a' bhuidhinn"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
-msgid "Username"
-msgstr "Ainm-cleachdaiche"
-
-#: ../panels/network/network-vpn.ui.h:6
 msgid "Turn VPN connection off"
 msgstr "Cuir an ceangal VPN dheth"
 
@@ -3037,6 +3003,14 @@ msgstr "Cuir ri làimh chleachdaichean eile"
 msgid "identity"
 msgstr "dearbh-aithne"
 
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "Seòl_aidhean"
+
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "Seòlaidhean fèin-obrachail (DHCP) a-mhàin"
@@ -3057,6 +3031,10 @@ msgstr "Le_ig seachad slighean a fhuaras gu fèin-obrachail"
 msgid "ipv4"
 msgstr "ipv4"
 
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv_6"
+
 #: ../panels/network/network-wifi.ui.h:37
 msgid "ipv6"
 msgstr "ipv6"
@@ -3069,12 +3047,16 @@ msgstr "Seòladh MAC _clònaichte"
 msgid "hardware"
 msgstr "bathar-cruaidh"
 
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "_Ath-shuidhich"
+
 #: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
 msgstr ""
-"Aisig bun-roghainnean a' cheangail seo ach cuimhnich e mar cheangal as "
+"Aisig bun-roghainnean a’ cheangail seo ach cuimhnich e mar cheangal as "
 "fhearr leat."
 
 #: ../panels/network/network-wifi.ui.h:44
@@ -3082,7 +3064,7 @@ msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
 msgstr ""
-"Thoir air falbh fiosrachadh sam bith mun lìonra seo 's na dèan ceangal ris "
+"Thoir air falbh fiosrachadh sam bith mun lìonra seo ’s na dèan ceangal ris "
 "gu fèin-obrachail a-rithist"
 
 #: ../panels/network/network-wifi.ui.h:45
@@ -3094,7 +3076,6 @@ msgid "Hardware"
 msgstr "Bathar Cruaidh"
 
 #: ../panels/network/network-wifi.ui.h:51
-#, fuzzy
 #| msgid "Reset"
 msgctxt "tab"
 msgid "Reset"
@@ -3105,52 +3086,74 @@ msgid "Wi-Fi Hotspot"
 msgstr "WiFi Hotspot"
 
 #: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "_Cuir air"
-
-#: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "WiFi"
-
-#: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "Cuir am WiFi dheth"
-
-#: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "_Cleachd mar hotspot…"
-
-#: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "_Ceangail ri lìonra falaichte…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "An eachdraid_h"
-
-#: ../panels/network/network-wifi.ui.h:59
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Cuir dheth e gus ceangal a dhèanamh ri lìonra WiFi"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:54
 msgid "Network Name"
 msgstr "Ainm an lìonraidh"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: ../panels/network/network-wifi.ui.h:55
 msgid "Connected Devices"
 msgstr "Uidheaman a tha ceangailte ris"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:56
 msgid "Security type"
 msgstr "Seòrsa na tèarainteachd"
 
-#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/network/network-wifi.ui.h:57
 #: ../panels/printers/authentication-dialog.ui.h:5
 #: ../panels/printers/new-printer-dialog.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "Password"
 msgstr "Facal-faire"
 
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Turn Wi-Fi off"
+msgstr "Cuir am WiFi dheth"
+
+#: ../panels/network/network-wifi.ui.h:60
+msgid "_Connect to Hidden Network…"
+msgstr "_Ceangail ri lìonra falaichte…"
+
+#: ../panels/network/network-wifi.ui.h:61
+#| msgid "Wi-Fi Hotspot"
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "Cuir air WiFi Ho_tspot…"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "_Known Wi-Fi Networks"
+msgstr "_Lìonraidhean WiFi as aithne dhuinn"
+
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr ""
+"Dèan cinnteach gu bheil adaptar WiFi agad ceangailte agus air a chur air"
+
+#: ../panels/network/wifi.ui.h:2
+#| msgid "No Pictures Found"
+msgid "No Wi-Fi Adapter Found"
+msgstr "Cha deach adaptar WiFi a lorg"
+
+#: ../panels/network/wifi.ui.h:3
+#| msgid "Air_plane Mode"
+msgid "Airplane Mode"
+msgstr "Modh itealain"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Cuiridh seo WiFi, Bluetooth agus bann-leathann mobile à comas"
+
+#: ../panels/network/wifi.ui.h:5
+#| msgid "Networks"
+msgid "Visible Networks"
+msgstr "Lìonraidhean a chithear"
+
+#: ../panels/network/wifi.ui.h:6
+#| msgid "NetworkManager needs to be running."
+msgid "NetworkManager needs to be running"
+msgstr "Feumaidh NetworkManager a bhith a’ ruith"
+
 #. TRANSLATORS: AP type
 #: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
@@ -3181,7 +3184,7 @@ msgstr "Chan eil seo ri fhaighinn"
 #. TRANSLATORS: VPN status
 #: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
 msgid "Connecting"
-msgstr "A' ceangal"
+msgstr "A’ ceangal"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
@@ -3198,13 +3201,13 @@ msgstr "Ceangailte"
 #. TRANSLATORS: device status
 #: ../panels/network/panel-common.c:177
 msgid "Disconnecting"
-msgstr "A' briseadh a' cheangail"
+msgstr "A’ briseadh a’ cheangail"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
 #: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
 msgid "Connection failed"
-msgstr "Dh'fhàillig an ceangal"
+msgstr "Dh’fhàillig an ceangal"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
@@ -3220,17 +3223,17 @@ msgstr "Chan eil ceangal ann"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:248
 msgid "Configuration failed"
-msgstr "Dh'fhàillig an rèiteachadh"
+msgstr "Dh’fhàillig an rèiteachadh"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:252
 msgid "IP configuration failed"
-msgstr "Dh'fhàillig rèiteachadh an IP"
+msgstr "Dh’fhàillig rèiteachadh an IP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:256
 msgid "IP configuration expired"
-msgstr "Dh'fhalbh an ùine air rèiteachadh an IP"
+msgstr "Dh’fhalbh an ùine air rèiteachadh an IP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:260
@@ -3245,12 +3248,12 @@ msgstr "Chaidh an ceangal ris an athchuingiche 802.1x a bhriseadh"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
-msgstr "Dh'fhàillig rèiteachadh an athchuingiche 802.1x"
+msgstr "Dh’fhàillig rèiteachadh an athchuingiche 802.1x"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
-msgstr "Dh'fhàillig an t-athchuingiche 802.1x"
+msgstr "Dh’fhàillig an t-athchuingiche 802.1x"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:276
@@ -3260,7 +3263,7 @@ msgstr "Thug dearbhadh an t-athchuingiche 802.1x ro fhada"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:280
 msgid "PPP service failed to start"
-msgstr "Dh'fhàillig tòiseachadh na seirbheise PPP"
+msgstr "Dh’fhàillig tòiseachadh na seirbheise PPP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:284
@@ -3270,37 +3273,37 @@ msgstr "Chaidh an ceangal ris an t-seirbheis PPP a bhriseadh"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:288
 msgid "PPP failed"
-msgstr "Dh'fhàillig PPP"
+msgstr "Dh’fhàillig PPP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
-msgstr "Dh'fhàillig thòiseachadh a' chlianit DHCP"
+msgstr "Dh’fhàillig thòiseachadh a’ chliant DHCP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:296
 msgid "DHCP client error"
-msgstr "Mearachd a' chliaint DHCP"
+msgstr "Mearachd a’ chliant DHCP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:300
 msgid "DHCP client failed"
-msgstr "Dh'fhàillig an cliant DCHP"
+msgstr "Dh’fhàillig an cliant DCHP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
-msgstr "Dh'fhàillig tòiseachadh seirbheis a' cheangail cho-roinnte"
+msgstr "Dh’fhàillig tòiseachadh seirbheis a’ cheangail cho-roinnte"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed"
-msgstr "Dh'fhàillig seirbheis a' cheangail cho-roinnte"
+msgstr "Dh’fhàillig seirbheis a’ cheangail cho-roinnte"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
-msgstr "Dh'fhàillig tòiseachadh na seirbheise AutoIP"
+msgstr "Dh’fhàillig tòiseachadh na seirbheise AutoIP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:316
@@ -3310,7 +3313,7 @@ msgstr "Mearachd na seirbheise AutoIP"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:320
 msgid "AutoIP service failed"
-msgstr "Dh'fhàillig an t-seirbheis AutoIP"
+msgstr "Dh’fhàillig an t-seirbheis AutoIP"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:324
@@ -3325,32 +3328,32 @@ msgstr "Chan eil fuaim daithealaidh ann"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:332
 msgid "No carrier could be established"
-msgstr "Cha b' urrainn giùlanair a stèidheachadh"
+msgstr "Cha b’ urrainn giùlanair a stèidheachadh"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:336
 msgid "Dialing request timed out"
-msgstr "Dh'fhalbh an ùine air an iarrtas daithealaidh"
+msgstr "Dh’fhalbh an ùine air an iarrtas daithealaidh"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
-msgstr "Dh'fhàillig an oidhirp daithealaidh"
+msgstr "Dh’fhàillig an oidhirp daithealaidh"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:344
 msgid "Modem initialization failed"
-msgstr "Dh'fhàillig tòiseachadh a' mhòdaim"
+msgstr "Dh’fhàillig tòiseachadh a’ mhòdaim"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
-msgstr "Dh'fhàillig taghadh an APN a shònraich thu"
+msgstr "Dh’fhàillig taghadh an APN a shònraich thu"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:352
 msgid "Not searching for networks"
-msgstr "Chan eilear a' sireadh lìonraidhean"
+msgstr "Chan eilear a’ sireadh lìonraidhean"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:356
@@ -3360,27 +3363,27 @@ msgstr "Chaidh clàradh an lìonraidh a dhiùltadh"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:360
 msgid "Network registration timed out"
-msgstr "Dh'fhalbh an ùine air clàradh an lìonraidh"
+msgstr "Dh’fhalbh an ùine air clàradh an lìonraidh"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
-msgstr "Cha b' urrainn dhuinn clàradh aig an lìonra a dh'iarr thu"
+msgstr "Cha b’ urrainn dhuinn clàradh aig an lìonra a dh’iarr thu"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:368
 msgid "PIN check failed"
-msgstr "Dh'fhàillig sgrùdadh a' PIN"
+msgstr "Dh’fhàillig sgrùdadh a’ PIN"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
-msgstr "Dh'fhaoidte gu bheil am bathar-an-sàs airson an uidheim a dhìth"
+msgstr "Dh’fhaoidte gu bheil am bathar-an-sàs airson an uidheim a dhìth"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:376
 msgid "Connection disappeared"
-msgstr "Dh'fhalbh an ceangal"
+msgstr "Dh’fhalbh an ceangal"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:380
@@ -3395,7 +3398,7 @@ msgstr "Cha deach am mòdam a lorg"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
-msgstr "Dh'fhàillig an ceangal Bluetooth"
+msgstr "Dh’fhàillig an ceangal Bluetooth"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:392
@@ -3420,7 +3423,7 @@ msgstr "Tha an SIM cearr"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:408
 msgid "Connection dependency failed"
-msgstr "Dh'fhàillig eisimeileachd a' cheangail"
+msgstr "Dh’fhàillig eisimeileachd a’ cheangail"
 
 #. TRANSLATORS: device status
 #: ../panels/network/panel-common.c:433
@@ -3432,24 +3435,25 @@ msgstr "Tha bathar-an-sàs a dhìth"
 msgid "Cable unplugged"
 msgstr "Chan eil an càball a-staigh"
 
-#: ../panels/network/wireless-security/eap-method.c:69
-msgid "undefined error in 802.1x security (wpa-eap)"
-msgstr "mearachd gun sònrachadh san tèarainteachd 802.1x (wpa-eap)"
+#: ../panels/network/wireless-security/eap-method.c:57
+#| msgid "undefined error in 802.1x security (wpa-eap)"
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "mearachd gun sònrachadh san tèarainteachd 802.1X (wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:245
+#: ../panels/network/wireless-security/eap-method.c:233
 msgid "no file selected"
 msgstr "cha deach faidhle a thaghadh"
 
-#: ../panels/network/wireless-security/eap-method.c:276
+#: ../panels/network/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "mearachd gun sònrachadh le dearbhadh an fhaidhle eap-method"
 
-#: ../panels/network/wireless-security/eap-method.c:480
+#: ../panels/network/wireless-security/eap-method.c:439
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 "Iuchraichean prìobhaideach DER, PEM no PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:483
+#: ../panels/network/wireless-security/eap-method.c:442
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER no teisteanasan PEM (*.der, *.pem, *.crt, *.cer)"
 
@@ -3459,13 +3463,13 @@ msgstr "tha faidhle EAP-FAST PAC a dhìth"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:268
 #: ../panels/network/wireless-security/eap-method-peap.c:302
-#: ../panels/network/wireless-security/eap-method-ttls.c:333
+#: ../panels/network/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:283
 #: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:288
+#: ../panels/network/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
@@ -3478,37 +3482,28 @@ msgid "PAC files (*.pac)"
 msgstr "Faidhlichean PAC (*.pac)"
 
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:1
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/authentication-dialog.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "Gun urra"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Authenticated"
 msgstr "Air a dhearbhadh"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Both"
 msgstr "An dà chuid"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 msgid "PAC _file"
 msgstr "_Faidhle PAC"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
 msgid "_Inner authentication"
 msgstr "De_arbhadh a-staigh"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Ceadaich PAC _Provisioning fèin-obrachail"
 
@@ -3546,38 +3541,38 @@ msgstr ""
 "teisteanas EAP-PEAP CA mì-dhligheach: cha deach teisteanas a shònrachadh"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:318
-#: ../panels/network/wireless-security/wireless-security.c:439
+#: ../panels/network/wireless-security/eap-method-ttls.c:336
+#: ../panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:381
-#: ../panels/network/wireless-security/eap-method-tls.c:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:412
+#: ../panels/network/wireless-security/eap-method-tls.c:492
+#: ../panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "Tagh seirbheis ùghdarras theisteanasan"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Tionndadh 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 1"
 msgstr "Tionndadh 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 msgid "C_A certificate"
 msgstr "Teiste_anas le ùghdarras theisteanasan"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
 msgid "No CA certificate is _required"
 msgstr "Chan eil teisteanas CA _riatanach"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version"
 msgstr "Tionndadh _PEAP"
 
@@ -3603,43 +3598,45 @@ msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr ""
 "teisteanas EAP-TLS CA mì-dhligheach: cha deach teisteanas a shònrachadh"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:95
-msgid "invalid EAP-TLS password: missing"
-msgstr "facal-faire EAP-TLS mì-dhligheach: chan eil gin ann"
-
-#: ../panels/network/wireless-security/eap-method-tls.c:109
+#: ../panels/network/wireless-security/eap-method-tls.c:100
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "iuchair phrìobhaideach EAP-TLS mhì-dhligheach: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:119
+#: ../panels/network/wireless-security/eap-method-tls.c:110
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "teisteanas cleachdaiche EAP-TLS mì-dhligheach: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:316
+#: ../panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "Chan eil iuchraichean prìobhaideach gun chrioptachadh tèarainte"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:319
+#: ../panels/network/wireless-security/eap-method-tls.c:310
+#| msgid ""
+#| "The selected private key does not appear to be protected by a password.  "
+#| "This could allow your security credentials to be compromised.  Please "
+#| "select a password-protected private key.\n"
+#| "\n"
+#| "(You can password-protect your private key with openssl)"
 msgid ""
-"The selected private key does not appear to be protected by a password.  "
-"This could allow your security credentials to be compromised.  Please select "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
 "Tha coltas nach eil an iuchair phrìobhaideach a thagh thu air a "
 "chrioptachadh. Bheireadh sin cothrom do dhaoine an t-ainm is facal-faire "
-"agad a ghoid. Tagh iuchair a tha fo dhìon facail-fhaire.\n"
+"agad a ghoid. Tagh iuchair phrìobhaideach a tha fo dhìon facail-fhaire.\n"
 "\n"
-"('S urrainn dhut an iuchair phrìobhaideach agad a dhìon le openssl)"
+"(’S urrainn dhut an iuchair phrìobhaideach agad a dhìon le openssl)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:495
+#: ../panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "Tagh an teisteanas prìobhaideach agad"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:507
+#: ../panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "Tagh an iuchair phrìobhaideach agad"
 
@@ -3669,45 +3666,51 @@ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr ""
 "teisteanas EAP-TTLS CA mì-dhligheach: cha deach teisteanas a shònrachadh"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:258
+#: ../panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:273
+#: ../panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:303
+#: ../panels/network/wireless-security/eap-method-ttls.c:305
+#| msgid "MSCHAPv2"
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2 (gun EAP)"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../panels/network/wireless-security/wireless-security.c:87
-msgid "Unknown error validating 802.1x security"
-msgstr "Mearachd nach aithne dhuinn le dearbhadh tèarainteachd 802.1x"
+#| msgid "Unknown error validating 802.1x security"
+msgid "Unknown error validating 802.1X security"
+msgstr "Mearachd nach aithne dhuinn le dearbhadh tèarainteachd 802.1X"
 
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: ../panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: ../panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: ../panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: ../panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: ../panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
 msgid "Au_thentication"
 msgstr "D_earbhadh"
 
@@ -3728,7 +3731,7 @@ msgstr "tha iuchair wep a dhìth"
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod ach figearan sia-dheicheach a "
-"bhith am broinn iuchair a tha %zu a dh'fhaid"
+"bhith am broinn iuchair a tha %zu a dh’fhaid"
 
 #: ../panels/network/wireless-security/ws-wep-key.c:124
 #, c-format
@@ -3736,7 +3739,7 @@ msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod ach caractaran ASCII a bhith am "
-"broinn iuchair a tha %zu a dh'fhaid"
+"broinn iuchair a tha %zu a dh’fhaid"
 
 #: ../panels/network/wireless-security/ws-wep-key.c:130
 #, c-format
@@ -3745,7 +3748,7 @@ msgid ""
 "(ascii) or 10/26 (hex)"
 msgstr ""
 "tha an iuchair wep mì-dhligheach: tha faide na iuchrach %zu cearr. Feumaidh "
-"iuchair a bith 5/13 (ascii) no 10/26 (sia-dheicheach) a dh'fhaid"
+"iuchair a bith 5/13 (ascii) no 10/26 (sia-dheicheach) a dh’fhaid"
 
 #: ../panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
@@ -3763,34 +3766,22 @@ msgid "1 (Default)"
 msgstr "1 (Bun-roghainn)"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Open System"
 msgstr "Siostam fosgailte"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
 msgid "Shared Key"
 msgstr "Iuchair cho-roinnte"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key"
 msgstr "_Iuchair"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Sho_w key"
 msgstr "_Seall an iuchair"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
 msgid "WEP inde_x"
 msgstr "Inneacs _WEP"
 
@@ -3807,7 +3798,7 @@ msgstr ""
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk mì-dhligheach: cha ghabh an iuchair tuigsinn mar àireamh shia-"
-"dheicheach a tha 43 baidht a dh'fhaid"
+"dheicheach a tha 43 baidht a dh’fhaid"
 
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type"
@@ -3826,27 +3817,27 @@ msgid "Sound _Alerts"
 msgstr "C_aismeachdan fuaime"
 
 #: ../panels/notifications/edit-dialog.ui.h:5
-#, fuzzy
 #| msgctxt "notifications"
 #| msgid "_Notifications"
 msgctxt "notifications"
 msgid "Notification _Popups"
-msgstr "Bratha_n"
+msgstr "_Priob-bhrathan"
 
 #: ../panels/notifications/edit-dialog.ui.h:6
 msgid ""
 "Notifications will continue to appear in the notification list when popups "
 "are disabled."
 msgstr ""
+"Nochdaidh brathan fhathast air liosta nam brathan nuair a bhios am priobadh "
+"air a chur à comas."
 
 #. Popups here refers to message tray notifications in the middle of the screen.
 #: ../panels/notifications/edit-dialog.ui.h:8
-#, fuzzy
 #| msgctxt "notifications"
 #| msgid "Show Message _Content in Banners"
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
-msgstr "Seall susbaint nan tea_chdaireachdan ann am brataich"
+msgstr "Seall susbaint nan tea_chdaireachdan ann am priob-bhrathan"
 
 #: ../panels/notifications/edit-dialog.ui.h:9
 msgctxt "notifications"
@@ -3875,11 +3866,10 @@ msgstr ""
 "treidhe;priob-uinneag;"
 
 #: ../panels/notifications/notifications.ui.h:1
-#, fuzzy
 #| msgctxt "notifications"
 #| msgid "_Notifications"
 msgid "Notification _Popups"
-msgstr "Bratha_n"
+msgstr "_Priob-bhrathan"
 
 #: ../panels/notifications/notifications.ui.h:2
 msgid "_Lock Screen Notifications"
@@ -3887,7 +3877,7 @@ msgstr "Brathan na sgrìn-g_lasaidh"
 
 #. List of applications.
 #: ../panels/notifications/notifications.ui.h:4
-#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781
+#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1787
 msgid "Applications"
 msgstr "Aplacaidean"
 
@@ -3898,23 +3888,23 @@ msgstr "Eile"
 
 #. translators: This is the title of the "Show Account" dialog. The
 #. * %s is the name of the provider. e.g., 'Google'.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:580
-#, fuzzy, c-format
+#: ../panels/online-accounts/cc-online-accounts-panel.c:603
+#, c-format
 #| msgid "My Account"
 msgid "%s Account"
-msgstr "An cunntas agam"
+msgstr "Cunntas %s"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:872
+#: ../panels/online-accounts/cc-online-accounts-panel.c:895
 msgid "Error removing account"
-msgstr "Mearachd a' toirt air falbh a' chunntais"
+msgstr "Mearachd a’ toirt air falbh a’ chunntais"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:937
+#: ../panels/online-accounts/cc-online-accounts-panel.c:960
 #, c-format
 msgid "<b>%s</b> removed"
-msgstr ""
+msgstr "Chaidh <b>%s</b> a toirt air falbh"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
@@ -3924,7 +3914,7 @@ msgstr "Cunntasan air loidhne"
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr ""
-"Ceangail ris na cunntasan air loidhne 's cuir romhad mar a thèid an "
+"Ceangail ris na cunntasan air loidhne ’s cuir romhad mar a thèid an "
 "cleachdadh"
 
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
@@ -3936,23 +3926,26 @@ msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;cabadaich;post;mìosachadn;pòcaid;"
 
+#. Translators: This is the button which allows undoing the removal of the printer.
 #: ../panels/online-accounts/online-accounts.ui.h:1
+#: ../panels/printers/printers.ui.h:4
 msgid "Undo"
-msgstr ""
+msgstr "Neo-dhèan"
 
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Connect to your data in the cloud"
-msgstr ""
+msgstr "Dèan ceangal ris an dàta agad san neul"
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
 msgid "No internet connection — connect to set up new online accounts"
 msgstr ""
+"Chan eil ceangal dhan eadar-lìon ann — dèan ceangal gus cunntas air loidhne "
+"ùr a chruthachadh"
 
 #: ../panels/online-accounts/online-accounts.ui.h:4
-#, fuzzy
 #| msgid "Add an online account"
 msgid "Add an account"
-msgstr "Cuir cunntas air loidhne ris"
+msgstr "Cuir cunntas ris"
 
 #: ../panels/online-accounts/online-accounts.ui.h:5
 msgid "Remove Account"
@@ -4034,12 +4027,12 @@ msgstr "Falamh"
 #. TRANSLATORS: primary battery
 #: ../panels/power/cc-power-panel.c:336
 msgid "Charging"
-msgstr "A' teairrdseadh"
+msgstr "A’ teairrdseadh"
 
 #. TRANSLATORS: primary battery
 #: ../panels/power/cc-power-panel.c:341
 msgid "Discharging"
-msgstr "'Ga dhì-theairrdseadh"
+msgstr "’Ga dhì-theairrdseadh"
 
 #: ../panels/power/cc-power-panel.c:464
 msgctxt "Battery name"
@@ -4093,7 +4086,7 @@ msgstr "Coimpiutair"
 
 #. TRANSLATORS: secondary battery, misc
 #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2366
+#: ../panels/power/cc-power-panel.c:2362
 msgid "Battery"
 msgstr "Bataraidh"
 
@@ -4101,7 +4094,7 @@ msgstr "Bataraidh"
 #: ../panels/power/cc-power-panel.c:615
 msgctxt "Battery power"
 msgid "Charging"
-msgstr "A' teairrdseadh"
+msgstr "A’ teairrdseadh"
 
 #. TRANSLATORS: secondary battery
 #: ../panels/power/cc-power-panel.c:622
@@ -4137,94 +4130,98 @@ msgstr "Falamh"
 msgid "Batteries"
 msgstr "Bataraidhean"
 
-#: ../panels/power/cc-power-panel.c:1227
+#: ../panels/power/cc-power-panel.c:1233
 msgid "When _idle"
-msgstr "Nua_ir a bhios e 'na thàmh"
+msgstr "Nua_ir a bhios e ’na thàmh"
 
-#: ../panels/power/cc-power-panel.c:1681
+#: ../panels/power/cc-power-panel.c:1687
 msgid "Power Saving"
 msgstr "Caomhnadh cumhachd"
 
-#: ../panels/power/cc-power-panel.c:1716
+#: ../panels/power/cc-power-panel.c:1718
 msgid "_Screen brightness"
 msgstr "_Soilleireachd na sgrìn"
 
-#: ../panels/power/cc-power-panel.c:1735
+#: ../panels/power/cc-power-panel.c:1737
 msgid "Automatic brightness"
 msgstr "Soilleireachd fhèin-obrachail"
 
-#: ../panels/power/cc-power-panel.c:1755
+#: ../panels/power/cc-power-panel.c:1757
 msgid "_Keyboard brightness"
-msgstr "Soilleireachd a' _mheur-chlàir"
+msgstr "Soilleireachd a’ _mheur-chlàir"
 
-#: ../panels/power/cc-power-panel.c:1765
+#: ../panels/power/cc-power-panel.c:1767
 msgid "_Dim screen when inactive"
 msgstr "_Doilleirich an sgrìn mur eil gnìomhachd sam bith"
 
-#: ../panels/power/cc-power-panel.c:1790
+#: ../panels/power/cc-power-panel.c:1792
 msgid "_Blank screen"
 msgstr "Sgrìn _bhàn"
 
-#: ../panels/power/cc-power-panel.c:1827
+#: ../panels/power/cc-power-panel.c:1829
 msgid "_Wi-Fi"
 msgstr "_WiFi"
 
-#: ../panels/power/cc-power-panel.c:1832
+#: ../panels/power/cc-power-panel.c:1834
 msgid "Turn off Wi-Fi to save power."
 msgstr "Cuir WiFi dheth gus cumhachd a shàbhaladh."
 
-#: ../panels/power/cc-power-panel.c:1857
+#: ../panels/power/cc-power-panel.c:1859
 msgid "_Mobile broadband"
 msgstr "Bann-leathann _mobile"
 
-#: ../panels/power/cc-power-panel.c:1862
+#: ../panels/power/cc-power-panel.c:1864
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr ""
 "Cuir am bann-leathan mobile (3G, 4G, LTE, is msaa.) dheth gus cumhachd a "
 "shàbhaladh."
 
-#: ../panels/power/cc-power-panel.c:1907
+#: ../panels/power/cc-power-panel.c:1909
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1970
+#: ../panels/power/cc-power-panel.c:1972
 msgid "When on battery power"
 msgstr "Nuair a bhithear air cumhachd bataraidh"
 
-#: ../panels/power/cc-power-panel.c:1972
+#: ../panels/power/cc-power-panel.c:1974
 msgid "When plugged in"
 msgstr "Nuair a bhios e air a phlugadh a-steach"
 
-#: ../panels/power/cc-power-panel.c:2067
+#: ../panels/power/cc-power-panel.c:2069
 msgid "Suspend"
-msgstr "Cuir 'na dhàil"
+msgstr "Cuir ’na dhàil"
+
+#: ../panels/power/cc-power-panel.c:2070
+msgid "Power Off"
+msgstr "Cumhachd dheth"
 
-#: ../panels/power/cc-power-panel.c:2068
+#: ../panels/power/cc-power-panel.c:2071
 msgid "Hibernate"
 msgstr "Dèan cadal-geamhraidh"
 
-#: ../panels/power/cc-power-panel.c:2069
+#: ../panels/power/cc-power-panel.c:2072
 msgid "Nothing"
 msgstr "Na dèan dad"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2183
+#: ../panels/power/cc-power-panel.c:2186
 msgid "Suspend & Power Button"
-msgstr "Putan cur 'na dhàil ⁊ na cumhachd"
+msgstr "Putan cur ’na dhàil ⁊ na cumhachd"
 
-#: ../panels/power/cc-power-panel.c:2226
+#: ../panels/power/cc-power-panel.c:2225
 msgid "_Automatic suspend"
-msgstr "Cuir 'n_a dhàil gu fèin-obrachail"
+msgstr "Cuir ’n_a dhàil gu fèin-obrachail"
 
-#: ../panels/power/cc-power-panel.c:2227
+#: ../panels/power/cc-power-panel.c:2226
 msgid "Automatic suspend"
-msgstr "Cur 'na dhàil fèin-obrachail"
+msgstr "Cur ’na dhàil fèin-obrachail"
 
-#: ../panels/power/cc-power-panel.c:2294
+#: ../panels/power/cc-power-panel.c:2293
 msgid "_When the Power Button is pressed"
-msgstr "_Nuair a bhios putan na cumhachd 'ga bhrùthadh"
+msgstr "_Nuair a bhios putan na cumhachd ’ga bhrùthadh"
 
-#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:273
+#: ../panels/power/cc-power-panel.c:2412 ../shell/cc-window.c:247
 #: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "Innleadan"
@@ -4232,12 +4229,12 @@ msgstr "Innleadan"
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
 msgid "Po­wer"
-msgstr "A' chumhachd"
+msgstr "A’ chumhachd"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:3
 msgid "View your battery status and change power saving settings"
 msgstr ""
-"Seall ìre a' bhataraidh agad is atharraich roghainnean caomhnadh na cumhachd"
+"Seall ìre a’ bhataraidh agad is atharraich roghainnean caomhnadh na cumhachd"
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:5
@@ -4306,7 +4303,7 @@ msgstr "12 mhionaid"
 
 #: ../panels/power/power.ui.h:18
 msgid "Automatic Suspend"
-msgstr "Cuir 'na dhàil gu fèin-obrachail"
+msgstr "Cuir ’na dhàil gu fèin-obrachail"
 
 #: ../panels/power/power.ui.h:19
 msgid "_Plugged In"
@@ -4314,34 +4311,49 @@ msgstr "_Plugte a-staigh"
 
 #: ../panels/power/power.ui.h:20
 msgid "On _Battery Power"
-msgstr "Air cumhachd a' _bhataraidh"
+msgstr "Air cumhachd a’ _bhataraidh"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
 msgid "Delay"
 msgstr "Dàil"
 
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
 msgstr "Dearbhaich"
 
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+msgstr "Ainm-cleachdaiche"
+
 #: ../panels/printers/authentication-dialog.ui.h:6
 #: ../panels/printers/new-printer-dialog.ui.h:11
 msgid "Authentication Required"
 msgstr "Tha feum air dearbhadh"
 
+#. Translators: %s is the printer name
+#: ../panels/printers/cc-printers-panel.c:718
+#, c-format
+msgid "Printer “%s” has been deleted"
+msgstr "Chaidh an clò-bhualadair “%s” a sguabadh às"
+
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:735
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Failed to add new printer."
-msgstr "Cha b' urrainn dhuinn an clò-bhualadair ùr a chur ris."
+msgstr "Cha b’ urrainn dhuinn an clò-bhualadair ùr a chur ris."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:983
+#: ../panels/printers/cc-printers-panel.c:1221
 #, c-format
 msgid "Could not load ui: %s"
-msgstr "Cha b' urrainn dhuinn an eadar-aghaidh %s a luchdadh"
+msgstr "Cha b’ urrainn dhuinn an eadar-aghaidh %s a luchdadh"
 
 #: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:6
+#: ../panels/printers/printer-entry.ui.h:10
 msgid "Location"
 msgstr "Ionad"
 
@@ -4353,25 +4365,22 @@ msgstr "Draibhear"
 
 #: ../panels/printers/details-dialog.ui.h:5
 msgid "Searching for preferred drivers…"
-msgstr "A' lorg nan draibhearan as fhearr…"
+msgstr "A’ lorg nan draibhearan as fhearr…"
 
 #: ../panels/printers/details-dialog.ui.h:6
-#, fuzzy
 #| msgid "Search for a city"
 msgid "Search for Drivers"
-msgstr "Lorg baile"
+msgstr "Lorg draibhearan"
 
 #: ../panels/printers/details-dialog.ui.h:7
-#, fuzzy
 #| msgid "Select from database…"
 msgid "Select from Database…"
 msgstr "Tagh o stòr-dàta…"
 
 #: ../panels/printers/details-dialog.ui.h:8
-#, fuzzy
 #| msgid "Install More…"
 msgid "Install PPD File…"
-msgstr "Stàlaich barrachd…"
+msgstr "Stàlaich faidhle PPD…"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
@@ -4381,7 +4390,7 @@ msgstr "Clò-bhualadairean"
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr ""
-"Cuir clò-bhualadairean, seall obraichean a' chlò-bhualadair is cuir romhad "
+"Cuir clò-bhualadairean, seall obraichean a’ chlò-bhualadair is cuir romhad "
 "mar a thèid clò-bhualadh"
 
 #. Translators: those are keywords for the printing control-center panel
@@ -4409,14 +4418,13 @@ msgstr "Cuir clò-bhualadair ris"
 #. Translators: This buttons submits the credentials for the selected server.
 #: ../panels/printers/new-printer-dialog.ui.h:6
 msgid "_Unlock"
-msgstr ""
+msgstr "_Thoir a’ ghlas dheth"
 
 #. Translators: No printers were detected
 #: ../panels/printers/new-printer-dialog.ui.h:8
-#, fuzzy
 #| msgid "No Pictures Found"
 msgid "No Printers Found"
-msgstr "Cha deach dealbh sam bith a lorg"
+msgstr "Cha deach clò-bhualadair a lorg"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
 #: ../panels/printers/new-printer-dialog.ui.h:10
@@ -4424,24 +4432,27 @@ msgid "Enter a network address or search for a printer"
 msgstr "Cuir a-steach seòladh lìonraidh gus clò-bhualadair a lorg"
 
 #: ../panels/printers/new-printer-dialog.ui.h:12
-#, fuzzy
 #| msgid "Enter your username and password to view printers available on %s."
 msgid "Enter username and password to view printers on Print Server."
 msgstr ""
-"Cuir a-steach an t-ainm-cleachdaiche 's am facal-faire agad gus na clò-"
-"bhualadairean fhaicinn a tha ri làimh air %s."
+"Cuir a-steach ainm-cleachdaiche ’s facal-faire gus na clò-bhualadairean "
+"fhaicinn a tha ri làimh air an fhrithealaiche."
 
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "A' luchdadh nan roghainnean…"
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/printers/pp-options-dialog.c:893
+#| msgid "Test page"
+msgid "Test Page"
+msgstr "Duilleag deuchainne"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
 #: ../panels/printers/pp-details-dialog.c:123
 #: ../panels/printers/pp-details-dialog.c:415
-#, fuzzy, c-format
+#, c-format
 #| msgid "Details"
 msgid "%s Details"
-msgstr "Mion-fhiosrachadh"
+msgstr "Fiosrachadh air %s"
 
 #: ../panels/printers/pp-details-dialog.c:172
 msgid "No suitable driver found"
@@ -4461,7 +4472,7 @@ msgstr ""
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:1
 msgid "Select Printer Driver"
-msgstr "Tagh draibhear a' chlò-bhualadair"
+msgstr "Tagh draibhear a’ chlò-bhualadair"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
 #: ../panels/user-accounts/um-photo-dialog.c:96
@@ -4469,10 +4480,9 @@ msgid "Select"
 msgstr "Tagh"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
-#, fuzzy
 #| msgid "Loading drivers database..."
 msgid "Loading drivers database…"
-msgstr "A' luchdadh stòr-data nan draibhearan..."
+msgstr "A’ luchdadh stòr-dàta nan draibhearan…"
 
 #. Translators: The found device is a JetDirect printer
 #: ../panels/printers/pp-host.c:539
@@ -4532,13 +4542,13 @@ msgstr "Ri dhèanamh"
 #: ../panels/printers/pp-jobs-dialog.c:108
 msgctxt "print job"
 msgid "Paused"
-msgstr "'Na stad"
+msgstr "’Na stad"
 
 #. Translators: Job's state (job is currently printing)
 #: ../panels/printers/pp-jobs-dialog.c:112
 msgctxt "print job"
 msgid "Processing"
-msgstr "'Ga làimhseachadh"
+msgstr "’Ga phròiseasadh"
 
 #. Translators: Job's state (job has been stopped)
 #: ../panels/printers/pp-jobs-dialog.c:116
@@ -4566,39 +4576,37 @@ msgstr "Air a choileanadh"
 
 #. Translators: This is the printer name for which we are showing the active jobs
 #: ../panels/printers/pp-jobs-dialog.c:310
-#, fuzzy, c-format
+#, c-format
 #| msgctxt "Printer jobs dialog title"
 #| msgid "%s - Active Jobs"
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
-msgstr "%s - Obraichean gnìomhach"
+msgstr "%s – Obraichean gnìomhach"
 
 #: ../panels/printers/pp-new-printer-dialog.c:402
-#, fuzzy
 #| msgid "Select Printer Driver"
 msgid "Unlock Print Server"
-msgstr "Tagh draibhear a' chlò-bhualadair"
+msgstr "Thoir a’ ghlas far an fhrithealaiche clò-bhualaidh"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
 #: ../panels/printers/pp-new-printer-dialog.c:406
 #, c-format
 msgid "Unlock %s."
-msgstr ""
+msgstr "Thoir a’ ghlas far %s."
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
 #: ../panels/printers/pp-new-printer-dialog.c:411
-#, fuzzy, c-format
+#, c-format
 #| msgid "Enter your username and password to view printers available on %s."
 msgid "Enter username and password to view printers on %s."
 msgstr ""
-"Cuir a-steach an t-ainm-cleachdaiche 's am facal-faire agad gus na clò-"
-"bhualadairean fhaicinn a tha ri làimh air %s."
+"Cuir a-steach ainm-cleachdaiche ’s facal-faire gus na clò-bhualadairean "
+"fhaicinn a tha ri làimh air %s."
 
 #: ../panels/printers/pp-new-printer-dialog.c:876
-#, fuzzy
 #| msgid "Not searching for networks"
 msgid "Searching for Printers"
-msgstr "Chan eilear a' sireadh lìonraidhean"
+msgstr "A’ lorg clò-bhualadairean"
 
 #. Translators: The found device is a printer connected via USB
 #: ../panels/printers/pp-new-printer-dialog.c:1799
@@ -4615,11 +4623,6 @@ msgstr "Port sreathach"
 msgid "Parallel Port"
 msgstr "Port co-shìnte"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
 #: ../panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
@@ -4637,89 +4640,89 @@ msgstr "Seòladh: %s"
 msgid "Server requires authentication"
 msgstr "Feumaidh am frithealaiche dearbhadh"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "Dà-thaobhach"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
-msgstr "Seòrsa a' phàipeir"
+msgstr "Seòrsa a’ phàipeir"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
-msgstr "Tùs a' phàipeir"
+msgstr "Tùs a’ phàipeir"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "Treidhe às-chuir"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "Ro-chriathradh GhostScript"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: ../panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "Duilleagan air gach taobh"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:545
+#: ../panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "Dà-thaobhach"
 
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
-msgid "Orientation"
-msgstr "Comhair"
-
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "Coitcheann"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:657
+#: ../panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "Suidheachadh na duilleige"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:660
+#: ../panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Roghainnean a gabhas stàladh"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:663
+#: ../panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "Obair"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:666
+#: ../panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "Càileachd an deilbh"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:669
+#: ../panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Dath"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:672
+#: ../panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Lìomhadh"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:675
+#: ../panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Adhartach"
 
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "Duilleag deuchainne"
+
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:76
 #: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4734,7 +4737,7 @@ msgstr "Taghadh fèin-obrachail"
 #: ../panels/printers/pp-ppd-option-widget.c:84
 #: ../panels/printers/pp-ppd-option-widget.c:88
 msgid "Printer Default"
-msgstr "Bun-roghainnean a' chlò-bhualadair"
+msgstr "Bun-roghainnean a’ chlò-bhualadair"
 
 #. Translators: this is an option of "GhostScript"
 #: ../panels/printers/pp-ppd-option-widget.c:90
@@ -4744,12 +4747,12 @@ msgstr "Na leabaich ach cruthan-clò GhostScript"
 #. Translators: this is an option of "GhostScript"
 #: ../panels/printers/pp-ppd-option-widget.c:92
 msgid "Convert to PS level 1"
-msgstr "Iompaich 'na PS leibheil 1"
+msgstr "Iompaich ’na PS leibheil 1"
 
 #. Translators: this is an option of "GhostScript"
 #: ../panels/printers/pp-ppd-option-widget.c:94
 msgid "Convert to PS level 2"
-msgstr "Iompaich 'na PS leibheil 2"
+msgstr "Iompaich ’na PS leibheil 2"
 
 #. Translators: this is an option of "GhostScript"
 #: ../panels/printers/pp-ppd-option-widget.c:96
@@ -4762,187 +4765,193 @@ msgid "Manufacturer"
 msgstr "Saothraiche"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:443
-#, fuzzy
+#: ../panels/printers/pp-printer-entry.c:585
+#: ../panels/printers/printer-entry.ui.h:8
 #| msgid "Active Jobs"
 msgid "No Active Jobs"
-msgstr "Obraichean gnìomhach"
+msgstr "Chan eil obair ghnìomhach ann"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:448
+#: ../panels/printers/pp-printer-entry.c:590
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%u obair"
+msgstr[1] "%u obair"
+msgstr[2] "%u obraichean"
+msgstr[3] "%u obair"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:584
+#: ../panels/printers/pp-printer-entry.c:739
 msgid "Low on toner"
 msgstr "Tònair gann"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:586
+#: ../panels/printers/pp-printer-entry.c:741
 msgid "Out of toner"
 msgstr "Chan eil tònair air fhàgail"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:589
+#: ../panels/printers/pp-printer-entry.c:744
 msgid "Low on developer"
 msgstr "Stuth-leasachaidh gann"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:592
+#: ../panels/printers/pp-printer-entry.c:747
 msgid "Out of developer"
 msgstr "Chan eil stuth-leasachaidh air fhàgail"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:594
+#: ../panels/printers/pp-printer-entry.c:749
 msgid "Low on a marker supply"
-msgstr "Dath gann ann am biona a' chlò-bhualadair"
+msgstr "Dath gann ann am biona a’ chlò-bhualadair"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:596
+#: ../panels/printers/pp-printer-entry.c:751
 msgid "Out of a marker supply"
-msgstr "Chan eil dath air fhàgail ann am biona a' chlò-bhualadair"
+msgstr "Chan eil dath air fhàgail ann am biona a’ chlò-bhualadair"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:598
+#: ../panels/printers/pp-printer-entry.c:753
 msgid "Open cover"
 msgstr "Tha am mullach fosgailte"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:600
+#: ../panels/printers/pp-printer-entry.c:755
 msgid "Open door"
 msgstr "Tha an doras fosgailte"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:602
+#: ../panels/printers/pp-printer-entry.c:757
 msgid "Low on paper"
 msgstr "Pàipear gann"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:604
+#: ../panels/printers/pp-printer-entry.c:759
 msgid "Out of paper"
 msgstr "Chan eil pàipear air fhàgail"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:606
+#: ../panels/printers/pp-printer-entry.c:761
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Far loidhne"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/pp-printer-entry.c:608
-#: ../panels/printers/pp-printer-entry.c:738
+#: ../panels/printers/pp-printer-entry.c:763
+#: ../panels/printers/pp-printer-entry.c:893
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Sguireadh dheth"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:610
+#: ../panels/printers/pp-printer-entry.c:765
 msgid "Waste receptacle almost full"
 msgstr "Tha soitheach an sgudail cha mhòr làn"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:612
+#: ../panels/printers/pp-printer-entry.c:767
 msgid "Waste receptacle full"
 msgstr "Tha soitheach an sgudail làn"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:614
+#: ../panels/printers/pp-printer-entry.c:769
 msgid "The optical photo conductor is near end of life"
-msgstr "Tha am foto-ghiùlanair lèirsinneach a' dol bàs"
+msgstr "Tha am foto-ghiùlanair lèirsinneach a’ dol bàs"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:616
+#: ../panels/printers/pp-printer-entry.c:771
 msgid "The optical photo conductor is no longer functioning"
 msgstr "Chan eil am foto-ghiùlanair lèirsinneach ag obair tuilleadh"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/pp-printer-entry.c:724
+#: ../panels/printers/pp-printer-entry.c:879
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Deiseil"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/pp-printer-entry.c:729
+#: ../panels/printers/pp-printer-entry.c:884
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "Cha ghabh e ri obraichean"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:734
+#: ../panels/printers/pp-printer-entry.c:889
 msgctxt "printer state"
 msgid "Processing"
-msgstr "'Ga làimhseachadh"
+msgstr "’Ga phròiseasadh"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:913
+msgid "Clean print heads"
+msgstr "Glan na cinn clò-bhualaidh"
 
 #: ../panels/printers/printer-entry.ui.h:1
-#, fuzzy
 #| msgid "Login Options"
 msgid "Printing Options"
-msgstr "Roghainnean a' chlàraidh a-steach"
+msgstr "Roghainnean a’ chlò-bhualaidh"
 
 #: ../panels/printers/printer-entry.ui.h:2
-#, fuzzy
 #| msgid "Printer Default"
 msgid "Printer Details"
-msgstr "Bun-roghainnean a' chlò-bhualadair"
+msgstr "Fiosrachadh a’ chlò-bhualadair"
 
-#: ../panels/printers/printer-entry.ui.h:3
-#, fuzzy
+#. Set this printer as default
+#: ../panels/printers/printer-entry.ui.h:4
 #| msgid "Printer Default"
 msgid "Use Printer by Default"
-msgstr "Bun-roghainnean a' chlò-bhualadair"
+msgstr "Cleachd an clò-bhualadair seo a gnàth"
 
-#: ../panels/printers/printer-entry.ui.h:4
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:6
+#| msgid "Cancel Print Job"
+msgid "Clean Print Heads"
+msgstr "Glan na cinn clò-bhualaidh"
+
+#: ../panels/printers/printer-entry.ui.h:7
 msgid "Remove Printer"
 msgstr "Thoir air falbh an clò-bhualadair"
 
-#: ../panels/printers/printer-entry.ui.h:5
+#: ../panels/printers/printer-entry.ui.h:9
 msgid "Model"
 msgstr "Modail"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: ../panels/printers/printer-entry.ui.h:11
 msgid "Ink Level"
 msgstr "Ìre na h-ince"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:9
+#: ../panels/printers/printer-entry.ui.h:13
 msgid "Please restart when the problem is resolved."
-msgstr ""
+msgstr "Dèan ath-thòiseachadh nuair a bhios an duilgheadas air a chàradh."
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:11
-#, fuzzy
+#: ../panels/printers/printer-entry.ui.h:15
 #| msgid "Restart Now"
 msgid "Restart"
-msgstr "Ath-thòisich an-dràsta"
+msgstr "Ath-thòisich"
 
 #. Translators: This button adds new printer.
 #: ../panels/printers/printers.ui.h:2
 msgid "Add…"
-msgstr ""
+msgstr "Cuir ris…"
 
-#: ../panels/printers/printers.ui.h:3
+#: ../panels/printers/printers.ui.h:5
 msgid "No printers"
 msgstr "Chan eil clò-bhualadair ann"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:5
-#, fuzzy
+#: ../panels/printers/printers.ui.h:7
 #| msgid "Add a Printer"
 msgid "Add a Printer…"
-msgstr "Cuir clò-bhualadair ris"
+msgstr "Cuir clò-bhualadair ris…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:7
-#, fuzzy
+#: ../panels/printers/printers.ui.h:9
 #| msgid ""
 #| "Sorry! The system printing service\n"
 #| "doesn't seem to be available."
@@ -4959,7 +4968,7 @@ msgstr "Glas na sgrìn"
 
 #: ../panels/privacy/cc-privacy-panel.c:438
 msgid "In use"
-msgstr "'Ga chleachdadh"
+msgstr "’Ga chleachdadh"
 
 #: ../panels/privacy/cc-privacy-panel.c:443
 msgctxt "Location services status"
@@ -4975,48 +4984,48 @@ msgstr "Dheth"
 msgid "Location Services"
 msgstr "Seirbheisean ionaid"
 
-#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:946 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "Cleachdadh ⁊ an eachraidh"
 
-#: ../panels/privacy/cc-privacy-panel.c:1071
+#: ../panels/privacy/cc-privacy-panel.c:1075
 msgid "Empty all items from Trash?"
 msgstr "A bheil thu airson an sgudal fhalamhachadh gu tur?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1072
+#: ../panels/privacy/cc-privacy-panel.c:1076
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Thèid gach rud san sgudal a sguabadh às gu buan."
 
-#: ../panels/privacy/cc-privacy-panel.c:1073
+#: ../panels/privacy/cc-privacy-panel.c:1077
 msgid "_Empty Trash"
 msgstr "_Falamhaich an sgudal"
 
-#: ../panels/privacy/cc-privacy-panel.c:1096
+#: ../panels/privacy/cc-privacy-panel.c:1100
 msgid "Delete all the temporary files?"
 msgstr "A bheil thu airson na faidhlichean sealach a sguabadh às?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1097
+#: ../panels/privacy/cc-privacy-panel.c:1101
 msgid "All the temporary files will be permanently deleted."
 msgstr "Thèid gach faidhle sealach a sguabadh às gu buan."
 
-#: ../panels/privacy/cc-privacy-panel.c:1098
+#: ../panels/privacy/cc-privacy-panel.c:1102
 msgid "_Purge Temporary Files"
 msgstr "_Purgaidich na faidhlichean sealach"
 
-#: ../panels/privacy/cc-privacy-panel.c:1120 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1124 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "Purgaidich an sgudal ⁊ na faidhlichean sealach"
 
-#: ../panels/privacy/cc-privacy-panel.c:1160 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1164 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "Cleachdadh bathair-bhog"
 
-#: ../panels/privacy/cc-privacy-panel.c:1201 ../panels/privacy/privacy.ui.h:46
+#: ../panels/privacy/cc-privacy-panel.c:1205 ../panels/privacy/privacy.ui.h:46
 msgid "Problem Reporting"
 msgstr "Ag aithris air duilgheadasan"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1215
+#: ../panels/privacy/cc-privacy-panel.c:1219
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -5026,7 +5035,7 @@ msgstr ""
 "seo ach an leasaich sinn %s. Thèid na h-aithrisean a chur gun urra agus gach "
 "dàta pearsanta a thoirt air falbh uapa."
 
-#: ../panels/privacy/cc-privacy-panel.c:1227 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1231 ../panels/privacy/privacy.ui.h:41
 msgid "Privacy Policy"
 msgstr "Am poileasaidh prìobhaideachd"
 
@@ -5045,9 +5054,9 @@ msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
 msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;sgrìn;glas;diagnosachd;tuisleadh;prìobhaideach;sealach;"
-"inneacs;lìonra;ainm;dearbh-aithne;"
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;networ"
+"k;identity;sgrìn;glas;diagnosachd;tuisleadh;prìobhaideach;sealach;inneacs;lì"
+"onra;ainm;dearbh-aithne;"
 
 #: ../panels/privacy/privacy.ui.h:1
 msgid "Screen Turns Off"
@@ -5155,16 +5164,14 @@ msgid "Purge _After"
 msgstr "Purgaidich an _dèidh"
 
 #: ../panels/privacy/privacy.ui.h:34
-#, fuzzy
 #| msgid "_Empty Trash"
 msgid "_Empty Trash…"
-msgstr "_Falamhaich an sgudal"
+msgstr "_Falamhaich an sgudal…"
 
 #: ../panels/privacy/privacy.ui.h:35
-#, fuzzy
 #| msgid "_Purge Temporary Files"
 msgid "_Purge Temporary Files…"
-msgstr "_Purgaidich na faidhlichean sealach"
+msgstr "_Purgaidich na faidhlichean sealach…"
 
 #: ../panels/privacy/privacy.ui.h:37
 msgid ""
@@ -5175,7 +5182,7 @@ msgid ""
 "All the information we collect is made anonymous, and we will never share "
 "your data with third parties."
 msgstr ""
-"Ma chuireas tu fiosrachadh thugainn mun bhathar-bhog a chleachdas tu, 's "
+"Ma chuireas tu fiosrachadh thugainn mun bhathar-bhog a chleachdas tu, ’s "
 "urrainn dhuinn molaidhean nas pongaile a thoirt dhut. Agus bidh cothrom "
 "againn am bathar-bog againn a leasachadh.\n"
 "\n"
@@ -5184,7 +5191,7 @@ msgstr ""
 
 #: ../panels/privacy/privacy.ui.h:40
 msgid "_Send software usage statistics"
-msgstr "Cuir _stats air cleachdadh a' bhathair-bhog"
+msgstr "Cuir _stats air cleachdadh a’ bhathair-bhog"
 
 #: ../panels/privacy/privacy.ui.h:43
 msgid ""
@@ -5202,17 +5209,17 @@ msgstr "Seirbheisean _ionaid"
 msgid "_Automatic Problem Reporting"
 msgstr "_Aithrisean fèin-obrachail air duilgheadasan"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Impireil"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "Meatraigeach"
 
-#: ../panels/region/cc-format-chooser.c:287
+#: ../panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "Cha deach roinn-dùthcha a lorg"
 
@@ -5220,18 +5227,18 @@ msgstr "Cha deach roinn-dùthcha a lorg"
 msgid "No input sources found"
 msgstr "Cha deach tùs ion-chuir a lorg"
 
-#: ../panels/region/cc-input-chooser.c:992
+#: ../panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Eile"
 
-#: ../panels/region/cc-region-panel.c:866
+#: ../panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "Cha deach tùs ion-chuir a thaghadh"
 
-#: ../panels/region/cc-region-panel.c:1758
+#: ../panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
-msgstr "_Sgrìn a' chlàraidh a-steach"
+msgstr "_Sgrìn a’ chlàraidh a-steach"
 
 #: ../panels/region/format-chooser.ui.h:1
 msgid "Formats"
@@ -5250,14 +5257,19 @@ msgid "Times"
 msgstr "Amannan"
 
 #: ../panels/region/format-chooser.ui.h:7
+#| msgid "Date & Time"
+msgid "Dates & Times"
+msgstr "Cinn-là ⁊ amannan"
+
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Numbers"
 msgstr "Àireamhan"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Measurement"
 msgstr "Tomhasan"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
 msgid "Paper"
 msgstr "Pàipear"
 
@@ -5282,7 +5294,6 @@ msgid "Add an Input Source"
 msgstr "Cuir tùs ion-chuir ris"
 
 #: ../panels/region/input-chooser.ui.h:4
-#, fuzzy
 #| msgid "Input methods can't be used on the login screen"
 msgid "Input methods can’t be used on the login screen"
 msgstr "Cha ghabh dòighean ion-chuir a chleachdadh air an sgrìn chlàraidh"
@@ -5318,7 +5329,7 @@ msgstr "Super+Space"
 #: ../panels/region/input-options.ui.h:9
 msgid "You can change these shortcuts in the keyboard settings"
 msgstr ""
-"'S urrainn dhut na h-ath-ghoiridean seo atharrachadh ann an roghainnean a' "
+"’S urrainn dhut na h-ath-ghoiridean seo atharrachadh ann an roghainnean a’ "
 "mheur-chlàir"
 
 #: ../panels/region/input-options.ui.h:10
@@ -5330,26 +5341,26 @@ msgid "Left+Right Alt"
 msgstr "Alt clì + deas"
 
 #: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr ""
-"Feumaidh tu an seisean ath-thòiseachadh gus bi buaidh aig na dh'atharraich "
-"thu"
-
-#: ../panels/region/region.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Restart Now"
-msgstr "Ath-thòisich an-dràsta"
-
-#: ../panels/region/region.ui.h:3
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "_Cànan"
 
-#: ../panels/region/region.ui.h:4
+#: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
 msgstr "Beurla (An Rìoghachd Aonaichte)"
 
+#: ../panels/region/region.ui.h:3
+#| msgid "Your session needs to be restarted for changes to take effect"
+msgid "Restart the session for changes to take effect"
+msgstr ""
+"Feumaidh tu an seisean ath-thòiseachadh mus bi buaidh aig na dh’atharraich "
+"thu"
+
+#: ../panels/region/region.ui.h:4
+#| msgid "Restart Now"
+msgid "Restart…"
+msgstr "Ath-thòisich…"
+
 #: ../panels/region/region.ui.h:5
 msgid "_Formats"
 msgstr "_Fòrmatan"
@@ -5388,23 +5399,23 @@ msgstr "Rèitich an tùs ion-chuir"
 
 #: ../panels/region/region.ui.h:14
 msgid "Show input source keyboard layout"
-msgstr "Seall co-dhealbhachd a' mheur-chlàir air an tùs ion-chuir"
+msgstr "Seall co-dhealbhachd a’ mheur-chlàir air an tùs ion-chuir"
 
 #: ../panels/region/region.ui.h:15
 msgid "Login settings are used by all users when logging into the system"
 msgstr ""
-"Thèid roghainnean a' chlàraidh a-steach a chleachdadh leis a h-uile "
+"Thèid roghainnean a’ chlàraidh a-steach a chleachdadh leis a h-uile "
 "cleachdaiche nuair a chlàraicheas iad a-steach air an t-siostam"
 
-#: ../panels/search/cc-search-locations-dialog.c:634
+#: ../panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "Tagh ionad"
 
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: ../panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "_Ceart ma-tha"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "Cha deach aplacaid sam bith a lorg"
 
@@ -5424,8 +5435,8 @@ msgstr ""
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:5
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr ""
-"Search;Find;Index;Hide;Privacy;Results;lorg;inneacs;clàr-amais;falaich;"
-"prìobhaideachd;toraidhean;"
+"Search;Find;Index;Hide;Privacy;Results;lorg;inneacs;clàr-amais;falaich;prìob"
+"haideachd;toraidhean;"
 
 #: ../panels/search/search-locations-dialog.ui.h:1
 msgid "Search Locations"
@@ -5460,67 +5471,67 @@ msgstr "Roghainnean"
 msgid "No networks selected for sharing"
 msgstr "Cha deach lìonra a thaghadh a chum co-roinnidh"
 
-#: ../panels/sharing/cc-sharing-panel.c:266
+#: ../panels/sharing/cc-sharing-panel.c:273
 msgctxt "service is enabled"
 msgid "On"
 msgstr "Air"
 
-#: ../panels/sharing/cc-sharing-panel.c:268
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:275
+#: ../panels/sharing/cc-sharing-panel.c:302
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Dheth"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:305
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "An comas"
 
-#: ../panels/sharing/cc-sharing-panel.c:301
+#: ../panels/sharing/cc-sharing-panel.c:308
 msgctxt "service is active"
 msgid "Active"
 msgstr "Gnìomhach"
 
-#: ../panels/sharing/cc-sharing-panel.c:372
+#: ../panels/sharing/cc-sharing-panel.c:379
 msgid "Choose a Folder"
 msgstr "Tagh pasgan"
 
-#: ../panels/sharing/cc-sharing-panel.c:683
+#: ../panels/sharing/cc-sharing-panel.c:690
 #, c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
 "your current network using: <a href=\"dav://%s\">dav://%s</a>"
 msgstr ""
 "Bheir co-roinneadh fhaidhlichean pearsanta comas dhut am pasgan poblach agad "
-"a cho-roinneadh le daoine eile air an lìonra làithreach agad slighe: <a href="
-"\"dav://%s\">dav://%s</a>"
+"a cho-roinneadh le daoine eile air an lìonra làithreach agad slighe: <a "
+"href=\"dav://%s\">dav://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:685
+#: ../panels/sharing/cc-sharing-panel.c:692
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 msgstr ""
-"Ma tha an clàradh a-steach cèin an coma, 's urrainn dha chleachdaichean "
+"Ma tha an clàradh a-steach cèin an coma, ’s urrainn dha chleachdaichean "
 "ceangal a dhèanamh on taobh a-muigh slighe na h-àithne Secure Shell:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:687
+#: ../panels/sharing/cc-sharing-panel.c:694
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
 "connecting to <a href=\"vnc://%s\">vnc://%s</a>"
 msgstr ""
 "Bheir co-roinneadh na sgrìn cead do chleachdaichean an sgrìn agad a "
-"shealltainn no a stiùireadh on taobh a-muigh slighe <a href=\"vnc://%s"
-"\">vnc://%s</a>"
+"shealltainn no a stiùireadh on taobh a-muigh slighe <a href=\"vnc://%"
+"s\">vnc://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:799
+#: ../panels/sharing/cc-sharing-panel.c:806
 msgid "Copy"
 msgstr "Dèan lethbhreac"
 
-#: ../panels/sharing/cc-sharing-panel.c:1125
+#: ../panels/sharing/cc-sharing-panel.c:1233
 msgid "Sharing"
 msgstr "Co-roinneadh"
 
@@ -5539,9 +5550,9 @@ msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
 msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;co-roinn;co-roinneadh;òstair;cèin;meadhan;fuaim;"
-"dealbhan;deilbh;filmichean;frithealaiche;reandaraiche;"
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos"
+";movies;server;renderer;co-roinn;co-roinneadh;òstair;cèin;meadhan;fuaim;deal"
+"bhan;deilbh;filmichean;frithealaiche;reandaraiche;"
 
 #: ../panels/sharing/networks.ui.h:1
 msgid "Networks"
@@ -5558,7 +5569,7 @@ msgstr ""
 
 #: ../panels/sharing/sharing.ui.h:1
 msgid "_Computer Name"
-msgstr "Ainm a' _choimpiutair"
+msgstr "Ainm a’ _choimpiutair"
 
 #: ../panels/sharing/sharing.ui.h:2
 msgid "_File Sharing"
@@ -5579,7 +5590,7 @@ msgstr "Clà_radh a-steach cèin"
 #: ../panels/sharing/sharing.ui.h:6
 msgid "Some services are disabled because of no network access."
 msgstr ""
-"Chaidh cuid dhe na seirbheisean a chur à comas a chionn 's nach eil cothrom "
+"Chaidh cuid dhe na seirbheisean a chur à comas a chionn ’s nach eil cothrom "
 "air an lìonra."
 
 #: ../panels/sharing/sharing.ui.h:7
@@ -5764,63 +5775,63 @@ msgstr "Cuir na glaodhairean _fo dheuchainn"
 msgid "Peak detect"
 msgstr "Lorg am mullach"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1512
+#: ../panels/sound/gvc-mixer-dialog.c:1518
 msgid "Device"
 msgstr "Uidheam"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1575
+#: ../panels/sound/gvc-mixer-dialog.c:1581
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Cuir na glaodhairean airson %s fo dheuchainn"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1631
+#: ../panels/sound/gvc-mixer-dialog.c:1637
 msgid "_Output volume:"
 msgstr "Àirde fuaim a_n às-chuir:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1645
+#: ../panels/sound/gvc-mixer-dialog.c:1651
 msgid "Output"
 msgstr "Às-chur"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1650
+#: ../panels/sound/gvc-mixer-dialog.c:1656
 msgid "C_hoose a device for sound output:"
 msgstr "T_agh uidheam airson às-chur na fuaime:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1672
+#: ../panels/sound/gvc-mixer-dialog.c:1678
 msgid "Settings for the selected device:"
 msgstr "Roghainnean an uidheim a thagh thu:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1683
+#: ../panels/sound/gvc-mixer-dialog.c:1689
 msgid "Input"
 msgstr "Ion-chur"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1690
+#: ../panels/sound/gvc-mixer-dialog.c:1696
 msgid "_Input volume:"
 msgstr "Àirde fuaim an i_on-chuir:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: ../panels/sound/gvc-mixer-dialog.c:1717
 msgid "Input level:"
 msgstr "Ìre an ion-chuir:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1737
+#: ../panels/sound/gvc-mixer-dialog.c:1743
 msgid "C_hoose a device for sound input:"
 msgstr "T_agh uidheam airson ion-chur fuaime:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: ../panels/sound/gvc-mixer-dialog.c:1767
 msgid "Sound Effects"
 msgstr "Èifeachdan fuaime"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1768
+#: ../panels/sound/gvc-mixer-dialog.c:1774
 msgid "_Alert volume:"
 msgstr "Àirde _fuaim nan rabhadh:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1785
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "No application is currently playing or recording audio."
 msgstr ""
-"Chan eil aplacaid sam bith a' cluich no a' clàradh fuaime an-dràsta fhèin."
+"Chan eil aplacaid sam bith a’ cluich no a’ clàradh fuaime an-dràsta fhèin."
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:188
 msgid "Built-in"
-msgstr "'Na bhroinn o thùs"
+msgstr "’Na bhroinn o thùs"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:454
 #: ../panels/sound/gvc-sound-theme-chooser.c:466
@@ -5832,7 +5843,7 @@ msgstr "Roghainnean na fuaime"
 #: ../panels/sound/gvc-sound-theme-chooser.c:468
 #: ../panels/sound/gvc-sound-theme-chooser.c:480
 msgid "Testing event sound"
-msgstr "A' cur na fuaime fo dheuchainn"
+msgstr "A’ cur na fuaime fo dheuchainn"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:554
 #: ../panels/wacom/wacom-stylus-page.ui.h:1
@@ -5864,6 +5875,51 @@ msgstr "Subwoofer"
 msgid "Custom"
 msgstr "Gnàthaichte"
 
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: ../panels/universal-access/cc-ua-panel.c:351
+#| msgid "Default"
+msgctxt "cursor size"
+msgid "Default"
+msgstr "Bun-roghainn"
+
+#: ../panels/universal-access/cc-ua-panel.c:354
+#| msgctxt "Calibration quality"
+#| msgid "Medium"
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "Meadhanach"
+
+#: ../panels/universal-access/cc-ua-panel.c:357
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Large"
+msgstr "Mòr"
+
+#: ../panels/universal-access/cc-ua-panel.c:360
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "Nas motha"
+
+#: ../panels/universal-access/cc-ua-panel.c:363
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "As motha"
+
+#: ../panels/universal-access/cc-ua-panel.c:367
+#, c-format
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d phiogsail"
+msgstr[1] "%d phiogsail"
+msgstr[2] "%d piogsailean"
+msgstr[3] "%d piogsail"
+
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
 msgid "Uni­ver­sal Access"
@@ -5872,23 +5928,23 @@ msgstr "Inntrigeadh uile-choitcheann"
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Make it easier to see, hear, type, point and click"
 msgstr ""
-"Dèan nas fhasa e rudan fhaicinn, a chluinntinn, a sgrìobhadh, a thomhadh 's "
+"Dèan nas fhasa e rudan fhaicinn, a chluinntinn, a sgrìobhadh, a thomhadh ’s "
 "a bhriogadh"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
-#, fuzzy
 #| msgid ""
 #| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
 #| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 msgstr ""
-"meur-chlàr;a11y;so-ruigsinneachd;iomsgaradh;sùm;leughadair-sgrìn;teacsa;"
-"cruth-clò;AccessX;steigeach;slaodach;diùltaidh;luchag;Keyboard;Mouse;a11y;"
-"Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;AccessX;Sticky;Keys;"
-"Slow;Bounce;Mouse;"
+"meur-chlàr;a11y;so-ruigsinneachd;iomsgaradh;sùm;leughadair-sgrìn;teacsa"
+";cruth-clò;AccessX;steigeach;slaodach;diùltaidh;luchag;dùbailte;briog;brioga"
+"dh;dàil;taic;priobadh;boillsgeadh;Keyboard;Mouse;a11y;Accessibility;Contrast"
+";Zoom;Screen;Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Dou"
+"ble;click;Delay;Assist;Repeat;Blink;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5896,7 +5952,7 @@ msgstr "Se_all clàr-taice an inntrigidh uile-choitchinn an-còmhnaidh"
 
 #: ../panels/universal-access/uap.ui.h:2
 msgid "Seeing"
-msgstr "A' faicinn"
+msgstr "A’ faicinn"
 
 #: ../panels/universal-access/uap.ui.h:3
 msgid "_High Contrast"
@@ -5907,284 +5963,300 @@ msgid "_Large Text"
 msgstr "_Teacsa mòr"
 
 #: ../panels/universal-access/uap.ui.h:5
+msgid "C_ursor Size"
+msgstr "Me_ud a’ chùrsair"
+
+#: ../panels/universal-access/uap.ui.h:6
 #: ../panels/universal-access/zoom-options.ui.h:7
 msgid "_Zoom"
 msgstr "Sù_m"
 
-#: ../panels/universal-access/uap.ui.h:7
+#: ../panels/universal-access/uap.ui.h:8
 msgid "Screen _Reader"
 msgstr "Leughadai_r-sgrìn"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:9
 msgid "_Sound Keys"
 msgstr "_Iuchraichean fuaime"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: ../panels/universal-access/uap.ui.h:10
 msgid "Hearing"
 msgstr "Claisneachd"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:11
 msgid "_Visual Alerts"
 msgstr "_Rabhaidhean lèirsinneach"
 
-#: ../panels/universal-access/uap.ui.h:12
+#: ../panels/universal-access/uap.ui.h:13
 msgid "Screen _Keyboard"
 msgstr "Meur-_chlàr air sgrìn"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:14
 msgid "R_epeat Keys"
 msgstr "_Putain ath-dhèanaimh"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:15
 msgid "Cursor _Blinking"
-msgstr "Prio_badh a' chùrsair"
+msgstr "Prio_badh a’ chùrsair"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:16
 msgid "_Typing Assist (AccessX)"
 msgstr "_Cuidiche sgrìobhaidh (AccessX)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:17
 msgid "Pointing & Clicking"
 msgstr "Tomhadh ⁊ briogadh"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:18
 msgid "_Mouse Keys"
 msgstr "I_uchraichean luchaige"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:19
 msgid "_Click Assist"
 msgstr "Taic le _briogadh"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:20
 msgid "_Double-Click Delay"
-msgstr "_Dàil air a' bhriogadh dùbailte"
+msgstr "_Dàil air a’ bhriogadh dùbailte"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:21
 msgid "Double-Click Delay"
-msgstr "Dàil air a' bhriogadh dùbailte"
+msgstr "Dàil air a’ bhriogadh dùbailte"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:22
+#| msgid "Cursor Blinking"
+msgid "Cursor Size"
+msgstr "Meud a’ chùrsair"
+
+#: ../panels/universal-access/uap.ui.h:23
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr ""
+"’S urrainn dhut meud a’ chùrsair agus an sùm a chleachdadh còmhla ach am bi "
+"e nas fhasa an cùrsair fhaicinn."
+
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Leughadair-sgrìn"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:25
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr ""
-"Cuiridh leughadair na sgrìn fòcas air an teacsa 's tu a' gluasad troimhe."
+"Cuiridh leughadair na sgrìn fòcas air an teacsa ’s tu a’ gluasad troimhe."
 
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:26
 msgid "_Screen Reader"
 msgstr "Leughadair-_sgrìn"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Sound Keys"
 msgstr "Iuchraichean fuaime"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "Dèan bìd nuair a thèid NumLock no CapsLock a chur air no dheth."
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Visual Alerts"
 msgstr "Rabhaidhean lèirsinneach"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:30
 msgid "_Test flash"
 msgstr "_Boillsgeadh deuchainne"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "Nochd sanas lèirsinneach nuair a thèid fuaim rabhaidh a chluich."
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Flash the _window title"
 msgstr "Boillsg tiotal na _h-uinneige"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the entire _screen"
 msgstr "Boillsg an _sgrìn gu lèir"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Repeat Keys"
 msgstr "Putain ath-dhèanaimh"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Key presses repeat when key is held down."
 msgstr "Thèid brùthadh na h-iuchrach ath-dhèanamh ma chumar shìos an iuchair."
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:37
 msgid "Repeat keys delay"
 msgstr "Dàil nam putan ath-dhèanaimh"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Speed"
 msgstr "Luaths"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Repeat keys speed"
 msgstr "Astar nam putan ath-dhèanaimh"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:40
 msgid "Cursor Blinking"
-msgstr "Priobadh a' chùrsair"
+msgstr "Priobadh a’ chùrsair"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:41
 msgid "Cursor blinks in text fields."
-msgstr "Bidh an cùrsair a' priobadh ann an raointean teacsa."
+msgstr "Bidh an cùrsair a’ priobadh ann an raointean teacsa."
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Cursor blinking speed"
-msgstr "Luaths priobadh a' chùrsair"
+msgstr "Luaths priobadh a’ chùrsair"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:43
 msgid "Typing Assist"
 msgstr "An cuidiche sgrìobhaidh"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:44
 msgid "_Sticky Keys"
 msgstr "Iuchraichean _steigeach"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr ""
-"Làimhsichidh seo sreath de dh'iuchraichean atharrachaidh mar cho-iuchraichean"
+"Làimhsichidh seo sreath de dh’iuchraichean atharrachaidh mar cho-"
+"iuchraichean"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:46
 msgid "_Disable if two keys are pressed together"
 msgstr "_Cuir à comas ma thèid dà iuchair a bhrùthadh còmhla"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Beep when a _modifier key is pressed"
-msgstr "_Bìd nuair a bhios iuchair atharrachaidh 'ga bhrùthadh"
+msgstr "_Bìd nuair a bhios iuchair atharrachaidh ’ga bhrùthadh"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:48
 msgid "S_low Keys"
 msgstr "Putanan s_laodach"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr ""
 "Cuiridh seo dàil eadar brùthadh iuchrach is cuin a ghabhas an siostam ris"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:50
 msgid "A_cceptance delay:"
 msgstr "Dàil g_abhail ris:"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:51
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Goirid"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Slow keys typing delay"
 msgstr "Dàil clò-sgrìobhadh nam putan slaodach"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:53
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Fada"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is pr_essed"
 msgstr "Dèan bìd nuair a thèid iuchair a _bhrùthadh"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Beep when a key is _accepted"
 msgstr "Dèan bìd _nuair a ghabhar ri iuchair"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Beep when a key is _rejected"
 msgstr "Dèan bìd nuair a thèid iuchair a _dhiùltadh"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:57
 msgid "_Bounce Keys"
 msgstr "_Putanan bocaidh"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Ignores fast duplicate keypresses"
 msgstr "Leigidh seo seachad iuchraichean a thèid ath-bhrùthadh gu luath"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:59
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Goirid"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Bounce keys typing delay"
 msgstr "Dàil clò-sgrìobhadh air na putanan bocaidh"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:61
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Fada"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:62
 msgid "_Enable by Keyboard"
-msgstr "Cuir an comas l_eis a' mheur-chlàr"
+msgstr "Cuir an comas l_eis a’ mheur-chlàr"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Turn accessibility features on and off using the keyboard"
-msgstr ""
-"Cuiridh seo gleusan na so-ruigsinneach air no dheth leis a' mheur-chlàr"
+msgstr "Cuiridh seo gleusan na so-ruigsinneach air no dheth leis a’ mheur-chlàr"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Click Assist"
 msgstr "Taic le briogadh"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:65
 msgid "_Simulated Secondary Click"
 msgstr "Dàrnacha briogadh ma_s-fhìor"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Trigger a secondary click by holding down the primary button"
-msgstr "Dùisg dàrnacha briogadh le bhith a' cumail sìos am prìomh-phutan"
+msgstr "Dùisg dàrnacha briogadh le bhith a’ cumail sìos am prìomh-phutan"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:67
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Goirid"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Secondary click delay"
 msgstr "An dàil air an dàrnacha briogadh"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:69
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Fada"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:70
 msgid "_Hover Click"
 msgstr "Briogadh _fantainn"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Trigger a click when the pointer hovers"
-msgstr "Dùisg briogadh nuair a dh'fhanas an tomhaire os cionn rud"
+msgstr "Dùisg briogadh nuair a dh’fhanas an tomhaire os cionn rud"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:72
 msgid "D_elay:"
 msgstr "_Dàil:"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:73
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Goirid"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:74
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Fada"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Motion _threshold:"
 msgstr "_Starsnaich gluasaid:"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:76
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Beag"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:77
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Mòr"
@@ -6248,7 +6320,7 @@ msgstr "_Lean ri cùrsair na luchaige"
 
 #: ../panels/universal-access/zoom-options.ui.h:10
 msgid "_Screen part:"
-msgstr "A' phàirt dhen _sgrìn:"
+msgstr "A’ phàirt dhen _sgrìn:"
 
 #: ../panels/universal-access/zoom-options.ui.h:11
 msgid "Magnifier _extends outside of screen"
@@ -6256,19 +6328,19 @@ msgstr "Thèid am m_eudaichear a-mach air an sgrìn"
 
 #: ../panels/universal-access/zoom-options.ui.h:12
 msgid "_Keep magnifier cursor centered"
-msgstr "_Cum cùrsair a' mheudaicheir sa mheadhan"
+msgstr "_Cum cùrsair a’ mheudaicheir sa mheadhan"
 
 #: ../panels/universal-access/zoom-options.ui.h:13
 msgid "Magnifier cursor _pushes contents around"
-msgstr "_Gluaisidh cùrsair a' mheudaicheir susbaint mun cuairt"
+msgstr "_Gluaisidh cùrsair a’ mheudaicheir susbaint mun cuairt"
 
 #: ../panels/universal-access/zoom-options.ui.h:14
 msgid "Magnifier cursor moves with _contents"
-msgstr "Gluaisidh cùrsair a' mheudaicheir mun _cuairt leis an t-susbaint"
+msgstr "Gluaisidh cùrsair a’ mheudaicheir mun _cuairt leis an t-susbaint"
 
 #: ../panels/universal-access/zoom-options.ui.h:15
 msgid "Magnifier Position:"
-msgstr "Ionad a' mheudaicheir:"
+msgstr "Ionad a’ mheudaicheir:"
 
 #: ../panels/universal-access/zoom-options.ui.h:16
 msgid "Magnifier"
@@ -6303,7 +6375,7 @@ msgstr "_Crois-ribeachan:"
 
 #: ../panels/universal-access/zoom-options.ui.h:24
 msgid "_Overlaps mouse cursor"
-msgstr "A' dol a-steach air cùrsair na _luchaige"
+msgstr "A’ dol a-steach air cùrsair na _luchaige"
 
 #: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Crosshairs"
@@ -6387,12 +6459,12 @@ msgstr "Rianaire"
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Account _Type"
-msgstr "_Seòrsa a' chunntais"
+msgstr "_Seòrsa a’ chunntais"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:10
 msgid "Allow user to set a password when they next _login"
 msgstr ""
-"Leig leis a' chleachdaiche facal-faire a thaghadh nuair a ch_làraicheas iad "
+"Leig leis a’ chleachdaiche facal-faire a thaghadh nuair a ch_làraicheas iad "
 "a-steach an ath-thuras"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:11
@@ -6410,7 +6482,7 @@ msgid ""
 "resources on the internet."
 msgstr ""
 "Le clàradh a-steach enterprise, gabhaidh cunntas-cleachdaiche fo stiùireadh "
-"meadhanaichte a chleachdadh air an uidheam seo. 'S urrainn dhut an cunntas "
+"meadhanaichte a chleachdadh air an uidheam seo. ’S urrainn dhut an cunntas "
 "seo a chleachdadh cuideachd gus goireasan na companaidh inntrigeadh air an "
 "eadar-lìn."
 
@@ -6555,7 +6627,7 @@ msgstr "Am _facal-faire làithreach"
 #: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "Allow user to change their password on next login"
 msgstr ""
-"Leig leis a' chleachdaiche am facal-faire atharrachadh nuair a chlàraicheas "
+"Leig leis a’ chleachdaiche am facal-faire atharrachadh nuair a chlàraicheas "
 "iad a-steach an ath-thuras"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
@@ -6566,6 +6638,16 @@ msgstr "Suidhich facal-faire an-dràsta"
 msgid "_Add User…"
 msgstr "Cuir cle_achdaiche ris…"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr ""
+"Feumaidh tu an seisean ath-thòiseachadh gus bi buaidh aig na dh’atharraich "
+"thu"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "Ath-thòisich an-dràsta"
+
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "Clàradh a-steach fèin-_obrachail"
@@ -6576,17 +6658,16 @@ msgstr "Clàradh a-steach le _meur-lorg"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "User Icon"
-msgstr "Ìomhaigheag a' chleachdaiche"
+msgstr "Ìomhaigheag a’ chleachdaiche"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "An clàradh a-steach mu dheireadh"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
-#, fuzzy
 #| msgid "Remove User Account"
 msgid "Remove User…"
-msgstr "Thoir air falbh cunntas a' chleachdaiche"
+msgstr "Thoir air falbh an cleachdaiche…"
 
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
@@ -6595,13 +6676,13 @@ msgstr "Stiùirich cunntasan nan cleachdaichean"
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
 msgid "Authentication is required to change user data"
 msgstr ""
-"Feumaidh tu dearbhadh a dhèanamh mus urrainn dhut dàta a' chleachdaiche "
+"Feumaidh tu dearbhadh a dhèanamh mus urrainn dhut dàta a’ chleachdaiche "
 "atharrachadh"
 
 #: ../panels/user-accounts/pw-utils.c:81
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
-msgstr "Chan fhaod an seann fhacal-faire 's am fear ùr a bhith co-ionnann."
+msgstr "Chan fhaod an seann fhacal-faire ’s am fear ùr a bhith co-ionnann."
 
 #: ../panels/user-accounts/pw-utils.c:83
 msgctxt "Password hint"
@@ -6621,7 +6702,7 @@ msgstr "Bhiodh facal-faire as aonais an ainm-chleachdaiche agad nas làidire."
 #: ../panels/user-accounts/pw-utils.c:89
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
-msgstr "Feuch is na cleachd d' ainm san fhacal-fhaire."
+msgstr "Feuch is na cleachd d’ ainm san fhacal-fhaire."
 
 #: ../panels/user-accounts/pw-utils.c:91
 msgctxt "Password hint"
@@ -6666,7 +6747,7 @@ msgstr "Feuch is cleachd measgachadh de litrichean, àireamhan is puingeachadh."
 #: ../panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
-msgstr "Feuch is seachain an aon charactar a-rithist 's a-rithist."
+msgstr "Feuch is seachain an aon charactar a-rithist ’s a-rithist."
 
 #: ../panels/user-accounts/pw-utils.c:111
 msgctxt "Password hint"
@@ -6674,7 +6755,7 @@ msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
 msgstr ""
-"Feuch is seachain an aon seòrsa de charactar a-rithist 's a-rithist: "
+"Feuch is seachain an aon seòrsa de charactar a-rithist ’s a-rithist: "
 "feumaidh tu measgachadh de litrichean, àireamhan is puingeachadh."
 
 #: ../panels/user-accounts/pw-utils.c:113
@@ -6683,58 +6764,37 @@ msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "Feuch is seachain sreathan mar 1234 no abcd."
 
 #: ../panels/user-accounts/pw-utils.c:115
+#| msgctxt "Password hint"
+#| msgid "Try to use a mixture of letters, numbers and punctuation."
 msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "Feuch is cleachd barrachd litrichean, àireamhan is chomharran."
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr ""
+"Feumaidh faclan-faire a bhith nas fhaide. Feuch is cuir ris barrachd "
+"litrichean, àireamhan is puingeachadh."
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr ""
-"Cleachd litrichean mòra 's beaga agus feuch an cleachd thu àireamh no dhà."
+"Cleachd litrichean mòra ’s beaga agus feuch an cleachd thu àireamh no dhà."
 
 #: ../panels/user-accounts/pw-utils.c:119
+#| msgctxt "Password hint"
+#| msgid ""
+#| "Good password! Adding more letters, numbers and punctuation will make it "
+#| "stronger."
 msgctxt "Password hint"
 msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
-msgstr ""
-"Deagh fhacal-faire! Cuir ris barrachd litrichean, àireamhan is puingeachadh "
-"is bidh e nas treasa fhathast."
-
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "Neart: lag"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "Neart: ìseal"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "Neart: meadhanach"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "Neart: math"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "Neart: àrd"
+"Adding more letters, numbers and punctuation will make the password stronger."
+msgstr ""
+"Bidh e nas treasa ma chuireas tu barrachd litrichean, àireamhan is "
+"puingeachadh ris."
 
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
-msgstr "Dh'fhàillig an dearbhadh"
+msgstr "Dh’fhàillig an dearbhadh"
 
 #: ../panels/user-accounts/run-passwd.c:502
 #, c-format
@@ -6765,7 +6825,7 @@ msgstr ""
 #: ../panels/user-accounts/run-passwd.c:524
 #, c-format
 msgid "The old and new passwords are the same"
-msgstr "Tha an seann fhacal-faire 's am fear ùra co-ionnann"
+msgstr "Tha an seann fhacal-faire ’s am fear ùra co-ionnann"
 
 #: ../panels/user-accounts/run-passwd.c:528
 #, c-format
@@ -6786,35 +6846,34 @@ msgstr "Mearachd neo-aithnichte"
 #: ../panels/user-accounts/um-account-dialog.c:34
 msgid "Should match the web address of your login provider."
 msgstr ""
-"Bu chòir dha a bhith co-ionnann ri seòladh-lìn solaraiche a' chlàraidh a-"
-"steach agad."
+"Bu chòir dha a bhith co-ionnann ri seòladh-lìn solaraiche a’ chlàraidh "
+"a-steach agad."
 
 #: ../panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
-msgstr "Cha b' urrainn dhuinn an cunntas a chur ris"
+msgstr "Cha b’ urrainn dhuinn an cunntas a chur ris"
 
-#: ../panels/user-accounts/um-account-dialog.c:463
+#: ../panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "Chan eil an dà fhacal-faire co-ionnann."
 
-#: ../panels/user-accounts/um-account-dialog.c:718
-#: ../panels/user-accounts/um-account-dialog.c:764
-#: ../panels/user-accounts/um-account-dialog.c:785
+#: ../panels/user-accounts/um-account-dialog.c:717
+#: ../panels/user-accounts/um-account-dialog.c:763
+#: ../panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
-msgstr "Cha b' urrainn dhuinn an cunntas a chlàradh"
+msgstr "Cha b’ urrainn dhuinn an cunntas a chlàradh"
 
-#: ../panels/user-accounts/um-account-dialog.c:908
+#: ../panels/user-accounts/um-account-dialog.c:907
 msgid "No supported way to authenticate with this domain"
 msgstr ""
 "Chan eil dòigh sam bith ann ris a bheil taic agus leis an urrainnear "
 "dearbhadh a dhèanamh air an àrainn seo"
 
-#: ../panels/user-accounts/um-account-dialog.c:981
+#: ../panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
-msgstr "Cha b' urrainn dhuinn ceangal ris an àrainn"
+msgstr "Cha b’ urrainn dhuinn ceangal ris an àrainn"
 
-#: ../panels/user-accounts/um-account-dialog.c:1042
-#, fuzzy
+#: ../panels/user-accounts/um-account-dialog.c:1041
 #| msgid ""
 #| "That login name didn't work.\n"
 #| "Please try again."
@@ -6822,11 +6881,10 @@ msgid ""
 "That login name didn’t work.\n"
 "Please try again."
 msgstr ""
-"Cha do dh'obraich an t-ainm sin.\n"
+"Cha do dh’obraich an t-ainm sin.\n"
 "Feuch ris a-rithist."
 
-#: ../panels/user-accounts/um-account-dialog.c:1049
-#, fuzzy
+#: ../panels/user-accounts/um-account-dialog.c:1048
 #| msgid ""
 #| "That login password didn't work.\n"
 #| "Please try again."
@@ -6834,15 +6892,16 @@ msgid ""
 "That login password didn’t work.\n"
 "Please try again."
 msgstr ""
-"Cha do dh'obraich am facal-faire sin.\n"
+"Cha do dh’obraich am facal-faire sin.\n"
 "Feuch ris a-rithist."
 
-#: ../panels/user-accounts/um-account-dialog.c:1057
+#: ../panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
-msgstr "Cha b' urrainn dhuinn clàradh a-steach aig an àrainn"
+msgstr "Cha b’ urrainn dhuinn clàradh a-steach aig an àrainn"
 
-#: ../panels/user-accounts/um-account-dialog.c:1115
-msgid "Unable find the domain. Maybe you misspelled it?"
+#: ../panels/user-accounts/um-account-dialog.c:1114
+#| msgid "Unable find the domain. Maybe you misspelled it?"
+msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr ""
 "Chan fhaigh sinn greim air an àrainn. Saoil a bheil e air a dheagh-"
 "litreachadh?"
@@ -6866,7 +6925,7 @@ msgstr ""
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:144
 msgid "The device is already in use."
-msgstr "Tha an t-uidheam seo 'ga chleachdadh mu thràth."
+msgstr "Tha an t-uidheam seo ’ga chleachdadh mu thràth."
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:146
 msgid "An internal error occurred."
@@ -6889,7 +6948,7 @@ msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr ""
-"A bheil thu airson na meur-lorgan clàraichte a sguabadh às airson 's nach "
+"A bheil thu airson na meur-lorgan clàraichte a sguabadh às airson ’s nach "
 "urrainnear clàradh a-steach leotha tuilleadh?"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:443
@@ -6901,25 +6960,25 @@ msgstr "Deiseil!"
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
 #: ../panels/user-accounts/um-fingerprint-dialog.c:504
 #: ../panels/user-accounts/um-fingerprint-dialog.c:546
-#, fuzzy, c-format
+#, c-format
 #| msgid "Could not access '%s' device"
 msgid "Could not access “%s” device"
-msgstr "Cha b' urrainn dhuinn cothrom fhaighinn air an uidheam \"%s\""
+msgstr "Cha b’ urrainn dhuinn cothrom fhaighinn air an uidheam “%s”"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
 #: ../panels/user-accounts/um-fingerprint-dialog.c:587
-#, fuzzy, c-format
+#, c-format
 #| msgid "Could not start finger capture on '%s' device"
 msgid "Could not start finger capture on “%s” device"
 msgstr ""
-"Cha b' urrainn dhuinn glacadh a' mheòir a thòiseachadh air an uidheam \"%s\""
+"Cha b’ urrainn dhuinn glacadh a’ mheòir a thòiseachadh air an uidheam “%s”"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:631
 msgid "Could not access any fingerprint readers"
 msgstr ""
-"Cha b' urrainn dhuinn cothrom fhaighinn air leughadair mheur-lorgan sam bith"
+"Cha b’ urrainn dhuinn cothrom fhaighinn air leughadair mheur-lorgan sam bith"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:632
 msgid "Please contact your system administrator for help."
@@ -6931,7 +6990,7 @@ msgstr "Cuir fios gu rianaire an t-siostaim agad airson cuideachadh."
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
 #: ../panels/user-accounts/um-fingerprint-dialog.c:714
-#, fuzzy, c-format
+#, c-format
 #| msgid ""
 #| "To enable fingerprint login, you need to save one of your fingerprints, "
 #| "using the '%s' device."
@@ -6939,16 +6998,16 @@ msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the “%s” device."
 msgstr ""
-"Feumaidh tu lorg do mheòir a chlàradh leis an uidheam \"%s\" mus urrainn "
-"dhut clàradh a-steach le meur-lorg."
+"Feumaidh tu lorg do mheòir a chlàradh leis an uidheam “%s” mus urrainn dhut "
+"clàradh a-steach le meur-lorg."
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:721
 msgid "Selecting finger"
-msgstr "A' taghadh meur"
+msgstr "A’ taghadh meur"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:722
 msgid "Enrolling fingerprints"
-msgstr "A' clàradh nam meur-lorgan"
+msgstr "A’ clàradh nam meur-lorgan"
 
 #: ../panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
@@ -6981,7 +7040,7 @@ msgstr "%e %b %Y"
 #, c-format
 msgctxt "login history week label"
 msgid "%s — %s"
-msgstr ""
+msgstr "%s — %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
@@ -7011,52 +7070,52 @@ msgstr "Thòisich an seisean"
 #. Translators: This is the title of the "Account Activity" dialog.
 #. The %s is the user real name.
 #: ../panels/user-accounts/um-history-dialog.c:299
-#, fuzzy, c-format
+#, c-format
 #| msgid "%s - Account Activity"
 msgid "%s — Account Activity"
-msgstr "%s - Gnìomhachd a' chunntais"
+msgstr "%s – Gnìomhachd a’ chunntais"
 
-#: ../panels/user-accounts/um-password-dialog.c:145
+#: ../panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "Tagh facal-faire eile."
 
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "Nach cuir thu am facal-faire làithreach agad a-rithist?"
 
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
-msgstr "Cha b' urrainn dhuinn am facal-faire atharrachadh"
+msgstr "Cha b’ urrainn dhuinn am facal-faire atharrachadh"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "Chan eil an dà fhacal-faire co-ionnann."
 
-#: ../panels/user-accounts/um-photo-dialog.c:215
+#: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "Brabhsaich airson barrachd dhealbhan"
 
-#: ../panels/user-accounts/um-photo-dialog.c:449
+#: ../panels/user-accounts/um-photo-dialog.c:452
 msgid "Disable image"
 msgstr "Cuir an dealbh à comas"
 
-#: ../panels/user-accounts/um-photo-dialog.c:467
+#: ../panels/user-accounts/um-photo-dialog.c:470
 msgid "Take a photo…"
 msgstr "Tog dealbh…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:485
+#: ../panels/user-accounts/um-photo-dialog.c:488
 msgid "Browse for more pictures…"
 msgstr "Brabhsaich airson barrachd dhealbhan…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:714
 #, c-format
 msgid "Used by %s"
-msgstr "'Ga chleachdadh le %s"
+msgstr "’Ga chleachdadh le %s"
 
 #: ../panels/user-accounts/um-realm-manager.c:350
 msgid "Cannot automatically join this type of domain"
 msgstr ""
-"Chan urrainnear pàirt a ghabhail sa leithid seo de dh'àrainn gu fèin-"
+"Chan urrainnear pàirt a ghabhail sa leithid seo de dh’àrainn gu fèin-"
 "obrachail"
 
 #: ../panels/user-accounts/um-realm-manager.c:413
@@ -7075,20 +7134,19 @@ msgid "Invalid password, please try again"
 msgstr "Tha am facal-faire cearr, nach fheuch thu ris a-rithist?"
 
 #: ../panels/user-accounts/um-realm-manager.c:834
-#, fuzzy, c-format
+#, c-format
 #| msgid "Couldn't connect to the %s domain: %s"
 msgid "Couldn’t connect to the %s domain: %s"
-msgstr "Cha b' urrainn ceangal ris an àrainn %s: %s"
+msgstr "Cha b’ urrainn ceangal ris an àrainn %s: %s"
 
 #: ../panels/user-accounts/um-user-panel.c:195
-#, fuzzy
 #| msgid "My Account"
 msgid "Your account"
-msgstr "An cunntas agam"
+msgstr "An cunntas agad"
 
 #: ../panels/user-accounts/um-user-panel.c:390
 msgid "Failed to delete user"
-msgstr "Cha b' urrainn dhuinn an cleachdaiche a sguabadh às"
+msgstr "Cha b’ urrainn dhuinn an cleachdaiche a sguabadh às"
 
 #: ../panels/user-accounts/um-user-panel.c:448
 #: ../panels/user-accounts/um-user-panel.c:507
@@ -7110,11 +7168,11 @@ msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr ""
-"Ma sguabas tu às cleachdaiche fhad 's a tha iad clàraichte a-staigh "
-"fhathast, dh'fhaoidte gum fàg sin an siostam neo-sheasmhach."
+"Ma sguabas tu às cleachdaiche fhad ’s a tha iad clàraichte a-staigh "
+"fhathast, dh’fhaoidte gum fàg sin an siostam neo-sheasmhach."
 
 #: ../panels/user-accounts/um-user-panel.c:635
-#, fuzzy, c-format
+#, c-format
 #| msgid "Do you want to keep %s's files?"
 msgid "Do you want to keep %s’s files?"
 msgstr "A bheil thu airson na faidhlichean aig %s a chumail?"
@@ -7124,7 +7182,7 @@ msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr ""
-"Gabhaidh am pasgan dachaidh, spàl a' phuist agus na faidhlichean sealach a "
+"Gabhaidh am pasgan dachaidh, spàl a’ phuist agus na faidhlichean sealach a "
 "ghlèidheadh nuair a sguabar às cunntas cleachdaiche."
 
 #: ../panels/user-accounts/um-user-panel.c:642
@@ -7136,7 +7194,7 @@ msgid "_Keep Files"
 msgstr "_Cum na faidhlichean"
 
 #: ../panels/user-accounts/um-user-panel.c:657
-#, fuzzy, c-format
+#, c-format
 #| msgid "Are you sure you want to revoke remotely managed %s's account?"
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr ""
@@ -7168,7 +7226,7 @@ msgstr "Air clàradh a-steach"
 
 #: ../panels/user-accounts/um-user-panel.c:1117
 msgid "Failed to contact the accounts service"
-msgstr "Cha b' urrainn dhuinn fios a chur gu seirbheis nan cunntasan"
+msgstr "Cha b’ urrainn dhuinn fios a chur gu seirbheis nan cunntasan"
 
 #: ../panels/user-accounts/um-user-panel.c:1119
 msgid "Please make sure that the AccountService is installed and enabled."
@@ -7201,7 +7259,7 @@ msgstr ""
 
 #: ../panels/user-accounts/um-user-panel.c:1216
 msgid "Delete the selected user account"
-msgstr "Sguab às cunntas a' chleachdaiche a thagh thu"
+msgstr "Sguab às cunntas a’ chleachdaiche a thagh thu"
 
 #: ../panels/user-accounts/um-user-panel.c:1228
 #: ../panels/user-accounts/um-user-panel.c:1390
@@ -7209,11 +7267,10 @@ msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
 msgstr ""
-"Gus cunntas a' chleachdaiche a thagh thu a sguabadh às,\n"
+"Gus cunntas a’ chleachdaiche a thagh thu a sguabadh às,\n"
 "briog air an ìomhaigheag * an toiseach"
 
 #: ../panels/user-accounts/um-utils.c:507
-#, fuzzy
 #| msgid "Sorry, that user name isn't available. Please try another."
 msgid "Sorry, that user name isn’t available. Please try another."
 msgstr ""
@@ -7226,37 +7283,39 @@ msgid "The username is too long."
 msgstr "Tha an t-ainm-cleachdaiche ro fhada."
 
 #: ../panels/user-accounts/um-utils.c:513
-#, fuzzy
 #| msgid "The username cannot start with a '-'."
 msgid "The username cannot start with a “-”."
-msgstr "Chan fhaod an t-ainm-cleachdaiche tòiseachadh le \"-\"."
+msgstr "Chan fhaod an t-ainm-cleachdaiche tòiseachadh le “-”."
 
 #: ../panels/user-accounts/um-utils.c:516
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
 msgstr ""
-"Cha bu chòir a bhith am broinn ainm-cleachdaiche ach litrichean mòra 's "
+"Cha bu chòir a bhith am broinn ainm-cleachdaiche ach litrichean mòra ’s "
 "beaga o a-z, àireamhan agus gin dhe na caractaran seo: . - _"
 
 #: ../panels/user-accounts/um-utils.c:520
-#, fuzzy
 #| msgid "This will be used to name your home folder and can't be changed."
 msgid "This will be used to name your home folder and can’t be changed."
 msgstr ""
-"Thèid seo a chleachdadh gus ainm a chur air a' phasgan dachaigh agad is cha "
+"Thèid seo a chleachdadh gus ainm a chur air a’ phasgan dachaigh agad is cha "
 "ghabh atharrachadh."
 
 #: ../panels/wacom/button-mapping.ui.h:1
 msgid "Map Buttons"
 msgstr "Mapaich putanan"
 
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+msgid "_Close"
+msgstr "_Dùin"
+
 #: ../panels/wacom/button-mapping.ui.h:3
 msgid "Map buttons to functions"
 msgstr "Mapaich putanan ri gnìomhan"
 
 #: ../panels/wacom/button-mapping.ui.h:4
-#, fuzzy
 #| msgid ""
 #| "To edit a shortcut, choose the \"Send Keystroke\" action, press the "
 #| "keyboard shortcut button and hold down the new keys or press Backspace to "
@@ -7265,8 +7324,8 @@ msgid ""
 "To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
 msgstr ""
-"Gus ath-ghoirid a dheasachadh, tagh an gnìomh \"Cuir bualadh nan iuchraichean"
-"\", brùth putan ath-ghoirid meur-chlàir is cum sìos na h-iuchraichean ùra no "
+"Gus ath-ghoirid a dheasachadh, tagh an gnìomh “Cuir brùthadh iuchrach”, "
+"brùth putan ath-ghoirid meur-chlàir is cum sìos na h-iuchraichean ùra no "
 "brùth Backspace gus fhalamhachadh."
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:83
@@ -7278,28 +7337,26 @@ msgstr ""
 "tablaid a chailbhreachadh."
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:87
-#, fuzzy
 #| msgid "Mis-click detected, restarting..."
 msgid "Mis-click detected, restarting…"
-msgstr "Mhothaich sinn do bhriogadh claon, ag ath-thòiseachadh..."
+msgstr "Mhothaich sinn do bhriogadh claon, ag ath-thòiseachadh…"
 
 #: ../panels/wacom/cc-wacom-button-row.c:266
-#, fuzzy, c-format
+#, c-format
 #| msgid "Button"
 msgid "Button %d"
-msgstr "Putan"
+msgstr "Putan %d"
 
 #: ../panels/wacom/cc-wacom-button-row.h:53
-#, fuzzy
 #| msgid "Applications"
 msgctxt "Wacom action-type"
 msgid "Application defined"
-msgstr "Aplacaidean"
+msgstr "A-rèir na h-aplacaid"
 
 #: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
-msgstr "Cuir buille-iuchrach"
+msgstr "Cuir brùthadh iuchrach"
 
 #: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
@@ -7309,7 +7366,7 @@ msgstr "Gearr leum gu monatair eile"
 #: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
-msgstr "Seall a' chobhair air an sgrìn"
+msgstr "Seall a’ chobhair air an sgrìn"
 
 #: ../panels/wacom/cc-wacom-mapping-panel.c:260
 msgid "Output:"
@@ -7401,7 +7458,7 @@ msgstr "Mapaich putanan…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:12
 msgid "Calibrate…"
-msgstr "Cailbhrich..."
+msgstr "Cailbhrich…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:13
 msgid "Adjust display resolution"
@@ -7421,7 +7478,7 @@ msgstr "An comhair na làimhe chlì"
 
 #: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
-msgstr "Ath-ghoirid…"
+msgstr "Ath-ghoirid ùr…"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:2
 msgid "Middle Mouse Button Click"
@@ -7440,14 +7497,13 @@ msgid "Forward"
 msgstr "Air adhart"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:6
-#, fuzzy
 #| msgid "No results found"
 msgid "No stylus found"
-msgstr "Cha deach toradh a lorg"
+msgstr "Cha deach peann a lorg"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:7
 msgid "Please move your stylus to the proximity of the tablet to configure it"
-msgstr ""
+msgstr "Gluais am peann agad faisg air an tablaid gus a rèiteachadh"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:10
 msgid "Eraser Pressure Feel"
@@ -7463,25 +7519,41 @@ msgstr "Stalcanta"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:13
 msgid "Top Button"
-msgstr "Am putan aig a' bharr"
+msgstr "Am putan aig a’ bharr"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:14
 msgid "Lower Button"
-msgstr "Am putan aig a' bhonn"
+msgstr "Am putan aig a’ bhonn"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:15
 msgid "Tip Pressure Feel"
-msgstr "Faireachdainn brùthadh a' chinn"
+msgstr "Faireachdainn brùthadh a’ chinn"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:17
 msgid "page 3"
 msgstr "duilleag 3"
 
-#: ../shell/alt/cc-window.c:766 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1484
+#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:762
 msgid "All Settings"
 msgstr "Na h-uile roghainn"
 
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "Pearsanta"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "Bathar-cruaidh"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "Siostam"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "Ionad-stiùiridh GNOME"
@@ -7491,7 +7563,6 @@ msgid "Utilities to configure the GNOME desktop"
 msgstr "Goireasan gus an deasg GNOME a rèiteachadh"
 
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
-#, fuzzy
 #| msgid ""
 #| "The control center is GNOME's main interface for configuration of various "
 #| "aspects of your desktop."
@@ -7499,7 +7570,7 @@ msgid ""
 "The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
 msgstr ""
-"'S e a' phrìomh eadar-aghaidh aig GNOME a tha san ionad-stiùiridh gus iomadh "
+"’S e a’ phrìomh eadar-aghaidh aig GNOME a tha san ionad-stiùiridh gus iomadh "
 "gleus dhen deasg agad a rèiteachadh."
 
 #: ../shell/cc-application.c:45
@@ -7524,7 +7595,7 @@ msgstr "Seall ainmean a ghabhas a chleachdadh is dèan fàgail"
 
 #: ../shell/cc-application.c:50
 msgid "Panel to display"
-msgstr "A' phanail a thèid a shealltainn"
+msgstr "A’ phanail a thèid a shealltainn"
 
 #: ../shell/cc-application.c:50
 msgid "[PANEL] [ARGUMENT…]"
@@ -7542,22 +7613,6 @@ msgstr "Cobhair"
 msgid "Quit"
 msgstr "Fàg an-seo"
 
-#. Add categories
-#: ../shell/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "Pearsanta"
-
-#: ../shell/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "Bathar-cruaidh"
-
-#: ../shell/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "Siostam"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Roghainnean;"
@@ -7602,6 +7657,215 @@ msgstr "Hotspot"
 msgid "No results found"
 msgstr "Cha deach toradh a lorg"
 
+#~ msgid "Lid Closed"
+#~ msgstr "Mullach dùinte"
+
+#~ msgid "Mirrored"
+#~ msgstr "Sgàthanaichte"
+
+#~ msgid "Primary"
+#~ msgstr "Prìomh-phanail"
+
+#~ msgid "Secondary"
+#~ msgstr "Panail dhàrnach"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "Cuir air gleus na co-thaisbeanaidhean"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr ""
+#~ "Slaod na h-uidheaman-taisbeanaidh mun cuairt gus an t-òrdugh atharrachadh"
+
+#~ msgid "%d Hz (NTSC)"
+#~ msgstr "%d Hz (NTSC)"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "Cuairtich gu tuathail le 90°"
+
+#~ msgid "Rotate by 180°"
+#~ msgstr "Cuairtich le 180°"
+
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "Cuairtich gu deiseil le 90°"
+
+#~ msgid "Size"
+#~ msgstr "Meud"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "Co-mheas an deilbh"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr ""
+#~ "Seall am bàr mullaich is foir-shealladh na gnìomhachd air an uidheam-"
+#~ "taisbeanaidh seo"
+
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr ""
+#~ "Cuir an t-uidheam-taisbeanaidh seo còmhla ri fear eile airson rum-obrach "
+#~ "a bharrachd a chruthachadh"
+
+#~ msgid "Presentation"
+#~ msgstr "Taisbeanadh"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "Na seall ach taisbeanaidhean-shleamhnagan is meadhanan"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "Seall an sealladh làithreach agad air an dà uidheam-taisbeanaidh"
+
+#~ msgid "Turn Off"
+#~ msgstr "Cuir dheth"
+
+#~| msgid "Don't use this display"
+#~ msgid "Don’t use this display"
+#~ msgstr "Na cleachd an t-uidheam-taisbeanaidh seo"
+
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "Cuir _air gleus na co-thaisbeanaidhean"
+
+#~ msgid "%s %d-bit (Build ID: %s)"
+#~ msgstr "%s %d-biod (ID na togail: %s)"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d-biod"
+
+#~ msgid "Base system"
+#~ msgstr "Bun-shiostam"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Ath-ghoirid;Ath-dhèan;Priobadh;"
+
+#~ msgid "Press Esc to cancel."
+#~ msgstr "Brùth air Esc airson sgur dheth."
+
+#~ msgid "Server"
+#~ msgstr "Frithealaiche"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "Sguab às am frithealaiche DNS"
+
+#~ msgid "Reset"
+#~ msgstr "Ath-shuidhich"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "C_uir ri làimh chleachdaichean eile"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "_Sòn na cachaileith-teine"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "Bun-roghainn"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "Tha an sòn seo a' sònrachadh ìre earbsa a' cheangail"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr ""
+#~ "Ath-shuidhich roghainnean an lìonraidh seo, a' gabhail a-steach nam "
+#~ "faclan-faire, ach cuimhnich e mar lìonra as fhearr leat"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr ""
+#~ "Thoir air falbh fiosrachadh sam bith mun lìonra seo 's na dèan ceangal "
+#~ "ris gu fèin-obrachail a-rithist"
+
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "Ma tha ceangal agad ris an eadar-lìon a bharrachd air a' cheangal "
+#~ "uèirleas, 's urrainn dhut hotspot uèirleas a shuidheachadh gus an ceangal "
+#~ "agad a cho-roinneadh le daoine eile."
+
+#~ msgid "History"
+#~ msgstr "An eachdraidh"
+
+#~ msgid "Proxy"
+#~ msgstr "Progsaidh"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "Cui_r pròifil ris…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "Chan eil gin"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "A làimh"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "Gu fèin-obrachail"
+
+#~ msgid "Add Device"
+#~ msgstr "Cuir uidheam ris"
+
+#~ msgid "Remove Device"
+#~ msgstr "Thoirt an t-uidheam air falbh"
+
+#~ msgid "VPN Type"
+#~ msgstr "Seòrsa an VPN"
+
+#~ msgid "Group Name"
+#~ msgstr "Ainm a' bhuidhinn"
+
+#~ msgid "Group Password"
+#~ msgstr "Facal-faire a' bhuidhinn"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "_Cleachd mar hotspot…"
+
+#~ msgid "_History"
+#~ msgstr "An eachdraid_h"
+
+#~ msgid "invalid EAP-TLS password: missing"
+#~ msgstr "facal-faire EAP-TLS mì-dhligheach: chan eil gin ann"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "Loading options…"
+#~ msgstr "A' luchdadh nan roghainnean…"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "Feuch is cleachd barrachd litrichean, àireamhan is chomharran."
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "Neart: lag"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "Neart: ìseal"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "Neart: meadhanach"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "Neart: math"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "Neart: àrd"
+
 #~ msgid "Edit"
 #~ msgstr "Deasaich"
 
@@ -7679,9 +7943,6 @@ msgstr "Cha deach toradh a lorg"
 #~ msgid "Provide PPD File…"
 #~ msgstr "Solair faidhle PPD…"
 
-#~ msgid "Test page"
-#~ msgstr "Duilleag deuchainne"
-
 #~ msgid "Add a New Printer"
 #~ msgstr "Cuir clò-bhualadair ùr ris"
 
@@ -8066,9 +8327,6 @@ msgstr "Cha deach toradh a lorg"
 #~ msgid "Pause Printing"
 #~ msgstr "Cuir an clò-bhualadh 'na stad"
 
-#~ msgid "Cancel Print Job"
-#~ msgstr "Sguir dhen obair chlò-bhualaidh"
-
 #~ msgctxt "print job"
 #~ msgid "Held"
 #~ msgstr "'Ga chumail"
@@ -8130,9 +8388,6 @@ msgstr "Cha deach toradh a lorg"
 #~ msgid "When battery power is _critical"
 #~ msgstr "Nuair a bhios am bataraidh _cha mhòr falamh"
 
-#~ msgid "Power Off"
-#~ msgstr "Cumhachd dheth"
-
 #~ msgid ""
 #~ "share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;"
 #~ "video;pictures;photos;movies;server;renderer;"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]