[gnome-control-center] Update Scottish Gaelic translation



commit 88277534a5f5326685f63e89e88c2ccc99413ec1
Author: Gun Chleoc <fios foramnagaidhlig net>
Date:   Tue Apr 12 12:11:16 2022 +0000

    Update Scottish Gaelic translation

 po/gd.po | 11360 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 7122 insertions(+), 4238 deletions(-)
---
diff --git a/po/gd.po b/po/gd.po
index 448742d7f..e49519a7e 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
 "issues\n"
-"POT-Creation-Date: 2018-05-25 11:45+0000\n"
+"POT-Creation-Date: 2022-04-07 11:50+0000\n"
 "PO-Revision-Date: 2018-02-26 12:42+0100\n"
 "Last-Translator: GunChleoc <fios foramnagaidhlig net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
@@ -23,194 +23,506 @@ msgstr ""
 "X-Launchpad-Export-Date: 2016-04-20 12:56+0000\n"
 "X-Project-Style: gnome\n"
 
-#: panels/background/background.ui:49
-msgid "_Background"
-msgstr "Cùlai_bh"
-
-#. This refers to a slideshow background
-#: panels/background/background.ui:99 panels/background/background.ui:212
-msgid "Changes throughout the day"
-msgstr "Atharraichean tron latha"
-
-#. To translators: This is a noun, not a verb
-#: panels/background/background.ui:162
-msgid "_Lock Screen"
-msgstr "G_lais an sgrìn"
-
-#: panels/background/background.ui:268
-msgctxt "background, style"
-msgid "Tile"
-msgstr "Leacag"
-
-#: panels/background/background.ui:272
-msgctxt "background, style"
-msgid "Zoom"
-msgstr "Sùm"
-
-#: panels/background/background.ui:276
-msgctxt "background, style"
-msgid "Center"
-msgstr "Meadhanaich"
-
-#: panels/background/background.ui:280
-msgctxt "background, style"
-msgid "Scale"
-msgstr "Sgèile"
+#: panels/applications/cc-applications-panel.c:803
+#, fuzzy
+#| msgid "System Sounds"
+msgid "System Bus"
+msgstr "Fuaimean an t-siostaim"
 
-#: panels/background/background.ui:284
-msgctxt "background, style"
-msgid "Fill"
-msgstr "Lìon"
+#: panels/applications/cc-applications-panel.c:803
+#: panels/applications/cc-applications-panel.c:805
+#: panels/applications/cc-applications-panel.c:818
+#: panels/applications/cc-applications-panel.c:823
+#, fuzzy
+#| msgid "_Full Name"
+msgid "Full access"
+msgstr "Ainm _slàn"
 
-#: panels/background/background.ui:288
-msgctxt "background, style"
-msgid "Span"
-msgstr "Ruigheachd"
+#: panels/applications/cc-applications-panel.c:805
+#, fuzzy
+#| msgid "Session Ended"
+msgid "Session Bus"
+msgstr "Thàinig an seisean gu crìoch"
 
-#: panels/background/cc-background-chooser-dialog.c:424
-msgid "Wallpapers"
-msgstr "Pàipearan-balla"
+#: panels/applications/cc-applications-panel.c:809
+#: panels/power/cc-power-panel.ui:75 panels/thunderbolt/cc-bolt-panel.ui:266
+#: panels/thunderbolt/cc-bolt-panel.ui:310
+msgid "Devices"
+msgstr "Innleadan"
+
+#: panels/applications/cc-applications-panel.c:809
+msgid "Full access to /dev"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.c:813
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:230 panels/wwan/cc-wwan-device-page.ui:61
+#: panels/wwan/cc-wwan-network-dialog.ui:5
+msgid "Network"
+msgstr "Lìonra"
+
+#: panels/applications/cc-applications-panel.c:813
+#, fuzzy
+#| msgid "Network Name"
+msgid "Has network access"
+msgstr "Ainm an lìonraidh"
 
-#: panels/background/cc-background-chooser-dialog.c:433
-msgid "Colors"
-msgstr "Dathan"
-
-#. translators: This is the title of the wallpaper chooser dialog.
-#: panels/background/cc-background-chooser-dialog.c:468
-msgid "Select Background"
-msgstr "Tagh an cùlaibh"
-
-#: panels/background/cc-background-chooser-dialog.c:496
-msgid "Pictures"
-msgstr "Dealbhan"
-
-#. translators: No pictures were found
-#: panels/background/cc-background-chooser-dialog.c:528
-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:545
-#: panels/search/cc-search-locations-dialog.c:302
+#: panels/applications/cc-applications-panel.c:818
+#: panels/applications/cc-applications-panel.c:820
+#: panels/search/cc-search-locations-dialog.c:384
 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:555
+#: panels/applications/cc-applications-panel.c:820
+#: panels/applications/cc-applications-panel.c:825
+#, fuzzy
+#| msgctxt "printer state"
+#| msgid "Ready"
+msgid "Read-only"
+msgstr "Deiseil"
+
+#: panels/applications/cc-applications-panel.c:823
+#: panels/applications/cc-applications-panel.c:825
+#, fuzzy
+#| msgid "Open System"
+msgid "File System"
+msgstr "Siostam fosgailte"
+
+#: panels/applications/cc-applications-panel.c:829
+#: panels/keyboard/01-launchers.xml.in:6
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:7 shell/cc-window.c:246
+#: shell/cc-window.c:878 shell/cc-window.ui:22
+#: shell/org.gnome.Settings.desktop.in.in:3
+msgid "Settings"
+msgstr "Roghainnean"
+
+#: panels/applications/cc-applications-panel.c:829
+msgid "Can change settings"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.c:831
 #, 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 an-seo"
-
-#: panels/background/cc-background-chooser-dialog.c:560
-#: panels/color/cc-color-panel.c:225 panels/color/cc-color-panel.c:963
-#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
-#: panels/common/language-chooser.ui:23 panels/display/cc-display-panel.c:2597
-#: panels/network/connection-editor/connection-editor.ui:15
-#: panels/network/connection-editor/vpn-helpers.c:181
-#: panels/network/connection-editor/vpn-helpers.c:310
-#: panels/network/net-device-wifi.c:1411 panels/network/net-device-wifi.c:1491
-#: panels/network/net-device-wifi.c:1736 panels/network/network-wifi.ui:24
-#: panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:331
-#: panels/privacy/cc-privacy-panel.c:1053 panels/region/format-chooser.ui:25
-#: panels/region/input-chooser.ui:13
-#: panels/search/cc-search-locations-dialog.c:642
-#: panels/sharing/cc-sharing-panel.c:384
-#: panels/user-accounts/data/account-dialog.ui:28
-#: panels/user-accounts/data/join-dialog.ui:20
-#: panels/user-accounts/data/password-dialog.ui:21
-#: panels/user-accounts/um-fingerprint-dialog.c:261
-#: panels/user-accounts/um-photo-dialog.c:103
-#: panels/user-accounts/um-photo-dialog.c:230
-#: panels/user-accounts/um-user-panel.c:634
-#: panels/user-accounts/um-user-panel.c:652
+msgid ""
+"%s has the following permissions built-in. These cannot be altered. If you "
+"are concerned about these permissions, consider removing this application."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.c:1164
+#, c-format
+msgid "%u file and link type that is opened by the app"
+msgid_plural "%u file and link types that are opened by the app"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: panels/applications/cc-applications-panel.c:1171
+#, c-format
+msgid "<b>%s</b> is used to open the following types of files and links."
+msgstr ""
+
+#. Translators: '%s' is the formatted size, e.g. "26.2 MB"
+#: panels/applications/cc-applications-panel.c:1223
+#, c-format
+msgid "%s of disk space used"
+msgstr ""
+
+#. List of applications.
+#: panels/applications/cc-applications-panel.c:1387
+#: panels/applications/cc-applications-panel.ui:19
+#: panels/applications/gnome-applications-panel.desktop.in.in:3
+#: panels/notifications/cc-notifications-panel.ui:26
+msgid "Applications"
+msgstr "Aplacaidean"
+
+#: panels/applications/cc-applications-panel.ui:31
+#, fuzzy
+#| msgid "No applications found"
+msgid "No applications"
+msgstr "Cha deach aplacaid sam bith a lorg"
+
+#: panels/applications/cc-applications-panel.ui:34
+#, fuzzy
+#| msgid "Install PPD File…"
+msgid "Install some…"
+msgstr "Stàlaich faidhle PPD…"
+
+#: panels/applications/cc-applications-panel.ui:84
+#: panels/network/wireless-security/ws-file-chooser-button.c:96
+#, fuzzy
+#| msgid "_Open"
+msgid "Open"
+msgstr "F_osgail"
+
+#: panels/applications/cc-applications-panel.ui:94
+#, fuzzy
+#| msgid "_View details"
+msgid "View Details"
+msgstr "_Seall am mion-fhiosrachadh"
+
+#: panels/applications/cc-applications-panel.ui:112
+#: panels/applications/cc-applications-panel.ui:119
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:41
+msgid "Search"
+msgstr "Lorg"
+
+#: panels/applications/cc-applications-panel.ui:113
+#: panels/applications/cc-applications-panel.ui:120
+msgid "Receive system searches and send results."
+msgstr ""
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
+#. TRANSLATORS: Status of Parental Controls setup
+#. translators:
+#. * The device has been disabled
+#: panels/applications/cc-applications-panel.ui:121
+#: panels/applications/cc-applications-panel.ui:156
+#: panels/applications/cc-applications-panel.ui:177
+#: panels/applications/cc-applications-panel.ui:191
+#: panels/applications/cc-applications-panel.ui:205
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:118
+#: panels/keyboard/cc-xkb-modifier-dialog.c:344
+#: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:105
+#: panels/user-accounts/cc-user-panel.c:789
+#: panels/user-accounts/cc-user-panel.c:879
+#: panels/wwan/cc-wwan-device-page.c:478
+#: subprojects/gvc/gvc-mixer-control.c:1908
+msgid "Disabled"
+msgstr "À comas"
+
+#: panels/applications/cc-applications-panel.ui:126
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
+msgstr "Brathan"
+
+#: panels/applications/cc-applications-panel.ui:127
+#, fuzzy
+#| msgid "Show _Notifications"
+msgid "Show system notifications."
+msgstr "Seall _na brathan"
+
+#: panels/applications/cc-applications-panel.ui:133
+#, fuzzy
+#| msgid "Current background"
+msgid "Run in background"
+msgstr "An cùlaibh làithreach"
+
+#: panels/applications/cc-applications-panel.ui:134
+msgid "Allow activity when the app is closed."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:140
+#, fuzzy
+#| msgid "Wallpapers"
+msgid "Change Wallpaper"
+msgstr "Pàipearan-balla"
+
+#: panels/applications/cc-applications-panel.ui:141
+#, fuzzy
+#| msgid "preferences-desktop-wallpaper"
+msgid "Change the desktop wallpaper."
+msgstr "preferences-desktop-wallpaper"
+
+#: panels/applications/cc-applications-panel.ui:147
+#: panels/applications/cc-applications-panel.ui:154
+#, fuzzy
+#| msgid "Sound"
+msgid "Sounds"
+msgstr "Fuaim"
+
+#: panels/applications/cc-applications-panel.ui:148
+#: panels/applications/cc-applications-panel.ui:155
+msgid "Reproduce sounds."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:161
+#, fuzzy
+#| msgid "Set Shortcut"
+msgid "Inhibit Shortcuts"
+msgstr "Suidhich ath-ghoirid"
+
+#: panels/applications/cc-applications-panel.ui:162
+#, fuzzy
+#| msgid "No keyboard shortcut found"
+msgid "Block standard keyboard shortcuts."
+msgstr "Cha deach ath-ghoirid a’ mheur-chlàir a lorg"
+
+#: panels/applications/cc-applications-panel.ui:168
+#: panels/applications/cc-applications-panel.ui:175
+#: panels/camera/gnome-camera-panel.desktop.in.in:3
+#, fuzzy
+#| msgid "%s Camera"
+msgid "Camera"
+msgstr "Camara %s"
+
+#: panels/applications/cc-applications-panel.ui:169
+#: panels/applications/cc-applications-panel.ui:176
+msgid "Take pictures with the camera."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:182
+#: panels/applications/cc-applications-panel.ui:189
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:3
+msgid "Microphone"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:183
+#: panels/applications/cc-applications-panel.ui:190
+msgid "Record audio with the microphone."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:196
+#: panels/applications/cc-applications-panel.ui:203
+#: panels/location/gnome-location-panel.desktop.in.in:3
+msgid "Location Services"
+msgstr "Seirbheisean ionaid"
+
+#: panels/applications/cc-applications-panel.ui:197
+#: panels/applications/cc-applications-panel.ui:204
+msgid "Access device location data."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:215
+#: panels/applications/cc-applications-panel.ui:319
+#, fuzzy
+#| msgid "Built-in Webcam"
+msgid "Built-in Permissions"
+msgstr "Camara-lìn ’na bhroinn"
+
+#: panels/applications/cc-applications-panel.ui:216
+msgid "System access that is required by the app"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:224
+msgid "File &amp; Link Associations"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:232
+#: panels/applications/cc-applications-panel.ui:399
+msgid "Storage"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:294 shell/cc-panel-list.ui:105
+msgid "No results found"
+msgstr "Cha deach toradh a lorg"
+
+#: panels/applications/cc-applications-panel.ui:304
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:198
+#: shell/cc-panel-list.ui:114
+msgid "Try a different search"
+msgstr "Feuch lorg eile"
+
+#: panels/applications/cc-applications-panel.ui:344
+msgid "File & Link Associations"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:367
+#, fuzzy
+#| msgid "Display Type"
+msgid "File Types"
+msgstr "Seòrsa an uidheim-thaisbeanaidh"
+
+#: panels/applications/cc-applications-panel.ui:373
+#, fuzzy
+#| msgid "Link speed"
+msgid "Link Types"
+msgstr "Astar a’ cheangail"
+
+#: panels/applications/cc-applications-panel.ui:383
+msgid "Reset"
+msgstr "Ath-shuidhich"
+
+#: panels/applications/cc-applications-panel.ui:410
+msgid ""
+"How much disk space this application is occupying with app data and caches."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:413
+#, fuzzy
+#| msgid "Applications"
+msgid "Application"
+msgstr "Aplacaidean"
+
+#: panels/applications/cc-applications-panel.ui:419
+msgid "Data"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:425
+msgid "Cache"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:431
+msgid "<b>Total</b>"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:441
+msgid "Clear Cache…"
+msgstr ""
+
+#: panels/applications/gnome-applications-panel.desktop.in.in:4
+msgid "Control various application permissions and settings"
+msgstr ""
+
+#. FIXME
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/applications/gnome-applications-panel.desktop.in.in:16
+msgid "application;flatpak;permission;setting;"
+msgstr ""
+
+#: panels/background/cc-background-chooser.c:307
+#, fuzzy
+#| msgid "Select a File…"
+msgid "Select a picture"
+msgstr "Tagh faidhle…"
+
+#: panels/background/cc-background-chooser.c:310
+#: panels/color/cc-color-calibrate.ui:22 panels/color/cc-color-panel.c:284
+#: panels/color/cc-color-panel.c:844 panels/common/cc-language-chooser.ui:21
+#: panels/display/cc-display-panel.ui:31
+#: panels/info-overview/cc-info-overview-panel.ui:198
+#: panels/keyboard/cc-input-chooser.ui:11
+#: panels/network/cc-wifi-hotspot-dialog.ui:123
+#: panels/network/cc-wifi-panel.c:881
+#: panels/network/connection-editor/connection-editor.ui:14
+#: panels/network/connection-editor/vpn-helpers.c:221
+#: panels/network/connection-editor/vpn-helpers.c:341
+#: panels/network/net-device-wifi.c:860
+#: panels/printers/new-printer-dialog.ui:50
+#: panels/printers/pp-details-dialog.c:263
+#: panels/region/cc-format-chooser.ui:24
+#: panels/search/cc-search-locations-dialog.c:677
+#: panels/sharing/cc-sharing-panel.c:523 panels/usage/cc-usage-panel.c:139
+#: panels/user-accounts/cc-add-user-dialog.ui:25
+#: panels/user-accounts/cc-avatar-chooser.c:96
+#: panels/user-accounts/cc-avatar-chooser.c:167
+#: panels/user-accounts/cc-fingerprint-dialog.ui:32
+#: panels/user-accounts/cc-password-dialog.ui:18
+#: panels/user-accounts/cc-user-panel.c:579
+#: panels/user-accounts/cc-user-panel.c:597
+#: panels/user-accounts/data/join-dialog.ui:17
+#: panels/wwan/cc-wwan-mode-dialog.ui:32
+#: panels/wwan/cc-wwan-network-dialog.ui:139
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:268
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: panels/background/cc-background-chooser-dialog.c:561
-msgid "_Select"
-msgstr "_Tagh"
+#: panels/background/cc-background-chooser.c:311
+#: panels/network/connection-editor/vpn-helpers.c:222
+#: panels/printers/pp-details-dialog.c:264
+#: panels/sharing/cc-sharing-panel.c:524
+#: panels/user-accounts/cc-avatar-chooser.c:168
+msgid "_Open"
+msgstr "F_osgail"
 
-#: panels/background/cc-background-item.c:192
+#: panels/background/cc-background-item.c:169
 msgid "multiple sizes"
 msgstr "iomadh meud"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: panels/background/cc-background-item.c:196
+#: panels/background/cc-background-item.c:173
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: panels/background/cc-background-item.c:321
+#: panels/background/cc-background-item.c:325
 msgid "No Desktop Background"
 msgstr "Chan eil cùlaibh aig an deasga"
 
-#: panels/background/cc-background-panel.c:291
+#: panels/background/cc-background-panel.c:227
 msgid "Current background"
 msgstr "An cùlaibh làithreach"
 
-#: panels/background/gnome-background-panel.desktop.in.in:3
-#| msgid "_Background"
+#: panels/background/cc-background-panel.ui:9
+#, fuzzy
+#| msgid "Stylus"
+msgid "Style"
+msgstr "Staidhleas"
+
+#: panels/background/cc-background-panel.ui:45
+#, fuzzy
+#| msgid "Right"
+msgid "Light"
+msgstr "Deas"
+
+#: panels/background/cc-background-panel.ui:72
+msgid "Dark"
+msgstr ""
+
+#: panels/background/cc-background-panel.ui:91
 msgid "Background"
 msgstr "Cùlaibh"
 
+#: panels/background/cc-background-panel.ui:97
+#, fuzzy
+#| msgid "Add a Printer…"
+msgid "Add Picture…"
+msgstr "Cuir clò-bhualadair ris…"
+
+#: panels/background/gnome-background-panel.desktop.in.in:3
+msgid "Appearance"
+msgstr ""
+
 #: panels/background/gnome-background-panel.desktop.in.in:4
-msgid "Change your background image to a wallpaper or photo"
+#, fuzzy
+#| msgid "Change your background image to a wallpaper or photo"
+msgid "Change your background image or the UI colors"
 msgstr "Cleachd pàipear-balla no dealbh mar chùlaibh"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/background/gnome-background-panel.desktop.in.in:7
-msgid "preferences-desktop-wallpaper"
-msgstr "preferences-desktop-wallpaper"
-
-#. Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#. Translators: Search terms to find the Appearance panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/background/gnome-background-panel.desktop.in.in:15
-msgid "Wallpaper;Screen;Desktop;"
+#, fuzzy
+#| msgid "Wallpaper;Screen;Desktop;"
+msgid "Background;Wallpaper;Screen;Desktop;Style;Light;Dark;"
 msgstr "Wallpaper;Screen;Desktop;pàipear-balla;sgrìn;deasg;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:265
-msgid "Turn Off Airplane Mode"
-msgstr "Cuir am modh itealain dheth"
-
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.ui:21
 msgid "No Bluetooth Found"
 msgstr "Cha deach Bluetooth a lorg"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.ui:22
 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.ui:28
 msgid "Bluetooth Turned Off"
 msgstr "Tha Bluetooth dheth"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.ui:29
 msgid "Turn on to connect devices and receive file transfers."
-msgstr "Cuir air e gus uidheaman a cheangal is tar-chuir fhaidhlichean fhaighinn."
+msgstr ""
+"Cuir air e gus uidheaman a cheangal is tar-chuir fhaidhlichean fhaighinn."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
-msgid "Airplane Mode is on"
+#: panels/bluetooth/cc-bluetooth-panel.ui:35
+#, fuzzy
+#| msgid "Airplane Mode is on"
+msgid "Airplane Mode is On"
 msgstr "Tha am modh itealain air"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.ui:36
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Tha Bluetooth à comas fhad ’s a tha am modh itealain air."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:333
-msgid "Hardware Airplane Mode is on"
+#: panels/bluetooth/cc-bluetooth-panel.ui:39
+msgid "Turn Off Airplane Mode"
+msgstr "Cuir am modh itealain dheth"
+
+#: panels/bluetooth/cc-bluetooth-panel.ui:53
+#, fuzzy
+#| msgid "Hardware Airplane Mode is on"
+msgid "Hardware Airplane Mode is On"
 msgstr "Tha modh itealain a’ bhathair-chruaidh air"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:333
+#: panels/bluetooth/cc-bluetooth-panel.ui:54
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Cuir suidse a’ mhodh itealain dheth gus Bluetooth a chur an comas."
 
 #. Translators: The found device is a printer connected via Bluetooth
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
-#: panels/network/network.ui:101 panels/printers/pp-new-printer-dialog.c:1816
+#: panels/printers/pp-new-printer-dialog.c:1383
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -218,92 +530,156 @@ msgstr "Bluetooth"
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Cuir Bluetooth air is dheth is ceangail na h-uidheaman agad ris"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:6
-#| msgid "Bluetooth"
-msgid "bluetooth"
-msgstr "bluetooth"
-
 #. Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:19
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;co-roinn;co-roinneadh;"
 
+#: panels/camera/cc-camera-panel.ui:21
+#, fuzzy
+#| msgid "Bluetooth Turned Off"
+msgid "Camera is Turned Off"
+msgstr "Tha Bluetooth dheth"
+
+#: panels/camera/cc-camera-panel.ui:22
+#, fuzzy
+#| msgid "No application is currently playing or recording audio."
+msgid "No applications can capture photos or video."
+msgstr ""
+"Chan eil aplacaid sam bith a’ cluich no a’ clàradh fuaime an-dràsta fhèin."
+
+#: panels/camera/cc-camera-panel.ui:36
+msgid ""
+"Use of the camera allows applications to capture photos and video. Disabling "
+"the camera may cause some applications to not function properly.\n"
+"\n"
+"Allow the applications below to use your camera."
+msgstr ""
+
+#: panels/camera/cc-camera-panel.ui:52
+msgid "No Applications Have Asked for Camera Access"
+msgstr ""
+
+#: panels/camera/gnome-camera-panel.desktop.in.in:4
+#, fuzzy
+#| msgid "Browse for more pictures"
+msgid "Protect your pictures"
+msgstr "Brabhsaich airson barrachd dhealbhan"
+
+#. FIXME
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/camera/gnome-camera-panel.desktop.in.in:20
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:20
+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;"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: panels/color/cc-color-calibrate.c:361
+#: panels/color/cc-color-calibrate.c:347
 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”"
+msgstr ""
+"Cuir an t-uidheam cailbhreachaidh agad os cionn na ceàrnaige is brùth air "
+"“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
+#: panels/color/cc-color-calibrate.c:353
 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”"
+msgstr ""
+"Gluais an t-uidheam cailbhreachaidh agad dhan ionad chailbhreachaidh is "
+"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
+#: panels/color/cc-color-calibrate.c:359
 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”"
+msgstr ""
+"Gluais an t-uidheam cailbhreachaidh agad dhan ionad uachdair is brùth air "
+"“Air adhart”"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: panels/color/cc-color-calibrate.c:379
+#: panels/color/cc-color-calibrate.c:365
 msgid "Shut the laptop lid"
 msgstr "Dùin mullach an laptop"
 
-#. TRANSLATORS: We suck, the calibation failed and we have no
+#. TRANSLATORS: We suck, the calibration failed and we have no
 #. * good idea why or any suggestions
-#: panels/color/cc-color-calibrate.c:410
+#: panels/color/cc-color-calibrate.c:396
 msgid "An internal error occurred that could not be recovered."
 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
-#: panels/color/cc-color-calibrate.c:415
+#: panels/color/cc-color-calibrate.c:401
 msgid "Tools required for calibration are not installed."
-msgstr "Cha deach na h-innealan a stàladh air a bheil feum airson cailbhreachadh."
+msgstr ""
+"Cha deach na h-innealan a stàladh air a bheil feum airson cailbhreachadh."
 
 #. TRANSLATORS: The profile failed for some reason
-#: panels/color/cc-color-calibrate.c:421
+#: panels/color/cc-color-calibrate.c:407
 msgid "The profile could not be generated."
 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
+#: panels/color/cc-color-calibrate.c:413
 msgid "The target whitepoint was not obtainable."
 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
+#: panels/color/cc-color-calibrate.c:452
 msgid "Complete!"
 msgstr "Deiseil!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: panels/color/cc-color-calibrate.c:475
+#: panels/color/cc-color-calibrate.c:460
 msgid "Calibration failed!"
 msgstr "Dh’fhàillig an cailbhreachadh!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: panels/color/cc-color-calibrate.c:482
+#: panels/color/cc-color-calibrate.c:467
 msgid "You can remove the calibration device."
 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
+#: panels/color/cc-color-calibrate.c:535
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Na bean ris an uidheam chailbhreachaidh fhad ’s a tha e trang"
 
+#: panels/color/cc-color-calibrate.ui:9
+msgid "Display Calibration"
+msgstr "Cailbhreachadh an uidheim-thaisbeanaidh"
+
+#. This starts the calibration process
+#: panels/color/cc-color-calibrate.ui:28
+msgid "_Start"
+msgstr "_Tòisich"
+
+#. This resumes the calibration process
+#: panels/color/cc-color-calibrate.ui:34
+msgid "_Resume"
+msgstr "_Lean air"
+
+#. This button returns the user back to the color control panel
+#: panels/color/cc-color-calibrate.ui:40 panels/region/cc-format-chooser.ui:49
+#: panels/user-accounts/cc-fingerprint-dialog.ui:60
+msgid "_Done"
+msgstr "_Deiseil"
+
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
@@ -345,495 +721,470 @@ msgstr "Clò-bhualadair %s"
 msgid "%s Webcam"
 msgstr "Camara-lìn %s"
 
-#: panels/color/cc-color-device.c:89
+#: panels/color/cc-color-device.c:87
 #, c-format
 msgid "Enable color management for %s"
 msgstr "Cuir an comas stiùireadh dhathan airson %s"
 
-#: panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:92
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "Seall na pròifilean dhathan airson %s"
 
 #. not calibrated
-#: panels/color/cc-color-device.c:323
+#: panels/color/cc-color-device.c:292
 msgid "Not calibrated"
 msgstr "Cha deach a chailbhreachadh"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: panels/color/cc-color-panel.c:141
+#: panels/color/cc-color-panel.c:160
 msgid "Default: "
 msgstr "Tùsail: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: panels/color/cc-color-panel.c:149
+#: panels/color/cc-color-panel.c:168
 msgid "Colorspace: "
 msgstr "Spàs nan dathan: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: panels/color/cc-color-panel.c:156
+#: panels/color/cc-color-panel.c:175
 msgid "Test profile: "
 msgstr "Pròifil deuchainne: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: panels/color/cc-color-panel.c:223
+#: panels/color/cc-color-panel.c:282
 msgid "Select ICC Profile File"
 msgstr "Tagh faidhle pròifil ICC"
 
-#: panels/color/cc-color-panel.c:226
+#: panels/color/cc-color-panel.c:285
 msgid "_Import"
 msgstr "_Ion-phortaich"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:237
+#: panels/color/cc-color-panel.c:296
 msgid "Supported ICC profiles"
 msgstr "Pròifilean ICC ris a bheil taic"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:244
-#: panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:303
+#: panels/network/wireless-security/eap-method-fast.c:357
 msgid "All files"
 msgstr "A h-uile faidhle"
 
-#: panels/color/cc-color-panel.c:583
+#: panels/color/cc-color-panel.c:586
 msgid "Screen"
 msgstr "Sgrìn"
 
-#. TRANSLATORS: this is when the upload of the profile failed
-#: 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"
-
-#. 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:"
-
-#: panels/color/cc-color-panel.c:924
-msgid "Write down this URL."
-msgstr "Sgrìobh sìos an URL seo."
-
-#: panels/color/cc-color-panel.c:925
-msgid "Restart this computer and boot your normal operating system."
-msgstr "Ath-thòisich an coimpiutair seo is tòisich an siostam-obrachaidh àbhaisteach agad."
-
-#: 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 a-nuas is a stàladh."
-
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: panels/color/cc-color-panel.c:960
+#: panels/color/cc-color-panel.c:841
 msgid "Save Profile"
 msgstr "Sàbhail a’ phròifil"
 
-#: panels/color/cc-color-panel.c:964
-#: panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:845
+#: panels/network/connection-editor/vpn-helpers.c:342
+#: panels/wwan/cc-wwan-apn-dialog.ui:43
 msgid "_Save"
 msgstr "_Sàbhail"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: panels/color/cc-color-panel.c:1325
+#: panels/color/cc-color-panel.c:1146
 msgid "Create a color profile for the selected device"
 msgstr "Cruthaich pròifil dhathan airson an uidheim a thagh thu"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1340 panels/color/cc-color-panel.c:1364
+#: panels/color/cc-color-panel.c:1161 panels/color/cc-color-panel.c:1185
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
-msgstr "Cha do mhothaich sinn ri inneal tomhais. Dèan cinnteach gu bheil e air agus ceangailte ris mar bu 
chòir."
+msgstr ""
+"Cha do mhothaich sinn ri inneal tomhais. Dèan cinnteach gu bheil e air agus "
+"ceangailte ris mar bu chòir."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1374
+#: panels/color/cc-color-panel.c:1195
 msgid "The measuring instrument does not support printer profiling."
-msgstr "Chan eil an t-inneal tomhais a’ cur taic ri pròifileadh chlò-bhualadairean."
+msgstr ""
+"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:1385
+#: panels/color/cc-color-panel.c:1206
 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."
 
-#. TRANSLATORS: standard spaces are well known colorspaces like
-#. * sRGB, AdobeRGB and ProPhotoRGB
-#: panels/color/cc-color-profile.c:103
-msgid "Standard Space"
-msgstr "Spàs stannardach"
-
-#. TRANSLATORS: test profiles do things like changing the screen
-#. * a different color, or swap the red and green channels
-#: panels/color/cc-color-profile.c:109
-msgid "Test Profile"
-msgstr "Pròifil deuchainne"
+#: panels/color/cc-color-panel.ui:4 panels/wacom/calibrator/calibrator.ui:40
+msgid "Screen Calibration"
+msgstr "Cailbhreachadh na sgrìn"
 
-#. TRANSLATORS: automatic profiles are generated automatically
-#. * by the color management system based on manufacturing data,
-#. * for instance the default monitor profile is created from the
-#. * primaries specified in the monitor EDID
-#: panels/color/cc-color-profile.c:117
-msgctxt "Automatically generated profile"
-msgid "Automatic"
-msgstr "Fèin-obrachail"
+#: panels/color/cc-color-panel.ui:12
+msgid "Calibration Quality"
+msgstr "Càileachd a’ chailbhreachaidh"
 
-#. TRANSLATORS: the profile quality - low quality profiles take
-#. * much less time to generate but may be a poor reflection of the
-#. * device capability
-#: panels/color/cc-color-profile.c:127
-msgctxt "Profile quality"
-msgid "Low Quality"
-msgstr "Càileachd ìseal"
+#: panels/color/cc-color-panel.ui:21
+msgid ""
+"Calibration will produce a profile that you can use to color manage your "
+"screen. The longer you spend on calibration, the better the quality of the "
+"color profile."
+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."
 
-#. TRANSLATORS: the profile quality
-#: panels/color/cc-color-profile.c:132
-msgctxt "Profile quality"
-msgid "Medium Quality"
-msgstr "Càileachd mheadhanach"
-
-#. TRANSLATORS: the profile quality - high quality profiles take
-#. * a *long* time, and have the best calibration and
-#. * characterisation data.
-#: panels/color/cc-color-profile.c:139
-msgctxt "Profile quality"
-msgid "High Quality"
-msgstr "Càileachd àrd"
-
-#. TRANSLATORS: this default RGB space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:156
-msgctxt "Colorspace fallback"
-msgid "Default RGB"
-msgstr "RGB tùsail"
-
-#. TRANSLATORS: this default CMYK space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:163
-msgctxt "Colorspace fallback"
-msgid "Default CMYK"
-msgstr "CMYK tùsail"
-
-#. TRANSLATORS: this default gray space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:170
-msgctxt "Colorspace fallback"
-msgid "Default Gray"
-msgstr "Liath tùsail"
-
-#: panels/color/cc-color-profile.c:194
-msgid "Vendor supplied factory calibration data"
-msgstr "Dàta cailbhreachaidh tùsail a sholair an reiceadair"
-
-#: panels/color/cc-color-profile.c:203
-msgid "Full-screen display correction not possible with this profile"
-msgstr "Cha ghabh ceartachadh taisbeanadh làn-sgrìn a dhèanamh sa phròifil seo"
-
-#: 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"
-
-#: panels/color/color-calibrate.ui:7
-msgid "Display Calibration"
-msgstr "Cailbhreachadh an uidheim-thaisbeanaidh"
-
-#. This starts the calibration process
-#: panels/color/color-calibrate.ui:40
-msgid "_Start"
-msgstr "_Tòisich"
-
-#. This resumes the calibration process
-#: panels/color/color-calibrate.ui:54
-msgid "_Resume"
-msgstr "_Lean air"
-
-#. This button returns the user back to the color control panel
-#: panels/color/color-calibrate.ui:67 panels/common/language-chooser.ui:12
-#: panels/region/format-chooser.ui:14
-msgid "_Done"
-msgstr "_Deiseil"
-
-#. Timeout parameters
-#. 15000 = 15 sec
-#. 750 = 0.75 sec
-#. Text printed on screen
-#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
-msgid "Screen Calibration"
-msgstr "Cailbhreachadh na sgrìn"
-
-#: panels/color/color.ui:23
-msgid ""
-"Calibration will produce a profile that you can use to color manage your "
-"screen. The longer you spend on calibration, the better the quality of the "
-"color profile."
-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."
-
-#: panels/color/color.ui:38
-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."
+#: panels/color/cc-color-panel.ui:28
+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."
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:58
+#: panels/color/cc-color-panel.ui:40
 msgid "Quality"
 msgstr "Càileachd"
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:75
+#: panels/color/cc-color-panel.ui:51
 msgid "Approximate Time"
 msgstr "Tuairmeas air dè cho fad ’s a bheir e"
 
-#: panels/color/color.ui:121
-msgid "Calibration Quality"
-msgstr "Càileachd a’ chailbhreachaidh"
+#: panels/color/cc-color-panel.ui:82
+msgid "Calibration Device"
+msgstr "An t-uidheam cailbhreachaidh"
 
-#: panels/color/color.ui:137
+#: panels/color/cc-color-panel.ui:90
 msgid "Select the sensor device you want to use for calibration."
-msgstr "Tagh an t-uidheam mothachaidh a bu toigh leat cleachdadh airson cailbhreachadh."
+msgstr ""
+"Tagh an t-uidheam mothachaidh a bu toigh leat cleachdadh airson "
+"cailbhreachadh."
 
-#: panels/color/color.ui:174
-msgid "Calibration Device"
-msgstr "An t-uidheam cailbhreachaidh"
+#: panels/color/cc-color-panel.ui:117
+msgid "Display Type"
+msgstr "Seòrsa an uidheim-thaisbeanaidh"
 
-#: panels/color/color.ui:189
+#: panels/color/cc-color-panel.ui:125
 msgid "Select the type of display that is connected."
 msgstr "Tagh seòrsa an uidheim-thaisbeanaidh a tha ceangailte ris."
 
-#: panels/color/color.ui:226
-msgid "Display Type"
-msgstr "Seòrsa an uidheim-thaisbeanaidh"
+#: panels/color/cc-color-panel.ui:152
+msgid "Profile Whitepoint"
+msgstr "Geal-phuing na pròifile"
 
-#: panels/color/color.ui:241
+#: panels/color/cc-color-panel.ui:160
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
-msgstr "Tagh geal-phuing targaide air an uidheam-taisbeanadh. Mar is trice, cleachdar illuminant D65 airson 
cailbhreachadh."
+msgstr ""
+"Tagh geal-phuing targaide air an uidheam-taisbeanadh. Mar is trice, "
+"cleachdar illuminant D65 airson cailbhreachadh."
 
-#: panels/color/color.ui:278
-msgid "Profile Whitepoint"
-msgstr "Geal-phuing na pròifile"
+#: panels/color/cc-color-panel.ui:187
+msgid "Display Brightness"
+msgstr "Soilleireachd an uidheim-thaisbeanaidh"
 
-#: panels/color/color.ui:293
+#: panels/color/cc-color-panel.ui:195
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
-msgstr "Suidhich an t-uidheam-taisbeanaidh air an t-soilleireachd a chleachdas tu mar is trice. Bidh 
stiùireadh nan dathan nas pongaile air an ìre seo de shoilleireachd."
+msgstr ""
+"Suidhich an t-uidheam-taisbeanaidh air an t-soilleireachd a chleachdas tu "
+"mar is trice. Bidh stiùireadh nan dathan nas pongaile air an ìre seo de "
+"shoilleireachd."
 
-#: panels/color/color.ui:307
+#: panels/color/cc-color-panel.ui:202
 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 a chleachdadh."
+msgstr ""
+"Air neo ’s urrainn dhut ìre soilleireachd o phròifil eile aig an uidheam seo "
+"a chleachdadh."
 
-#: panels/color/color.ui:318
-msgid "Display Brightness"
-msgstr "Soilleireachd an uidheim-thaisbeanaidh"
+#: panels/color/cc-color-panel.ui:214
+msgid "Profile Name"
+msgstr "Ainm na pròifile"
 
-#: panels/color/color.ui:333
+#: panels/color/cc-color-panel.ui:222
 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 fiù pròifilean a 
chleachdadh airson diofar ìrean de sholas."
+msgstr ""
+"’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:348
+#: panels/color/cc-color-panel.ui:229
 msgid "Profile Name:"
 msgstr "Ainm na pròifile:"
 
-#: panels/color/color.ui:377
-msgid "Profile Name"
-msgstr "Ainm na pròifile"
+#: panels/color/cc-color-panel.ui:251
+msgid "Summary"
+msgstr "Gearr-chunntas"
 
-#: panels/color/color.ui:392
+#: panels/color/cc-color-panel.ui:259
 msgid "Profile successfully created!"
 msgstr "Chaidh a’ phròifil a chruthachadh!"
 
-#: panels/color/color.ui:443
+#: panels/color/cc-color-panel.ui:290
 msgid "Copy profile"
 msgstr "Dèan lethbhreac dhen phròifil"
 
-#: panels/color/color.ui:456
+#: panels/color/cc-color-panel.ui:296
 msgid "Requires writable media"
 msgstr "Feumaidh seo meadhan as urrainnear sgrìobhadh air"
 
-#: panels/color/color.ui:519
-msgid "Upload profile"
-msgstr "Luchdaich suas pròifil"
-
-#: panels/color/color.ui:532
-msgid "Requires Internet connection"
-msgstr "Feumaidh seo ceangal ris an eadar-lìon"
-
-#: panels/color/color.ui:591
+#: panels/color/cc-color-panel.ui:313
 msgid ""
 "You may find these instructions on how to use the profile on <a href=\"linux"
 "\">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 seo air <a 
href=\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> agus <a href=\"windows\">Microsoft Windows</a> 
feumail dhut."
-
-#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
-msgid "Summary"
-msgstr "Gearr-chunntas"
+msgstr ""
+"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."
 
-#: panels/color/color.ui:621
+#: panels/color/cc-color-panel.ui:335
 msgid "Add Profile"
 msgstr "Cuir ris pròifil"
 
-#: panels/color/color.ui:643
+#: panels/color/cc-color-panel.ui:373
+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 "
+"bu chòir. <a href=\"\">Seall am mion-fhiosrachadh.</a>"
+
+#: panels/color/cc-color-panel.ui:384
 msgid "_Import File…"
 msgstr "_Ion-phortaich faidhle…"
 
-#: panels/color/color.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:519
-#: panels/printers/new-printer-dialog.ui:80 panels/region/input-chooser.ui:22
-#: panels/user-accounts/data/account-dialog.ui:47
+#: panels/color/cc-color-panel.ui:390 panels/keyboard/cc-input-chooser.ui:18
+#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/printers/new-printer-dialog.ui:84
+#: panels/user-accounts/cc-add-user-dialog.ui:39
 msgid "_Add"
 msgstr "_Cuir ris"
 
-#: panels/color/color.ui:732
-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 bu chòir. <a 
href=\"\">Seall am mion-fhiosrachadh.</a>"
-
-#: panels/color/color.ui:807
+#: panels/color/cc-color-panel.ui:424
 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 gabh an dath a stiùireadh."
+msgstr ""
+"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:829
+#. translators: Text used in link to privacy policy
+#: panels/color/cc-color-panel.ui:434
+#: panels/diagnostics/cc-diagnostics-panel.c:137
 msgid "Learn more"
 msgstr "Barrachd fiosrachaidh"
 
-#: panels/color/color.ui:834
+#: panels/color/cc-color-panel.ui:436
 msgid "Learn more about color management"
 msgstr "Barrachd fiosrachaidh mu stiùireadh dhathan"
 
-#: panels/color/color.ui:882
+#: panels/color/cc-color-panel.ui:473
 msgid "_Set for all users"
 msgstr "_Suidhich airson a h-uile cleachdaiche"
 
-#: panels/color/color.ui:886 panels/color/color.ui:901
-#: panels/color/color.ui:902
+#: panels/color/cc-color-panel.ui:475 panels/color/cc-color-panel.ui:483
+#: panels/color/cc-color-panel.ui:484
 msgid "Set this profile for all users on this computer"
-msgstr "Suidhich a’ phròifil seo airson na h-uile cleachdaiche air a’ choimpiutair seo"
+msgstr ""
+"Suidhich a’ phròifil seo airson na h-uile cleachdaiche air a’ choimpiutair "
+"seo"
 
-#: panels/color/color.ui:897
+#: panels/color/cc-color-panel.ui:481
 msgid "_Enable"
 msgstr "_Cuir an comas"
 
-#: panels/color/color.ui:928
+#: panels/color/cc-color-panel.ui:497
 msgid "_Add profile"
 msgstr "Cuir ris _pròifil"
 
-#: panels/color/color.ui:941
+#: panels/color/cc-color-panel.ui:503
 msgid "_Calibrate…"
 msgstr "_Cailbhrich…"
 
-#: panels/color/color.ui:945
+#: panels/color/cc-color-panel.ui:505
 msgid "Calibrate the device"
 msgstr "Cailbhrich an t-uidheam"
 
-#: panels/color/color.ui:956
+#: panels/color/cc-color-panel.ui:511
 msgid "_Remove profile"
 msgstr "Thoi_r air falbh a’ phròifil"
 
-#: panels/color/color.ui:969
+#: panels/color/cc-color-panel.ui:517
 msgid "_View details"
 msgstr "_Seall am mion-fhiosrachadh"
 
-#: panels/color/color.ui:1005
+#: panels/color/cc-color-panel.ui:529
 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 stiùireadh dha"
+msgstr ""
+"Cha do mhothaich sinn dha dh’uidheam sam bith a ghabhas na dathan a "
+"stiùireadh dha"
 
-#: panels/color/color.ui:1047
+#: panels/color/cc-color-panel.ui:568
 msgid "LCD"
 msgstr "LCD"
 
-#: panels/color/color.ui:1052
+#: panels/color/cc-color-panel.ui:573
 msgid "LED"
 msgstr "LED"
 
-#: panels/color/color.ui:1057
+#: panels/color/cc-color-panel.ui:578
 msgid "CRT"
 msgstr "CRT"
 
-#: panels/color/color.ui:1062
+#: panels/color/cc-color-panel.ui:583
 msgid "Projector"
 msgstr "Proiseactar"
 
-#: panels/color/color.ui:1067
+#: panels/color/cc-color-panel.ui:588
 msgid "Plasma"
 msgstr "Plasma"
 
-#: panels/color/color.ui:1072
+#: panels/color/cc-color-panel.ui:593
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (solas-cùil CCFL)"
 
-#: panels/color/color.ui:1077
+#: panels/color/cc-color-panel.ui:598
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (solas-cùil LED RGB)"
 
-#: panels/color/color.ui:1082
+#: panels/color/cc-color-panel.ui:603
 msgid "LCD (white LED backlight)"
 msgstr "LCD (solas-cùil LED geal)"
 
-#: panels/color/color.ui:1087
+#: panels/color/cc-color-panel.ui:608
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "LCD gamut leathann (solas-cùil CCFL)"
 
-#: panels/color/color.ui:1092
+#: panels/color/cc-color-panel.ui:613
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "LCD gamut leathann (solas-cùil LED RGB)"
 
-#: panels/color/color.ui:1109
+#: panels/color/cc-color-panel.ui:630
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Àrd"
 
-#: panels/color/color.ui:1110
+#: panels/color/cc-color-panel.ui:631
 msgid "40 minutes"
 msgstr "40 mionaid"
 
-#: panels/color/color.ui:1114
+#: panels/color/cc-color-panel.ui:635
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Meadhanach"
 
-#: panels/color/color.ui:1115 panels/power/power.ui:25
-#: panels/privacy/privacy.ui:38
+#: panels/color/cc-color-panel.ui:636
 msgid "30 minutes"
 msgstr "Leth-uair a thìde"
 
-#: panels/color/color.ui:1119
+#: panels/color/cc-color-panel.ui:640
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Ìseal"
 
-#: panels/color/color.ui:1120 panels/power/power.ui:13 panels/power/power.ui:95
+#: panels/color/cc-color-panel.ui:641
 msgid "15 minutes"
 msgstr "Cairteal na h-uarach"
 
-#: panels/color/color.ui:1142
+#: panels/color/cc-color-panel.ui:663
 msgid "Native to display"
 msgstr "Roghainn thùsail an uidheim-thaisbeanaidh"
 
-#: panels/color/color.ui:1146
+#: panels/color/cc-color-panel.ui:667
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (clò-bhualadh is foillseachadh)"
 
-#: panels/color/color.ui:1150
+#: panels/color/cc-color-panel.ui:671
 msgid "D55"
 msgstr "D55"
 
-#: panels/color/color.ui:1154
+#: panels/color/cc-color-panel.ui:675
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (fotografachd is grafaigeachd)"
 
-#: panels/color/color.ui:1158
+#: panels/color/cc-color-panel.ui:679
 msgid "D75"
 msgstr "D75"
 
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: panels/color/cc-color-profile.c:98
+msgid "Standard Space"
+msgstr "Spàs stannardach"
+
+#. TRANSLATORS: test profiles do things like changing the screen
+#. * a different color, or swap the red and green channels
+#: panels/color/cc-color-profile.c:104
+msgid "Test Profile"
+msgstr "Pròifil deuchainne"
+
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * by the color management system based on manufacturing data,
+#. * for instance the default monitor profile is created from the
+#. * primaries specified in the monitor EDID
+#: panels/color/cc-color-profile.c:112
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "Fèin-obrachail"
+
+#. TRANSLATORS: the profile quality - low quality profiles take
+#. * much less time to generate but may be a poor reflection of the
+#. * device capability
+#: panels/color/cc-color-profile.c:122
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "Càileachd ìseal"
+
+#. TRANSLATORS: the profile quality
+#: panels/color/cc-color-profile.c:127
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "Càileachd mheadhanach"
+
+#. TRANSLATORS: the profile quality - high quality profiles take
+#. * a *long* time, and have the best calibration and
+#. * characterisation data.
+#: panels/color/cc-color-profile.c:134
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "Càileachd àrd"
+
+#. TRANSLATORS: this default RGB space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:151
+msgctxt "Colorspace fallback"
+msgid "Default RGB"
+msgstr "RGB tùsail"
+
+#. TRANSLATORS: this default CMYK space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:158
+msgctxt "Colorspace fallback"
+msgid "Default CMYK"
+msgstr "CMYK tùsail"
+
+#. TRANSLATORS: this default gray space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:165
+msgctxt "Colorspace fallback"
+msgid "Default Gray"
+msgstr "Liath tùsail"
+
+#: panels/color/cc-color-profile.c:188
+msgid "Vendor supplied factory calibration data"
+msgstr "Dàta cailbhreachaidh tùsail a sholair an reiceadair"
+
+#: panels/color/cc-color-profile.c:197
+msgid "Full-screen display correction not possible with this profile"
+msgstr "Cha ghabh ceartachadh taisbeanadh làn-sgrìn a dhèanamh sa phròifil seo"
+
+#: panels/color/cc-color-profile.c:219
+msgid "This profile may no longer be accurate"
+msgstr "Dh’fhaoidte nach eil a’ phròifil seo ceart tuilleadh"
+
 #: panels/color/gnome-color-panel.desktop.in.in:3
 msgid "Color"
 msgstr "Dath"
@@ -841,39 +1192,83 @@ msgstr "Dath"
 #: panels/color/gnome-color-panel.desktop.in.in:4
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
-msgstr "Cailbhrich dathan nan uidheaman agad, can uidheaman-taisbeanaidh, camarathan no clò-bhualadairean"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/color/gnome-color-panel.desktop.in.in:7
-#| msgid "Preferences"
-msgid "preferences-color"
-msgstr "preferences-color"
+msgstr ""
+"Cailbhrich dathan nan uidheaman agad, can uidheaman-taisbeanaidh, camarathan "
+"no clò-bhualadairean"
 
 #. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/color/gnome-color-panel.desktop.in.in:19
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr 
"Color;ICC;Profile;Calibrate;Printer;Display;dath;ICC;pròifil;cailbhrich;cailbhreachadh;clò-bhualadair;taisbeanadh;uidheam-taisbenaidh;sgrìn;"
+msgstr ""
+"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
+#: panels/common/cc-common-language.c:300
 msgid "Other…"
 msgstr "Eile…"
 
-#: panels/common/cc-language-chooser.c:124
-#: panels/region/cc-format-chooser.c:269 panels/region/cc-input-chooser.c:169
-msgid "More…"
-msgstr "Barrachd…"
+#: panels/common/cc-language-chooser.ui:5
+#, fuzzy
+#| msgid "Language"
+msgid "Select Language"
+msgstr "Cànan"
+
+#: panels/common/cc-language-chooser.ui:13
+msgid "_Select"
+msgstr "_Tagh"
 
-#: panels/common/cc-language-chooser.c:140
+#: panels/common/cc-language-chooser.ui:58
 msgid "No languages found"
 msgstr "Cha deach cànan a lorg"
 
+#: panels/common/cc-language-chooser.ui:69
+#: panels/keyboard/cc-input-chooser.c:173
+msgid "More…"
+msgstr "Barrachd…"
+
+#: panels/common/cc-permission-infobar.c:109
+#, fuzzy
+#| msgid "Bluetooth Settings"
+msgid "Unlock to Change Settings"
+msgstr "Roghainnean Bluetooth"
+
+#: panels/common/cc-permission-infobar.ui:40
+msgid "Some settings must be unlocked before they can be changed."
+msgstr ""
+
+#: panels/common/cc-permission-infobar.ui:57
+#, fuzzy
+#| msgid "_Unlock"
+msgid "Unlock…"
+msgstr "_Thoir a’ ghlas dheth"
+
+#: panels/common/cc-time-editor.ui:25
+msgid "Increment Hour"
+msgstr ""
+
+#: panels/common/cc-time-editor.ui:53
+msgid "Increment Minute"
+msgstr ""
+
+#: panels/common/cc-time-editor.ui:73
+msgid "Time"
+msgstr "Àm"
+
+#: panels/common/cc-time-editor.ui:94
+msgid "Decrement Hour"
+msgstr ""
+
+#: panels/common/cc-time-editor.ui:122
+msgid "Decrement Minute"
+msgstr ""
+
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:106
+#: panels/network/connection-editor/ce-page-details.c:162
 msgid "Today"
 msgstr "An-diugh"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:108
+#: panels/network/connection-editor/ce-page-details.c:164
 msgid "Yesterday"
 msgstr "An-dè"
 
@@ -887,37 +1282,110 @@ msgstr "%e %b"
 msgid "%b %e, %Y"
 msgstr "%e %b %Y"
 
-#: panels/common/language-chooser.ui:5
-msgid "Language"
-msgstr "Cànan"
+#: panels/common/cc-util.c:165
+#, fuzzy, c-format
+#| msgid "%i hour"
+#| msgid_plural "%i hours"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%i uair a thìde"
+msgstr[1] "%i uair a thìde"
+msgstr[2] "%i uairean a thìde"
+msgstr[3] "%i uair a thìde"
 
-#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
-#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
-msgid "Day"
-msgstr "Latha"
+#. Translators: Option for "Blank Screen" in "Power" panel
+#: panels/common/cc-util.c:166 panels/power/cc-power-panel.c:846
+#, fuzzy, c-format
+#| msgid "%i minute"
+#| msgid_plural "%i minutes"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%i mhionaid"
+msgstr[1] "%i mhionaid"
+msgstr[2] "%i mionaidean"
+msgstr[3] "%i mionaid"
 
-#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
-#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
-msgid "Month"
-msgstr "Mìos"
+#: panels/common/cc-util.c:167
+#, fuzzy, c-format
+#| msgid "30 seconds"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "30 diog"
+msgstr[1] "30 diog"
+msgstr[2] "30 diog"
+msgstr[3] "30 diog"
+
+#. 5 hours 2 minutes 12 seconds
+#: panels/common/cc-util.c:174
+#, fuzzy, c-format
+#| msgid "%i %s %i %s"
+msgctxt "hours minutes seconds"
+msgid "%s %s %s"
+msgstr "%i %s %i %s"
 
-#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
-#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
-msgid "Year"
-msgstr "Bliadhna"
+#. 5 hours 2 minutes
+#: panels/common/cc-util.c:179
+#, fuzzy, c-format
+#| msgid "%i %s %i %s"
+msgctxt "hours minutes"
+msgid "%s %s"
+msgstr "%i %s %i %s"
+
+#. 5 hours
+#: panels/common/cc-util.c:184
+#, c-format
+msgctxt "hours"
+msgid "%s"
+msgstr ""
+
+#. 2 minutes 12 seconds
+#: panels/common/cc-util.c:192
+#, fuzzy, c-format
+#| msgid "%i %s %i %s"
+msgctxt "minutes seconds"
+msgid "%s %s"
+msgstr "%i %s %i %s"
+
+#. 2 minutes
+#: panels/common/cc-util.c:197
+#, c-format
+msgctxt "minutes"
+msgid "%s"
+msgstr ""
+
+#. 0 seconds
+#: panels/common/cc-util.c:208
+#, fuzzy
+#| msgid "30 seconds"
+msgid "0 seconds"
+msgstr "30 diog"
+
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: panels/common/hostname-helper.c:177
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: panels/datetime/cc-datetime-panel.c:175
+msgid "24-hour"
+msgstr "24 uairean"
+
+#: panels/datetime/cc-datetime-panel.c:177
+msgid "AM / PM"
+msgstr "m/f"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:333
+#: panels/datetime/cc-datetime-panel.c:248
 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:338
+#: panels/datetime/cc-datetime-panel.c:253
 msgid "%e %B %Y, %R"
 msgstr "%e %B %Y, %R"
 
 #. Translators: "city, country"
-#: panels/datetime/cc-datetime-panel.c:503
+#: panels/datetime/cc-datetime-panel.c:423
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -925,7 +1393,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: panels/datetime/cc-datetime-panel.c:530
+#: panels/datetime/cc-datetime-panel.c:450
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -933,143 +1401,139 @@ 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:537
+#: panels/datetime/cc-datetime-panel.c:457
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:542
+#: panels/datetime/cc-datetime-panel.c:462
 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:547
+#: panels/datetime/cc-datetime-panel.c:467
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: panels/datetime/cc-datetime-panel.c:552
+#: panels/datetime/cc-datetime-panel.c:472
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: panels/datetime/datetime.ui:22
+#: panels/datetime/cc-datetime-panel.ui:15
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
+msgid "Date & Time"
+msgstr "Ceann-là ⁊ an t-àm"
+
+#: panels/datetime/cc-datetime-panel.ui:50
+msgid "Year"
+msgstr "Bliadhna"
+
+#: panels/datetime/cc-datetime-panel.ui:66
+msgid "Month"
+msgstr "Mìos"
+
+#: panels/datetime/cc-datetime-panel.ui:71
 msgid "January"
 msgstr "Am Faoilleach"
 
-#: panels/datetime/datetime.ui:25
+#: panels/datetime/cc-datetime-panel.ui:72
 msgid "February"
 msgstr "An Gearran"
 
-#: panels/datetime/datetime.ui:28
+#: panels/datetime/cc-datetime-panel.ui:73
 msgid "March"
 msgstr "Am Màrt"
 
-#: panels/datetime/datetime.ui:31
+#: panels/datetime/cc-datetime-panel.ui:74
 msgid "April"
 msgstr "An Giblean"
 
-#: panels/datetime/datetime.ui:34
+#: panels/datetime/cc-datetime-panel.ui:75
 msgid "May"
 msgstr "An Cèitean"
 
-#: panels/datetime/datetime.ui:37
+#: panels/datetime/cc-datetime-panel.ui:76
 msgid "June"
 msgstr "An t-Ògmhios"
 
-#: panels/datetime/datetime.ui:40
+#: panels/datetime/cc-datetime-panel.ui:77
 msgid "July"
 msgstr "An t-Iuchar"
 
-#: panels/datetime/datetime.ui:43
+#: panels/datetime/cc-datetime-panel.ui:78
 msgid "August"
 msgstr "An Lùnastal"
 
-#: panels/datetime/datetime.ui:46
+#: panels/datetime/cc-datetime-panel.ui:79
 msgid "September"
 msgstr "An t-Sultain"
 
-#: panels/datetime/datetime.ui:49
+#: panels/datetime/cc-datetime-panel.ui:80
 msgid "October"
 msgstr "An Dàmhair"
 
-#: panels/datetime/datetime.ui:52
+#: panels/datetime/cc-datetime-panel.ui:81
 msgid "November"
 msgstr "An t-Samhain"
 
-#: panels/datetime/datetime.ui:55
+#: panels/datetime/cc-datetime-panel.ui:82
 msgid "December"
 msgstr "An Dùbhlachd"
 
-#: panels/datetime/datetime.ui:61
-#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
-msgid "Date & Time"
-msgstr "Ceann-là ⁊ an t-àm"
+#: panels/datetime/cc-datetime-panel.ui:92
+msgid "Day"
+msgstr "Latha"
 
-#: panels/datetime/datetime.ui:106
-msgid "Hour"
-msgstr "Uair"
+#: panels/datetime/cc-datetime-panel.ui:113
+msgid "Time Zone"
+msgstr "Roinn-tìde"
 
-#. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: panels/datetime/datetime.ui:121
-msgid "∶"
-msgstr ":"
-
-#: panels/datetime/datetime.ui:143
-msgid "Minute"
-msgstr "Mionaid"
-
-#: panels/datetime/datetime.ui:208
-msgid "Time Zone"
-msgstr "Roinn-tìde"
-
-#: panels/datetime/datetime.ui:228
+#: panels/datetime/cc-datetime-panel.ui:130
 msgid "Search for a city"
 msgstr "Lorg baile"
 
-#: panels/datetime/datetime.ui:304
-msgid "Automatic _Date & Time"
+#: panels/datetime/cc-datetime-panel.ui:164
+#, fuzzy
+#| msgid "Automatic _Date & Time"
+msgid "Automatic _Date &amp; Time"
 msgstr "Ceann-là ⁊ an t-àm gu _fèin-obrachail"
 
-#: panels/datetime/datetime.ui:319 panels/datetime/datetime.ui:397
+#: panels/datetime/cc-datetime-panel.ui:165
 msgid "Requires internet access"
 msgstr "Tha feum air an eadar-lìon"
 
-#: panels/datetime/datetime.ui:382
+#: panels/datetime/cc-datetime-panel.ui:177
+#, fuzzy
+#| msgid "Date & _Time"
+msgid "Date &amp; _Time"
+msgstr "Ceann-là ⁊ an t-àm"
+
+#: panels/datetime/cc-datetime-panel.ui:201
 msgid "Automatic Time _Zone"
 msgstr "An _roinn-tìde gu fèin-obrachail"
 
-#: panels/datetime/datetime.ui:454
-msgid "Date & _Time"
-msgstr "Ceann-là ⁊ an t-àm"
+#: panels/datetime/cc-datetime-panel.ui:202
+#, fuzzy
+#| msgid "Requires internet access"
+msgid "Requires location services enabled and internet access"
+msgstr "Tha feum air an eadar-lìon"
 
-#: panels/datetime/datetime.ui:502
+#: panels/datetime/cc-datetime-panel.ui:214
 msgid "Time Z_one"
 msgstr "R_oinn-tìde"
 
-#: panels/datetime/datetime.ui:570
+#: panels/datetime/cc-datetime-panel.ui:239
 msgid "Time _Format"
 msgstr "_Fòrmat an ama"
 
-#: panels/datetime/datetime.ui:588
-msgid "24-hour"
-msgstr "24 uairean"
-
-#: panels/datetime/datetime.ui:589
-msgid "AM / PM"
-msgstr "m/f"
-
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 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"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/datetime/gnome-datetime-panel.desktop.in.in:7
-msgid "preferences-system-time"
-msgstr "preferences-system-time"
-
 #. Translators: Search terms to find the Date and Time panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:15
 msgid "Clock;Timezone;Location;"
@@ -1081,217 +1545,333 @@ msgstr "Atharraich roghainnean àm ’s ceann-là an t-siostaim"
 
 #: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 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à atharrachadh."
+msgstr ""
+"Feumaidh tu dearbhadh a dhèanamh gus roghainnean an ama no a’ chinn-là "
+"atharrachadh."
 
-#: panels/display/cc-display-panel.c:732
-msgctxt "Display rotation"
-msgid "Landscape"
-msgstr "Dreach-tìre"
+#: panels/default-apps/cc-default-apps-panel.ui:23
+msgid "_Web"
+msgstr "_Lìon"
 
-#: panels/display/cc-display-panel.c:735
-msgctxt "Display rotation"
-msgid "Portrait Right"
-msgstr "Portraid dheas"
+#: panels/default-apps/cc-default-apps-panel.ui:33
+msgid "_Mail"
+msgstr "_Post"
 
-#: panels/display/cc-display-panel.c:738
-msgctxt "Display rotation"
-msgid "Portrait Left"
-msgstr "Portraid chlì"
+#: panels/default-apps/cc-default-apps-panel.ui:47
+msgid "_Calendar"
+msgstr "_Mìosachan"
 
-#: panels/display/cc-display-panel.c:741
-msgctxt "Display rotation"
-msgid "Landscape (flipped)"
-msgstr "Dreach-tìre (air a chuairteachadh)"
+#: panels/default-apps/cc-default-apps-panel.ui:61
+msgid "M_usic"
+msgstr "C_eòl"
 
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/display/cc-display-panel.c:808
-#: panels/printers/pp-options-dialog.c:558
-msgid "Orientation"
-msgstr "Comhair"
+#: panels/default-apps/cc-default-apps-panel.ui:75
+msgid "_Video"
+msgstr "_Video"
 
-#: panels/display/cc-display-panel.c:873 panels/display/cc-display-panel.c:1676
-#: panels/printers/pp-options-dialog.c:87
-msgid "Resolution"
-msgstr "Dùmhlachd-bhreacaidh"
+#: panels/default-apps/cc-default-apps-panel.ui:134
+#: panels/removable-media/cc-removable-media-panel.ui:127
+msgid "_Photos"
+msgstr "_Dealbhan"
 
-#: panels/display/cc-display-panel.c:961
-msgid "Refresh Rate"
-msgstr "Tricead an ath-nuadhachaidh"
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "Aplacaidean tùsail"
 
-#: panels/display/cc-display-panel.c:1098
-msgid "Scale"
-msgstr "Sgèile"
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+msgstr "Rèitich na h-placaidean tùsail"
 
-#: panels/display/cc-display-panel.c:1151
-msgid "Adjust for TV"
-msgstr "Gleus airson TBh"
+#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:19
+msgid "default;application;preferred;media;"
+msgstr ""
+"default;application;preferred;media;tùsail;bun-roghainn;bunaiteach;aplacaid;"
+"nas fheass;as fhearr;meadhan;meadhanan;"
 
-#: panels/display/cc-display-panel.c:1413
-msgid "Primary Display"
-msgstr "Am prìomh uidheam-taisbeanaidh"
+#. translators: The first '%s' is the distributor's name, such as 'Fedora', the second '%s' is a link to the 
privacy policy
+#: panels/diagnostics/cc-diagnostics-panel.c:139
+#, fuzzy, c-format
+#| msgid ""
+#| "Sending reports of technical problems helps us improve %s. Reports are "
+#| "sent anonymously and are scrubbed of personal data."
+msgid ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data. %s"
+msgstr ""
+"Ma chuireas tu aithrisean air duilgheadasan teicnigeach a-null, cuidichidh "
+"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/display/cc-display-panel.c:1442
-msgid "Display Arrangement"
-msgstr "Rian nan uidheaman-taisbeanaidh"
+#: panels/diagnostics/cc-diagnostics-panel.ui:8
+msgid "Problem Reporting"
+msgstr "Ag aithris air duilgheadasan"
 
-#: panels/display/cc-display-panel.c:1443
-msgid ""
-"Drag displays to match your setup. The top bar is placed on the primary "
-"display."
-msgstr "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/diagnostics/cc-diagnostics-panel.ui:11
+msgid "_Automatic Problem Reporting"
+msgstr "_Aithrisean fèin-obrachail air duilgheadasan"
 
-#: panels/display/cc-display-panel.c:1866
-msgid "Display Mode"
-msgstr "Modh an taisbeanaidh"
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:3
+msgid "Diagnostics"
+msgstr ""
 
-#: panels/display/cc-display-panel.c:1882
-msgid "Join Displays"
-msgstr "Cuir na h-uidheaman-taisbeanaidh còmhla"
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:4
+msgid "Report your problems"
+msgstr ""
 
-#: panels/display/cc-display-panel.c:1885
-msgid "Mirror"
-msgstr "Sgàthanaich"
+#. FIXME
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:20
+#: panels/location/gnome-location-panel.desktop.in.in:20
+#: panels/lock/gnome-lock-panel.desktop.in.in:20
+#: panels/usage/gnome-usage-panel.desktop.in.in:20
+#, fuzzy
+#| msgid ""
+#| "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+#| "network;identity;"
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;privacy;"
+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;"
+
+#: panels/display/cc-display-panel.c:512
+#: panels/notifications/cc-notifications-panel.c:217
+#: panels/power/cc-power-panel.c:734 panels/power/cc-power-panel.c:741
+#: panels/universal-access/cc-ua-panel.c:336
+#: panels/universal-access/cc-ua-panel.c:468
+#: panels/universal-access/cc-ua-panel.c:478
+#: panels/universal-access/cc-ua-panel.c:490
+#: panels/universal-access/cc-ua-panel.c:526
+msgid "On"
+msgstr "Air"
 
-#: panels/display/cc-display-panel.c:1888
-msgid "Single Display"
-msgstr "Mar aon uidheam-taisbeanaidh"
+#: panels/display/cc-display-panel.c:514 panels/network/net-proxy.c:69
+#: panels/notifications/cc-notifications-panel.c:217
+#: panels/power/cc-power-panel.c:728 panels/power/cc-power-panel.c:739
+#: panels/universal-access/cc-ua-panel.c:336
+#: panels/universal-access/cc-ua-panel.c:468
+#: panels/universal-access/cc-ua-panel.c:478
+#: panels/universal-access/cc-ua-panel.c:490
+#: panels/universal-access/cc-ua-panel.c:526
+msgid "Off"
+msgstr "Dheth"
 
-#: panels/display/cc-display-panel.c:2593
+#: panels/display/cc-display-panel.c:945
 msgid "Apply Changes?"
 msgstr "A bheil thu airson na h-atharraichean a chur an sàs?"
 
-#: panels/display/cc-display-panel.c:2607
-#: panels/network/connection-editor/connection-editor.ui:24
-#: panels/network/network-wifi.ui:38
+#: panels/display/cc-display-panel.c:950
+msgid "Changes Cannot be Applied"
+msgstr ""
+
+#: panels/display/cc-display-panel.c:952
+msgid "This could be due to hardware limitations."
+msgstr ""
+
+#: panels/display/cc-display-panel.ui:43
+#: panels/network/connection-editor/connection-editor.ui:21
 msgid "_Apply"
 msgstr "Cuir _an sàs"
 
-#: panels/display/cc-display-panel.c:2982
+#: panels/display/cc-display-panel.ui:97
+#, fuzzy
+#| msgid "Bluetooth is disabled"
+msgid "Display Settings Disabled"
+msgstr "Tha Bluetooth à comas"
+
+#: panels/display/cc-display-panel.ui:113
+msgid "Display Arrangement"
+msgstr "Rian nan uidheaman-taisbeanaidh"
+
+#: panels/display/cc-display-panel.ui:124
+#, fuzzy
+#| msgid "Single Display"
+msgid "Multiple Displays"
+msgstr "Mar aon uidheam-taisbeanaidh"
+
+#. 'Join' as in 'Join displays'
+#: panels/display/cc-display-panel.ui:133
+msgid "Join"
+msgstr ""
+
+#: panels/display/cc-display-panel.ui:140
+msgid "Mirror"
+msgstr "Sgàthanaich"
+
+#: panels/display/cc-display-panel.ui:153
+msgid "Contains top bar and Activities"
+msgstr ""
+
+#: panels/display/cc-display-panel.ui:154
+msgid "Primary Display"
+msgstr "Am prìomh uidheam-taisbeanaidh"
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: panels/display/cc-display-panel.ui:175
+#: panels/display/cc-display-panel.ui:223
+#: panels/display/cc-night-light-page.ui:77
+msgid "Night Light"
+msgstr "Solas oidhche"
+
+#: panels/display/cc-display-settings.c:110
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Dreach-tìre"
+
+#: panels/display/cc-display-settings.c:113
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Portraid dheas"
+
+#: panels/display/cc-display-settings.c:116
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Portraid chlì"
+
+#: panels/display/cc-display-settings.c:119
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Dreach-tìre (air a chuairteachadh)"
+
+#: panels/display/cc-display-settings.c:177
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
-#. TRANSLATORS: the state of the night light setting
-#: panels/display/cc-display-panel.c:3198
-#: panels/notifications/cc-notifications-panel.c:292
-#: panels/power/cc-power-panel.c:1994 panels/power/cc-power-panel.c:2001
-#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
-#: panels/universal-access/cc-ua-panel.c:333
-#: panels/universal-access/cc-ua-panel.c:714
-#: panels/universal-access/cc-ua-panel.c:727
-#: panels/universal-access/cc-ua-panel.c:739
-#: panels/universal-access/cc-ua-panel.c:910
-msgid "On"
-msgstr "Air"
+#: panels/display/cc-display-settings.ui:40
+#, fuzzy
+#| msgid "Orientation"
+msgctxt "display setting"
+msgid "Orientation"
+msgstr "Comhair"
 
-#: panels/display/cc-display-panel.c:3198 panels/network/net-proxy.c:54
-#: panels/notifications/cc-notifications-panel.c:292
-#: panels/power/cc-power-panel.c:1988 panels/power/cc-power-panel.c:1999
-#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
-#: panels/universal-access/cc-ua-panel.c:333
-#: panels/universal-access/cc-ua-panel.c:714
-#: panels/universal-access/cc-ua-panel.c:727
-#: panels/universal-access/cc-ua-panel.c:739
-#: panels/universal-access/cc-ua-panel.c:910 panels/universal-access/uap.ui:334
-#: panels/universal-access/uap.ui:380 panels/universal-access/uap.ui:426
-#: panels/universal-access/uap.ui:532 panels/universal-access/uap.ui:685
-#: panels/universal-access/uap.ui:731 panels/universal-access/uap.ui:777
-#: panels/universal-access/uap.ui:929
-msgid "Off"
-msgstr "Dheth"
+#: panels/display/cc-display-settings.ui:47
+#, fuzzy
+#| msgid "Resolution"
+msgctxt "display setting"
+msgid "Resolution"
+msgstr "Dùmhlachd-bhreacaidh"
 
-#: panels/display/cc-display-panel.c:3219
-msgid "_Night Light"
-msgstr "Solas _oidhche"
+#: panels/display/cc-display-settings.ui:54
+msgid "Refresh Rate"
+msgstr "Tricead an ath-nuadhachaidh"
 
-#: panels/display/cc-display-panel.c:3284
-msgid "Could not get screen information"
-msgstr "Cha b’ urrainn dhuinn fiosrachadh na sgrìn fhaighinn"
+#: panels/display/cc-display-settings.ui:61
+msgid "Adjust for TV"
+msgstr "Gleus airson TBh"
 
-#. This cancels the redshift inhibit.
-#: panels/display/display.ui:71
-msgid "Restart Filter"
-msgstr "Ath-thòisich a’ chriathrag"
+#: panels/display/cc-display-settings.ui:75
+#: panels/display/cc-display-settings.ui:90
+#, fuzzy
+#| msgid "Scale"
+msgctxt "display setting"
+msgid "Scale"
+msgstr "Sgèile"
 
 #. Inhibit the redshift functionality until the next day starts
-#: panels/display/display.ui:103
+#: panels/display/cc-night-light-page.ui:21
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "À comas greis gu ruige a-màireach"
 
-#: panels/display/display.ui:144
+#. This cancels the redshift inhibit.
+#: panels/display/cc-night-light-page.ui:35
+msgid "Restart Filter"
+msgstr "Ath-thòisich a’ chriathrag"
+
+#: panels/display/cc-night-light-page.ui:57
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
-msgstr "Nì an solas oidhche dath na sgrìn nas blàithe. Cuidichidh seo an aghaidh sgìths nan sùilean agus 
bacadh-cadail."
-
-#. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: panels/display/display.ui:171 panels/display/display.ui:567
-msgid "Night Light"
-msgstr "Solas oidhche"
+msgstr ""
+"Nì an solas oidhche dath na sgrìn nas blàithe. Cuidichidh seo an aghaidh "
+"sgìths nan sùilean agus bacadh-cadail."
 
-#: panels/display/display.ui:187
+#: panels/display/cc-night-light-page.ui:91
 msgid "Schedule"
 msgstr "Sgeideal"
 
-#: panels/display/display.ui:215
+#: panels/display/cc-night-light-page.ui:99
 msgid "Sunset to Sunrise"
 msgstr "O laighe gu èirigh na grèine"
 
-#: panels/display/display.ui:229
-#: panels/network/connection-editor/ip4-page.ui:69
-#: panels/network/connection-editor/ip6-page.ui:83
-#: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113
-#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
-#: panels/privacy/cc-privacy-panel.c:217
-msgid "Manual"
-msgstr "A làimh"
+#: panels/display/cc-night-light-page.ui:100
+#, fuzzy
+#| msgid "Schedule"
+msgid "Manual Schedule"
+msgstr "Sgeideal"
+
+#: panels/display/cc-night-light-page.ui:110
+#: panels/region/cc-format-preview.ui:35
+msgid "Times"
+msgstr "Amannan"
 
-#: panels/display/display.ui:268
+#: panels/display/cc-night-light-page.ui:123
 msgid "From"
 msgstr "O"
 
-#: panels/display/display.ui:309 panels/display/display.ui:430
+#: panels/display/cc-night-light-page.ui:148
+#: panels/display/cc-night-light-page.ui:235
+msgid "Hour"
+msgstr "Uair"
+
+#: panels/display/cc-night-light-page.ui:154
+#: panels/display/cc-night-light-page.ui:241
 msgid ":"
 msgstr ":"
 
+#: panels/display/cc-night-light-page.ui:171
+#: panels/display/cc-night-light-page.ui:258
+msgid "Minute"
+msgstr "Mionaid"
+
 #. This is the short form for the time period in the morning
-#: panels/display/display.ui:343 panels/display/display.ui:464
+#: panels/display/cc-night-light-page.ui:181
+#: panels/display/cc-night-light-page.ui:268
 msgid "AM"
 msgstr "m"
 
 #. This is the short form for the time period in the afternoon
-#: panels/display/display.ui:359 panels/display/display.ui:480
+#: panels/display/cc-night-light-page.ui:193
+#: panels/display/cc-night-light-page.ui:280
 msgid "PM"
 msgstr "f"
 
-#: panels/display/display.ui:528
+#: panels/display/cc-night-light-page.ui:210
 msgid "To"
 msgstr "Gu"
 
+#: panels/display/cc-night-light-page.ui:316
+msgid "Color Temperature"
+msgstr ""
+
 #: panels/display/gnome-display-panel.desktop.in.in:3
-#| msgid "Dis­plays"
 msgid "Displays"
 msgstr "Uidheaman-taisbeanaidh"
 
 #: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
-msgstr "Tagh mar a thèid monatairean is proiseactaran a tha ceangailte ris a chleachdadh"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/display/gnome-display-panel.desktop.in.in:7
-msgid "preferences-desktop-display"
-msgstr "preferences-desktop-display"
+msgstr ""
+"Tagh mar a thèid monatairean is proiseactaran a tha ceangailte ris a "
+"chleachdadh"
 
 #. Translators: Search terms to find the Displays panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/display/gnome-display-panel.desktop.in.in:19
 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;"
-
-#. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:374
-#: panels/info/cc-info-overview-panel.c:457 panels/network/panel-common.c:123
+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;"
+
+#: panels/info-overview/cc-info-overview-panel.c:411
+#: panels/info-overview/cc-info-overview-panel.c:435
+#: panels/info-overview/cc-info-overview-panel.c:481
+#: panels/info-overview/cc-info-overview-panel.c:511
+#: panels/wwan/cc-wwan-details-dialog.c:100
 msgid "Unknown"
 msgstr "Chan eil fhios"
 
@@ -1299,291 +1879,165 @@ msgstr "Chan eil fhios"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info/cc-info-overview-panel.c:465
+#: panels/info-overview/cc-info-overview-panel.c:443
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s; ID na togail: %s"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:482
+#: panels/info-overview/cc-info-overview-panel.c:458
 #, c-format
 msgid "64-bit"
 msgstr "64-biod"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:485
+#: panels/info-overview/cc-info-overview-panel.c:461
 #, c-format
 msgid "32-bit"
 msgstr "32-biod"
 
-#: panels/info/cc-info-overview-panel.c:775
-#, c-format
-msgid "Version %s"
-msgstr "Tionndadh %s"
-
-#: panels/info/cc-info-removable-media-panel.c:298
-msgid "Ask what to do"
-msgstr "Faighnich dhìom"
+#: panels/info-overview/cc-info-overview-panel.c:720
+msgid "X11"
+msgstr ""
 
-#: panels/info/cc-info-removable-media-panel.c:302
-msgid "Do nothing"
-msgstr "Na dèan dad"
+#: panels/info-overview/cc-info-overview-panel.c:724
+msgid "Wayland"
+msgstr "Wayland"
 
-#: panels/info/cc-info-removable-media-panel.c:306
-msgid "Open folder"
-msgstr "Fosgail am pasgan"
+#: panels/info-overview/cc-info-overview-panel.c:726
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "Windowing system (Wayland, X11, or Unknown)"
+msgid "Unknown"
+msgstr "Chan eil fhios"
 
-#: panels/info/cc-info-removable-media-panel.c:391
-msgid "Other Media"
-msgstr "Meadhanan eile"
+#: panels/info-overview/cc-info-overview-panel.ui:17
+#, fuzzy
+#| msgid "System"
+msgid "System Logo"
+msgstr "Siostam"
 
-#: panels/info/cc-info-removable-media-panel.c:424
-msgid "Select an application for audio CDs"
-msgstr "Tagh aplacaid airson CDan fuaime"
+#: panels/info-overview/cc-info-overview-panel.ui:32
+#: panels/sharing/cc-sharing-panel.ui:299
+#, fuzzy
+#| msgid "Device name"
+msgid "Device Name"
+msgstr "Ainm an uidheim"
 
-#: panels/info/cc-info-removable-media-panel.c:425
-msgid "Select an application for video DVDs"
-msgstr "Tagh aplacaid airson DVDan video"
+#: panels/info-overview/cc-info-overview-panel.ui:50
+#, fuzzy
+#| msgid "Hardware Address"
+msgid "Hardware Model"
+msgstr "Seòladh bathair-chruaidh"
 
-#: panels/info/cc-info-removable-media-panel.c:426
-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-overview/cc-info-overview-panel.ui:58
+msgid "Memory"
+msgstr "Cuimhne"
 
-#: panels/info/cc-info-removable-media-panel.c:427
-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-overview/cc-info-overview-panel.ui:66
+msgid "Processor"
+msgstr "Pròiseasar"
 
-#: panels/info/cc-info-removable-media-panel.c:428
-msgid "Select an application for software CDs"
-msgstr "Tagh aplacaid airson CDan bathair-bhog"
+#: panels/info-overview/cc-info-overview-panel.ui:74
+msgid "Graphics"
+msgstr "Grafaigeachd"
 
-#. translators: these strings are duplicates of shared-mime-info
-#. * strings, just here to fix capitalization of the English originals.
-#. * If the shared-mime-info translation works for your language,
-#. * simply leave these untranslated.
-#.
-#: panels/info/cc-info-removable-media-panel.c:440
-msgid "audio DVD"
-msgstr "DVD fuaime"
+#: panels/info-overview/cc-info-overview-panel.ui:82
+msgid "Disk Capacity"
+msgstr ""
 
-#: panels/info/cc-info-removable-media-panel.c:441
-msgid "blank Blu-ray disc"
-msgstr "diosg Blu-ray bàn"
+#: panels/info-overview/cc-info-overview-panel.ui:83
+msgid "Calculating…"
+msgstr "’Ga àireamhachadh…"
 
-#: panels/info/cc-info-removable-media-panel.c:442
-msgid "blank CD disc"
-msgstr "diosg CD bàn"
+#. translators: this field contains the distro name and version
+#: panels/info-overview/cc-info-overview-panel.ui:98
+#, fuzzy
+#| msgid "Name"
+msgid "OS Name"
+msgstr "Ainm"
 
-#: panels/info/cc-info-removable-media-panel.c:443
-msgid "blank DVD disc"
-msgstr "diosg DVD bàn"
+#: panels/info-overview/cc-info-overview-panel.ui:106
+#, fuzzy
+#| msgid "VPN Type"
+msgid "OS Type"
+msgstr "Seòrsa an VPN"
 
-#: panels/info/cc-info-removable-media-panel.c:444
-msgid "blank HD DVD disc"
-msgstr "diosg DVD HD bàn"
+#: panels/info-overview/cc-info-overview-panel.ui:114
+#, fuzzy
+#| msgid "Version 0"
+msgid "GNOME Version"
+msgstr "Tionndadh 0"
 
-#: panels/info/cc-info-removable-media-panel.c:445
-msgid "Blu-ray video disc"
-msgstr "diosg video Blu-ray bàn"
+#: panels/info-overview/cc-info-overview-panel.ui:123
+#, fuzzy
+#| msgid "Windows software"
+msgid "Windowing System"
+msgstr "Bathar-bog Windows"
 
-#: panels/info/cc-info-removable-media-panel.c:446
-msgid "e-book reader"
-msgstr "leughadair leabhair-d"
+#: panels/info-overview/cc-info-overview-panel.ui:131
+msgid "Virtualization"
+msgstr "Biortaileachadh"
 
-#: panels/info/cc-info-removable-media-panel.c:447
-msgid "HD DVD video disc"
-msgstr "diosg video DVD HD"
+#: panels/info-overview/cc-info-overview-panel.ui:139
+#, fuzzy
+#| msgid "Software Usage"
+msgid "Software Updates"
+msgstr "Cleachdadh bathair-bhog"
 
-#: panels/info/cc-info-removable-media-panel.c:448
-msgid "Picture CD"
-msgstr "CD dhealbhan"
+#: panels/info-overview/cc-info-overview-panel.ui:158
+#, fuzzy
+#| msgid "Remove Device"
+msgid "Rename Device"
+msgstr "Thoirt an t-uidheam air falbh"
 
-#: panels/info/cc-info-removable-media-panel.c:449
-msgid "Super Video CD"
-msgstr "Super Video CD"
+#: panels/info-overview/cc-info-overview-panel.ui:174
+msgid ""
+"The device name is used to identify this device when it is viewed over the "
+"network, or when pairing Bluetooth devices."
+msgstr ""
 
-#: panels/info/cc-info-removable-media-panel.c:450
-msgid "Video CD"
-msgstr "Video CD"
+#: panels/info-overview/cc-info-overview-panel.ui:190
+#, fuzzy
+#| msgid "_Username"
+msgid "_Rename"
+msgstr "_Ainm-cleachdaiche"
 
-#: panels/info/cc-info-removable-media-panel.c:451
-msgid "Windows software"
-msgstr "Bathar-bog Windows"
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3
+msgid "About"
+msgstr "Mu dhèidhinn"
 
-#: panels/info/gnome-default-apps-panel.desktop.in.in:3
-msgid "Default Applications"
-msgstr "Aplacaidean tùsail"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:4
-msgid "Configure Default Applications"
-msgstr "Rèitich na h-placaidean tùsail"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/info/gnome-default-apps-panel.desktop.in.in:7
-msgid "starred"
-msgstr "starred"
-
-#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/info/gnome-default-apps-panel.desktop.in.in:19
-msgid "default;application;preferred;media;"
-msgstr "default;application;preferred;media;tùsail;bun-roghainn;bunaiteach;aplacaid;nas fheass;as 
fhearr;meadhan;meadhanan;"
-
-#: panels/info/gnome-info-overview-panel.desktop.in.in:3
-msgid "About"
-msgstr "Mu dhèidhinn"
-
-#: panels/info/gnome-info-overview-panel.desktop.in.in:4
-msgid "View information about your system"
-msgstr "Seall fiosrachadh mun t-siostam agad"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/info/gnome-info-overview-panel.desktop.in.in:7
-msgid "help-about"
-msgstr "help-about"
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:4
+msgid "View information about your system"
+msgstr "Seall fiosrachadh mun t-siostam agad"
 
 #. Translators: Search terms to find the About panel.
 #. Do NOT translate or localize the semicolons!
 #. The list MUST also end with a semicolon!
 #. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: panels/info/gnome-info-overview-panel.desktop.in.in:23
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:23
+#, fuzzy
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgid ""
+"device;system;information;hostname;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;"
 "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;device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-
-#: panels/info/gnome-removable-media-panel.desktop.in.in:3
-msgid "Removable Media"
-msgstr "Meadhan so-ghiùlain"
-
-#: panels/info/gnome-removable-media-panel.desktop.in.in:4
-msgid "Configure Removable Media settings"
-msgstr "Rèitich roghainnean nam meadhanan so-ghiùlain"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/info/gnome-removable-media-panel.desktop.in.in:7
-msgid "media-removable"
-msgstr "media-removable"
-
-#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
-#: panels/info/gnome-removable-media-panel.desktop.in.in:19
-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;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-
-#: panels/info/info-default-apps.ui:31
-msgid "_Web"
-msgstr "_Lìon"
-
-#: panels/info/info-default-apps.ui:43
-msgid "_Mail"
-msgstr "_Post"
-
-#: panels/info/info-default-apps.ui:59
-msgid "_Calendar"
-msgstr "_Mìosachan"
-
-#: panels/info/info-default-apps.ui:75
-msgid "M_usic"
-msgstr "C_eòl"
-
-#: panels/info/info-default-apps.ui:91
-msgid "_Video"
-msgstr "_Video"
-
-#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
-msgid "_Photos"
-msgstr "_Dealbhan"
-
-#: panels/info/info-overview.ui:58
-msgid "Device name"
-msgstr "Ainm an uidheim"
-
-#: panels/info/info-overview.ui:74
-msgid "Memory"
-msgstr "Cuimhne"
-
-#: panels/info/info-overview.ui:90
-msgid "Processor"
-msgstr "Pròiseasar"
-
-#: panels/info/info-overview.ui:106
-msgid "Graphics"
-msgstr "Grafaigeachd"
-
-#. To translators: this field contains the distro name and version
-#: panels/info/info-overview.ui:121
-msgid "OS name"
-msgstr "Ainm an t-siostam-obrachaidh"
-
-#. To translators: this field contains the distro type
-#: panels/info/info-overview.ui:137
-msgid "OS type"
-msgstr "Seòrsa an t-siostam-obrachaidh"
-
-#: panels/info/info-overview.ui:153
-msgid "Virtualization"
-msgstr "Biortaileachadh"
-
-#: panels/info/info-overview.ui:169
-msgid "Disk"
-msgstr "Diosga"
-
-#: panels/info/info-overview.ui:274
-msgid "Calculating…"
-msgstr "’Ga àireamhachadh…"
-
-#: panels/info/info-overview.ui:314
-msgid "Check for updates"
-msgstr "Thoir sùil airson ùrachaidhean"
-
-#: panels/info/info-removable-media.ui:43
-msgid "Select how media should be handled"
-msgstr "Tagh mar a thèid am meadhan a làimhseachadh"
-
-#: panels/info/info-removable-media.ui:74
-msgid "CD _audio"
-msgstr "CD _fuaime"
-
-#: panels/info/info-removable-media.ui:91
-msgid "_DVD video"
-msgstr "_DVD video"
-
-#: panels/info/info-removable-media.ui:132
-msgid "_Music player"
-msgstr "_Cluicheadair ciùil"
-
-#: panels/info/info-removable-media.ui:190
-msgid "_Software"
-msgstr "_Bathar-bog"
-
-#: panels/info/info-removable-media.ui:228
-msgid "_Other Media…"
-msgstr "_Meadhanan eile…"
-
-#: panels/info/info-removable-media.ui:272
-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"
-
-#: panels/info/info-removable-media.ui:331
-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:370
-msgid "_Action:"
-msgstr "_Gnìomh:"
-
-#: panels/info/info-removable-media.ui:393
-msgid "_Type:"
-msgstr "_Seòrsa:"
 
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "Fuaim agus meadhanan"
 
 #: panels/keyboard/00-multimedia.xml.in:4
-msgid "Volume mute"
+#, fuzzy
+#| msgid "Volume mute"
+msgid "Volume mute/unmute"
 msgstr "Mùch an fhuaim"
 
 #: panels/keyboard/00-multimedia.xml.in:6
@@ -1595,34 +2049,39 @@ msgid "Volume up"
 msgstr "Cuir an fhuaim an àirde"
 
 #: panels/keyboard/00-multimedia.xml.in:10
+msgid "Microphone mute/unmute"
+msgstr ""
+
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Launch media player"
 msgstr "Cuir gu dol cluicheadair nam meadhanan"
 
-#: panels/keyboard/00-multimedia.xml.in:12
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Play (or play/pause)"
 msgstr "Cluich (no cluich/cuir ’na stad)"
 
-#: panels/keyboard/00-multimedia.xml.in:14
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Pause playback"
 msgstr "Cuir a chluich ’na stad"
 
-#: panels/keyboard/00-multimedia.xml.in:16
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Stop playback"
 msgstr "Sguir dhen chluich"
 
-#: panels/keyboard/00-multimedia.xml.in:18
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Previous track"
 msgstr "An traca roimhe"
 
-#: panels/keyboard/00-multimedia.xml.in:20
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Next track"
 msgstr "An ath-thraca"
 
-#: panels/keyboard/00-multimedia.xml.in:22
+#: panels/keyboard/00-multimedia.xml.in:24
 msgid "Eject"
 msgstr "Gluais a-mach"
 
-#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:576
+#: panels/keyboard/01-input-sources.xml.in:4
+#: panels/universal-access/cc-ua-panel.ui:163
 msgid "Typing"
 msgstr "Sgrìobhadh"
 
@@ -1642,12 +2101,6 @@ msgstr "Lòinsearan"
 msgid "Launch help browser"
 msgstr "Cuir gu dol brabhsair na cobharach"
 
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:222
-#: shell/cc-window.c:760 shell/gnome-control-center.desktop.in.in:3
-#: shell/window.ui:125
-msgid "Settings"
-msgstr "Roghainnean"
-
 #: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "Cuir gu dol an t-àireamhair"
@@ -1665,42 +2118,10 @@ msgid "Home folder"
 msgstr "Am pasgan-dachaigh"
 
 #: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/window.ui:157
+msgctxt "keybinding"
 msgid "Search"
 msgstr "Lorg"
 
-#: panels/keyboard/01-screenshot.xml.in:2
-msgid "Screenshots"
-msgstr "Glacaidhean-sgrìn"
-
-#: panels/keyboard/01-screenshot.xml.in:6
-msgid "Save a screenshot to $PICTURES"
-msgstr "Cuir lethbhreac de ghlacadh-sgrìn dha $PICTURES"
-
-#: panels/keyboard/01-screenshot.xml.in:10
-msgid "Save a screenshot of a window to $PICTURES"
-msgstr "Cuir lethbhreac de ghlacadh-sgrìn uinneige dha $PICTURES"
-
-#: panels/keyboard/01-screenshot.xml.in:14
-msgid "Save a screenshot of an area to $PICTURES"
-msgstr "Cuir lethbhreac de ghlacadh-sgrìn raoin dha $PICTURES"
-
-#: panels/keyboard/01-screenshot.xml.in:17
-msgid "Copy a screenshot to clipboard"
-msgstr "Cuir lethbhreac de ghlacadh-sgrìn air an stòr-bhòrd"
-
-#: panels/keyboard/01-screenshot.xml.in:20
-msgid "Copy a screenshot of a window to clipboard"
-msgstr "Cuir lethbhreac de ghlacadh-sgrìn uinneige air an stòr-bhòrd"
-
-#: panels/keyboard/01-screenshot.xml.in:23
-msgid "Copy a screenshot of an area to clipboard"
-msgstr "Cuir lethbhreac de raon air an stòr-bhòrd"
-
-#: panels/keyboard/01-screenshot.xml.in:26
-msgid "Record a short screencast"
-msgstr "Clàraich craoladh-sgrìn goirid"
-
 #: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "Siostam"
@@ -1715,8 +2136,8 @@ msgstr "Glais an sgrìn"
 
 #: panels/keyboard/50-accessibility.xml.in:2
 #: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
-msgid "Universal Access"
-msgstr "Inntrigeadh uile-choitcheann"
+msgid "Accessibility"
+msgstr ""
 
 #: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
@@ -1750,918 +2171,1618 @@ 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:506
-#: panels/keyboard/cc-keyboard-manager.c:514
-#: panels/keyboard/cc-keyboard-manager.c:822
+#: panels/keyboard/cc-input-chooser.c:186
+msgid "No input sources found"
+msgstr "Cha deach tùs ion-chuir a lorg"
+
+#: panels/keyboard/cc-input-chooser.c:931
+msgctxt "Input Source"
+msgid "Other"
+msgstr "Eile"
+
+#: panels/keyboard/cc-input-chooser.ui:5
+msgid "Add an Input Source"
+msgstr "Cuir tùs ion-chuir ris"
+
+#: panels/keyboard/cc-input-chooser.ui:81
+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"
+
+#: panels/keyboard/cc-input-list-box.ui:24
+msgid "No input source selected"
+msgstr "Cha deach tùs ion-chuir a thaghadh"
+
+#: panels/keyboard/cc-input-row.ui:28 panels/search/cc-search-panel-row.ui:49
+msgid "Move Up"
+msgstr "Gluais suas"
+
+#: panels/keyboard/cc-input-row.ui:32 panels/search/cc-search-panel-row.ui:53
+msgid "Move Down"
+msgstr "Gluais sìos"
+
+#: panels/keyboard/cc-input-row.ui:38
+msgid "Preferences"
+msgstr "Roghainnean"
+
+#: panels/keyboard/cc-input-row.ui:45
+#, fuzzy
+#| msgid "Keyboard Shortcuts"
+msgid "View Keyboard Layout"
+msgstr "Ath-ghoiridean a’ mheur-chlàir"
+
+#: panels/keyboard/cc-input-row.ui:51
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:29
+msgid "Remove"
+msgstr "Thoir air falbh"
+
+#: panels/keyboard/cc-keyboard-manager.c:485
+#: panels/keyboard/cc-keyboard-manager.c:493
+#: panels/keyboard/cc-keyboard-manager.c:922
 msgid "Custom Shortcuts"
 msgstr "Ath-ghoiridean gnàthaichte"
 
-#. This label is displayed in a treeview cell displaying
-#. * a disabled accelerator key combination.
-#.
-#. translators:
-#. * The device has been disabled
-#: panels/keyboard/cc-keyboard-option.c:263
-#: panels/keyboard/cc-keyboard-option.c:382
-#: panels/keyboard/keyboard-shortcuts.c:435
-#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
-#: panels/network/network-wifi.ui:782 panels/network/network-wifi.ui:1059
-#: panels/user-accounts/um-fingerprint-dialog.c:211
-#: subprojects/gvc/gvc-mixer-control.c:1866
-msgid "Disabled"
-msgstr "À comas"
-
-#. Translators: This key is also known as 'third level
-#. * chooser'. AltGr is often used for this purpose. See
-#. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
-#.
-#: panels/keyboard/cc-keyboard-option.c:341
-msgid "Alternative Characters Key"
+#: panels/keyboard/cc-keyboard-panel.c:64
+#: panels/keyboard/cc-keyboard-panel.ui:62
+#, fuzzy
+#| msgid "Alternative Characters Key"
+msgid "Alternate Characters Key"
 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.
-#. * See http://en.wikipedia.org/wiki/Compose_key
-#.
-#: panels/keyboard/cc-keyboard-option.c:350
+#: panels/keyboard/cc-keyboard-panel.c:65
+msgid ""
+"The alternate characters key can be used to enter additional characters. "
+"These are sometimes printed as a third-option on your keyboard."
+msgstr ""
+
+#: panels/keyboard/cc-keyboard-panel.c:67
+#: panels/keyboard/cc-keyboard-panel.c:85
+#, fuzzy
+#| msgid "Left+Right Alt"
+msgctxt "keyboard key"
+msgid "Left Alt"
+msgstr "Alt clì + deas"
+
+#: panels/keyboard/cc-keyboard-panel.c:68
+#: panels/keyboard/cc-keyboard-panel.c:86
+#, fuzzy
+#| msgid "Left+Right Alt"
+msgctxt "keyboard key"
+msgid "Right Alt"
+msgstr "Alt clì + deas"
+
+#: panels/keyboard/cc-keyboard-panel.c:69
+#: panels/keyboard/cc-keyboard-panel.c:87
+#, fuzzy
+#| msgid "Left thumb"
+msgctxt "keyboard key"
+msgid "Left Super"
+msgstr "An òrdag chlì"
+
+#: panels/keyboard/cc-keyboard-panel.c:70
+#: panels/keyboard/cc-keyboard-panel.c:88
+#, fuzzy
+#| msgid "Right thumb"
+msgctxt "keyboard key"
+msgid "Right Super"
+msgstr "An òrdag dheas"
+
+#: panels/keyboard/cc-keyboard-panel.c:71
+#: panels/keyboard/cc-keyboard-panel.c:89
+#, fuzzy
+#| msgid "Security key"
+msgctxt "keyboard key"
+msgid "Menu key"
+msgstr "An iuchair tèarainteachd"
+
+#: panels/keyboard/cc-keyboard-panel.c:72
+#: panels/keyboard/cc-keyboard-panel.c:90
+#, fuzzy
+#| msgid "Right Half"
+msgctxt "keyboard key"
+msgid "Right Ctrl"
+msgstr "An leth dheas"
+
+#: panels/keyboard/cc-keyboard-panel.c:80
+#: panels/keyboard/cc-keyboard-panel.ui:79
 msgid "Compose Key"
 msgstr "Iuchair Compose"
 
-#: panels/keyboard/cc-keyboard-option.c:355
-msgid "Modifiers-only switch to next source"
-msgstr "Gluaisidh na h-iuchraichean atharrachaidh dhan ath-thùs thu"
+#: panels/keyboard/cc-keyboard-panel.c:81
+msgid ""
+"The compose key allows a wide variety of characters to be entered. To use "
+"it, press compose then a sequence of characters.  For example, compose key "
+"followed by <b>C</b> and <b>o</b> will enter <b>©</b>, <b>a</b> followed by "
+"<b>'</b> will enter <b>á</b>."
+msgstr ""
+
+#: panels/keyboard/cc-keyboard-panel.c:91
+msgctxt "keyboard key"
+msgid "Caps Lock"
+msgstr ""
+
+#: panels/keyboard/cc-keyboard-panel.c:92
+#, fuzzy
+#| msgid "Scroll Left"
+msgctxt "keyboard key"
+msgid "Scroll Lock"
+msgstr "Sgrolaich dhan taobh chlì"
+
+#: panels/keyboard/cc-keyboard-panel.c:93
+#, fuzzy
+#| msgid "Login _Screen"
+msgctxt "keyboard key"
+msgid "Print Screen"
+msgstr "_Sgrìn a’ chlàraidh a-steach"
+
+#: panels/keyboard/cc-keyboard-panel.c:217
+#, fuzzy, c-format
+#| msgid "You can change these shortcuts in the keyboard settings"
+msgid ""
+"Input sources can be switched using the %s keyboard shortcut.\n"
+"This can be changed in the keyboard shortcut settings."
+msgstr ""
+"’S urrainn dhut na h-ath-ghoiridean seo atharrachadh ann an roghainnean a’ "
+"mheur-chlàir"
+
+#: panels/keyboard/cc-keyboard-panel.ui:17
+msgid "Input Sources"
+msgstr "Tùsan ion-chuir"
+
+#: panels/keyboard/cc-keyboard-panel.ui:18
+msgid "Includes keyboard layouts and input methods."
+msgstr ""
+
+#: panels/keyboard/cc-keyboard-panel.ui:28
+#, fuzzy
+#| msgid "Input Source Options"
+msgid "Input Source Switching"
+msgstr "Roghainnean nan tùsan ion-chuir"
+
+#: panels/keyboard/cc-keyboard-panel.ui:31
+msgid "Use the _same source for all windows"
+msgstr "Cleachd an aon tù_s airson gach uinneag"
+
+#: panels/keyboard/cc-keyboard-panel.ui:43
+#, fuzzy
+#| msgid "Allow _different sources for each window"
+msgid "Switch input sources _individually for each window"
+msgstr "Ceadaich _diofar tùsan airson gach uinneag"
+
+#: panels/keyboard/cc-keyboard-panel.ui:58
+msgid "Special Character Entry"
+msgstr ""
+
+#: panels/keyboard/cc-keyboard-panel.ui:59
+msgid "Methods for entering symbols and letter variants using the keyboard."
+msgstr ""
 
-#: panels/keyboard/cc-keyboard-panel.c:181
+#: panels/keyboard/cc-keyboard-panel.ui:97
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:319
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:334 shell/cc-window.ui:160
+msgid "Keyboard Shortcuts"
+msgstr "Ath-ghoiridean a’ mheur-chlàir"
+
+#: panels/keyboard/cc-keyboard-panel.ui:100
+#, fuzzy
+#| msgid "Custom Shortcuts"
+msgid "View and Customize Shortcuts"
+msgstr "Ath-ghoiridean gnàthaichte"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:296
+#, c-format
+msgid "%d modified"
+msgid_plural "%d modified"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:460
 msgid "Reset All Shortcuts?"
 msgstr "A bheil thu airson na h-ath-ghoiridean uile ath-shuidheachadh?"
 
-#: panels/keyboard/cc-keyboard-panel.c:184
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:463
 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:346
-#: panels/printers/authentication-dialog.ui:29
-#: panels/printers/ppd-selection-dialog.ui:27
+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-shortcut-dialog.c:467
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:23
+#: panels/network/wireless-security/ws-file-chooser-button.c:94
+#: panels/printers/ppd-selection-dialog.ui:83
+#: panels/wwan/cc-wwan-device-page.c:189
 msgid "Cancel"
 msgstr "Sguir dheth"
 
-#: panels/keyboard/cc-keyboard-panel.c:189
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:468
 msgid "Reset All"
 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-dialog.ui:35
+msgid "Reset All…"
+msgstr "Ath-shuidhich na h-uile…"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:413
-#, 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 àite, thèid %s a chur à 
comas"
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:36
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "Ath-shuidhich na h-ath-ghoiridean uile air an luachan tùsail"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:143
+#, fuzzy
+#| msgid "Add Custom Shortcut"
+msgid "Add Custom Shortcuts"
+msgstr "Cuir ath-ghoirid ghnàthaichte ris"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:151
+msgid "Set up custom shortcuts for launching apps, running scripts, and more."
+msgstr ""
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:157
+msgid "Add Shortcut"
+msgstr "Cuir ath-ghoirid ris"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:189
+msgid "No keyboard shortcut found"
+msgstr "Cha deach ath-ghoirid a’ mheur-chlàir a lorg"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:583
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:392
+#, fuzzy, c-format
+#| msgid ""
+#| "%s is already being used for <b>%s</b>. If you replace it, %s will be "
+#| "disabled"
+msgid "%s is already being used for %s. If you replace it, %s will be disabled"
+msgstr ""
+"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:536
+msgid "Enter the new shortcut"
+msgstr "Cuir a-steach an ath-ghoirid ùr"
+
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:551
 msgid "Set Custom Shortcut"
 msgstr "Suidhich ath-ghoirid ghnàthaichte"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:583
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:551
 msgid "Set Shortcut"
 msgstr "Suidhich ath-ghoirid"
 
-#. Setup the top label
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:592
-#, c-format
-msgid "Enter new shortcut to change <b>%s</b>."
+#. TRANSLATORS: %s is replaced with a description of the keyboard shortcut
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:562
+#, fuzzy, c-format
+#| msgid "Enter new shortcut to change <b>%s</b>."
+msgid "Enter new shortcut to change %s."
 msgstr "Cuir a-steach an ath-ghoirid a dh’atharrachadh <b>%s</b>."
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:1019
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:992
 msgid "Add Custom Shortcut"
 msgstr "Cuir ath-ghoirid ghnàthaichte ris"
 
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
-#| msgid "Key­board"
-msgid "Keyboard"
-msgstr "Meur-chlàr"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:39
+#: panels/wwan/cc-wwan-apn-dialog.ui:33
+msgid "Add"
+msgstr "Cuir ris"
 
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
-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 roghainnean sgrìobhaidh agad"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:46
+msgid "Replace"
+msgstr "Cuir ’na àite"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:7
-msgid "input-keyboard"
-msgstr "input-keyboard"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:52
+msgid "Set"
+msgstr "Suidhich"
 
-#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
-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/cc-keyboard-shortcut-editor.ui:98
+#, fuzzy
+#| msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgid "Press Esc to cancel or Backspace to disable 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/cc-keyboard-shortcut-editor.ui:153
+#: panels/printers/pp-details-dialog.ui:39
+#: panels/user-accounts/cc-add-user-dialog.ui:68
+#: panels/user-accounts/cc-user-panel.ui:132
+#: panels/wwan/cc-wwan-apn-dialog.ui:96
+msgid "Name"
+msgstr "Ainm"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
-#: shell/cc-application.c:255
-msgid "Keyboard Shortcuts"
-msgstr "Ath-ghoiridean a’ mheur-chlàir"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:163
+msgid "Command"
+msgstr "Àithne"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:77
-msgid "Reset All…"
-msgstr "Ath-shuidhich na h-uile…"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:173
+msgid "Shortcut"
+msgstr "Ath-ghoirid"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:78
-msgid "Reset all shortcuts to their default keybindings"
-msgstr "Ath-shuidhich na h-ath-ghoiridean uile air an luachan tùsail"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:240
+msgid "Set Shortcut…"
+msgstr "Suidhich ath-ghoirid…"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:164
-msgid "No keyboard shortcut found"
-msgstr "Cha deach ath-ghoirid a’ mheur-chlàir a lorg"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:248
+msgid "None"
+msgstr "Chan eil gin"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/panel-list.ui:206
-msgid "Try a different search"
-msgstr "Feuch lorg eile"
+#: panels/keyboard/cc-keyboard-shortcut-row.ui:23
+msgid "Reset the shortcut to its default value"
+msgstr "Ath-shuidhich an ath-ghoirid air a luach tùsail"
 
-#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
-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/gnome-keyboard-panel.desktop.in.in:3
+msgid "Keyboard"
+msgstr "Meur-chlàr"
 
-#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
-#: panels/sound/gvc-mixer-dialog.c:1480
-#: panels/sound/gvc-sound-theme-chooser.c:554
-msgid "Name"
-msgstr "Ainm"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
+#, fuzzy
+#| msgid "View and change keyboard shortcuts and set your typing preferences"
+msgid ""
+"Change keyboard shortcuts and set your typing preferences, keyboard layouts "
+"and input sources"
+msgstr ""
+"Seall is atharraich ath-ghoiridean a’ mheur-chlàir agad is suidhich na "
+"roghainnean sgrìobhaidh agad"
 
-#: panels/keyboard/shortcut-editor.ui:168
-msgid "Command"
-msgstr "Àithne"
+#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
+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/location/cc-location-panel.ui:20
+#, fuzzy
+#| msgid "Location Services"
+msgid "Location Services Turned Off"
+msgstr "Seirbheisean ionaid"
 
-#: panels/keyboard/shortcut-editor.ui:180
-msgid "Shortcut"
-msgstr "Ath-ghoirid"
+#: panels/location/cc-location-panel.ui:21
+#, fuzzy
+#| msgid "No application is currently playing or recording audio."
+msgid "No applications can obtain location information."
+msgstr ""
+"Chan eil aplacaid sam bith a’ cluich no a’ clàradh fuaime an-dràsta fhèin."
 
-#: panels/keyboard/shortcut-editor.ui:259
-msgid "Set Shortcut…"
-msgstr "Suidhich ath-ghoirid…"
+#: panels/location/cc-location-panel.ui:35
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy.\n"
+"\n"
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>\n"
+"\n"
+"Allow the applications below to determine your location."
+msgstr ""
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:594
-msgid "None"
-msgstr "Chan eil gin"
+#: panels/location/cc-location-panel.ui:53
+msgid "No Applications Have Asked for Location Access"
+msgstr ""
 
-#: panels/keyboard/shortcut-editor.ui:303
-msgid "Enter the new shortcut"
-msgstr "Cuir a-steach an ath-ghoirid ùr"
+#: panels/location/gnome-location-panel.desktop.in.in:4
+msgid "Protect your location information"
+msgstr ""
 
-#: panels/keyboard/shortcut-editor.ui:357
-msgid "Remove"
-msgstr "Thoir air falbh"
+#. FIXME
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:62
+#, fuzzy
+#| msgid "Screen Turns Off"
+msgctxt "lock_screen"
+msgid "Screen Turns Off"
+msgstr "Thèid na sgrìnichean dheth"
 
-#: panels/keyboard/shortcut-editor.ui:367
-msgid "Add"
-msgstr "Cuir ris"
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:65
+#, fuzzy
+#| msgid "30 seconds"
+msgctxt "lock_screen"
+msgid "30 seconds"
+msgstr "30 diog"
 
-#: panels/keyboard/shortcut-editor.ui:382
-msgid "Replace"
-msgstr "Cuir ’na àite"
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:68
+#, fuzzy
+#| msgid "1 minute"
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 mhionaid"
 
-#: panels/keyboard/shortcut-editor.ui:395
-msgid "Set"
-msgstr "Suidhich"
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:71
+#, fuzzy
+#| msgid "2 minutes"
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 mhionaid"
 
-#: panels/mouse/cc-mouse-panel.c:82 panels/wacom/cc-wacom-panel.c:402
-msgid "Test Your _Settings"
-msgstr "Cuir na roghainnean agad fo dheuchainn"
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:74
+#, fuzzy
+#| msgid "3 minutes"
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 mionaidean"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
-#| msgid "Mouse & Touch­pad"
-msgid "Mouse & Touchpad"
-msgstr "An luchag ⁊ am pada-suathaidh"
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:77
+#, fuzzy
+#| msgid "5 minutes"
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 mionaidean"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:80
+#, fuzzy
+#| msgid "30 minutes"
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "Leth-uair a thìde"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:83
+#, fuzzy
+#| msgid "1 hour"
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 uair a thìde"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:126
+#, fuzzy
+#| msgid "1 minute"
+msgctxt "blank_screen"
+msgid "1 minute"
+msgstr "1 mhionaid"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:129
+#, fuzzy
+#| msgid "2 minutes"
+msgctxt "blank_screen"
+msgid "2 minutes"
+msgstr "2 mhionaid"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:132
+#, fuzzy
+#| msgid "3 minutes"
+msgctxt "blank_screen"
+msgid "3 minutes"
+msgstr "3 mionaidean"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:135
+#, fuzzy
+#| msgid "4 minutes"
+msgctxt "blank_screen"
+msgid "4 minutes"
+msgstr "4 mionaidean"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:138
+#, fuzzy
+#| msgid "5 minutes"
+msgctxt "blank_screen"
+msgid "5 minutes"
+msgstr "5 mionaidean"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:141
+#, fuzzy
+#| msgid "8 minutes"
+msgctxt "blank_screen"
+msgid "8 minutes"
+msgstr "8 mionaidean"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:144
+#, fuzzy
+#| msgid "10 minutes"
+msgctxt "blank_screen"
+msgid "10 minutes"
+msgstr "10 mionaidean"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:147
+#, fuzzy
+#| msgid "12 minutes"
+msgctxt "blank_screen"
+msgid "12 minutes"
+msgstr "12 mhionaid"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:150
+#, fuzzy
+#| msgid "15 minutes"
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "Cairteal na h-uarach"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:153
+#, fuzzy
+#| msgid "Never"
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "Chan ann idir"
+
+#: panels/lock/cc-lock-panel.ui:8
 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è deas- no chlì-làmhach"
+"Automatically locking the screen prevents others from accessing the computer "
+"while you're away."
+msgstr ""
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:7
-msgid "input-mouse"
-msgstr "input-mouse"
+#: panels/lock/cc-lock-panel.ui:13
+#, fuzzy
+#| msgid "_Blank screen"
+msgid "Blank Screen Delay"
+msgstr "Sgrìn _bhàn"
 
-#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
-msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
-msgstr 
"Pada-suathaidh;Tomhaire;Briog;Gnogag;Dùbailte;Ball-lorgaire;Sgrolaich;Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+#: panels/lock/cc-lock-panel.ui:14
+msgid "Period of inactivity after which the screen will go blank."
+msgstr ""
+
+#: panels/lock/cc-lock-panel.ui:32
+msgid "Automatic Screen _Lock"
+msgstr "G_las fhèin-obrachail na sgrìn"
+
+#: panels/lock/cc-lock-panel.ui:46
+#, fuzzy
+#| msgid "Automatic Screen _Lock"
+msgid "Automatic _Screen Lock Delay"
+msgstr "G_las fhèin-obrachail na sgrìn"
+
+#: panels/lock/cc-lock-panel.ui:47
+msgid "Period after the screen blanks when the screen is automatically locked."
+msgstr ""
+
+#: panels/lock/cc-lock-panel.ui:65
+#, fuzzy
+#| msgid "Show _Notifications"
+msgid "Show _Notifications on Lock Screen"
+msgstr "Seall _na brathan"
 
-#: panels/mouse/gnome-mouse-properties.ui:45
+#: panels/lock/cc-lock-panel.ui:80
+msgid "Forbid new _USB devices"
+msgstr ""
+
+#: panels/lock/cc-lock-panel.ui:81
+msgid ""
+"Prevent new USB devices from interacting with the system when the screen is "
+"locked."
+msgstr ""
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:3
+msgid "Screen Lock"
+msgstr "Glas na sgrìn"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:4
+#, fuzzy
+#| msgid "Lock screen"
+msgid "Lock your screen"
+msgstr "Glais an sgrìn"
+
+#. FIXME
+#: panels/microphone/cc-microphone-panel.ui:20
+#, fuzzy
+#| msgid "Screen Turns Off"
+msgid "Microphone Turned Off"
+msgstr "Thèid na sgrìnichean dheth"
+
+#: panels/microphone/cc-microphone-panel.ui:21
+#, fuzzy
+#| msgid "No applications found"
+msgid "No applications can record sound."
+msgstr "Cha deach aplacaid sam bith a lorg"
+
+#: panels/microphone/cc-microphone-panel.ui:34
+msgid ""
+"Use of the microphone allows applications to record and listen to audio. "
+"Disabling the microphone may cause some applications to not function "
+"properly.\n"
+"\n"
+"Allow the applications below to use your microphone."
+msgstr ""
+
+#: panels/microphone/cc-microphone-panel.ui:51
+msgid "No Applications Have Asked for Microphone Access"
+msgstr ""
+
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:4
+msgid "Protect your conversations"
+msgstr ""
+
+#. FIXME
+#: panels/mouse/cc-mouse-panel.ui:9 panels/wacom/cc-wacom-panel.ui:9
+msgid "Test Your _Settings"
+msgstr "Cuir na roghainnean agad fo dheuchainn"
+
+#: panels/mouse/cc-mouse-panel.ui:23
+#: panels/multitasking/cc-multitasking-panel.ui:9
 msgid "General"
 msgstr "Coitcheann"
 
-#: panels/mouse/gnome-mouse-properties.ui:83
+#: panels/mouse/cc-mouse-panel.ui:26
 msgid "Primary Button"
 msgstr "Prìomh-phutan"
 
-#: panels/mouse/gnome-mouse-properties.ui:102
+#: panels/mouse/cc-mouse-panel.ui:27
 msgid "Sets the order of physical buttons on mice and touchpads."
-msgstr "Suidhichidh seo òrdugh nam putanan fiosaigeach air luchagan is padaichean-suathaidh."
+msgstr ""
+"Suidhichidh seo òrdugh nam putanan fiosaigeach air luchagan is padaichean-"
+"suathaidh."
 
-#: panels/mouse/gnome-mouse-properties.ui:131
+#: panels/mouse/cc-mouse-panel.ui:41 panels/sound/cc-balance-slider.ui:13
 msgid "Left"
 msgstr "Clì"
 
-#: panels/mouse/gnome-mouse-properties.ui:141
+#: panels/mouse/cc-mouse-panel.ui:48 panels/sound/cc-balance-slider.ui:15
 msgid "Right"
 msgstr "Deas"
 
-#: panels/mouse/gnome-mouse-properties.ui:177
+#: panels/mouse/cc-mouse-panel.ui:62
 msgid "Mouse"
 msgstr "Luchag"
 
-#: panels/mouse/gnome-mouse-properties.ui:216
+#: panels/mouse/cc-mouse-panel.ui:65
 msgid "Mouse Speed"
 msgstr "Luaths na luchaige"
 
-#: panels/mouse/gnome-mouse-properties.ui:238
-#: panels/mouse/gnome-mouse-properties.ui:543
-msgid "Double-click timeout"
-msgstr "Crìoch-ùine a’ bhriogaidh dhùbailte"
-
 #. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use 
the same translation if possible.
 #. 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:275
-#: panels/mouse/gnome-mouse-properties.ui:451
+#: panels/mouse/cc-mouse-panel.ui:81 panels/mouse/cc-mouse-panel.ui:108
 msgid "Natural Scrolling"
 msgstr "Sgroladh nàdarra"
 
-#: panels/mouse/gnome-mouse-properties.ui:291
-#: panels/mouse/gnome-mouse-properties.ui:467
+#: panels/mouse/cc-mouse-panel.ui:82 panels/mouse/cc-mouse-panel.ui:109
 msgid "Scrolling moves the content, not the view."
 msgstr "Gluaisidh an sgroladh an t-susbaint ’s cha ghluais an sealladh."
 
-#: panels/mouse/gnome-mouse-properties.ui:341
-#: panels/mouse/gnome-mouse-properties.ui:386
+#: panels/mouse/cc-mouse-panel.ui:95 panels/mouse/cc-mouse-panel.ui:98
 msgid "Touchpad"
 msgstr "Pada-suathaidh"
 
-#: panels/mouse/gnome-mouse-properties.ui:522
+#: panels/mouse/cc-mouse-panel.ui:119
 msgid "Touchpad Speed"
 msgstr "Luaths a’ phada-shuathaidh"
 
-#: panels/mouse/gnome-mouse-properties.ui:581
+#: panels/mouse/cc-mouse-panel.ui:136
 msgid "Tap to Click"
 msgstr "Thoir gnogag airson briogadh"
 
-#: panels/mouse/gnome-mouse-properties.ui:634
+#: panels/mouse/cc-mouse-panel.ui:147
 msgid "Two-finger Scrolling"
 msgstr "Sgroladh dà-chorragach"
 
-#: panels/mouse/gnome-mouse-properties.ui:687
+#: panels/mouse/cc-mouse-panel.ui:159
 msgid "Edge Scrolling"
 msgstr "Sgroladh oir"
 
-#: panels/mouse/gnome-mouse-test.c:130 panels/mouse/gnome-mouse-test.ui:23
+#: panels/mouse/cc-mouse-test.c:131 panels/mouse/cc-mouse-test.ui:62
 msgid "Try clicking, double clicking, scrolling"
 msgstr "Feuch briogadh, briogadh dùbailte agus sgroladh"
 
-#: panels/mouse/gnome-mouse-test.c:135
+#: panels/mouse/cc-mouse-test.c:136
 msgid "Five clicks, GEGL time!"
 msgstr "Còig briogaidhean, àm GEGL!"
 
-#: panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/cc-mouse-test.c:141
 msgid "Double click, primary button"
 msgstr "Briogadh dùbailte, prìomh-phutan"
 
-#: panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/cc-mouse-test.c:141
 msgid "Single click, primary button"
 msgstr "Briogadh singilte, prìomh-phutan"
 
-#: panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/cc-mouse-test.c:144
 msgid "Double click, middle button"
 msgstr "Briogadh dùbailte, putan meadhain"
 
-#: panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/cc-mouse-test.c:144
 msgid "Single click, middle button"
 msgstr "Briogadh singilte, putan meadhain"
 
-#: panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/cc-mouse-test.c:147
 msgid "Double click, secondary button"
 msgstr "Briogadh dùbailte, an dàrna putan"
 
-#: panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/cc-mouse-test.c:147
 msgid "Single click, secondary button"
 msgstr "Briogadh singilte, an dàrna putan"
 
-#. add proxy to device list
-#: panels/network/cc-network-panel.c:579
-msgid "Network proxy"
-msgstr "Progsaidh lìonraidh"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
+msgstr "An luchag ⁊ am pada-suathaidh"
 
-#. Translators: this is the title of the connection details
-#. * window for vpn connections, it is also used to display
-#. * vpn connections in the device list.
-#.
-#: panels/network/cc-network-panel.c:715 panels/network/net-vpn.c:167
-#: panels/network/net-vpn.c:296
-#, c-format
-msgid "%s VPN"
-msgstr "%s VPN"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+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è "
+"deas- no chlì-làmhach"
 
-#: panels/network/cc-network-panel.c:779 panels/network/wifi.ui:282
-msgid "Oops, something has gone wrong. Please contact your software vendor."
-msgstr "Ìoc, chaidh rudeigin cearr. Cuir fios gu reiceadair a’ bhathair-bhog agad."
+#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
+msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+msgstr ""
+"Pada-suathaidh;Tomhaire;Briog;Gnogag;Dùbailte;Ball-lorgaire;Sgrolaich;"
+"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 
-#: panels/network/cc-network-panel.c:785
-msgid "NetworkManager needs to be running."
-msgstr "Feumaidh NetworkManager a bhith a’ ruith."
+#: panels/multitasking/cc-multitasking-panel.ui:15
+msgid "_Hot Corner"
+msgstr ""
 
-#: panels/network/cc-wifi-panel.c:213
-#: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1769
-msgid "Wi-Fi"
-msgstr "WiFi"
+#: panels/multitasking/cc-multitasking-panel.ui:16
+msgid "Touch the top-left corner to open the Activities Overview."
+msgstr ""
 
-#: panels/network/connection-editor/8021x-security-page.ui:26
-msgid "802.1x _Security"
-msgstr "_Tèarainteachd 802.1x"
+#: panels/multitasking/cc-multitasking-panel.ui:42
+msgid "_Active Screen Edges"
+msgstr ""
 
-#: panels/network/connection-editor/8021x-security-page.ui:73
-#: panels/network/connection-editor/security-page.ui:72
-#: panels/wacom/wacom-stylus-page.ui:108
-msgid "page 1"
-msgstr "duilleag 1"
-
-#: panels/network/connection-editor/8021x-security-page.ui:224
-#: panels/network/connection-editor/security-page.ui:223
-#: panels/network/wireless-security/eap-method-fast.ui:50
-#: panels/network/wireless-security/eap-method-peap.ui:48
-#: panels/network/wireless-security/eap-method-ttls.ui:31
-msgid "Anony_mous identity"
-msgstr "Gun _urra"
+#: panels/multitasking/cc-multitasking-panel.ui:43
+msgid ""
+"Drag windows against the top, left, and right screen edges to resize them."
+msgstr ""
 
-#: panels/network/connection-editor/8021x-security-page.ui:238
-#: panels/network/connection-editor/security-page.ui:237
-msgid "Inner _authentication"
-msgstr "De_arbhadh a-staigh"
+#: panels/multitasking/cc-multitasking-panel.ui:70
+#, fuzzy
+#| msgid "Colorspace: "
+msgid "Workspaces"
+msgstr "Spàs nan dathan: "
 
-#: panels/network/connection-editor/8021x-security-page.ui:281
-#: panels/network/connection-editor/security-page.ui:280
-#: panels/wacom/wacom-stylus-page.ui:426
-msgid "page 2"
-msgstr "duilleag 2"
+#: panels/multitasking/cc-multitasking-panel.ui:76
+msgid "_Dynamic workspaces"
+msgstr ""
 
-#: panels/network/connection-editor/ce-page-8021x-security.c:101
-#: panels/network/connection-editor/ce-page-security.c:445
-#: panels/network/connection-editor/details-page.ui:86
-#: panels/network/network-wifi.ui:239
-msgid "Security"
-msgstr "Tèarainteachd"
+#: panels/multitasking/cc-multitasking-panel.ui:77
+#, fuzzy
+#| msgid "Automatically empty _Trash"
+msgid "Automatically removes empty workspaces."
+msgstr "Fa_lamhaich an sgudal gu fèin-obrachail"
 
-#: panels/network/connection-editor/ce-page.c:481
-msgid "automatic"
-msgstr "fèin-obrachail"
+#: panels/multitasking/cc-multitasking-panel.ui:91
+msgid "_Fixed number of workspaces"
+msgstr ""
 
-#: panels/network/connection-editor/ce-page.c:521
-#, c-format
-msgid "Profile %d"
-msgstr "Pròifil %d"
+#: panels/multitasking/cc-multitasking-panel.ui:92
+msgid "Specify a number of permanent workspaces."
+msgstr ""
 
-#. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:235 panels/network/net-device-wifi.c:468
-msgid "WEP"
-msgstr "WEP"
+#: panels/multitasking/cc-multitasking-panel.ui:108
+msgid "_Number of Workspaces"
+msgstr ""
 
-#. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:239 panels/network/net-device-wifi.c:473
-#: panels/network/network-wifi.ui:593
-msgid "WPA"
-msgstr "WPA"
+#: panels/multitasking/cc-multitasking-panel.ui:124
+#, fuzzy
+#| msgid "%s Monitor"
+msgid "Multi-Monitor"
+msgstr "Monatair %s"
 
-#. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:243
-msgid "WPA2"
-msgstr "WPA2"
+#: panels/multitasking/cc-multitasking-panel.ui:130
+msgid "Workspaces on _primary display only"
+msgstr ""
 
-#. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:248
-msgid "Enterprise"
-msgstr "Enterprise"
+#: panels/multitasking/cc-multitasking-panel.ui:156
+msgid "Workspaces on all d_isplays"
+msgstr ""
 
-#: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:253 panels/network/net-device-wifi.c:458
-msgctxt "Wifi security"
-msgid "None"
-msgstr "Chan eil gin"
+#: panels/multitasking/cc-multitasking-panel.ui:184
+#, fuzzy
+#| msgctxt "Wacom action-type"
+#| msgid "Application defined"
+msgid "Application Switching"
+msgstr "A-rèir na h-aplacaid"
 
-#: panels/network/connection-editor/ce-page-details.c:95
-#: panels/power/power.ui:99
-msgid "Never"
-msgstr "Chan ann idir"
+#: panels/multitasking/cc-multitasking-panel.ui:190
+msgid "Include applications from all _workspaces"
+msgstr ""
 
-#: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:121
-#: panels/network/net-device-wifi.c:567
-#, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
-msgstr[0] "%i latha air ais"
-msgstr[1] "%i latha air ais"
-msgstr[2] "%i làithean air ais"
-msgstr[3] "%i latha air ais"
+#: panels/multitasking/cc-multitasking-panel.ui:204
+msgid "Include applications from the _current workspace only"
+msgstr ""
 
-#. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:225
-#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:646
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/s"
+#: panels/multitasking/gnome-multitasking-panel.desktop.in.in:3
+msgid "Multitasking"
+msgstr ""
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:675
-msgctxt "Signal strength"
-msgid "None"
-msgstr "Chan eil gin"
+#: panels/multitasking/gnome-multitasking-panel.desktop.in.in:4
+msgid "Manage preferences for productivity and multitasking"
+msgstr ""
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:677
-msgctxt "Signal strength"
-msgid "Weak"
-msgstr "Lag"
+#. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/multitasking/gnome-multitasking-panel.desktop.in.in:15
+msgid "Multitasking;Multitask;Productivity;Customize;Desktop;"
+msgstr ""
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:679
-msgctxt "Signal strength"
-msgid "Ok"
-msgstr "Ceart ma-thà"
+#: panels/network/cc-network-panel.c:662 panels/network/cc-wifi-panel.ui:300
+msgid "Oops, something has gone wrong. Please contact your software vendor."
+msgstr ""
+"Ìoc, chaidh rudeigin cearr. Cuir fios gu reiceadair a’ bhathair-bhog agad."
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:681
-msgctxt "Signal strength"
-msgid "Good"
-msgstr "Math"
+#: panels/network/cc-network-panel.c:669
+msgid "NetworkManager needs to be running."
+msgstr "Feumaidh NetworkManager a bhith a’ ruith."
 
-#: panels/network/connection-editor/ce-page-details.c:259
-#: panels/network/net-device-wifi.c:683
-msgctxt "Signal strength"
-msgid "Excellent"
+#: panels/network/cc-network-panel.ui:21 panels/network/cc-network-panel.ui:26
+#, fuzzy
+#| msgid "Devices"
+msgid "Other Devices"
+msgstr "Innleadan"
+
+#: panels/network/cc-network-panel.ui:37 panels/network/cc-network-panel.ui:53
+#: panels/network/connection-editor/net-connection-editor.c:580
+msgid "VPN"
+msgstr "VPN"
+
+#: panels/network/cc-network-panel.ui:70
+msgid "Not set up"
+msgstr "Cha deach seo a shuidheachadh"
+
+#. TRANSLATORS: This happens when the connection name does not contain the SSID.
+#: panels/network/cc-wifi-connection-row.c:207
+#, fuzzy, c-format
+#| msgctxt "timezone desc"
+#| msgid "%s (%s)"
+msgctxt "Wi-Fi Connection"
+msgid "%s (SSID: %s)"
+msgstr "%s (%s)"
+
+#: panels/network/cc-wifi-connection-row.c:263
+msgid "Insecure network (WEP)"
+msgstr ""
+
+#: panels/network/cc-wifi-connection-row.c:267
+msgid "Secure network (WPA)"
+msgstr ""
+
+#: panels/network/cc-wifi-connection-row.c:271
+msgid "Secure network (WPA2)"
+msgstr ""
+
+#: panels/network/cc-wifi-connection-row.c:275
+msgid "Secure network (WPA3)"
+msgstr ""
+
+#: panels/network/cc-wifi-connection-row.c:279
+msgid "Secure network"
+msgstr ""
+
+#. TRANSLATORS: device status
+#: panels/network/cc-wifi-connection-row.ui:41 panels/network/panel-common.c:63
+msgid "Connected"
+msgstr "Ceangailte"
+
+#: panels/network/cc-wifi-connection-row.ui:62
+#: panels/network/net-device-ethernet.c:325
+#: panels/network/network-bluetooth.ui:22 panels/network/network-ethernet.ui:50
+#: panels/network/network-mobile.ui:321 panels/network/network-vpn.ui:21
+msgid "Options…"
+msgstr "Roghainnean…"
+
+#. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name
+#: panels/network/cc-wifi-hotspot-dialog.c:133
+#, c-format
+msgid ""
+"Turning on the hotspot will disconnect from %s, and it will not be possible "
+"to access the internet through Wi-Fi."
+msgstr ""
+
+#: panels/network/cc-wifi-hotspot-dialog.c:266
+msgid "Must have a minimum of 8 characters"
+msgstr ""
+
+#: panels/network/cc-wifi-hotspot-dialog.c:271
+#, c-format
+msgid "Must have a maximum of %d character"
+msgid_plural "Must have a maximum of %d characters"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:4
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "A bheil thu airson an WiFi Hotspot a chur air?"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:28
+msgid ""
+"Wi-Fi hotspot allows others to share your internet connection, by creating a "
+"Wi-Fi network that they can connect to. To do this, you must have an "
+"internet connection through a source other than Wi-Fi."
+msgstr ""
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:51
+msgid "Network Name"
+msgstr "Ainm an lìonraidh"
+
+#. Translators: This is a password needed for printing.
+#: panels/network/cc-wifi-hotspot-dialog.ui:74
+#: panels/printers/new-printer-dialog.ui:331
+#: panels/printers/pp-jobs-dialog.ui:52 panels/sharing/cc-sharing-panel.ui:376
+#: panels/user-accounts/cc-add-user-dialog.ui:145
+#: panels/user-accounts/cc-add-user-dialog.ui:181
+#: panels/user-accounts/cc-add-user-dialog.ui:362
+#: panels/wwan/cc-wwan-apn-dialog.ui:172
+msgid "Password"
+msgstr "Facal-faire"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:86
+#, fuzzy
+#| msgid "Group Password"
+msgid "Generate Random Password"
+msgstr "Facal-faire a' bhuidhinn"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:87
+#, fuzzy
+#| msgid "Current _Password"
+msgid "Autogenerate Password"
+msgstr "Am _facal-faire làithreach"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:129
+msgid "_Turn On"
+msgstr "_Cuir air"
+
+#: panels/network/cc-wifi-panel.c:544
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:66
+msgid "Wi-Fi"
+msgstr "WiFi"
+
+#: panels/network/cc-wifi-panel.c:879
+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/cc-wifi-panel.c:882
+msgid "_Stop Hotspot"
+msgstr "_Cuir stad air an hotspot"
+
+#: panels/network/cc-wifi-panel.ui:72
+msgid "Airplane Mode"
+msgstr "Modh itealain"
+
+#: panels/network/cc-wifi-panel.ui:73
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Cuiridh seo WiFi, Bluetooth agus bann-leathann mobile à comas"
+
+#: panels/network/cc-wifi-panel.ui:110
+msgid "No Wi-Fi Adapter Found"
+msgstr "Cha deach adaptar WiFi a lorg"
+
+#: panels/network/cc-wifi-panel.ui:120
+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/cc-wifi-panel.ui:152 panels/wwan/cc-wwan-panel.ui:135
+#, fuzzy
+#| msgid "Airplane Mode"
+msgid "Airplane Mode On"
+msgstr "Modh itealain"
+
+#: panels/network/cc-wifi-panel.ui:162
+#, fuzzy
+#| msgid "Turn off Wi-Fi to save power."
+msgid "Turn off to use Wi-Fi"
+msgstr "Cuir WiFi dheth gus cumhachd a chaomhnadh."
+
+#: panels/network/cc-wifi-panel.ui:199
+#, fuzzy
+#| msgid "Wi-Fi Hotspot"
+msgid "Wi-Fi Hotspot Active"
+msgstr "WiFi Hotspot"
+
+#: panels/network/cc-wifi-panel.ui:209
+msgid "Mobile devices can scan the QR code to connect."
+msgstr ""
+
+#: panels/network/cc-wifi-panel.ui:217
+#, fuzzy
+#| msgid "_Turn On Wi-Fi Hotspot…"
+msgid "Turn Off Hotspot…"
+msgstr "Cuir air WiFi Ho_tspot…"
+
+#: panels/network/cc-wifi-panel.ui:237
+msgid "Visible Networks"
+msgstr "Lìonraidhean a chithear"
+
+#: panels/network/cc-wifi-panel.ui:294
+msgid "NetworkManager needs to be running"
+msgstr "Feumaidh NetworkManager a bhith a’ ruith"
+
+#: panels/network/connection-editor/8021x-security-page.ui:16
+msgid "802.1x _Security"
+msgstr "_Tèarainteachd 802.1x"
+
+#: panels/network/connection-editor/ce-page-8021x-security.c:109
+#: panels/network/connection-editor/ce-page-security.c:419
+#: panels/network/connection-editor/details-page.ui:78
+msgid "Security"
+msgstr "Tèarainteachd"
+
+#: panels/network/connection-editor/ce-page.c:234
+#, fuzzy
+#| msgid "reset"
+msgid "Preserve"
+msgstr "ath-shuidhich"
+
+#: panels/network/connection-editor/ce-page.c:235
+msgid "Permanent"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page.c:236
+msgid "Random"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page.c:237
+#, fuzzy
+#| msgid "Tablet"
+msgid "Stable"
+msgstr "Tablaid"
+
+#: panels/network/connection-editor/ce-page.c:241
+msgid ""
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on. This feature is known as MAC "
+"cloning or spoofing. Example: 00:11:22:33:44:55"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page.c:399
+#, c-format
+msgid "Profile %d"
+msgstr "Pròifil %d"
+
+#. TRANSLATORS: this WEP WiFi security
+#: panels/network/connection-editor/ce-page-details.c:97
+#: panels/network/net-device-wifi.c:229
+msgid "WEP"
+msgstr "WEP"
+
+#. TRANSLATORS: this WPA WiFi security
+#: panels/network/connection-editor/ce-page-details.c:101
+#: panels/network/net-device-wifi.c:234
+msgid "WPA"
+msgstr "WPA"
+
+#. TRANSLATORS: this WPA3 WiFi security
+#: panels/network/connection-editor/ce-page-details.c:107
+msgid "WPA3"
+msgstr ""
+
+#. TRANSLATORS: this Enhanced Open WiFi security
+#: panels/network/connection-editor/ce-page-details.c:112
+#: panels/network/connection-editor/ce-page-security.c:274
+msgid "Enhanced Open"
+msgstr ""
+
+#. TRANSLATORS: this WPA WiFi security
+#: panels/network/connection-editor/ce-page-details.c:119
+msgid "WPA2"
+msgstr "WPA2"
+
+#. TRANSLATORS: this Enterprise WiFi security
+#: panels/network/connection-editor/ce-page-details.c:125
+msgid "Enterprise"
+msgstr "Enterprise"
+
+#: panels/network/connection-editor/ce-page-details.c:130
+#: panels/network/net-device-wifi.c:219
+msgctxt "Wifi security"
+msgid "None"
+msgstr "Chan eil gin"
+
+#: panels/network/connection-editor/ce-page-details.c:151
+msgid "Never"
+msgstr "Chan ann idir"
+
+#: panels/network/connection-editor/ce-page-details.c:166
+#: panels/network/net-device-ethernet.c:105
+#, c-format
+msgid "%i day ago"
+msgid_plural "%i days ago"
+msgstr[0] "%i latha air ais"
+msgstr[1] "%i latha air ais"
+msgstr[2] "%i làithean air ais"
+msgstr[3] "%i latha air ais"
+
+#: panels/network/connection-editor/ce-page-details.c:293
+#, c-format
+msgid "%d Mb/s (%1.1f GHz)"
+msgstr ""
+
+#. Translators: network device speed
+#: panels/network/connection-editor/ce-page-details.c:295
+#: panels/network/net-device-ethernet.c:217
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: panels/network/connection-editor/ce-page-details.c:310
+msgid "2.4 GHz / 5 GHz"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page-details.c:312
+msgid "2.4 GHz"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page-details.c:314
+msgid "5 GHz"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page-details.c:334
+msgctxt "Signal strength"
+msgid "None"
+msgstr "Chan eil gin"
+
+#: panels/network/connection-editor/ce-page-details.c:336
+msgctxt "Signal strength"
+msgid "Weak"
+msgstr "Lag"
+
+#: panels/network/connection-editor/ce-page-details.c:338
+msgctxt "Signal strength"
+msgid "Ok"
+msgstr "Ceart ma-thà"
+
+#: panels/network/connection-editor/ce-page-details.c:340
+msgctxt "Signal strength"
+msgid "Good"
+msgstr "Math"
+
+#: panels/network/connection-editor/ce-page-details.c:342
+msgctxt "Signal strength"
+msgid "Excellent"
 msgstr "Fìor-mhath"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:409
+#: panels/network/connection-editor/details-page.ui:94
+#: panels/network/net-device-ethernet.c:144
+#: panels/network/net-device-mobile.c:441
+msgid "IPv4 Address"
+msgstr "Seòladh IPv4"
+
+#: panels/network/connection-editor/ce-page-details.c:410
+#: panels/network/connection-editor/details-page.ui:110
+#: panels/network/net-device-ethernet.c:146
+#: panels/network/net-device-mobile.c:442 panels/network/network-mobile.ui:176
+msgid "IPv6 Address"
+msgstr "Seòladh IPv6"
+
+#: panels/network/connection-editor/ce-page-details.c:412
+#: panels/network/connection-editor/ce-page-details.c:413
+#: panels/network/net-device-ethernet.c:149
+#: panels/network/net-device-ethernet.c:151
+#: panels/network/net-device-mobile.c:445
+#: panels/network/net-device-mobile.c:446 panels/network/network-mobile.ui:163
+msgid "IP Address"
+msgstr "Seòladh IP"
+
+#: panels/network/connection-editor/ce-page-details.c:417
+#: panels/network/net-device-ethernet.c:166
+#: panels/network/net-device-mobile.c:450
+msgid "DNS4"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page-details.c:418
+#: panels/network/net-device-ethernet.c:167
+#: panels/network/net-device-mobile.c:451
+msgid "DNS6"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page-details.c:420
+#: panels/network/connection-editor/ce-page-details.c:421
+#: panels/network/connection-editor/details-page.ui:175
+#: panels/network/connection-editor/details-page.ui:192
+#: panels/network/connection-editor/ip4-page.ui:165
+#: panels/network/connection-editor/ip6-page.ui:175
+#: panels/network/net-device-ethernet.c:169
+#: panels/network/net-device-ethernet.c:171
+#: panels/network/net-device-mobile.c:453
+#: panels/network/net-device-mobile.c:454 panels/network/network-mobile.ui:203
+#: panels/network/network-mobile.ui:217
+msgid "DNS"
+msgstr "DNS"
+
+#: panels/network/connection-editor/ce-page-details.c:473
 msgid "Forget Connection"
 msgstr "Dìochuimhnich an ceangal"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:475
 msgid "Remove Connection Profile"
 msgstr "Thoir air falbh pròifil a’ cheangail"
 
-#: panels/network/connection-editor/ce-page-details.c:306
+#: panels/network/connection-editor/ce-page-details.c:477
 msgid "Remove VPN"
 msgstr "Thoir air falbh a’ VPN"
 
-#: panels/network/connection-editor/ce-page-details.c:334
-#: panels/network/network-wifi.ui:1456 shell/cc-window.c:214
-#: shell/panel-list.ui:103
+#: panels/network/connection-editor/ce-page-details.c:495
 msgid "Details"
 msgstr "Mion-fhiosrachadh"
 
-#: 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:1460
+#: panels/network/connection-editor/ce-page-ethernet.c:71
+msgid "automatic"
+msgstr "fèin-obrachail"
+
+#: panels/network/connection-editor/ce-page-ethernet.c:144
+#: panels/network/connection-editor/ce-page-vpn.c:148
+#: panels/network/connection-editor/ce-page-wifi.c:129
 msgid "Identity"
 msgstr "Dearbh-aithne"
 
-#: panels/network/connection-editor/ce-page-ip4.c:251
-#: panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:245
+#: panels/network/connection-editor/ce-page-ip6.c:226
 msgid "Delete Address"
 msgstr "Sguab às an seòladh"
 
-#: panels/network/connection-editor/ce-page-ip4.c:422
-#: panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:392
+#: panels/network/connection-editor/ce-page-ip6.c:361
 msgid "Delete Route"
 msgstr "Sguab às an t-slighe"
 
-#: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1464
+#: panels/network/connection-editor/ce-page-ip4.c:742
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1468
+#: panels/network/connection-editor/ce-page-ip6.c:712
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:263
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:298
 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:278
+#: panels/network/connection-editor/ce-page-security.c:308
 msgid "WEP 128-bit Passphrase"
 msgstr "Abairt-fhaire WEP 128-bit"
 
-#: panels/network/connection-editor/ce-page-security.c:291
-#: panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:321
+#: panels/network/wireless-security/ws-dynamic-wep.ui:20
+#: panels/network/wireless-security/ws-wpa-eap.ui:25
 msgid "LEAP"
 msgstr "LEAP"
 
-#: panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:334
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:348
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
 
-#: panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:362
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ⁊ WPA2 Enterprise"
 
-#: panels/network/connection-editor/details-page.ui:18
-#: panels/network/network-wifi.ui:174
+#: panels/network/connection-editor/ce-page-security.c:376
+#, fuzzy
+#| msgctxt "category"
+#| msgid "Personal"
+msgid "WPA3 Personal"
+msgstr "Pearsanta"
+
+#: panels/network/connection-editor/details-page.ui:14
+#: panels/wwan/cc-wwan-details-dialog.ui:73
 msgid "Signal Strength"
 msgstr "Neart an t-siognail"
 
-#: panels/network/connection-editor/details-page.ui:52
-#: panels/network/network-wifi.ui:207
+#: panels/network/connection-editor/details-page.ui:46
 msgid "Link speed"
 msgstr "Astar a’ cheangail"
 
-#: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
-#: panels/network/panel-common.c:644
-msgid "IPv4 Address"
-msgstr "Seòladh IPv4"
-
-#: panels/network/connection-editor/details-page.ui:122
-#: panels/network/net-device-ethernet.c:155
-#: panels/network/net-device-ethernet.c:159
-#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
-#: panels/network/panel-common.c:645
-msgid "IPv6 Address"
-msgstr "Seòladh IPv6"
-
-#: panels/network/connection-editor/details-page.ui:140
-#: panels/network/net-device-ethernet.c:162 panels/network/network-wifi.ui:290
+#: panels/network/connection-editor/details-page.ui:126
+#: panels/network/net-device-ethernet.c:154
 msgid "Hardware Address"
 msgstr "Seòladh bathair-chruaidh"
 
+#: panels/network/connection-editor/details-page.ui:142
+#, fuzzy
+#| msgid "Supported ICC profiles"
+msgid "Supported Frequencies"
+msgstr "Pròifilean ICC ris a bheil taic"
+
 #: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:166
-#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
+#: panels/network/net-device-ethernet.c:158
+#: panels/network/net-device-ethernet.c:160
+#: panels/network/net-device-ethernet.c:162
+#: panels/network/network-mobile.ui:189
 msgid "Default Route"
 msgstr "An t-slighe bhunaiteach"
 
-#: panels/network/connection-editor/details-page.ui:177
-#: panels/network/connection-editor/ip4-page.ui:197
-#: panels/network/connection-editor/ip6-page.ui:211
-#: panels/network/net-device-ethernet.c:168
-#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
-#: panels/network/network-wifi.ui:832 panels/network/network-wifi.ui:1109
-msgid "DNS"
-msgstr "DNS"
-
-#: panels/network/connection-editor/details-page.ui:195
+#: panels/network/connection-editor/details-page.ui:208
 msgid "Last Used"
 msgstr "Air a chleachdadh an turas mu dheireadh"
 
-#: panels/network/connection-editor/details-page.ui:324
+#: panels/network/connection-editor/details-page.ui:369
 msgid "Connect _automatically"
 msgstr "Ce_angail gu fèin-obrachail"
 
-#: panels/network/connection-editor/details-page.ui:343
+#: panels/network/connection-editor/details-page.ui:383
 msgid "Make available to _other users"
 msgstr "Cuir ri lài_mh chleachdaichean eile"
 
-#: panels/network/connection-editor/details-page.ui:376
-msgid "Restrict background data usage"
-msgstr "Cuingich cleachdadh dàta sa chùlaibh"
-
-#: panels/network/connection-editor/details-page.ui:386
-msgid "Appropriate for connections that have data charges or limits."
-msgstr "Tha seo iomchaidh airson ceanglaichean le cosgais no cuingeachadh dàta orra."
-
-#: panels/network/connection-editor/ethernet-page.ui:16
-#: panels/network/connection-editor/ethernet-page.ui:39
-#: panels/network/connection-editor/ip4-page.ui:209
-#: panels/network/connection-editor/ip4-page.ui:277
-#: panels/network/connection-editor/ip6-page.ui:42
-#: panels/network/connection-editor/ip6-page.ui:223
-#: panels/network/connection-editor/ip6-page.ui:291
-#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
-#: panels/network/wireless-security/eap-method-peap.ui:22
-#: panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "Fèin-obrachail"
-
-#: panels/network/connection-editor/ethernet-page.ui:19
-msgid "Twisted Pair (TP)"
-msgstr "Twisted Pair (TP)"
-
-#: panels/network/connection-editor/ethernet-page.ui:22
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
-
-#: panels/network/connection-editor/ethernet-page.ui:25
-msgid "BNC"
-msgstr "BNC"
-
-#: panels/network/connection-editor/ethernet-page.ui:28
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
-
-#: panels/network/connection-editor/ethernet-page.ui:42
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:45
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:48
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#: panels/network/connection-editor/details-page.ui:412
+msgid "_Metered connection: has data limits or can incur charges"
+msgstr ""
 
-#: panels/network/connection-editor/ethernet-page.ui:51
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: panels/network/connection-editor/details-page.ui:421
+msgid ""
+"Software updates and other large downloads will not be started automatically."
+msgstr ""
 
-#: panels/network/connection-editor/ethernet-page.ui:71
-#: panels/network/connection-editor/vpn-page.ui:23
+#: panels/network/connection-editor/ethernet-page.ui:21
+#: panels/network/connection-editor/vpn-page.ui:17
 msgid "_Name"
 msgstr "Ai_nm"
 
-#: panels/network/connection-editor/ethernet-page.ui:100
-#: panels/network/connection-editor/wifi-page.ui:68
-#: panels/network/network-wifi.ui:1261
+#: panels/network/connection-editor/ethernet-page.ui:42
+#: panels/network/connection-editor/wifi-page.ui:51
 msgid "_MAC Address"
 msgstr "Seòladh _MAC"
 
-#: panels/network/connection-editor/ethernet-page.ui:146
+#: panels/network/connection-editor/ethernet-page.ui:80
 msgid "M_TU"
 msgstr "M_TU"
 
-#: panels/network/connection-editor/ethernet-page.ui:163
-#: panels/network/connection-editor/wifi-page.ui:98
+#: panels/network/connection-editor/ethernet-page.ui:93
+#: panels/network/connection-editor/wifi-page.ui:77
 msgid "_Cloned Address"
 msgstr "Seòladh _clònaichte"
 
-#: panels/network/connection-editor/ethernet-page.ui:178
+#: panels/network/connection-editor/ethernet-page.ui:104
 msgid "bytes"
 msgstr "bytes"
 
-#: panels/network/connection-editor/ip4-page.ui:27
+#: panels/network/connection-editor/ip4-page.ui:21
 msgid "IPv_4 Method"
 msgstr "Modh IPv_4"
 
-#: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
+#: panels/network/connection-editor/ip4-page.ui:36
 msgid "Automatic (DHCP)"
 msgstr "Fèin-obrachail (DHCP)"
 
-#: panels/network/connection-editor/ip4-page.ui:55
-#: panels/network/connection-editor/ip6-page.ui:69
+#: panels/network/connection-editor/ip4-page.ui:45
+#: panels/network/connection-editor/ip6-page.ui:55
 msgid "Link-Local Only"
 msgstr "Link-Local a-mhàin"
 
-#: panels/network/connection-editor/ip4-page.ui:83
-#: panels/network/connection-editor/ip6-page.ui:97
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:65
+#: panels/network/net-proxy.c:71 panels/network/network-proxy.ui:98
+msgid "Manual"
+msgstr "A làimh"
+
+#: panels/network/connection-editor/ip4-page.ui:65
+#: panels/network/connection-editor/ip6-page.ui:75
 msgid "Disable"
 msgstr "Cuir à comas"
 
-#: panels/network/connection-editor/ip4-page.ui:111
-#: panels/network/connection-editor/ip6-page.ui:125
+#: panels/network/connection-editor/ip4-page.ui:75
+#: panels/network/connection-editor/ip6-page.ui:85
+#, fuzzy
+#| msgid "Shared with other computers"
+msgid "Shared to other computers"
+msgstr "Co-roinnte le coimpiutairean eile"
+
+#: panels/network/connection-editor/ip4-page.ui:98
+#: panels/network/connection-editor/ip6-page.ui:108
 msgid "Addresses"
 msgstr "Seòlaidhean"
 
-#: panels/network/connection-editor/ip4-page.ui:129
-#: panels/network/connection-editor/ip4-page.ui:313
-#: panels/network/connection-editor/ip6-page.ui:143
-#: panels/network/connection-editor/ip6-page.ui:327
-#: panels/printers/details-dialog.ui:87
+#: panels/network/connection-editor/ip4-page.ui:112
+#: panels/network/connection-editor/ip4-page.ui:246
+#: panels/network/connection-editor/ip6-page.ui:122
+#: panels/network/connection-editor/ip6-page.ui:255
+#: panels/printers/pp-details-dialog.ui:90
 msgid "Address"
 msgstr "Seòladh"
 
-#: panels/network/connection-editor/ip4-page.ui:143
-#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip4-page.ui:124
+#: panels/network/connection-editor/ip4-page.ui:258
 msgid "Netmask"
 msgstr "Netmask"
 
-#: panels/network/connection-editor/ip4-page.ui:157
-#: panels/network/connection-editor/ip4-page.ui:341
-#: panels/network/connection-editor/ip6-page.ui:171
-#: panels/network/connection-editor/ip6-page.ui:355
+#: panels/network/connection-editor/ip4-page.ui:136
+#: panels/network/connection-editor/ip4-page.ui:270
+#: panels/network/connection-editor/ip6-page.ui:146
+#: panels/network/connection-editor/ip6-page.ui:279
 msgid "Gateway"
 msgstr "Bealach"
 
-#: panels/network/connection-editor/ip4-page.ui:220
-#: panels/network/connection-editor/ip6-page.ui:234
+#: panels/network/connection-editor/ip4-page.ui:175
+#: panels/network/connection-editor/ip4-page.ui:223
+#: panels/network/connection-editor/ip6-page.ui:36
+#: panels/network/connection-editor/ip6-page.ui:185
+#: panels/network/connection-editor/ip6-page.ui:232
+#: panels/network/net-proxy.c:73 panels/network/network-proxy.ui:91
+#: panels/network/wireless-security/eap-method-peap.ui:33
+#: panels/wacom/cc-wacom-page.c:621
+msgid "Automatic"
+msgstr "Fèin-obrachail"
+
+#: panels/network/connection-editor/ip4-page.ui:183
+#: panels/network/connection-editor/ip6-page.ui:193
 msgid "Automatic DNS"
 msgstr "DNS fèin-obrachail"
 
-#: panels/network/connection-editor/ip4-page.ui:244
-#: panels/network/connection-editor/ip6-page.ui:258
+#: panels/network/connection-editor/ip4-page.ui:196
+#: panels/network/connection-editor/ip6-page.ui:205
 msgid "Separate IP addresses with commas"
 msgstr "Sgaraich seòlaichean IP le cromagan"
 
-#: panels/network/connection-editor/ip4-page.ui:265
-#: panels/network/connection-editor/ip6-page.ui:279
-#: panels/network/network-wifi.ui:877 panels/network/network-wifi.ui:1154
+#: panels/network/connection-editor/ip4-page.ui:213
+#: panels/network/connection-editor/ip6-page.ui:222
 msgid "Routes"
 msgstr "Slighean"
 
-#: panels/network/connection-editor/ip4-page.ui:288
-#: panels/network/connection-editor/ip6-page.ui:302
+#: panels/network/connection-editor/ip4-page.ui:231
+#: panels/network/connection-editor/ip6-page.ui:240
 msgid "Automatic Routes"
 msgstr "Slighean fèin-obrachail"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: panels/network/connection-editor/ip4-page.ui:354
-#: panels/network/connection-editor/ip6-page.ui:368
+#: panels/network/connection-editor/ip4-page.ui:281
+#: panels/network/connection-editor/ip6-page.ui:290
 msgid "Metric"
 msgstr "Meatraigeachd"
 
-#: panels/network/connection-editor/ip4-page.ui:384
-#: panels/network/connection-editor/ip6-page.ui:398
-#: panels/network/network-wifi.ui:933 panels/network/network-wifi.ui:1210
+#: panels/network/connection-editor/ip4-page.ui:304
+#: panels/network/connection-editor/ip6-page.ui:313
 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:27
+#: panels/network/connection-editor/ip6-page.ui:21
 msgid "IPv_6 Method"
 msgstr "Modh IPv_6"
 
-#: panels/network/connection-editor/ip6-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:45
 msgid "Automatic, DHCP only"
 msgstr "Fèin-obrachail, DHCP a-mhàin"
 
-#: panels/network/connection-editor/ip6-page.ui:157
-#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:134
+#: panels/network/connection-editor/ip6-page.ui:267
 msgid "Prefix"
 msgstr "Ro-leasachan"
 
-#: panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:277
 msgid "Unable to open connection editor"
 msgstr "Chan urrainn dhuinn deasaiche nan ceanglaichean fhosgladh"
 
-#: panels/network/connection-editor/net-connection-editor.c:291
+#: panels/network/connection-editor/net-connection-editor.c:293
 msgid "New Profile"
 msgstr "Pròifil ùr"
 
-#: panels/network/connection-editor/net-connection-editor.c:603
-#: panels/network/network.ui:142
-msgid "VPN"
-msgstr "VPN"
-
-#: panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:715
 msgid "Import from file…"
 msgstr "Ion-phortaich o fhaidhle…"
 
-#: panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:741
 msgid "Add VPN"
 msgstr "Cuir ris VPN"
 
-#: panels/network/connection-editor/security-page.ui:26
-#: panels/network/network-wifi.ui:529
+#: panels/network/connection-editor/security-page.ui:16
 msgid "S_ecurity"
 msgstr "Tèaraint_eachd"
 
-#: panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:186
 msgid "Cannot import VPN connection"
 msgstr "Chan urrainn dhuinn an ceangal VPN ion-phortadh"
 
-#: panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:188
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
 "\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\nMearachd: %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"
+"\n"
+"Mearachd: %s."
 
-#: panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:218
 msgid "Select file to import"
 msgstr "Tagh faidhle a thèid ion-phortadh"
 
-#: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:332
-#: panels/sharing/cc-sharing-panel.c:385
-#: panels/user-accounts/um-photo-dialog.c:231
-msgid "_Open"
-msgstr "F_osgail"
-
-#: panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:271
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Tha faidhle air a bheil “%s” ann mu thràth."
 
-#: panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:273
 msgid "_Replace"
 msgstr "Cui_r ’na àite"
 
-#: panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:275
 #, 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”?"
+msgstr ""
+"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
+#: panels/network/connection-editor/vpn-helpers.c:310
 msgid "Cannot export VPN connection"
 msgstr "Chan urrainn dhuinn an ceangal VPN às-phortadh"
 
-#: panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:312
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr "Cha b’ urrainn dhuinn an ceangal VPN “%s” às-phortadh gu %s.\n\nMearachd: %s."
+msgstr ""
+"Cha b’ urrainn dhuinn an ceangal VPN “%s” às-phortadh gu %s.\n"
+"\n"
+"Mearachd: %s."
 
-#: panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:338
 msgid "Export VPN connection"
 msgstr "Às-phortaich ceangal VPN"
 
-#: panels/network/connection-editor/vpn-page.ui:58
+#: panels/network/connection-editor/vpn-page.ui:34
 msgid "(Error: unable to load VPN connection editor)"
-msgstr "(Mearachd: Chan urrainn dhuinn deasaiche nan ceanglaichean VPN a luchdadh)"
+msgstr ""
+"(Mearachd: Chan urrainn dhuinn deasaiche nan ceanglaichean VPN a luchdadh)"
 
-#: panels/network/connection-editor/wifi-page.ui:20
-#: panels/network/network-wifi.ui:497
+#: panels/network/connection-editor/wifi-page.ui:16
 msgid "_SSID"
 msgstr "_SSID"
 
-#: panels/network/connection-editor/wifi-page.ui:36
-#: panels/network/network-wifi.ui:513
+#: panels/network/connection-editor/wifi-page.ui:28
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: panels/network/connection-editor/wifi-page.ui:53
-#: panels/network/network-wifi.ui:562
-msgid "My Home Network"
-msgstr "An lìonra-dhachaidh agam"
-
-#: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
-msgid "Network"
-msgstr "Lìonra"
-
 #: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "Stiùirich an dòigh a cheanglas tu ris an eadar-lìon"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/network/gnome-network-panel.desktop.in.in:7
-msgid "network-workgroup"
-msgstr "network-workgroup"
-
 #. Translators: Search terms to find the Network panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/network/gnome-network-panel.desktop.in.in:19
-msgid ""
+#, fuzzy
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;DNS;"
+msgid "Network;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;"
+msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"DNS;"
-msgstr 
"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;lìonra,uèirleas,progsaidh;bann-leathann;drochaid;"
+"DNS;lìonra,uèirleas,progsaidh;bann-leathann;drochaid;"
 
 #: panels/network/gnome-wifi-panel.desktop.in.in:4
 msgid "Control how you connect to Wi-Fi networks"
 msgstr "Stiùirich an dòigh a cheanglas tu ri lìonraidhean WiFi"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/network/gnome-wifi-panel.desktop.in.in:7
-msgid "network-wireless"
-msgstr "network-wireless"
-
 #. Translators: Search terms to find the Wi-Fi panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/network/gnome-wifi-panel.desktop.in.in:19
-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;"
+#, fuzzy
+#| msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;"
+msgstr ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;lìonra;uèirleas,bann-"
+"leathann;"
 
-#: panels/network/net-device-ethernet.c:107
-#: panels/network/net-device-wifi.c:553
+#: panels/network/net-device-ethernet.c:93
 msgid "never"
 msgstr "Chan ann idir"
 
-#: panels/network/net-device-ethernet.c:117
-#: panels/network/net-device-wifi.c:563
+#: panels/network/net-device-ethernet.c:101
 msgid "today"
 msgstr "an-diugh"
 
-#: panels/network/net-device-ethernet.c:119
-#: panels/network/net-device-wifi.c:565
+#: panels/network/net-device-ethernet.c:103
 msgid "yesterday"
 msgstr "an-dè"
 
-#: panels/network/net-device-ethernet.c:157
-#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
-#: panels/network/panel-common.c:649
-msgid "IP Address"
-msgstr "Seòladh IP"
-
-#: panels/network/net-device-ethernet.c:173 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:177
 msgid "Last used"
 msgstr "Air a chleachdadh an turas mu dheireadh"
 
@@ -2670,680 +3791,490 @@ 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:276
-#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
+#: panels/network/net-device-ethernet.c:264
+#: panels/network/network-bluetooth.ui:5 panels/network/network-ethernet.ui:5
 msgid "Wired"
 msgstr "Uèirichte"
 
-#: panels/network/net-device-ethernet.c:344
-#: panels/network/net-device-wifi.c:1895 panels/network/network-ethernet.ui:120
-#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
-#: panels/network/network-vpn.ui:79
-msgid "Options…"
-msgstr "Roghainnean…"
-
-#: panels/network/net-device-mobile.c:238
+#: panels/network/net-device-mobile.c:208
 msgid "Add new connection"
 msgstr "Cuir ceangal ùr ris"
 
-#: panels/network/net-device-wifi.c:1368
-#, 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:1372
-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."
-
-#: panels/network/net-device-wifi.c:1379
-msgid "Turn On Wi-Fi Hotspot?"
-msgstr "A bheil thu airson an WiFi Hotspot a chur air?"
-
-#: panels/network/net-device-wifi.c:1401
-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:1412
-msgid "_Turn On"
-msgstr "_Cuir air"
-
-#: panels/network/net-device-wifi.c:1489
-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:1492
-msgid "_Stop Hotspot"
-msgstr "_Cuir stad air an hotspot"
-
-#: panels/network/net-device-wifi.c:1592
-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:1595
-msgid "Wireless device does not support Hotspot mode"
-msgstr "Chan eil an t-uidheam uèirleas a’ cur taic ris a’ mhodh hotspot"
-
-#: panels/network/net-device-wifi.c:1733
+#: panels/network/net-device-wifi.c:857
 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."
+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."
 
-#: panels/network/net-device-wifi.c:1737 panels/network/network-wifi.ui:1362
+#: panels/network/net-device-wifi.c:861
 msgid "_Forget"
 msgstr "_Dìochuimhnich"
 
-#: panels/network/net-device-wifi.c:2046 panels/network/net-device-wifi.c:2053
+#: panels/network/net-device-wifi.c:1041
 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:2086
+#: panels/network/net-device-wifi.c:1073
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Dìochuimhnich"
 
+#: panels/network/net-device-wifi.c:1216
+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:1219
+msgid "Wireless device does not support Hotspot mode"
+msgstr "Chan eil an t-uidheam uèirleas a’ cur taic ris a’ mhodh hotspot"
+
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:112
 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 progsaidh lìonraidh a 
chleachdadh."
+msgstr ""
+"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:110
+#: panels/network/net-proxy.c:120
 msgid "This is not recommended for untrusted public networks."
 msgstr "Cha mholamaid seo air lìonraidhean poblach anns nach eil earbsa."
 
-#: panels/network/network-mobile.ui:30
+#: panels/network/network-bluetooth.ui:11
+msgid "Turn device off"
+msgstr "Cuir an t-uidheam dheth"
+
+#: panels/network/network-mobile.ui:27
+#: panels/wwan/cc-wwan-details-dialog.ui:237
 msgid "IMEI"
 msgstr "IMEI"
 
-#: panels/network/network-mobile.ui:48
+#: panels/network/network-mobile.ui:41
 msgid "Provider"
 msgstr "Sòlaraiche"
 
-#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
+#: panels/network/network-proxy.ui:40 panels/network/network-proxy.ui:80
 msgid "Network Proxy"
 msgstr "Progsaidh lìonraidh"
 
-#: panels/network/network-proxy.ui:173
+#: panels/network/network-proxy.ui:139
 msgid "_HTTP Proxy"
 msgstr "Progsaidh _HTTP"
 
-#: panels/network/network-proxy.ui:192
+#: panels/network/network-proxy.ui:156
 msgid "H_TTPS Proxy"
 msgstr "Progsaidh H_TTPS"
 
-#: panels/network/network-proxy.ui:211
+#: panels/network/network-proxy.ui:173
 msgid "_FTP Proxy"
 msgstr "Progsaidh _FTP"
 
-#: panels/network/network-proxy.ui:230
+#: panels/network/network-proxy.ui:190
 msgid "_Socks Host"
 msgstr "Òstair _Socks"
 
-#: panels/network/network-proxy.ui:249
+#: panels/network/network-proxy.ui:207
 msgid "_Ignore Hosts"
 msgstr "Le_ig seachad òstairean"
 
-#: panels/network/network-proxy.ui:287
+#: panels/network/network-proxy.ui:244
 msgid "HTTP proxy port"
 msgstr "Port progsaidh HTTP"
 
-#: panels/network/network-proxy.ui:364
+#: panels/network/network-proxy.ui:307
 msgid "HTTPS proxy port"
 msgstr "Port progsaidh HTTPS"
 
-#: panels/network/network-proxy.ui:385
+#: panels/network/network-proxy.ui:322
 msgid "FTP proxy port"
 msgstr "Port progsaidh FTP"
 
-#: panels/network/network-proxy.ui:406
+#: panels/network/network-proxy.ui:337
 msgid "Socks proxy port"
 msgstr "Port progsaidh Socks"
 
-#: panels/network/network-proxy.ui:435
+#: panels/network/network-proxy.ui:357
 msgid "_Configuration URL"
 msgstr "An URL _rèiteachaidh"
 
-#: panels/network/network-simple.ui:50
-msgid "Turn device off"
-msgstr "Cuir an t-uidheam dheth"
-
-#: panels/network/network.ui:194
-msgid "Not set up"
-msgstr "Cha deach seo a shuidheachadh"
-
-#: panels/network/network-vpn.ui:56
+#: panels/network/network-vpn.ui:11
 msgid "Turn VPN connection off"
 msgstr "Cuir an ceangal VPN dheth"
 
-#: panels/network/network-wifi.ui:127
-msgid "Automatic _Connect"
-msgstr "_Ceangail gu fèin-obrachail"
-
-#: panels/network/network-wifi.ui:474
-msgid "details"
-msgstr "mion-fhiosrachadh"
-
-#: panels/network/network-wifi.ui:545
-#: panels/network/wireless-security/eap-method-leap.ui:40
-#: panels/network/wireless-security/eap-method-simple.ui:40
-#: panels/network/wireless-security/ws-leap.ui:40
-#: panels/network/wireless-security/ws-wpa-psk.ui:22
-#: panels/sharing/sharing.ui:351
-#: panels/user-accounts/data/account-dialog.ui:300
-#: panels/user-accounts/data/account-dialog.ui:525
-#: panels/user-accounts/data/user-accounts-dialog.ui:205
-msgid "_Password"
-msgstr "_Facal-faire"
-
-#: panels/network/network-wifi.ui:622
-msgid "Show P_assword"
-msgstr "Seall _am facal-faire"
-
-#: panels/network/network-wifi.ui:652
-msgid "Make available to other users"
-msgstr "Cuir ri làimh chleachdaichean eile"
-
-#: panels/network/network-wifi.ui:680
-msgid "identity"
-msgstr "dearbh-aithne"
-
-#: panels/network/network-wifi.ui:714
-msgid "IPv_4"
-msgstr "IPv_4"
-
-#: panels/network/network-wifi.ui:755 panels/network/network-wifi.ui:1032
-msgid "_Addresses"
-msgstr "Seòl_aidhean"
-
-#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
-msgid "Automatic (DHCP) addresses only"
-msgstr "Seòlaidhean fèin-obrachail (DHCP) a-mhàin"
-
-#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
-msgid "Link-local only"
-msgstr "Link-Local a-mhàin"
-
-#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
-msgid "Shared with other computers"
-msgstr "Co-roinnte le coimpiutairean eile"
-
-#: panels/network/network-wifi.ui:917 panels/network/network-wifi.ui:1194
-msgid "_Ignore automatically obtained routes"
-msgstr "Le_ig seachad slighean a fhuaras gu fèin-obrachail"
-
-#: panels/network/network-wifi.ui:960
-msgid "ipv4"
-msgstr "ipv4"
-
-#: panels/network/network-wifi.ui:991
-msgid "IPv_6"
-msgstr "IPv_6"
-
-#: panels/network/network-wifi.ui:1237
-msgid "ipv6"
-msgstr "ipv6"
-
-#: panels/network/network-wifi.ui:1277
-msgid "_Cloned MAC Address"
-msgstr "Seòladh MAC _clònaichte"
-
-#: panels/network/network-wifi.ui:1327
-msgid "hardware"
-msgstr "bathar-cruaidh"
-
-#: panels/network/network-wifi.ui:1346
-msgid "_Reset"
-msgstr "_Ath-shuidhich"
-
-#: panels/network/network-wifi.ui:1382
-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 fhearr leat."
-
-#: panels/network/network-wifi.ui:1399
-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 gu fèin-obrachail 
a-rithist"
-
-#: panels/network/network-wifi.ui:1419
-msgid "reset"
-msgstr "ath-shuidhich"
-
-#: panels/network/network-wifi.ui:1472
-msgid "Hardware"
-msgstr "Bathar Cruaidh"
-
-#: panels/network/network-wifi.ui:1476
-msgctxt "tab"
-msgid "Reset"
-msgstr "Ath-shuidhich"
-
-#: panels/network/network-wifi.ui:1537
-msgid "Wi-Fi Hotspot"
-msgstr "WiFi Hotspot"
-
-#: panels/network/network-wifi.ui:1554
-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:1603
+#: panels/network/network-wifi.ui:34
+#, fuzzy
+#| msgid "Network Name"
+msgctxt "Wi-Fi Hotspot"
 msgid "Network Name"
 msgstr "Ainm an lìonraidh"
 
-#: panels/network/network-wifi.ui:1621
-msgid "Connected Devices"
-msgstr "Uidheaman a tha ceangailte ris"
-
-#: panels/network/network-wifi.ui:1639
+#: panels/network/network-wifi.ui:40
+#, fuzzy
+#| msgid "Security type"
+msgctxt "Wi-Fi Hotspot"
 msgid "Security type"
 msgstr "Seòrsa na tèarainteachd"
 
-#: panels/network/network-wifi.ui:1702
+#: panels/network/network-wifi.ui:46
+#, fuzzy
 #| msgid "Password"
-msgctxt "Wi-Fi passkey"
+msgctxt "Wi-Fi Hotspot"
 msgid "Password"
 msgstr "Facal-faire"
 
-#: panels/network/network-wifi.ui:1799
+#: panels/network/network-wifi.ui:90
 msgid "Turn Wi-Fi off"
 msgstr "Cuir am WiFi dheth"
 
-#: panels/network/network-wifi.ui:1831
+#: panels/network/network-wifi.ui:121
 msgid "_Connect to Hidden Network…"
 msgstr "_Ceangail ri lìonra falaichte…"
 
-#: panels/network/network-wifi.ui:1841
+#: panels/network/network-wifi.ui:128
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "Cuir air WiFi Ho_tspot…"
 
-#: panels/network/network-wifi.ui:1851
+#: panels/network/network-wifi.ui:135
 msgid "_Known Wi-Fi Networks"
 msgstr "_Lìonraidhean WiFi as aithne dhuinn"
 
-#: panels/network/wifi.ui:40
-msgid "No Wi-Fi Adapter Found"
-msgstr "Cha deach adaptar WiFi a lorg"
-
-#: panels/network/wifi.ui:52
-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:127
-msgid "Airplane Mode"
-msgstr "Modh itealain"
-
-#: panels/network/wifi.ui:142
-msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
-msgstr "Cuiridh seo WiFi, Bluetooth agus bann-leathann mobile à comas"
-
-#: panels/network/wifi.ui:192
-msgid "Visible Networks"
-msgstr "Lìonraidhean a chithear"
-
-#: panels/network/wifi.ui:271
-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"
-msgstr "Ad-hoc"
-
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:131
-msgid "Infrastructure"
-msgstr "Bun-structar"
-
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:147 panels/network/panel-common.c:201
+#: panels/network/panel-common.c:37
 msgid "Status unknown"
 msgstr "Chan eil fhios dè an staid"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:151
+#: panels/network/panel-common.c:41
 msgid "Unmanaged"
 msgstr "Gun stiùireadh"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:155
+#: panels/network/panel-common.c:45
 msgid "Unavailable"
 msgstr "Chan eil seo ri fhaighinn"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:165 panels/network/panel-common.c:207
+#: panels/network/panel-common.c:55
 msgid "Connecting"
 msgstr "A’ ceangal"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:169 panels/network/panel-common.c:211
+#: panels/network/panel-common.c:59
 msgid "Authentication required"
 msgstr "Tha feum air dearbhadh"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
-msgid "Connected"
-msgstr "Ceangailte"
-
-#. TRANSLATORS: device status
-#: panels/network/panel-common.c:177
+#: panels/network/panel-common.c:67
 msgid "Disconnecting"
 msgstr "A’ briseadh a’ cheangail"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:181 panels/network/panel-common.c:219
+#: panels/network/panel-common.c:71
 msgid "Connection failed"
 msgstr "Dh’fhàillig an ceangal"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:185 panels/network/panel-common.c:227
+#: panels/network/panel-common.c:75
 msgid "Status unknown (missing)"
 msgstr "Chan eil fhios dè an staid (a dhìth)"
 
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:223
-msgid "Not connected"
-msgstr "Chan eil ceangal ann"
-
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:248
+#: panels/network/panel-common.c:96
 msgid "Configuration failed"
 msgstr "Dh’fhàillig an rèiteachadh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:252
+#: panels/network/panel-common.c:100
 msgid "IP configuration failed"
 msgstr "Dh’fhàillig rèiteachadh an IP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:256
+#: panels/network/panel-common.c:104
 msgid "IP configuration expired"
 msgstr "Dh’fhalbh an ùine air rèiteachadh an IP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:260
+#: panels/network/panel-common.c:108
 msgid "Secrets were required, but not provided"
 msgstr "Bha feum air rùintean ach cha dug thu seachad gin"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:264
+#: panels/network/panel-common.c:112
 msgid "802.1x supplicant disconnected"
 msgstr "Chaidh an ceangal ris an athchuingiche 802.1x a bhriseadh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:268
+#: panels/network/panel-common.c:116
 msgid "802.1x supplicant configuration failed"
 msgstr "Dh’fhàillig rèiteachadh an athchuingiche 802.1x"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:272
+#: panels/network/panel-common.c:120
 msgid "802.1x supplicant failed"
 msgstr "Dh’fhàillig an t-athchuingiche 802.1x"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:276
+#: panels/network/panel-common.c:124
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "Thug dearbhadh an t-athchuingiche 802.1x ro fhada"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:280
+#: panels/network/panel-common.c:128
 msgid "PPP service failed to start"
 msgstr "Dh’fhàillig tòiseachadh na seirbheise PPP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:284
+#: panels/network/panel-common.c:132
 msgid "PPP service disconnected"
 msgstr "Chaidh an ceangal ris an t-seirbheis PPP a bhriseadh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:288
+#: panels/network/panel-common.c:136
 msgid "PPP failed"
 msgstr "Dh’fhàillig PPP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:292
+#: panels/network/panel-common.c:140
 msgid "DHCP client failed to start"
 msgstr "Dh’fhàillig thòiseachadh a’ chliant DHCP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:296
+#: panels/network/panel-common.c:144
 msgid "DHCP client error"
 msgstr "Mearachd a’ chliant DHCP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:300
+#: panels/network/panel-common.c:148
 msgid "DHCP client failed"
 msgstr "Dh’fhàillig an cliant DCHP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:304
+#: panels/network/panel-common.c:152
 msgid "Shared connection service failed to start"
 msgstr "Dh’fhàillig tòiseachadh seirbheis a’ cheangail cho-roinnte"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:308
+#: panels/network/panel-common.c:156
 msgid "Shared connection service failed"
 msgstr "Dh’fhàillig seirbheis a’ cheangail cho-roinnte"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:312
+#: panels/network/panel-common.c:160
 msgid "AutoIP service failed to start"
 msgstr "Dh’fhàillig tòiseachadh na seirbheise AutoIP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:316
+#: panels/network/panel-common.c:164
 msgid "AutoIP service error"
 msgstr "Mearachd na seirbheise AutoIP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:320
+#: panels/network/panel-common.c:168
 msgid "AutoIP service failed"
 msgstr "Dh’fhàillig an t-seirbheis AutoIP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:324
+#: panels/network/panel-common.c:172
 msgid "Line busy"
 msgstr "Tha an loidhne trang"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:328
+#: panels/network/panel-common.c:176
 msgid "No dial tone"
 msgstr "Chan eil fuaim daithealaidh ann"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:332
+#: panels/network/panel-common.c:180
 msgid "No carrier could be established"
 msgstr "Cha b’ urrainn giùlanair a stèidheachadh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:336
+#: panels/network/panel-common.c:184
 msgid "Dialing request timed out"
 msgstr "Dh’fhalbh an ùine air an iarrtas daithealaidh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:340
+#: panels/network/panel-common.c:188
 msgid "Dialing attempt failed"
 msgstr "Dh’fhàillig an oidhirp daithealaidh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:344
+#: panels/network/panel-common.c:192
 msgid "Modem initialization failed"
 msgstr "Dh’fhàillig tòiseachadh a’ mhòdaim"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:348
+#: panels/network/panel-common.c:196
 msgid "Failed to select the specified APN"
 msgstr "Dh’fhàillig taghadh an APN a shònraich thu"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:352
+#: panels/network/panel-common.c:200
 msgid "Not searching for networks"
 msgstr "Chan eilear a’ sireadh lìonraidhean"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:356
+#: panels/network/panel-common.c:204
 msgid "Network registration denied"
 msgstr "Chaidh clàradh an lìonraidh a dhiùltadh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:360
+#: panels/network/panel-common.c:208
 msgid "Network registration timed out"
 msgstr "Dh’fhalbh an ùine air clàradh an lìonraidh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:364
+#: panels/network/panel-common.c:212
 msgid "Failed to register with the requested network"
 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
+#: panels/network/panel-common.c:216
 msgid "PIN check failed"
 msgstr "Dh’fhàillig sgrùdadh a’ PIN"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:372
+#: panels/network/panel-common.c:220
 msgid "Firmware for the device may be missing"
 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
+#: panels/network/panel-common.c:224
 msgid "Connection disappeared"
 msgstr "Dh’fhalbh an ceangal"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:380
+#: panels/network/panel-common.c:228
 msgid "Existing connection was assumed"
 msgstr "Chaidh ceangal a bha ann a ghabhail os làimh"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:384
+#: panels/network/panel-common.c:232
 msgid "Modem not found"
 msgstr "Cha deach am mòdam a lorg"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:388
+#: panels/network/panel-common.c:236
 msgid "Bluetooth connection failed"
 msgstr "Dh’fhàillig an ceangal Bluetooth"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:392
+#: panels/network/panel-common.c:240
 msgid "SIM Card not inserted"
 msgstr "Cha deach cairt SIM a chur a-steach"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:396
+#: panels/network/panel-common.c:244
 msgid "SIM Pin required"
 msgstr "Tha feum air PIN an SIM"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:400
+#: panels/network/panel-common.c:248
 msgid "SIM Puk required"
 msgstr "Tha feum air PUK an SIM"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:404
+#: panels/network/panel-common.c:252 panels/wwan/cc-wwan-errors-private.h:53
 msgid "SIM wrong"
 msgstr "Tha an SIM cearr"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:408
+#: panels/network/panel-common.c:256
 msgid "Connection dependency failed"
 msgstr "Dh’fhàillig eisimeileachd a’ cheangail"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:433
+#: panels/network/panel-common.c:327
 msgid "Firmware missing"
 msgstr "Tha bathar-an-sàs a dhìth"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:437
+#: panels/network/panel-common.c:331
 msgid "Cable unplugged"
 msgstr "Chan eil an càball a-staigh"
 
-#: panels/network/wireless-security/eap-method.c:69
+#: panels/network/wireless-security/eap-method.c:92
 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:196
 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:224
 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:451
+#: panels/network/wireless-security/eap-method.c:389
 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)"
+msgstr ""
+"Iuchraichean prìobhaideach DER, PEM no PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: panels/network/wireless-security/eap-method.c:454
+#: panels/network/wireless-security/eap-method.c:392
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER no teisteanasan PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:88
 msgid "missing EAP-FAST PAC file"
 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:351
+#: panels/network/wireless-security/eap-method-fast.c:353
+msgid "PAC files (*.pac)"
+msgstr "Faidhlichean PAC (*.pac)"
+
+#: panels/network/wireless-security/eap-method-fast.ui:13
+#: panels/network/wireless-security/eap-method-peap.ui:21
+#: panels/network/wireless-security/eap-method-ttls.ui:37
 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:289
+#: panels/network/wireless-security/eap-method-fast.ui:17
+#: panels/network/wireless-security/eap-method-peap.ui:13
+#: panels/network/wireless-security/eap-method-ttls.ui:21
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: panels/network/wireless-security/eap-method-fast.c:406
-msgid "Choose a PAC file"
-msgstr "Tagh faidhle PAC"
-
-#: panels/network/wireless-security/eap-method-fast.c:413
-msgid "PAC files (*.pac)"
-msgstr "Faidhlichean PAC (*.pac)"
-
-#: panels/network/wireless-security/eap-method-fast.ui:22
+#: panels/network/wireless-security/eap-method-fast.ui:29
 msgid "Anonymous"
 msgstr "Gun urra"
 
-#: panels/network/wireless-security/eap-method-fast.ui:25
+#: panels/network/wireless-security/eap-method-fast.ui:32
 msgid "Authenticated"
 msgstr "Air a dhearbhadh"
 
-#: panels/network/wireless-security/eap-method-fast.ui:28
+#: panels/network/wireless-security/eap-method-fast.ui:35
 msgid "Both"
 msgstr "An dà chuid"
 
-#: panels/network/wireless-security/eap-method-fast.ui:76
+#: panels/network/wireless-security/eap-method-fast.ui:46
+#: panels/network/wireless-security/eap-method-peap.ui:49
+#: panels/network/wireless-security/eap-method-ttls.ui:48
+msgid "Anony_mous identity"
+msgstr "Gun _urra"
+
+#: panels/network/wireless-security/eap-method-fast.ui:67
 msgid "PAC _file"
 msgstr "_Faidhle PAC"
 
-#: panels/network/wireless-security/eap-method-fast.ui:122
-#: panels/network/wireless-security/eap-method-peap.ui:146
-#: panels/network/wireless-security/eap-method-ttls.ui:97
+#: panels/network/wireless-security/eap-method-fast.ui:79
+msgid "Choose a PAC file"
+msgstr "Tagh faidhle PAC"
+
+#: panels/network/wireless-security/eap-method-fast.ui:99
+#: panels/network/wireless-security/eap-method-peap.ui:131
+#: panels/network/wireless-security/eap-method-ttls.ui:122
 msgid "_Inner authentication"
 msgstr "De_arbhadh a-staigh"
 
-#: panels/network/wireless-security/eap-method-fast.ui:156
+#: panels/network/wireless-security/eap-method-fast.ui:126
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Ceadaich PAC _Provisioning fèin-obrachail"
 
@@ -3351,231 +4282,285 @@ msgstr "Ceadaich PAC _Provisioning fèin-obrachail"
 msgid "missing EAP-LEAP username"
 msgstr "tha ainm-cleachdaiche EAP-LEAP a dhìth"
 
-#: panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:80
 msgid "missing EAP-LEAP password"
 msgstr "tha facal-faire EAP-LEAP a dhìth"
 
-#: panels/network/wireless-security/eap-method-leap.ui:26
-#: panels/network/wireless-security/eap-method-simple.ui:26
-#: panels/network/wireless-security/ws-leap.ui:26
-#: panels/user-accounts/data/account-dialog.ui:142
-#: panels/user-accounts/data/account-dialog.ui:505
+#: panels/network/wireless-security/eap-method-leap.ui:11
+#: panels/network/wireless-security/eap-method-simple.ui:11
+#: panels/network/wireless-security/ws-leap.ui:11
 msgid "_Username"
 msgstr "_Ainm-cleachdaiche"
 
-#: panels/network/wireless-security/eap-method-leap.ui:68
-#: panels/network/wireless-security/eap-method-simple.ui:85
-#: panels/network/wireless-security/eap-method-tls.ui:164
-#: panels/network/wireless-security/ws-leap.ui:68
-#: panels/network/wireless-security/ws-wpa-psk.ui:76
+#: panels/network/wireless-security/eap-method-leap.ui:23
+#: panels/network/wireless-security/eap-method-simple.ui:23
+#: panels/network/wireless-security/ws-leap.ui:23
+#: panels/network/wireless-security/ws-sae.ui:10
+#: panels/network/wireless-security/ws-wpa-psk.ui:10
+#: panels/sharing/cc-sharing-panel.ui:152
+#: panels/user-accounts/cc-user-panel.ui:175
+msgid "_Password"
+msgstr "_Facal-faire"
+
+#: panels/network/wireless-security/eap-method-leap.ui:44
+#: panels/network/wireless-security/eap-method-simple.ui:61
+#: panels/network/wireless-security/eap-method-tls.ui:129
+#: panels/network/wireless-security/ws-leap.ui:44
+#: panels/network/wireless-security/ws-sae.ui:45
+#: panels/network/wireless-security/ws-wpa-psk.ui:53
 msgid "Sho_w password"
 msgstr "Seall a_m facal-faire"
 
-#: panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:88
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "teisteanas EAP-PEAP CA mì-dhligheach: %s"
 
-#: panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:97
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr "teisteanas EAP-PEAP CA mì-dhligheach: cha deach teisteanas a shònrachadh"
+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:336
-#: panels/network/wireless-security/wireless-security.c:441
+#: panels/network/wireless-security/eap-method-peap.ui:17
+#: panels/network/wireless-security/eap-method-ttls.ui:33
+#: panels/network/wireless-security/ws-wpa-eap.ui:15
 msgid "MD5"
 msgstr "MD5"
 
-#: panels/network/wireless-security/eap-method-peap.c:381
-#: 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:25
+#: panels/network/wireless-security/eap-method-peap.ui:36
 msgid "Version 0"
 msgstr "Tionndadh 0"
 
-#: panels/network/wireless-security/eap-method-peap.ui:28
+#: panels/network/wireless-security/eap-method-peap.ui:39
 msgid "Version 1"
 msgstr "Tionndadh 1"
 
-#: panels/network/wireless-security/eap-method-peap.ui:74
-#: panels/network/wireless-security/eap-method-tls.ui:75
-#: panels/network/wireless-security/eap-method-ttls.ui:57
+#: panels/network/wireless-security/eap-method-peap.ui:70
+#: panels/network/wireless-security/eap-method-tls.ui:54
+#: panels/network/wireless-security/eap-method-ttls.ui:89
 msgid "C_A certificate"
 msgstr "Teiste_anas le ùghdarras theisteanasan"
 
-#: panels/network/wireless-security/eap-method-peap.ui:96
-#: panels/network/wireless-security/eap-method-tls.ui:97
-#: panels/network/wireless-security/eap-method-ttls.ui:79
+#: panels/network/wireless-security/eap-method-peap.ui:82
+#: panels/network/wireless-security/eap-method-tls.c:524
+#: panels/network/wireless-security/eap-method-tls.ui:44
+#: panels/network/wireless-security/eap-method-tls.ui:66
+msgid "Choose a Certificate Authority certificate"
+msgstr "Tagh seirbheis ùghdarras theisteanasan"
+
+#: panels/network/wireless-security/eap-method-peap.ui:91
+#: panels/network/wireless-security/eap-method-tls.ui:75
+#: panels/network/wireless-security/eap-method-ttls.ui:110
 msgid "No CA certificate is _required"
 msgstr "Chan eil teisteanas CA _riatanach"
 
-#: panels/network/wireless-security/eap-method-peap.ui:114
+#: panels/network/wireless-security/eap-method-peap.ui:103
 msgid "PEAP _version"
 msgstr "Tionndadh _PEAP"
 
-#: panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:78
 msgid "missing EAP username"
 msgstr "tha ainm-cleachdaiche EAP a dhìth"
 
-#: panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:91
 msgid "missing EAP password"
 msgstr "tha facal-faire EAP a dhìth"
 
-#: panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:93
 msgid "missing EAP-TLS identity"
 msgstr "tha dearbh-aithne EAP-TLS a dhìth"
 
-#: panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:103
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "teisteanas EAP-TLS CA mì-dhligheach: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:113
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
-msgstr "teisteanas EAP-TLS CA mì-dhligheach: cha deach teisteanas a shònrachadh"
+msgstr ""
+"teisteanas EAP-TLS CA mì-dhligheach: cha deach teisteanas a shònrachadh"
 
-#: panels/network/wireless-security/eap-method-tls.c:100
+#: panels/network/wireless-security/eap-method-tls.c:130
 #, 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:110
+#: panels/network/wireless-security/eap-method-tls.c:140
 #, 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:307
+#: panels/network/wireless-security/eap-method-tls.c:279
 msgid "Unencrypted private keys are insecure"
 msgstr "Chan eil iuchraichean prìobhaideach gun chrioptachadh tèarainte"
 
-#: panels/network/wireless-security/eap-method-tls.c:310
+#: panels/network/wireless-security/eap-method-tls.c:282
 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)"
-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 phrìobhaideach a tha fo dhìon 
facail-fhaire.\n\n(’S urrainn dhut an iuchair phrìobhaideach agad a dhìon le 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 phrìobhaideach a tha fo dhìon facail-fhaire.\n"
+"\n"
+"(’S urrainn dhut an iuchair phrìobhaideach agad a dhìon le openssl)"
 
-#: panels/network/wireless-security/eap-method-tls.c:486
+#: panels/network/wireless-security/eap-method-tls.c:517
 msgid "Choose your personal certificate"
 msgstr "Tagh an teisteanas prìobhaideach agad"
 
-#: panels/network/wireless-security/eap-method-tls.c:498
+#: panels/network/wireless-security/eap-method-tls.c:531
 msgid "Choose your private key"
 msgstr "Tagh an iuchair phrìobhaideach agad"
 
-#: panels/network/wireless-security/eap-method-tls.ui:24
+#: panels/network/wireless-security/eap-method-tls.ui:11
 msgid "I_dentity"
 msgstr "_Dearbh-aithne"
 
-#: panels/network/wireless-security/eap-method-tls.ui:50
+#: panels/network/wireless-security/eap-method-tls.ui:32
 msgid "_User certificate"
 msgstr "_Teisteanas cleachdaiche"
 
-#: panels/network/wireless-security/eap-method-tls.ui:115
+#: panels/network/wireless-security/eap-method-tls.ui:87
 msgid "Private _key"
 msgstr "I_uchair phrìobhaideach"
 
-#: panels/network/wireless-security/eap-method-tls.ui:140
+#: panels/network/wireless-security/eap-method-tls.ui:108
 msgid "_Private key password"
 msgstr "Facal-faire na _h-iuchrach phrìobhaideach"
 
-#: panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:99
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "teisteanas EAP-TTLS CA mì-dhligheach: %s"
 
-#: panels/network/wireless-security/eap-method-ttls.c:68
+#: panels/network/wireless-security/eap-method-ttls.c:107
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr "teisteanas EAP-TTLS CA mì-dhligheach: cha deach teisteanas a shònrachadh"
+msgstr ""
+"teisteanas EAP-TTLS CA mì-dhligheach: cha deach teisteanas a shònrachadh"
 
-#: panels/network/wireless-security/eap-method-ttls.c:259
+#: panels/network/wireless-security/eap-method-ttls.ui:13
 msgid "PAP"
 msgstr "PAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:274
+#: panels/network/wireless-security/eap-method-ttls.ui:17
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:305
+#: panels/network/wireless-security/eap-method-ttls.ui:25
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (gun EAP)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:321
+#: panels/network/wireless-security/eap-method-ttls.ui:29
 msgid "CHAP"
 msgstr "CHAP"
 
-#: panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/eap-method-ttls.ui:68
+#: panels/user-accounts/data/join-dialog.ui:90
+msgid "_Domain"
+msgstr "_Àrainn"
+
+#: panels/network/wireless-security/wireless-security.c:71
 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:453
+#: panels/network/wireless-security/ws-dynamic-wep.ui:15
+#: panels/network/wireless-security/ws-wpa-eap.ui:20
 msgid "TLS"
 msgstr "TLS"
 
-#: panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/ws-dynamic-wep.ui:25
+#: panels/network/wireless-security/ws-wpa-eap.ui:30
 msgid "PWD"
 msgstr "PWD"
 
-#: panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/ws-dynamic-wep.ui:30
+#: panels/network/wireless-security/ws-wpa-eap.ui:35
 msgid "FAST"
 msgstr "FAST"
 
-#: panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/ws-dynamic-wep.ui:35
+#: panels/network/wireless-security/ws-wpa-eap.ui:40
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/ws-dynamic-wep.ui:40
+#: panels/network/wireless-security/ws-wpa-eap.ui:45
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: panels/network/wireless-security/ws-dynamic-wep.ui:39
-#: panels/network/wireless-security/ws-wep-key.ui:115
-#: panels/network/wireless-security/ws-wpa-eap.ui:33
+#: panels/network/wireless-security/ws-dynamic-wep.ui:52
+#: panels/network/wireless-security/ws-wep-key.ui:87
+#: panels/network/wireless-security/ws-wpa-eap.ui:57
 msgid "Au_thentication"
 msgstr "D_earbhadh"
 
-#: panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-file-chooser-button.c:49
+#, fuzzy
+#| msgid "Select a File…"
+msgid "Select a file"
+msgstr "Tagh faidhle…"
+
+#: panels/network/wireless-security/ws-leap.c:66
 msgid "missing leap-username"
 msgstr "tha ainm-cleachdaiche leap a dhìth"
 
-#: panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:81
 msgid "missing leap-password"
 msgstr "tha facal-faire leap a dhìth"
 
-#: panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-sae.c:77
+#, fuzzy
+#| msgid "invalid EAP-TLS password: missing"
+msgid "Wi-Fi password is missing."
+msgstr "facal-faire EAP-TLS mì-dhligheach: chan eil gin ann"
+
+#: panels/network/wireless-security/ws-sae.ui:33
+#: panels/network/wireless-security/ws-wpa-psk.ui:33
+msgid "_Type"
+msgstr "_Seòrsa"
+
+#: panels/network/wireless-security/ws-wep-key.c:114
 msgid "missing wep-key"
 msgstr "tha iuchair wep a dhìth"
 
-#: panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:123
 #, c-format
 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"
+msgstr ""
+"tha an iuchair wep mì-dhligheach: chan fhaod ach figearan sia-dheicheach a "
+"bhith am broinn iuchair a tha %zu a dh’fhaid"
 
-#: panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:131
 #, c-format
 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"
+msgstr ""
+"tha an iuchair wep mì-dhligheach: chan fhaod ach caractaran ASCII a bhith am "
+"broinn iuchair a tha %zu a dh’fhaid"
 
-#: panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:137
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(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"
+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"
 
-#: panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:144
 msgid "invalid wep-key: passphrase must be non-empty"
-msgstr "tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith falamh"
+msgstr ""
+"tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith falamh"
 
-#: panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:146
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
-msgstr "tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith nas giorra na 64 caractar"
+msgstr ""
+"tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith nas "
+"giorra na 64 caractar"
 
 #: panels/network/wireless-security/ws-wep-key.ui:11
 msgid "1 (Default)"
@@ -3589,144 +4574,151 @@ msgstr "Siostam fosgailte"
 msgid "Shared Key"
 msgstr "Iuchair cho-roinnte"
 
-#: panels/network/wireless-security/ws-wep-key.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:44
 msgid "_Key"
 msgstr "_Iuchair"
 
-#: panels/network/wireless-security/ws-wep-key.ui:94
+#: panels/network/wireless-security/ws-wep-key.ui:75
 msgid "Sho_w key"
 msgstr "_Seall an iuchair"
 
-#: panels/network/wireless-security/ws-wep-key.ui:152
+#: panels/network/wireless-security/ws-wep-key.ui:115
 msgid "WEP inde_x"
 msgstr "Inneacs _WEP"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:77
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
-msgstr "wpa-psk mì-dhligheach: tha faide na h-iuchrach %zu mì-dhligheach. Feumaidh i bhith [8,63] baidht no 
64 figear sia-dheicheach"
+msgstr ""
+"wpa-psk mì-dhligheach: tha faide na h-iuchrach %zu mì-dhligheach. Feumaidh i "
+"bhith [8,63] baidht no 64 figear sia-dheicheach"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:86
 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"
-
-#: panels/network/wireless-security/ws-wpa-psk.ui:50
-msgid "_Type"
-msgstr "_Seòrsa"
+msgstr ""
+"wpa-psk mì-dhligheach: cha ghabh an iuchair tuigsinn mar àireamh shia-"
+"dheicheach a tha 43 baidht a dh’fhaid"
 
 #. This is the per application switch for message tray usage.
-#: panels/notifications/edit-dialog.ui:64
+#: panels/notifications/cc-app-notifications-dialog.ui:15
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "Bratha_n"
 
 #. This is the setting to configure sounds associated with notifications.
-#: panels/notifications/edit-dialog.ui:116
+#: panels/notifications/cc-app-notifications-dialog.ui:29
 msgctxt "notifications"
 msgid "Sound _Alerts"
 msgstr "C_aismeachdan fuaime"
 
-#: panels/notifications/edit-dialog.ui:172
+#: panels/notifications/cc-app-notifications-dialog.ui:42
 msgctxt "notifications"
 msgid "Notification _Popups"
 msgstr "_Priob-bhrathan"
 
-#: panels/notifications/edit-dialog.ui:188
+#: panels/notifications/cc-app-notifications-dialog.ui:43
 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."
+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:253
+#: panels/notifications/cc-app-notifications-dialog.ui:56
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
 msgstr "Seall susbaint nan tea_chdaireachdan ann am priob-bhrathan"
 
-#: panels/notifications/edit-dialog.ui:304
+#: panels/notifications/cc-app-notifications-dialog.ui:69
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "Brathan na sgrìn-g_lasaidh"
 
-#: panels/notifications/edit-dialog.ui:355
+#: panels/notifications/cc-app-notifications-dialog.ui:82
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "Seall s_usbaint nan teachdaireachdan air an sgrìn-ghlasaidh"
 
-#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
-#| msgctxt "notifications"
-#| msgid "_Notifications"
-msgid "Notifications"
-msgstr "Brathan"
+#: panels/notifications/cc-notifications-panel.ui:10
+msgid "_Do Not Disturb"
+msgstr ""
+
+#: panels/notifications/cc-notifications-panel.ui:17
+msgid "_Lock Screen Notifications"
+msgstr "Brathan na sgrìn-g_lasaidh"
 
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
 msgstr "Stiùirich na brathan a chithear agus na sheallas iad"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/notifications/gnome-notifications-panel.desktop.in.in:7
-#| msgid "Preferences;Settings;"
-msgid "preferences-system-notifications"
-msgstr "preferences-system-notifications"
-
 #. Translators: Search terms to find the Notifications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:20
 msgid "Notifications;Banner;Message;Tray;Popup;"
-msgstr "Notifications;Banner;Message;Tray;Popup;brathan;bratach;teachdaireachd;treidhe;priob-uinneag;"
-
-#: panels/notifications/notifications.ui:84
-msgid "Notification _Popups"
-msgstr "_Priob-bhrathan"
-
-#: panels/notifications/notifications.ui:134
-msgid "_Lock Screen Notifications"
-msgstr "Brathan na sgrìn-g_lasaidh"
+msgstr ""
+"Notifications;Banner;Message;Tray;Popup;brathan;bratach;teachdaireachd;"
+"treidhe;priob-uinneag;"
 
-#. List of applications.
-#: panels/notifications/notifications.ui:180 panels/privacy/privacy.ui:875
-#: panels/sound/gvc-mixer-dialog.c:1768
-msgid "Applications"
-msgstr "Aplacaidean"
+#. Translators: The %s is the username (eg., debarshi ray gmail com
+#. * or rishi).
+#.
+#: panels/online-accounts/cc-online-accounts-panel.c:277
+#, fuzzy, c-format
+#| msgid "<b>%s</b> removed"
+msgid "%s removed"
+msgstr "Chaidh <b>%s</b> a toirt air falbh"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:148
+#: panels/online-accounts/cc-online-accounts-panel.c:406
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Eile"
 
+#: panels/online-accounts/cc-online-accounts-panel.c:803
+msgid "Error removing account"
+msgstr "Mearachd a’ toirt air falbh a’ chunntais"
+
+#. Translators: This is the button which allows undoing the removal of the printer.
+#: panels/online-accounts/cc-online-accounts-panel.ui:23
+#: panels/printers/printers.ui:51
+msgid "Undo"
+msgstr "Neo-dhèan"
+
+#: panels/online-accounts/cc-online-accounts-panel.ui:55
+msgid "Connect to your data in the cloud"
+msgstr "Dèan ceangal ris an dàta agad san neul"
+
+#: panels/online-accounts/cc-online-accounts-panel.ui:66
+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/cc-online-accounts-panel.ui:93
+msgid "Add an account"
+msgstr "Cuir cunntas ris"
+
 #. 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:612
+#: panels/online-accounts/gnome-control-center-goa-helper.c:426
 #, c-format
 msgid "%s Account"
 msgstr "Cunntas %s"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:904
-msgid "Error removing account"
-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:969
-#, c-format
-msgid "<b>%s</b> removed"
-msgstr "Chaidh <b>%s</b> a toirt air falbh"
+#: panels/online-accounts/gnome-control-center-goa-helper.c:429
+msgid "Remove Account"
+msgstr "Thoir air falbh an cunntas"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
-#| msgid "On­line Accounts"
 msgid "Online Accounts"
 msgstr "Cunntasan air loidhne"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:4
 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 cleachdadh"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:7
-msgid "goa-panel"
-msgstr "goa-panel"
+msgstr ""
+"Ceangail ris na cunntasan air loidhne ’s cuir romhad mar a thèid an "
+"cleachdadh"
 
 #. Translators: Search terms to find the Online Accounts panel.
 #. Do NOT translate or localize the semicolons!
@@ -3736,34 +4728,15 @@ msgstr "goa-panel"
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
-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:38 panels/printers/printers.ui:71
-msgid "Undo"
-msgstr "Neo-dhèan"
-
-#: panels/online-accounts/online-accounts.ui:125
-msgid "Connect to your data in the cloud"
-msgstr "Dèan ceangal ris an dàta agad san neul"
-
-#: panels/online-accounts/online-accounts.ui:137
-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:159
-msgid "Add an account"
-msgstr "Cuir cunntas ris"
-
-#: panels/online-accounts/online-accounts.ui:264
-msgid "Remove Account"
-msgstr "Thoir air falbh an cunntas"
+msgstr ""
+"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;cabadaich;post;mìosachadn;pòcaid;"
 
-#: panels/power/cc-power-panel.c:253
+#: panels/power/cc-battery-row.c:80
 msgid "Unknown time"
 msgstr "Chan eil fhios dè cho fad"
 
-#: panels/power/cc-power-panel.c:259
+#: panels/power/cc-battery-row.c:83
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -3772,7 +4745,7 @@ msgstr[1] "%i mhionaid"
 msgstr[2] "%i mionaidean"
 msgstr[3] "%i mionaid"
 
-#: panels/power/cc-power-panel.c:271
+#: panels/power/cc-battery-row.c:92
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3783,12 +4756,12 @@ msgstr[3] "%i uair a thìde"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: panels/power/cc-power-panel.c:279
+#: panels/power/cc-battery-row.c:98
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: panels/power/cc-power-panel.c:280
+#: panels/power/cc-battery-row.c:99
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uair a thìde"
@@ -3796,7 +4769,7 @@ msgstr[1] "uair a thìde"
 msgstr[2] "uairean a thìde"
 msgstr[3] "uair a thìde"
 
-#: panels/power/cc-power-panel.c:281
+#: panels/power/cc-battery-row.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "mhionaid"
@@ -3805,631 +4778,661 @@ msgstr[2] "mionaidean"
 msgstr[3] "mionaid"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:300
+#: panels/power/cc-battery-row.c:117
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s gus am bi e air a làn-teairrdseadh"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:307
+#: panels/power/cc-battery-row.c:124
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "Rabhadh: %s air fhàgail"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:312
+#: panels/power/cc-battery-row.c:129
 #, c-format
 msgid "%s remaining"
 msgstr "%s air fhàgail"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:317 panels/power/cc-power-panel.c:345
+#: panels/power/cc-battery-row.c:134 panels/power/cc-battery-row.c:164
 msgid "Fully charged"
 msgstr "Air a làn-teairrdseadh"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
+#: panels/power/cc-battery-row.c:138 panels/power/cc-battery-row.c:168
+#, fuzzy
+#| msgid "Charging"
+msgid "Not charging"
+msgstr "A’ teairrdseadh"
+
+#. TRANSLATORS: primary battery
+#: panels/power/cc-battery-row.c:142 panels/power/cc-battery-row.c:172
 msgid "Empty"
 msgstr "Falamh"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:336
+#: panels/power/cc-battery-row.c:155
 msgid "Charging"
 msgstr "A’ teairrdseadh"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:341
+#: panels/power/cc-battery-row.c:160
 msgid "Discharging"
 msgstr "’Ga dhì-theairrdseadh"
 
-#: panels/power/cc-power-panel.c:464
-msgctxt "Battery name"
-msgid "Main"
-msgstr "Prìomh-bhataraidh"
-
-#: panels/power/cc-power-panel.c:466
-msgctxt "Battery name"
-msgid "Extra"
-msgstr "Bataraidh a bharrachd"
-
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:537
+#: panels/power/cc-battery-row.c:191
 msgid "Wireless mouse"
 msgstr "Luchag uèirleas"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:540
+#: panels/power/cc-battery-row.c:194
 msgid "Wireless keyboard"
 msgstr "Meur-chlàr uèirleas"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:543
+#: panels/power/cc-battery-row.c:197
 msgid "Uninterruptible power supply"
 msgstr "Solar cumhachd do-bhrisidh"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:546
+#: panels/power/cc-battery-row.c:200
 msgid "Personal digital assistant"
 msgstr "Cuidiche digiteach pearsanta"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:549
+#: panels/power/cc-battery-row.c:203
 msgid "Cellphone"
 msgstr "Fòn-làimhe"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:552
+#: panels/power/cc-battery-row.c:206
 msgid "Media player"
 msgstr "Cluicheadair mheadhanan"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:555 panels/wacom/cc-wacom-panel.c:793
+#: panels/power/cc-battery-row.c:209
 msgid "Tablet"
 msgstr "Tablaid"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:558
+#: panels/power/cc-battery-row.c:212
 msgid "Computer"
 msgstr "Coimpiutair"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:561
+#: panels/power/cc-battery-row.c:215
 msgid "Gaming input device"
 msgstr "Uidheam ion-chuir geama"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:564 panels/power/cc-power-panel.c:804
-#: panels/power/cc-power-panel.c:2380
+#: panels/power/cc-battery-row.c:218 panels/power/cc-power-panel.c:257
+#: panels/power/cc-power-panel.ui:58
 msgid "Battery"
 msgstr "Bataraidh"
 
-#. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:618
-msgctxt "Battery power"
-msgid "Charging"
-msgstr "A’ teairrdseadh"
-
-#. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:625
-msgctxt "Battery power"
-msgid "Caution"
-msgstr "Aire"
-
-#. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:630
-msgctxt "Battery power"
-msgid "Low"
-msgstr "Ìseal"
-
-#. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:635
-msgctxt "Battery power"
-msgid "Good"
-msgstr "Math"
-
-#. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:640
-msgctxt "Battery power"
-msgid "Fully charged"
-msgstr "Air a làn-teairrdseadh"
+#: panels/power/cc-battery-row.c:266
+msgctxt "Battery name"
+msgid "Main"
+msgstr "Prìomh-bhataraidh"
 
-#. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:644
-msgctxt "Battery power"
-msgid "Empty"
-msgstr "Falamh"
+#: panels/power/cc-battery-row.c:268
+msgctxt "Battery name"
+msgid "Extra"
+msgstr "Bataraidh a bharrachd"
 
-#: panels/power/cc-power-panel.c:802
+#: panels/power/cc-power-panel.c:255
 msgid "Batteries"
 msgstr "Bataraidhean"
 
-#: panels/power/cc-power-panel.c:1242
+#: panels/power/cc-power-panel.c:511
 msgid "When _idle"
 msgstr "Nua_ir a bhios e ’na thàmh"
 
-#: panels/power/cc-power-panel.c:1696
-msgid "Power Saving"
-msgstr "Caomhnadh cumhachd"
-
-#: panels/power/cc-power-panel.c:1727
-msgid "_Screen brightness"
-msgstr "_Soilleireachd na sgrìn"
-
-#: panels/power/cc-power-panel.c:1746
-msgid "Automatic brightness"
-msgstr "Soilleireachd fhèin-obrachail"
-
-#: panels/power/cc-power-panel.c:1766
-msgid "_Keyboard brightness"
-msgstr "Soilleireachd a’ _mheur-chlàir"
-
-#: panels/power/cc-power-panel.c:1776
-msgid "_Dim screen when inactive"
-msgstr "_Doilleirich an sgrìn mur eil gnìomhachd sam bith"
-
-#: panels/power/cc-power-panel.c:1801
-msgid "_Blank screen"
-msgstr "Sgrìn _bhàn"
-
-#: panels/power/cc-power-panel.c:1838
-msgid "_Wi-Fi"
-msgstr "_WiFi"
-
-#: panels/power/cc-power-panel.c:1843
-msgid "Turn off Wi-Fi to save power."
-msgstr "Cuir WiFi dheth gus cumhachd a chaomhnadh."
-
-#: panels/power/cc-power-panel.c:1868
-msgid "_Mobile broadband"
-msgstr "Bann-leathann _mobile"
-
-#: panels/power/cc-power-panel.c:1873
-msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
-msgstr "Cuir am bann-leathann mobile (3G, 4G, LTE, is msaa.) dheth gus cumhachd a chaomhnadh."
-
-#: panels/power/cc-power-panel.c:1926
-msgid "_Bluetooth"
-msgstr "_Bluetooth"
-
-#: panels/power/cc-power-panel.c:1931
-#| msgid "Turn off Wi-Fi to save power."
-msgid "Turn off Bluetooth to save power."
-msgstr "Cuir Bluetooth dheth gus cumhachd a chaomhnadh."
-
-#: panels/power/cc-power-panel.c:1990
-msgid "When on battery power"
-msgstr "Nuair a bhithear air cumhachd bataraidh"
-
-#: panels/power/cc-power-panel.c:1992
-msgid "When plugged in"
-msgstr "Nuair a bhios e air a phlugadh a-steach"
-
-#: panels/power/cc-power-panel.c:2087
+#: panels/power/cc-power-panel.c:671
 msgid "Suspend"
 msgstr "Cuir ’na dhàil"
 
-#: panels/power/cc-power-panel.c:2088
+#: panels/power/cc-power-panel.c:672
 msgid "Power Off"
 msgstr "Cumhachd dheth"
 
-#: panels/power/cc-power-panel.c:2089
+#: panels/power/cc-power-panel.c:673
 msgid "Hibernate"
 msgstr "Dèan cadal-geamhraidh"
 
-#: panels/power/cc-power-panel.c:2090
+#: panels/power/cc-power-panel.c:674
 msgid "Nothing"
 msgstr "Na dèan dad"
 
-#. Frame header
-#: panels/power/cc-power-panel.c:2204
-msgid "Suspend & Power Button"
-msgstr "Putan cur ’na dhàil ⁊ na cumhachd"
+#: panels/power/cc-power-panel.c:730
+msgid "When on battery power"
+msgstr "Nuair a bhithear air cumhachd bataraidh"
+
+#: panels/power/cc-power-panel.c:732
+msgid "When plugged in"
+msgstr "Nuair a bhios e air a phlugadh a-steach"
 
-#: panels/power/cc-power-panel.c:2243
-msgid "_Automatic suspend"
-msgstr "Cuir ’n_a dhàil gu fèin-obrachail"
+#: panels/power/cc-power-panel.c:853
+#, fuzzy
+#| msgid "Never"
+msgctxt "Idle time"
+msgid "Never"
+msgstr "Chan ann idir"
 
-#: panels/power/cc-power-panel.c:2244
+#: panels/power/cc-power-panel.c:937
 msgid "Automatic suspend"
 msgstr "Cur ’na dhàil fèin-obrachail"
 
-#: panels/power/cc-power-panel.c:2311
-msgid "_When the Power Button is pressed"
-msgstr "_Nuair a bhios putan na cumhachd ’ga bhrùthadh"
+#: panels/power/cc-power-panel.c:1030
+msgid ""
+"Performance mode temporarily disabled due to high operating temperature."
+msgstr ""
 
-#: panels/power/cc-power-panel.c:2430 shell/cc-window.c:218
-#: shell/panel-list.ui:45
-msgid "Devices"
-msgstr "Innleadan"
+#: panels/power/cc-power-panel.c:1032
+msgid ""
+"Lap detected: performance mode temporarily unavailable. Move the device to a "
+"stable surface to restore."
+msgstr ""
 
-#: panels/power/gnome-power-panel.desktop.in.in:3
-msgid "Power"
-msgstr "Cumhachd"
+#: panels/power/cc-power-panel.c:1034
+msgid "Performance mode temporarily disabled."
+msgstr ""
 
-#: panels/power/gnome-power-panel.desktop.in.in:4
-msgid "View your battery status and change power saving settings"
-msgstr "Seall ìre a’ bhataraidh agad is atharraich roghainnean caomhnadh na cumhachd"
+#: panels/power/cc-power-panel.c:1076
+msgid ""
+"Low battery: power saver enabled. Previous mode will be restored when "
+"battery is sufficiently charged."
+msgstr ""
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/power/gnome-power-panel.desktop.in.in:7
-msgid "gnome-power-manager"
-msgstr "gnome-power-manager"
+#. translators: "%s" is an application name
+#: panels/power/cc-power-panel.c:1084
+#, c-format
+msgid "Power Saver mode activated by “%s”."
+msgstr ""
 
-#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/power/gnome-power-panel.desktop.in.in:19
-msgid ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr 
"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;cumhachd;cadal;dàil;cadal-geamhraidh;bataraidh;soilleireachd;doilleireachd;bàn;monatair;tàmh;"
+#. translators: "%s" is an application name
+#: panels/power/cc-power-panel.c:1088
+#, c-format
+msgid "Performance mode activated by “%s”."
+msgstr ""
 
-#: panels/power/power.ui:17
-#| msgid "2 minutes"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:12
+#, fuzzy
+#| msgid "15 minutes"
+msgctxt "automatic_suspend"
+msgid "15 minutes"
+msgstr "Cairteal na h-uarach"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:16
+#, fuzzy
+#| msgid "20 minutes"
+msgctxt "automatic_suspend"
 msgid "20 minutes"
 msgstr "20 mionaid"
 
-#: panels/power/power.ui:21
-#| msgid "5 minutes"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:20
+#, fuzzy
+#| msgid "25 minutes"
+msgctxt "automatic_suspend"
 msgid "25 minutes"
 msgstr "25 mionaid"
 
-#: panels/power/power.ui:29
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:24
+#, fuzzy
+#| msgid "30 minutes"
+msgctxt "automatic_suspend"
+msgid "30 minutes"
+msgstr "Leth-uair a thìde"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:28
+#, fuzzy
+#| msgid "45 minutes"
+msgctxt "automatic_suspend"
 msgid "45 minutes"
 msgstr "Trì cairtealan na h-uarach"
 
-#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
-#: panels/privacy/privacy.ui:56
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:32
+#, fuzzy
+#| msgid "1 hour"
+msgctxt "automatic_suspend"
 msgid "1 hour"
 msgstr "1 uair a thìde"
 
-#: panels/power/power.ui:37
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:36
+#, fuzzy
+#| msgid "80 minutes"
+msgctxt "automatic_suspend"
 msgid "80 minutes"
 msgstr "80 mionaid"
 
-#: panels/power/power.ui:41
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:40
+#, fuzzy
+#| msgid "90 minutes"
+msgctxt "automatic_suspend"
 msgid "90 minutes"
 msgstr "90 mionaid"
 
-#: panels/power/power.ui:45
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:44
+#, fuzzy
+#| msgid "100 minutes"
+msgctxt "automatic_suspend"
 msgid "100 minutes"
 msgstr "100 mionaid"
 
-#: panels/power/power.ui:49
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:48
+#, fuzzy
+#| msgid "2 hours"
+msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 uair a thìde"
 
-#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
-msgid "1 minute"
-msgstr "1 mhionaid"
+#: panels/power/cc-power-panel.ui:93
+#, fuzzy
+#| msgid "Power"
+msgid "Power Mode"
+msgstr "Cumhachd"
 
-#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
-msgid "2 minutes"
-msgstr "2 mhionaid"
+#: panels/power/cc-power-panel.ui:94
+msgid "Affects system performance and power usage."
+msgstr ""
 
-#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
-msgid "3 minutes"
-msgstr "3 mionaidean"
+#: panels/power/cc-power-panel.ui:123
+#, fuzzy
+#| msgid "Power Saving"
+msgid "Power Saving Options"
+msgstr "Caomhnadh cumhachd"
 
-#: panels/power/power.ui:75
-msgid "4 minutes"
-msgstr "4 mionaidean"
+#: panels/power/cc-power-panel.ui:126
+#, fuzzy
+#| msgid "Automatic brightness"
+msgid "Automatic Screen Brightness"
+msgstr "Soilleireachd fhèin-obrachail"
 
-#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
-msgid "5 minutes"
-msgstr "5 mionaidean"
+#: panels/power/cc-power-panel.ui:127
+msgid "Screen brightness adjusts to the surrounding light."
+msgstr ""
 
-#: panels/power/power.ui:83
-msgid "8 minutes"
-msgstr "8 mionaidean"
+#: panels/power/cc-power-panel.ui:138
+#, fuzzy
+#| msgid "Screen"
+msgid "Dim Screen"
+msgstr "Sgrìn"
 
-#: panels/power/power.ui:87
-msgid "10 minutes"
-msgstr "10 mionaidean"
+#: panels/power/cc-power-panel.ui:139
+msgid "Reduces the screen brightness when the computer is inactive."
+msgstr ""
 
-#: panels/power/power.ui:91
-msgid "12 minutes"
-msgstr "12 mhionaid"
+#: panels/power/cc-power-panel.ui:150
+#, fuzzy
+#| msgid "Screen _Reader"
+msgid "Screen _Blank"
+msgstr "Leughadai_r-sgrìn"
+
+#: panels/power/cc-power-panel.ui:151
+msgid "Turns the screen off after a period of inactivity."
+msgstr ""
+
+#: panels/power/cc-power-panel.ui:159
+#, fuzzy
+#| msgid "_Automatic Problem Reporting"
+msgid "Automatic Power Saver"
+msgstr "_Aithrisean fèin-obrachail air duilgheadasan"
+
+#: panels/power/cc-power-panel.ui:160
+msgid "Enables power saver mode when battery is low."
+msgstr ""
+
+#: panels/power/cc-power-panel.ui:173
+#, fuzzy
+#| msgid "Automatic Suspend"
+msgid "_Automatic Suspend"
+msgstr "Cuir ’na dhàil gu fèin-obrachail"
+
+#: panels/power/cc-power-panel.ui:174
+msgid "Pauses the computer after a period of inactivity."
+msgstr ""
+
+#: panels/power/cc-power-panel.ui:199
+#, fuzzy
+#| msgid "Lower Button"
+msgid "Po_wer Button Behavior"
+msgstr "Am putan aig a’ bhonn"
+
+#: panels/power/cc-power-panel.ui:207
+msgid "Show Battery _Percentage"
+msgstr ""
 
-#: panels/power/power.ui:155
+#: panels/power/cc-power-panel.ui:243
 msgid "Automatic Suspend"
 msgstr "Cuir ’na dhàil gu fèin-obrachail"
 
-#: panels/power/power.ui:180
+#: panels/power/cc-power-panel.ui:266
 msgid "_Plugged In"
 msgstr "_Plugte a-staigh"
 
-#: panels/power/power.ui:196
+#: panels/power/cc-power-panel.ui:278
 msgid "On _Battery Power"
 msgstr "Air cumhachd a’ _bhataraidh"
 
-#: panels/power/power.ui:241 panels/power/power.ui:301
-#: panels/universal-access/uap.ui:1501
+#: panels/power/cc-power-panel.ui:311 panels/power/cc-power-panel.ui:347
+#: panels/universal-access/cc-repeat-keys-dialog.ui:62
 msgid "Delay"
 msgstr "Dàil"
 
-#: panels/printers/authentication-dialog.ui:11
-msgid " "
-msgstr " "
+#: panels/power/cc-power-profile-row.c:132
+msgctxt "Power profile"
+msgid "Performance"
+msgstr ""
 
-#: panels/printers/authentication-dialog.ui:42
-msgid "Authenticate"
-msgstr "Dearbhaich"
+#: panels/power/cc-power-profile-row.c:133
+msgid "High performance and power usage."
+msgstr ""
 
-#. Translators: This is a username on a print server.
-#: panels/printers/authentication-dialog.ui:80
-#: panels/printers/jobs-dialog.ui:57 panels/printers/new-printer-dialog.ui:361
-msgid "Username"
-msgstr "Ainm-cleachdaiche"
+#: panels/power/cc-power-profile-row.c:136
+#, fuzzy
+#| msgid "_Balance:"
+msgctxt "Power profile"
+msgid "Balanced"
+msgstr "Cothro_m:"
 
-#. Translators: This is a password needed for printing.
-#: panels/printers/authentication-dialog.ui:96
-#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:382
-#: panels/user-accounts/data/account-dialog.ui:240
-msgid "Password"
-msgstr "Facal-faire"
+#: panels/power/cc-power-profile-row.c:137
+msgid "Standard performance and power usage."
+msgstr ""
 
-#: panels/printers/authentication-dialog.ui:139
-#: panels/printers/new-printer-dialog.ui:336
-msgid "Authentication Required"
-msgstr "Tha feum air dearbhadh"
+#: panels/power/cc-power-profile-row.c:140
+#, fuzzy
+#| msgid "Power Saving"
+msgctxt "Power profile"
+msgid "Power Saver"
+msgstr "Caomhnadh cumhachd"
+
+#: panels/power/cc-power-profile-row.c:141
+msgid "Reduced performance and power usage."
+msgstr ""
+
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "Cumhachd"
+
+#: panels/power/gnome-power-panel.desktop.in.in:4
+msgid "View your battery status and change power saving settings"
+msgstr ""
+"Seall ìre a’ bhataraidh agad is atharraich roghainnean caomhnadh na cumhachd"
+
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
+#, fuzzy
+#| msgid ""
+#| "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;"
+#| "Idle;"
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"Energy;"
+msgstr ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"cumhachd;cadal;dàil;cadal-geamhraidh;bataraidh;soilleireachd;doilleireachd;"
+"bàn;monatair;tàmh;"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:808
+#: panels/printers/cc-printers-panel.c:676
 #, 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:1053
+#: panels/printers/cc-printers-panel.c:928
 msgid "Failed to add new printer."
 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:1390
+#: panels/printers/cc-printers-panel.c:1229
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Cha b’ urrainn dhuinn an eadar-aghaidh %s a luchdadh"
 
-#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
-msgid "Location"
-msgstr "Ionad"
-
-#. Translators: Name of column showing printer drivers
-#: panels/printers/details-dialog.ui:111
-#: panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "Draibhear"
-
-#: panels/printers/details-dialog.ui:147
-msgid "Searching for preferred drivers…"
-msgstr "A’ lorg nan draibhearan as fhearr…"
-
-#: panels/printers/details-dialog.ui:169
-msgid "Search for Drivers"
-msgstr "Lorg draibhearan"
-
-#: panels/printers/details-dialog.ui:177
-msgid "Select from Database…"
-msgstr "Tagh o stòr-dàta…"
-
-#: panels/printers/details-dialog.ui:185
-msgid "Install PPD File…"
-msgstr "Stàlaich faidhle PPD…"
+#: panels/printers/cc-printers-panel.c:1297
+msgid "Unlock to Add Printers and Change Settings"
+msgstr ""
 
 #: panels/printers/gnome-printers-panel.desktop.in.in:3
-#| msgid "Prin­ters"
 msgid "Printers"
 msgstr "Clò-bhualadairean"
 
 #: panels/printers/gnome-printers-panel.desktop.in.in:4
 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 mar a thèid clò-bhualadh"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/printers/gnome-printers-panel.desktop.in.in:7
-#| msgid "No printers"
-msgid "printer"
-msgstr "printer"
+msgstr ""
+"Cuir clò-bhualadairean, seall obraichean a’ chlò-bhualadair is cuir romhad "
+"mar a thèid clò-bhualadh"
 
 #. Translators: Search terms to find the Printers panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/printers/gnome-printers-panel.desktop.in.in:16
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Clò-bhualadair;Ciudha;Clò-bhualadh;Pàipear;Inc;Tònair;"
 
-#. Translators: This is a windows domain used with SMB protocol.
-#: panels/printers/jobs-dialog.ui:44
-#| msgid "_Domain"
-msgid "Domain"
-msgstr "Àrainn"
-
-#. Translators: This button authenticates all print jobs and send them for printing.
-#: panels/printers/jobs-dialog.ui:123
-msgid "A_uthenticate"
-msgstr "D_earbhaich"
-
-#. Translators: this action removes (purges) all the listed jobs from the list.
-#: panels/printers/jobs-dialog.ui:163
-msgid "Clear All"
-msgstr "Falamhaich na h-uile"
-
-#. Translators: This button pop up authentication dialog for print jobs which need credentials.
-#: panels/printers/jobs-dialog.ui:225
-#| msgid "Authenticate"
-msgid "_Authenticate"
-msgstr "De_arbhaich"
-
-#. Translators: this label describes the dialog empty state, with no jobs listed.
-#: panels/printers/jobs-dialog.ui:354
-msgid "No Active Printer Jobs"
-msgstr "Chan eil obair clò-bhualaidh gnìomhach"
-
 #. Translators: This is the title presented at top of the dialog.
-#: panels/printers/new-printer-dialog.ui:29
-#: panels/printers/pp-new-printer-dialog.c:384
-#: panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/new-printer-dialog.ui:28
+#: panels/printers/new-printer-dialog.ui:38
+#: panels/printers/pp-new-printer-dialog.c:255
+#: panels/printers/pp-new-printer-dialog.c:312
 msgid "Add Printer"
 msgstr "Cuir clò-bhualadair ris"
 
 #. Translators: This button opens authentication dialog for selected server.
 #. Translators: This buttons submits the credentials for the selected server.
-#: panels/printers/new-printer-dialog.ui:96
-#: panels/printers/new-printer-dialog.ui:111
+#: panels/printers/new-printer-dialog.ui:100
+#: panels/printers/new-printer-dialog.ui:115
+#: panels/wwan/cc-wwan-device-page.ui:38
 msgid "_Unlock"
 msgstr "_Thoir a’ ghlas dheth"
 
 #. Translators: No printers were detected
-#: panels/printers/new-printer-dialog.ui:210
+#: panels/printers/new-printer-dialog.ui:194
 msgid "No Printers Found"
 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:283
+#: panels/printers/new-printer-dialog.ui:244
 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:352
+#: panels/printers/new-printer-dialog.ui:286
+msgid "Authentication Required"
+msgstr "Tha feum air dearbhadh"
+
+#: panels/printers/new-printer-dialog.ui:302
 msgid "Enter username and password to view printers on Print Server."
-msgstr "Cuir a-steach ainm-cleachdaiche ’s facal-faire gus na clò-bhualadairean fhaicinn a tha ri làimh air 
an fhrithealaiche."
+msgstr ""
+"Cuir a-steach ainm-cleachdaiche ’s facal-faire gus na clò-bhualadairean "
+"fhaicinn a tha ri làimh air an fhrithealaiche."
 
-#. 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:22 panels/printers/pp-options-dialog.c:893
-msgid "Test Page"
-msgstr "Duilleag deuchainne"
+#. Translators: This is a username on a print server.
+#: panels/printers/new-printer-dialog.ui:311
+#: panels/printers/pp-jobs-dialog.ui:41
+#: panels/user-accounts/cc-add-user-dialog.ui:94
+#: panels/user-accounts/cc-add-user-dialog.ui:342
+#: panels/wwan/cc-wwan-apn-dialog.ui:148
+msgid "Username"
+msgstr "Ainm-cleachdaiche"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: panels/printers/pp-details-dialog.c:135
-#: panels/printers/pp-details-dialog.c:435
+#: panels/printers/pp-details-dialog.c:74
+#: panels/printers/pp-details-dialog.c:365
 #, c-format
 msgid "%s Details"
 msgstr "Fiosrachadh air %s"
 
-#: panels/printers/pp-details-dialog.c:184
+#: panels/printers/pp-details-dialog.c:101
 msgid "No suitable driver found"
 msgstr "Cha deach draibhear freagarrach a lorg"
 
-#: panels/printers/pp-details-dialog.c:328
+#: panels/printers/pp-details-dialog.c:260
 msgid "Select PPD File"
 msgstr "Tagh faidhle PPD"
 
-#: panels/printers/pp-details-dialog.c:337
+#: panels/printers/pp-details-dialog.c:269
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
-msgstr "Faidhlichean PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
+msgstr ""
+"Faidhlichean PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD."
+"gz, *.PPD.GZ)"
+
+#: panels/printers/pp-details-dialog.ui:65 panels/printers/printer-entry.ui:215
+msgid "Location"
+msgstr "Ionad"
+
+#. Translators: Name of column showing printer drivers
+#: panels/printers/pp-details-dialog.ui:115
+#: panels/printers/pp-ppd-selection-dialog.c:236
+msgid "Driver"
+msgstr "Draibhear"
+
+#: panels/printers/pp-details-dialog.ui:154
+msgid "Searching for preferred drivers…"
+msgstr "A’ lorg nan draibhearan as fhearr…"
+
+#: panels/printers/pp-details-dialog.ui:173
+msgid "Search for Drivers"
+msgstr "Lorg draibhearan"
+
+#: panels/printers/pp-details-dialog.ui:181
+msgid "Select from Database…"
+msgstr "Tagh o stòr-dàta…"
+
+#: panels/printers/pp-details-dialog.ui:189
+msgid "Install PPD File…"
+msgstr "Stàlaich faidhle PPD…"
 
-#: panels/printers/ppd-selection-dialog.ui:10
+#: panels/printers/ppd-selection-dialog.ui:8
 msgid "Select Printer Driver"
 msgstr "Tagh draibhear a’ chlò-bhualadair"
 
-#: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/um-photo-dialog.c:105
-msgid "Select"
-msgstr "Tagh"
-
-#: panels/printers/ppd-selection-dialog.ui:73
+#: panels/printers/ppd-selection-dialog.ui:75
 msgid "Loading drivers database…"
 msgstr "A’ luchdadh stòr-dàta nan draibhearan…"
 
+#: panels/printers/ppd-selection-dialog.ui:91
+#: panels/user-accounts/cc-avatar-chooser.c:98
+msgid "Select"
+msgstr "Tagh"
+
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:539
+#: panels/printers/pp-host.c:478
 msgid "JetDirect Printer"
 msgstr "Clò-bhualadair JetDirect"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:795
+#: panels/printers/pp-host.c:713
 msgid "LPD Printer"
 msgstr "Clò-bualadair LPD"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:66
-#: panels/printers/pp-ppd-option-widget.c:70
+#: panels/printers/pp-ipp-option-widget.c:64
+#: panels/printers/pp-ppd-option-widget.c:69
 msgid "One Sided"
 msgstr "Aon-taobhach"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:68
-#: panels/printers/pp-ppd-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:66
+#: panels/printers/pp-ppd-option-widget.c:71
 msgid "Long Edge (Standard)"
 msgstr "Oir fhada (stannardach)"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:70
-#: panels/printers/pp-ppd-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:68
+#: panels/printers/pp-ppd-option-widget.c:73
 msgid "Short Edge (Flip)"
 msgstr "Oir ghoirid (Flip)"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:70
 msgid "Portrait"
 msgstr "Portraid"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:72
 msgid "Landscape"
 msgstr "Dreach-tìre"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:76
+#: panels/printers/pp-ipp-option-widget.c:74
 msgid "Reverse landscape"
 msgstr "Dreach-tìre contrarra"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:78
+#: panels/printers/pp-ipp-option-widget.c:76
 msgid "Reverse portrait"
 msgstr "Portraid chontrarra"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: panels/printers/pp-jobs-dialog.c:234
+#: panels/printers/pp-job-row.c:134
 msgctxt "print job"
 msgid "Pending"
 msgstr "Ri dhèanamh"
 
 #. Translators: Job's state (job is held for printing)
-#: panels/printers/pp-jobs-dialog.c:240
+#: panels/printers/pp-job-row.c:140
 msgctxt "print job"
 msgid "Paused"
 msgstr "’Na stad"
 
 #. Translators: Job's state (job needs authentication to proceed further)
-#: panels/printers/pp-jobs-dialog.c:245
-#| msgid "Authentication required"
+#: panels/printers/pp-job-row.c:145
 msgctxt "print job"
 msgid "Authentication required"
 msgstr "Tha feum air dearbhadh"
 
 #. Translators: Job's state (job is currently printing)
-#: panels/printers/pp-jobs-dialog.c:250
+#: panels/printers/pp-job-row.c:150
 msgctxt "print job"
 msgid "Processing"
 msgstr "’Ga phròiseasadh"
 
 #. Translators: Job's state (job has been stopped)
-#: panels/printers/pp-jobs-dialog.c:254
+#: panels/printers/pp-job-row.c:154
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Sguireadh dheth"
 
 #. Translators: Job's state (job has been canceled)
-#: panels/printers/pp-jobs-dialog.c:258
+#: panels/printers/pp-job-row.c:158
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Sguireadh dheth"
 
 #. Translators: Job's state (job has aborted due to error)
-#: panels/printers/pp-jobs-dialog.c:262
+#: panels/printers/pp-job-row.c:162
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Sguireadh dheth"
 
 #. Translators: Job's state (job has completed successfully)
-#: panels/printers/pp-jobs-dialog.c:266
+#: panels/printers/pp-job-row.c:166
 msgctxt "print job"
 msgid "Completed"
 msgstr "Air a choileanadh"
 
+#. Translators: Clicking this button prioritizes printing of this print job
+#: panels/printers/pp-job-row.c:176
+msgid "Move this job to the top of the queue"
+msgstr ""
+
 #. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
-#: panels/printers/pp-jobs-dialog.c:390
-#,  c-format
-#| msgid "Server requires authentication"
+#: panels/printers/pp-jobs-dialog.c:318
+#, c-format
 msgid "%u Job Requires Authentication"
 msgid_plural "%u Jobs Require Authentication"
 msgstr[0] "Tha %u obair feumach air dearbhadh"
@@ -4438,202 +5441,249 @@ msgstr[2] "Tha %u obraichean feumach air dearbhadh"
 msgstr[3] "Tha %u obair feumach air dearbhadh"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: panels/printers/pp-jobs-dialog.c:620
+#: panels/printers/pp-jobs-dialog.c:456
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s – Obraichean gnìomhach"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:625
-#,  c-format
-#| msgid "Enter username and password to view printers on %s."
+#: panels/printers/pp-jobs-dialog.c:460
+#, c-format
 msgid "Enter credentials to print from %s."
 msgstr "Cuir a-steach teisteas airson clò-bhualadh o %s."
 
-#: panels/printers/pp-new-printer-dialog.c:402
-msgid "Unlock Print Server"
+#. Translators: This is a windows domain used with SMB protocol.
+#: panels/printers/pp-jobs-dialog.ui:30
+#: panels/user-accounts/cc-add-user-dialog.ui:300
+msgid "Domain"
+msgstr "Àrainn"
+
+#. Translators: This button authenticates all print jobs and send them for printing.
+#: panels/printers/pp-jobs-dialog.ui:100
+msgid "A_uthenticate"
+msgstr "D_earbhaich"
+
+#. Translators: this action removes (purges) all the listed jobs from the list.
+#: panels/printers/pp-jobs-dialog.ui:128
+msgid "Clear All"
+msgstr "Falamhaich na h-uile"
+
+#. Translators: This button pop up authentication dialog for print jobs which need credentials.
+#: panels/printers/pp-jobs-dialog.ui:173
+msgid "_Authenticate"
+msgstr "De_arbhaich"
+
+#. Translators: this label describes the dialog empty state, with no jobs listed.
+#: panels/printers/pp-jobs-dialog.ui:214
+msgid "No Active Printer Jobs"
+msgstr "Chan eil obair clò-bhualaidh gnìomhach"
+
+#: panels/printers/pp-new-printer-dialog.c:270
+msgid "Unlock Print Server"
 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
+#: panels/printers/pp-new-printer-dialog.c:274
 #, c-format
 msgid "Unlock %s."
 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
+#: panels/printers/pp-new-printer-dialog.c:278
 #, c-format
 msgid "Enter username and password to view printers on %s."
-msgstr "Cuir a-steach ainm-cleachdaiche ’s facal-faire gus na clò-bhualadairean fhaicinn a tha ri làimh air 
%s."
+msgstr ""
+"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
+#: panels/printers/pp-new-printer-dialog.c:578
 msgid "Searching for Printers"
 msgstr "A’ lorg clò-bhualadairean"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1799
+#: panels/printers/pp-new-printer-dialog.c:1366
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1804
+#: panels/printers/pp-new-printer-dialog.c:1371
 msgid "Serial Port"
 msgstr "Port sreathach"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1811
+#: panels/printers/pp-new-printer-dialog.c:1378
 msgid "Parallel Port"
 msgstr "Port co-shìnte"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1853
+#: panels/printers/pp-new-printer-dialog.c:1420
 #, c-format
 msgid "Location: %s"
 msgstr "Ionad: %s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1858
+#: panels/printers/pp-new-printer-dialog.c:1425
 #, c-format
 msgid "Address: %s"
 msgstr "Seòladh: %s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: panels/printers/pp-new-printer-dialog.c:1887
+#: panels/printers/pp-new-printer-dialog.c:1452
 msgid "Server requires authentication"
 msgstr "Feumaidh am frithealaiche dearbhadh"
 
-#: panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:87
 msgid "Two Sided"
 msgstr "Dà-thaobhach"
 
-#: panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:88
 msgid "Paper Type"
 msgstr "Seòrsa a’ phàipeir"
 
-#: panels/printers/pp-options-dialog.c:85
+#: panels/printers/pp-options-dialog.c:89
 msgid "Paper Source"
 msgstr "Tùs a’ phàipeir"
 
-#: panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:90
 msgid "Output Tray"
 msgstr "Treidhe às-chuir"
 
-#: panels/printers/pp-options-dialog.c:88
+#: panels/printers/pp-options-dialog.c:91
+#, fuzzy
+#| msgid "Resolution"
+msgctxt "printing option"
+msgid "Resolution"
+msgstr "Dùmhlachd-bhreacaidh"
+
+#: panels/printers/pp-options-dialog.c:92
 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:534
+#: panels/printers/pp-options-dialog.c:517
 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:546
+#: panels/printers/pp-options-dialog.c:529
 msgid "Two-sided"
 msgstr "Dà-thaobhach"
 
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: panels/printers/pp-options-dialog.c:541
+msgid "Orientation"
+msgstr "Comhair"
+
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:655
+#: panels/printers/pp-options-dialog.c:638
 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:658
+#: panels/printers/pp-options-dialog.c:641
 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:661
+#: panels/printers/pp-options-dialog.c:644
 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:664
+#: panels/printers/pp-options-dialog.c:647
 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:667
+#: panels/printers/pp-options-dialog.c:650
 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:670
+#: panels/printers/pp-options-dialog.c:653
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Dath"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:673
+#: panels/printers/pp-options-dialog.c:656
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Lìomhadh"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:676
+#: panels/printers/pp-options-dialog.c:659
 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
+#. Translators: This button triggers the printing of a test page.
+#: panels/printers/pp-options-dialog.c:844
+#: panels/printers/pp-options-dialog.ui:14
+msgid "Test Page"
+msgstr "Duilleag deuchainne"
+
+#. Translators: Name of job which makes printer to print test page
+#: panels/printers/pp-options-dialog.c:857
 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
-#: panels/printers/pp-ppd-option-widget.c:86
+#: panels/printers/pp-ppd-option-widget.c:75
+#: panels/printers/pp-ppd-option-widget.c:77
+#: panels/printers/pp-ppd-option-widget.c:85
 msgid "Auto Select"
 msgstr "Taghadh fèin-obrachail"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: panels/printers/pp-ppd-option-widget.c:80
-#: panels/printers/pp-ppd-option-widget.c:82
-#: panels/printers/pp-ppd-option-widget.c:84
-#: panels/printers/pp-ppd-option-widget.c:88
+#: panels/printers/pp-ppd-option-widget.c:79
+#: panels/printers/pp-ppd-option-widget.c:81
+#: panels/printers/pp-ppd-option-widget.c:83
+#: panels/printers/pp-ppd-option-widget.c:87
 msgid "Printer Default"
 msgstr "Bun-roghainnean a’ chlò-bhualadair"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:90
+#: panels/printers/pp-ppd-option-widget.c:89
 msgid "Embed GhostScript fonts only"
 msgstr "Na leabaich ach cruthan-clò GhostScript"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:92
+#: panels/printers/pp-ppd-option-widget.c:91
 msgid "Convert to PS level 1"
 msgstr "Iompaich ’na PS leibheil 1"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:94
+#: panels/printers/pp-ppd-option-widget.c:93
 msgid "Convert to PS level 2"
 msgstr "Iompaich ’na PS leibheil 2"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:96
+#: panels/printers/pp-ppd-option-widget.c:95
 msgid "No pre-filtering"
 msgstr "Gun ro-chriathradh"
 
 #. Translators: Name of column showing printer manufacturers
-#: panels/printers/pp-ppd-selection-dialog.c:233
+#: panels/printers/pp-ppd-selection-dialog.c:220
+#: panels/wwan/cc-wwan-details-dialog.ui:160
 msgid "Manufacturer"
 msgstr "Saothraiche"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:598 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:526 panels/printers/printer-entry.ui:167
 msgid "No Active Jobs"
 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:603
+#: panels/printers/pp-printer-entry.c:531
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -4642,2107 +5692,2263 @@ msgstr[1] "%u obair"
 msgstr[2] "%u obraichean"
 msgstr[3] "%u obair"
 
+#. Translators: Name of job which makes printer to clean its heads
+#: panels/printers/pp-printer-entry.c:651
+msgid "Clean print heads"
+msgstr "Glan na cinn clò-bhualaidh"
+
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:766
+#: panels/printers/pp-printer-entry.c:719
 msgid "Low on toner"
 msgstr "Tònair gann"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:768
+#: panels/printers/pp-printer-entry.c:721
 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:771
+#: panels/printers/pp-printer-entry.c:724
 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:774
+#: panels/printers/pp-printer-entry.c:727
 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:776
+#: panels/printers/pp-printer-entry.c:729
 msgid "Low on a marker supply"
 msgstr "Dath gann ann am biona a’ chlò-bhualadair"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:778
+#: panels/printers/pp-printer-entry.c:731
 msgid "Out of a marker supply"
 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:780
+#: panels/printers/pp-printer-entry.c:733
 msgid "Open cover"
 msgstr "Tha am mullach fosgailte"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:735
 msgid "Open door"
 msgstr "Tha an doras fosgailte"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:784
+#: panels/printers/pp-printer-entry.c:737
 msgid "Low on paper"
 msgstr "Pàipear gann"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:786
+#: panels/printers/pp-printer-entry.c:739
 msgid "Out of paper"
 msgstr "Chan eil pàipear air fhàgail"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:788
+#: panels/printers/pp-printer-entry.c:741
 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:790
-#: panels/printers/pp-printer-entry.c:920
+#: panels/printers/pp-printer-entry.c:743
+#: panels/printers/pp-printer-entry.c:886
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Sguireadh dheth"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:745
 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:794
+#: panels/printers/pp-printer-entry.c:747
 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:796
+#: panels/printers/pp-printer-entry.c:749
 msgid "The optical photo conductor is near end of life"
 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:798
+#: panels/printers/pp-printer-entry.c:751
 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:906
+#: panels/printers/pp-printer-entry.c:872
 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:911
+#: panels/printers/pp-printer-entry.c:877
 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:916
+#: panels/printers/pp-printer-entry.c:882
 msgctxt "printer state"
 msgid "Processing"
 msgstr "’Ga phròiseasadh"
 
-#. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:940
-msgid "Clean print heads"
-msgstr "Glan na cinn clò-bhualaidh"
-
-#: panels/printers/printer-entry.ui:14
+#: panels/printers/printer-entry.ui:18
 msgid "Printing Options"
 msgstr "Roghainnean a’ chlò-bhualaidh"
 
-#: panels/printers/printer-entry.ui:26
+#: panels/printers/printer-entry.ui:29
 msgid "Printer Details"
 msgstr "Fiosrachadh a’ chlò-bhualadair"
 
 #. Set this printer as default
-#: panels/printers/printer-entry.ui:38
+#: panels/printers/printer-entry.ui:40
 msgid "Use Printer by Default"
 msgstr "Cleachd an clò-bhualadair seo a gnàth"
 
 #. Translators: This button executes command which cleans print heads of the printer.
-#: panels/printers/printer-entry.ui:50
+#: panels/printers/printer-entry.ui:52
 msgid "Clean Print Heads"
 msgstr "Glan na cinn clò-bhualaidh"
 
-#: panels/printers/printer-entry.ui:61
+#: panels/printers/printer-entry.ui:62
 msgid "Remove Printer"
 msgstr "Thoir air falbh an clò-bhualadair"
 
-#: panels/printers/printer-entry.ui:193
+#: panels/printers/printer-entry.ui:187
+#: panels/wwan/cc-wwan-details-dialog.ui:184
 msgid "Model"
 msgstr "Modail"
 
-#: panels/printers/printer-entry.ui:251
+#: panels/printers/printer-entry.ui:242
 msgid "Ink Level"
 msgstr "Ìre na h-ince"
 
 #. Translators: This is the message which follows the printer error.
-#: panels/printers/printer-entry.ui:312
+#: panels/printers/printer-entry.ui:304
 msgid "Please restart when the problem is resolved."
 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:319
+#: panels/printers/printer-entry.ui:310
 msgid "Restart"
 msgstr "Ath-thòisich"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:20
-msgid "Add…"
-msgstr "Cuir ris…"
+#: panels/printers/printers.ui:10
+#, fuzzy
+#| msgid "Add a Printer…"
+msgid "Add Printer…"
+msgstr "Cuir clò-bhualadair ris…"
 
-#: panels/printers/printers.ui:186
+#: panels/printers/printers.ui:168
 msgid "No printers"
 msgstr "Chan eil clò-bhualadair ann"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:200
+#: panels/printers/printers.ui:179
 msgid "Add a Printer…"
 msgstr "Cuir clò-bhualadair ris…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:232
+#: panels/printers/printers.ui:204
+#, fuzzy
+#| msgid ""
+#| "Sorry! The system printing service\n"
+#| "doesn’t seem to be available."
 msgid ""
 "Sorry! The system printing service\n"
-"doesn’t seem to be available."
-msgstr "Tha sinn duilich ach chan eil seirbheis clò-bhualadh\nan t-siostaim ri làimh a-rèir coltais."
-
-#: panels/privacy/cc-privacy-panel.c:387 panels/privacy/privacy.ui:280
-msgid "Screen Lock"
-msgstr "Glas na sgrìn"
-
-#: panels/privacy/cc-privacy-panel.c:438
-msgid "In use"
-msgstr "’Ga chleachdadh"
-
-#: panels/privacy/cc-privacy-panel.c:443
-msgctxt "Location services status"
-msgid "On"
-msgstr "Air"
+"    doesn’t seem to be available."
+msgstr ""
+"Tha sinn duilich ach chan eil seirbheis clò-bhualadh\n"
+"an t-siostaim ri làimh a-rèir coltais."
 
-#: panels/privacy/cc-privacy-panel.c:444
-msgctxt "Location services status"
-msgid "Off"
-msgstr "Dheth"
+#: panels/region/cc-format-chooser.c:148 panels/region/cc-format-chooser.c:196
+#: panels/region/cc-format-chooser.ui:4
+msgid "Formats"
+msgstr "Fòrmatan"
 
-#: panels/privacy/cc-privacy-panel.c:823 panels/privacy/privacy.ui:745
-msgid "Location Services"
-msgstr "Seirbheisean ionaid"
+#: panels/region/cc-format-chooser.ui:37 panels/wwan/cc-wwan-apn-dialog.ui:21
+msgid "Back"
+msgstr "Air ais"
 
-#: panels/privacy/cc-privacy-panel.c:946 panels/privacy/privacy.ui:127
-msgid "Usage & History"
-msgstr "Cleachdadh ⁊ an eachraidh"
+#: panels/region/cc-format-chooser.ui:76
+#, fuzzy
+#| msgid "Search Locations"
+msgid "Search locales…"
+msgstr "Ionadan luirg"
 
-#: panels/privacy/cc-privacy-panel.c:1075
-msgid "Empty all items from Trash?"
-msgstr "A bheil thu airson an sgudal fhalamhachadh gu tur?"
+#: panels/region/cc-format-chooser.ui:113
+#, fuzzy
+#| msgid "Formats"
+msgid "Common Formats"
+msgstr "Fòrmatan"
 
-#: 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/region/cc-format-chooser.ui:140
+#, fuzzy
+#| msgid "Formats"
+msgid "All Formats"
+msgstr "Fòrmatan"
 
-#: panels/privacy/cc-privacy-panel.c:1077
-msgid "_Empty Trash"
-msgstr "_Falamhaich an sgudal"
+#: panels/region/cc-format-chooser.ui:188
+#, fuzzy
+#| msgid "No results found"
+msgid "No Search Results"
+msgstr "Cha deach toradh a lorg"
 
-#: 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/region/cc-format-chooser.ui:200
+msgid "Searches can be for countries or languages."
+msgstr ""
 
-#: 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/region/cc-format-chooser.ui:236
+msgid "Preview"
+msgstr "Ro-shealladh"
 
-#: panels/privacy/cc-privacy-panel.c:1102
-msgid "_Purge Temporary Files"
-msgstr "_Purgaidich na faidhlichean sealach"
+#: panels/region/cc-format-preview.c:135
+msgctxt "measurement format"
+msgid "Imperial"
+msgstr "Impireil"
 
-#: panels/privacy/cc-privacy-panel.c:1124 panels/privacy/privacy.ui:432
-msgid "Purge Trash & Temporary Files"
-msgstr "Purgaidich an sgudal ⁊ na faidhlichean sealach"
+#: panels/region/cc-format-preview.c:137
+msgctxt "measurement format"
+msgid "Metric"
+msgstr "Meatraigeach"
 
-#: panels/privacy/cc-privacy-panel.c:1164 panels/privacy/privacy.ui:637
-msgid "Software Usage"
-msgstr "Cleachdadh bathair-bhog"
+#: panels/region/cc-format-preview.ui:17
+msgid "Dates"
+msgstr "Cinn-là"
 
-#: panels/privacy/cc-privacy-panel.c:1205 panels/privacy/privacy.ui:959
-msgid "Problem Reporting"
-msgstr "Ag aithris air duilgheadasan"
+#: panels/region/cc-format-preview.ui:53
+msgid "Dates & Times"
+msgstr "Cinn-là ⁊ amannan"
 
-#. translators: '%s' is the distributor's name, such as 'Fedora'
-#: panels/privacy/cc-privacy-panel.c:1219
-#, c-format
-msgid ""
-"Sending reports of technical problems helps us improve %s. Reports are sent "
-"anonymously and are scrubbed of personal data."
-msgstr "Ma chuireas tu aithrisean air duilgheadasan teicnigeach a-null, cuidichidh 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/region/cc-format-preview.ui:71
+msgid "Numbers"
+msgstr "Àireamhan"
 
-#: panels/privacy/cc-privacy-panel.c:1231 panels/privacy/privacy.ui:719
-msgid "Privacy Policy"
-msgstr "Am poileasaidh prìobhaideachd"
+#: panels/region/cc-format-preview.ui:89
+msgid "Measurement"
+msgstr "Tomhasan"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "Prìobhaideachd"
+#: panels/region/cc-format-preview.ui:107
+msgid "Paper"
+msgstr "Pàipear"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
-msgid "Protect your personal information and control what others might see"
-msgstr "Dìon am fiosrachadh pearsanta agad is stiùirich na chì càch"
+#: panels/region/cc-region-panel.ui:19
+msgid "Language and format will be changed after next login"
+msgstr ""
 
-#. FIXME
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
-msgid "preferences-system-privacy"
-msgstr "preferences-system-privacy"
+#: panels/region/cc-region-panel.ui:29
+msgid "Logout…"
+msgstr ""
 
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
+#: panels/region/cc-region-panel.ui:45
 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;"
+"The language setting is used for interface text and web pages. Formats is "
+"used for numbers, dates, and currencies."
+msgstr ""
 
-#: panels/privacy/privacy.ui:14
-msgid "Screen Turns Off"
-msgstr "Thèid na sgrìnichean dheth"
+#: panels/region/cc-region-panel.ui:51
+#, fuzzy
+#| msgid "Your account"
+msgid "Your Account"
+msgstr "An cunntas agad"
 
-#: panels/privacy/privacy.ui:18
-msgid "30 seconds"
-msgstr "30 diog"
+#: panels/region/cc-region-panel.ui:56 panels/region/cc-region-panel.ui:95
+#: panels/user-accounts/cc-user-panel.ui:299
+msgid "_Language"
+msgstr "_Cànan"
 
-#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
-msgid "1 day"
-msgstr "1 latha"
+#: panels/region/cc-region-panel.ui:72 panels/region/cc-region-panel.ui:111
+msgid "_Formats"
+msgstr "_Fòrmatan"
 
-#: panels/privacy/privacy.ui:64
-msgid "2 days"
-msgstr "2 latha"
+#: panels/region/cc-region-panel.ui:90
+#, fuzzy
+#| msgid "Login _Screen"
+msgid "Login Screen"
+msgstr "_Sgrìn a’ chlàraidh a-steach"
 
-#: panels/privacy/privacy.ui:68
-msgid "3 days"
-msgstr "3 làithean"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "Roinn-dùthcha ⁊ cànan"
 
-#: panels/privacy/privacy.ui:72
-msgid "4 days"
-msgstr "4 làithean"
+#: panels/region/gnome-region-panel.desktop.in.in:4
+#, fuzzy
+#| msgid ""
+#| "Select your display language, formats, keyboard layouts and input sources"
+msgid "Select your display language and formats"
+msgstr "Tagh an cànan-taisbeanaidh, fòrmatan, meur-chlàran is tùsan ion-chuir"
 
-#: panels/privacy/privacy.ui:76
-msgid "5 days"
-msgstr "5 làithean"
+#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/region/gnome-region-panel.desktop.in.in:19
+msgid "Language;Layout;Keyboard;Input;"
+msgstr ""
+"cànan;co-dhealbhachd;meur-chlàr;ion-chur;Language;Layout;Keyboard;Input;"
 
-#: panels/privacy/privacy.ui:80
-msgid "6 days"
-msgstr "6 làithean"
+#: panels/removable-media/cc-removable-media-panel.c:256
+msgid "Ask what to do"
+msgstr "Faighnich dhìom"
 
-#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
-msgid "7 days"
-msgstr "7 làithean"
+#: panels/removable-media/cc-removable-media-panel.c:260
+msgid "Do nothing"
+msgstr "Na dèan dad"
 
-#: panels/privacy/privacy.ui:88
-msgid "14 days"
-msgstr "Cola-deug"
+#: panels/removable-media/cc-removable-media-panel.c:264
+msgid "Open folder"
+msgstr "Fosgail am pasgan"
 
-#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
-msgid "30 days"
-msgstr "30 latha"
+#: panels/removable-media/cc-removable-media-panel.c:331
+msgid "Other Media"
+msgstr "Meadhanan eile"
 
-#: panels/privacy/privacy.ui:118
-msgid "Forever"
-msgstr "Gu buan"
+#: panels/removable-media/cc-removable-media-panel.c:352
+msgid "Select an application for audio CDs"
+msgstr "Tagh aplacaid airson CDan fuaime"
 
-#: panels/privacy/privacy.ui:148
-msgid ""
-"Remembering your history makes things easier to find again. These items are "
-"never shared over the network."
-msgstr "Ma chumas tu an eachdraidh an cuimhne, bidh e nas fhasa greim fhaighinn air rudan. Cha dèid na rudan 
seo a nochdadh ris an lìonra idir."
+#: panels/removable-media/cc-removable-media-panel.c:353
+msgid "Select an application for video DVDs"
+msgstr "Tagh aplacaid airson DVDan video"
 
-#: panels/privacy/privacy.ui:176
-msgid "_Recently Used"
-msgstr "Ai_r an cleachdadh o chionn goirid"
+#: panels/removable-media/cc-removable-media-panel.c:354
+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/privacy/privacy.ui:207
-msgid "Retain _History"
-msgstr "Glèidh an eachdraid_h"
+#: panels/removable-media/cc-removable-media-panel.c:355
+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/privacy/privacy.ui:247
-msgid "Cl_ear Recent History"
-msgstr "Falamhaich an _eachdraidh faisg ort"
+#: panels/removable-media/cc-removable-media-panel.c:356
+msgid "Select an application for software CDs"
+msgstr "Tagh aplacaid airson CDan bathair-bhog"
 
-#: panels/privacy/privacy.ui:301
-msgid "The Screen Lock protects your privacy when you are away."
-msgstr "Dìonaidh glas na sgrìn do phrìobhaideachd nuair a bhios tu air falbh."
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: panels/removable-media/cc-removable-media-panel.c:368
+msgid "audio DVD"
+msgstr "DVD fuaime"
 
-#: panels/privacy/privacy.ui:328
-msgid "Automatic Screen _Lock"
-msgstr "G_las fhèin-obrachail na sgrìn"
+#: panels/removable-media/cc-removable-media-panel.c:369
+msgid "blank Blu-ray disc"
+msgstr "diosg Blu-ray bàn"
 
-#: panels/privacy/privacy.ui:362
-msgid "Lock screen _after blank for"
-msgstr "Glais _an sgrìn an dèidh dha a bhith bàn fad"
+#: panels/removable-media/cc-removable-media-panel.c:370
+msgid "blank CD disc"
+msgstr "diosg CD bàn"
 
-#: panels/privacy/privacy.ui:394
-msgid "Show _Notifications"
-msgstr "Seall _na brathan"
+#: panels/removable-media/cc-removable-media-panel.c:371
+msgid "blank DVD disc"
+msgstr "diosg DVD bàn"
 
-#: panels/privacy/privacy.ui:454
-msgid ""
-"Automatically purge the Trash and temporary files to help keep your computer "
-"free of unnecessary sensitive information."
-msgstr "Purgaidich an sgudal is na faidhlichean sealach gu fèin-obrachail gus an coimpiutair agad a chumail 
saor o fhiosrachadh prìobhaideach air nach eil feum."
+#: panels/removable-media/cc-removable-media-panel.c:372
+msgid "blank HD DVD disc"
+msgstr "diosg DVD HD bàn"
 
-#: panels/privacy/privacy.ui:483
-msgid "Automatically empty _Trash"
-msgstr "Fa_lamhaich an sgudal gu fèin-obrachail"
+#: panels/removable-media/cc-removable-media-panel.c:373
+msgid "Blu-ray video disc"
+msgstr "diosg video Blu-ray bàn"
 
-#: panels/privacy/privacy.ui:515
-msgid "Automatically purge Temporary _Files"
-msgstr "P_urgaidich faidhlichean sealach gu fèin-obrachail"
+#: panels/removable-media/cc-removable-media-panel.c:374
+msgid "e-book reader"
+msgstr "leughadair leabhair-d"
 
-#: panels/privacy/privacy.ui:546
-msgid "Purge _After"
-msgstr "Purgaidich an _dèidh"
+#: panels/removable-media/cc-removable-media-panel.c:375
+msgid "HD DVD video disc"
+msgstr "diosg video DVD HD"
 
-#: panels/privacy/privacy.ui:590
-msgid "_Empty Trash…"
-msgstr "_Falamhaich an sgudal…"
+#: panels/removable-media/cc-removable-media-panel.c:376
+msgid "Picture CD"
+msgstr "CD dhealbhan"
 
-#: panels/privacy/privacy.ui:606
-msgid "_Purge Temporary Files…"
-msgstr "_Purgaidich na faidhlichean sealach…"
+#: panels/removable-media/cc-removable-media-panel.c:377
+msgid "Super Video CD"
+msgstr "Super Video CD"
 
-#: panels/privacy/privacy.ui:654
-msgid ""
-"Sending us information about which software you use helps us provide you "
-"with more accurate recommendations. It also helps us to improve our "
-"software.\n"
-"\n"
-"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 urrainn dhuinn molaidhean 
nas pongaile a thoirt dhut. Agus bidh cothrom againn am bathar-bog againn a leasachadh.\n\nBidh fiosrachadh 
sam bith a chruinnicheas sinn gun urra agus cha doir sinn an dàta agad do threas-phàrtaidhean idir."
+#: panels/removable-media/cc-removable-media-panel.c:378
+msgid "Video CD"
+msgstr "Video CD"
 
-#: panels/privacy/privacy.ui:681
-msgid "_Send software usage statistics"
-msgstr "Cuir _stats air cleachdadh a’ bhathair-bhog"
+#: panels/removable-media/cc-removable-media-panel.c:379
+msgid "Windows software"
+msgstr "Bathar-bog Windows"
 
-#: panels/privacy/privacy.ui:764
-msgid ""
-"Location services allow applications to know your location. Using Wi-Fi and "
-"mobile broadband increases accuracy."
-msgstr "Leigidh seirbheisean ionaid leis na h-aplacaidean faighinn a-mach far a bheil thu. Bidh seo nas 
pongaile le WiFi is bann-leathann mobile."
+#: panels/removable-media/cc-removable-media-panel.ui:32
+msgid "Select how media should be handled"
+msgstr "Tagh mar a thèid am meadhan a làimhseachadh"
 
-#: panels/privacy/privacy.ui:778
-msgid ""
-"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
-"com/privacy'>Privacy Policy</a>"
-msgstr "Cleachdaidh e Mozilla Location Service: <a 
href='https://location.services.mozilla.com/privacy'>Poileasaidh prìobhaideachd</a>"
+#: panels/removable-media/cc-removable-media-panel.ui:52
+msgid "CD _audio"
+msgstr "CD _fuaime"
 
-#: panels/privacy/privacy.ui:828
-msgid "_Location Services"
-msgstr "Seirbheisean _ionaid"
+#: panels/removable-media/cc-removable-media-panel.ui:67
+msgid "_DVD video"
+msgstr "_DVD video"
 
-#: panels/privacy/privacy.ui:1026
-msgid "_Automatic Problem Reporting"
-msgstr "_Aithrisean fèin-obrachail air duilgheadasan"
+#: panels/removable-media/cc-removable-media-panel.ui:102
+msgid "_Music player"
+msgstr "_Cluicheadair ciùil"
 
-#: panels/region/cc-format-chooser.c:118
-msgctxt "measurement format"
-msgid "Imperial"
-msgstr "Impireil"
+#: panels/removable-media/cc-removable-media-panel.ui:152
+msgid "_Software"
+msgstr "_Bathar-bog"
 
-#: panels/region/cc-format-chooser.c:120
-msgctxt "measurement format"
-msgid "Metric"
-msgstr "Meatraigeach"
+#: panels/removable-media/cc-removable-media-panel.ui:178
+msgid "_Other Media…"
+msgstr "_Meadhanan eile…"
 
-#: panels/region/cc-format-chooser.c:285
-msgid "No regions found"
-msgstr "Cha deach roinn-dùthcha a lorg"
+#: panels/removable-media/cc-removable-media-panel.ui:195
+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"
 
-#: panels/region/cc-input-chooser.c:182
-msgid "No input sources found"
-msgstr "Cha deach tùs ion-chuir a lorg"
+#: panels/removable-media/cc-removable-media-panel.ui:225
+msgid "Select how other media should be handled"
+msgstr "Tagh mar a thèid meadhanan eile a làimhseachadh"
 
-#: panels/region/cc-input-chooser.c:1012
-msgctxt "Input Source"
-msgid "Other"
-msgstr "Eile"
+#: panels/removable-media/cc-removable-media-panel.ui:259
+msgid "_Action:"
+msgstr "_Gnìomh:"
 
-#: panels/region/cc-region-panel.c:881
-msgid "No input source selected"
-msgstr "Cha deach tùs ion-chuir a thaghadh"
+#: panels/removable-media/cc-removable-media-panel.ui:278
+msgid "_Type:"
+msgstr "_Seòrsa:"
 
-#: panels/region/cc-region-panel.c:1773
-msgid "Login _Screen"
-msgstr "_Sgrìn a’ chlàraidh a-steach"
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "Meadhan so-ghiùlain"
 
-#: panels/region/format-chooser.ui:7
-msgid "Formats"
-msgstr "Fòrmatan"
-
-#: panels/region/format-chooser.ui:120
-msgid "Preview"
-msgstr "Ro-shealladh"
-
-#: panels/region/format-chooser.ui:137
-msgid "Dates"
-msgstr "Cinn-là"
-
-#: panels/region/format-chooser.ui:168
-msgid "Times"
-msgstr "Amannan"
-
-#: panels/region/format-chooser.ui:199
-msgid "Dates & Times"
-msgstr "Cinn-là ⁊ amannan"
-
-#: panels/region/format-chooser.ui:230
-msgid "Numbers"
-msgstr "Àireamhan"
-
-#: panels/region/format-chooser.ui:247
-msgid "Measurement"
-msgstr "Tomhasan"
-
-#: panels/region/format-chooser.ui:264
-msgid "Paper"
-msgstr "Pàipear"
-
-#: panels/region/gnome-region-panel.desktop.in.in:3
-#| msgid "Re­gion & Lan­guage"
-msgid "Region & Language"
-msgstr "Roinn-dùthcha ⁊ cànan"
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:4
+msgid "Configure Removable Media settings"
+msgstr "Rèitich roghainnean nam meadhanan so-ghiùlain"
 
-#: panels/region/gnome-region-panel.desktop.in.in:4
+#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:19
 msgid ""
-"Select your display language, formats, keyboard layouts and input sources"
-msgstr "Tagh an cànan-taisbeanaidh, fòrmatan, meur-chlàran is tùsan ion-chuir"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/region/gnome-region-panel.desktop.in.in:7
-msgid "preferences-desktop-locale"
-msgstr "preferences-desktop-locale"
-
-#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/region/gnome-region-panel.desktop.in.in:19
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "cànan;co-dhealbhachd;meur-chlàr;ion-chur;Language;Layout;Keyboard;Input;"
-
-#: panels/region/input-chooser.ui:5
-msgid "Add an Input Source"
-msgstr "Cuir tùs ion-chuir ris"
-
-#: panels/region/input-chooser.ui:76
-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"
-
-#: panels/region/input-options.ui:7
-msgid "Input Source Options"
-msgstr "Roghainnean nan tùsan ion-chuir"
-
-#: panels/region/input-options.ui:27
-msgid "Use the _same source for all windows"
-msgstr "Cleachd an aon tù_s airson gach uinneag"
-
-#: panels/region/input-options.ui:45
-msgid "Allow _different sources for each window"
-msgstr "Ceadaich _diofar tùsan airson gach uinneag"
-
-#: panels/region/input-options.ui:85
-msgid "Switch to previous source"
-msgstr "Gearr leum gun tùs roimhe"
-
-#: panels/region/input-options.ui:102
-msgid "Super+Shift+Space"
-msgstr "Super+Shift+Space"
-
-#: panels/region/input-options.ui:116
-msgid "Switch to next source"
-msgstr "Gearr leum gun ath-thùs"
-
-#: panels/region/input-options.ui:133
-msgid "Super+Space"
-msgstr "Super+Space"
-
-#: panels/region/input-options.ui:147
-msgid "You can change these shortcuts in the keyboard settings"
-msgstr "’S urrainn dhut na h-ath-ghoiridean seo atharrachadh ann an roghainnean a’ mheur-chlàir"
-
-#: panels/region/input-options.ui:164
-msgid "Alternative switch to next source"
-msgstr "Dòigh eile airson leumadh gun ath-thùs"
-
-#: panels/region/input-options.ui:181
-msgid "Left+Right Alt"
-msgstr "Alt clì + deas"
-
-#: panels/region/region.ui:67
-#: panels/user-accounts/data/user-accounts-dialog.ui:348
-msgid "_Language"
-msgstr "_Cànan"
-
-#: panels/region/region.ui:85
-msgid "English (United Kingdom)"
-msgstr "Beurla (An Rìoghachd Aonaichte)"
-
-#: panels/region/region.ui:112
-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:134
-msgid "Restart…"
-msgstr "Ath-thòisich…"
+"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;preferred;"
+"cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 
-#: panels/region/region.ui:169
-msgid "_Formats"
-msgstr "_Fòrmatan"
+#: panels/search/cc-search-locations-dialog.c:674
+msgid "Select Location"
+msgstr "Tagh ionad"
 
-#: panels/region/region.ui:187
-msgid "United Kingdom"
-msgstr "An Rìoghachd Aonaichte"
+#: panels/search/cc-search-locations-dialog.c:678
+msgid "_OK"
+msgstr "_Ceart ma-tha"
 
-#: panels/region/region.ui:229
-msgid "Input Sources"
-msgstr "Tùsan ion-chuir"
+#: panels/search/cc-search-locations-dialog.ui:8
+#: panels/search/cc-search-panel.ui:22
+msgid "Search Locations"
+msgstr "Ionadan luirg"
 
-#: panels/region/region.ui:245
-msgid "_Options"
-msgstr "_Roghainnean"
+#: panels/search/cc-search-locations-dialog.ui:13
+msgid ""
+"Folders which are searched by system applications, such as Files, Photos and "
+"Videos."
+msgstr ""
 
-#: panels/region/region.ui:311
-msgid "Add input source"
-msgstr "Cuir tùs ion-chuir ris"
+#: panels/search/cc-search-locations-dialog.ui:18
+msgid "Places"
+msgstr "Àitichean"
 
-#: panels/region/region.ui:336
-msgid "Remove input source"
-msgstr "Thoir an tùs ion-chuir air falbh"
+#: panels/search/cc-search-locations-dialog.ui:33
+msgid "Bookmarks"
+msgstr "Comharran-lìn"
 
-#: panels/region/region.ui:386
-msgid "Move input source up"
-msgstr "Gluais an tùs ion-chuir suas"
+#: panels/search/cc-search-locations-dialog.ui:48
+#, fuzzy
+#| msgid "Other"
+msgid "Others"
+msgstr "Eile"
 
-#: panels/region/region.ui:411
-msgid "Move input source down"
-msgstr "Gluais an tùs ion-chuir sìos"
+#: panels/search/cc-search-locations-dialog.ui:55
+#, fuzzy
+#| msgid "Location"
+msgid "Add Location"
+msgstr "Ionad"
 
-#: panels/region/region.ui:461
-msgid "Configure input source"
-msgstr "Rèitich an tùs ion-chuir"
+#: panels/search/cc-search-panel.c:165
+msgid "No applications found"
+msgstr "Cha deach aplacaid sam bith a lorg"
 
-#: panels/region/region.ui:486
-msgid "Show input source keyboard layout"
-msgstr "Seall co-dhealbhachd a’ mheur-chlàir air an tùs ion-chuir"
+#: panels/search/cc-search-panel.ui:10
+#, fuzzy
+#| msgid "Applications"
+msgid "Application Search"
+msgstr "Aplacaidean"
 
-#: panels/region/region.ui:530
-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 cleachdaiche nuair a 
chlàraicheas iad a-steach air an t-siostam"
+#: panels/search/cc-search-panel.ui:11
+msgid "Include application-provided search results."
+msgstr ""
 
-#: panels/search/cc-search-locations-dialog.c:639
-msgid "Select Location"
-msgstr "Tagh ionad"
+#: panels/search/cc-search-panel.ui:23
+msgid "Folders which are searched by system applications."
+msgstr ""
 
-#: panels/search/cc-search-locations-dialog.c:643
-msgid "_OK"
-msgstr "_Ceart ma-tha"
+#: panels/search/cc-search-panel.ui:37
+#, fuzzy
+#| msgid "Search Locations"
+msgid "Search Results"
+msgstr "Ionadan luirg"
 
-#: panels/search/cc-search-panel.c:178
-msgid "No applications found"
-msgstr "Cha deach aplacaid sam bith a lorg"
+#: panels/search/cc-search-panel.ui:38
+msgid "Results are displayed according to the list order."
+msgstr ""
 
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
-msgstr "Stiùirich na h-aplacaidean a sheallas toraidhean luirg air foir-shealladh na gnìomhachd"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/search/gnome-search-panel.desktop.in.in:7
-msgid "preferences-system-search"
-msgstr "preferences-system-search"
+msgstr ""
+"Stiùirich na h-aplacaidean a sheallas toraidhean luirg air foir-shealladh na "
+"gnìomhachd"
 
 #. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/search/gnome-search-panel.desktop.in.in:19
 msgid "Search;Find;Index;Hide;Privacy;Results;"
-msgstr "Search;Find;Index;Hide;Privacy;Results;lorg;inneacs;clàr-amais;falaich;prìobhaideachd;toraidhean;"
-
-#: panels/search/search-locations-dialog.ui:9
-msgid "Search Locations"
-msgstr "Ionadan luirg"
-
-#: panels/search/search-locations-dialog.ui:43
-msgid "Places"
-msgstr "Àitichean"
-
-#: panels/search/search-locations-dialog.ui:73
-msgid "Bookmarks"
-msgstr "Comharran-lìn"
-
-#: panels/search/search-locations-dialog.ui:130
-msgid "Other"
-msgstr "Eile"
-
-#: panels/search/search.ui:66
-msgid "Move Up"
-msgstr "Gluais suas"
-
-#: panels/search/search.ui:83
-msgid "Move Down"
-msgstr "Gluais sìos"
-
-#: panels/search/search.ui:119
-msgid "Preferences"
-msgstr "Roghainnean"
+msgstr ""
+"Search;Find;Index;Hide;Privacy;Results;lorg;inneacs;clàr-amais;falaich;"
+"prìobhaideachd;toraidhean;"
 
 #. Label
-#: panels/sharing/cc-sharing-networks.c:305
+#: panels/sharing/cc-sharing-networks.c:265
 msgid "No networks selected for sharing"
 msgstr "Cha deach lìonra a thaghadh a chum co-roinnidh"
 
-#: panels/sharing/cc-sharing-panel.c:275
+#: panels/sharing/cc-sharing-networks.ui:15
+msgid "Networks"
+msgstr "Lìonraidhean"
+
+#: panels/sharing/cc-sharing-panel.c:367
 msgctxt "service is enabled"
 msgid "On"
 msgstr "Air"
 
-#: panels/sharing/cc-sharing-panel.c:277 panels/sharing/cc-sharing-panel.c:304
+#: panels/sharing/cc-sharing-panel.c:369 panels/sharing/cc-sharing-panel.c:396
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Dheth"
 
-#: panels/sharing/cc-sharing-panel.c:307
+#: panels/sharing/cc-sharing-panel.c:399
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "An comas"
 
-#: panels/sharing/cc-sharing-panel.c:310
+#: panels/sharing/cc-sharing-panel.c:402
 msgctxt "service is active"
 msgid "Active"
 msgstr "Gnìomhach"
 
-#: panels/sharing/cc-sharing-panel.c:381
+#: panels/sharing/cc-sharing-panel.c:520
 msgid "Choose a Folder"
 msgstr "Tagh pasgan"
 
-#: panels/sharing/cc-sharing-panel.c:693
-#,  c-format
+#. TRANSLATORS: %s is replaced with a link to a dav://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:748
+#, fuzzy, 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>"
+#| "File Sharing allows you to share your Public folder with others on your "
+#| "current network using: <a href=\"dav://%s\">dav://%s</a>"
 msgid ""
 "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 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>"
+"current network using: %s"
+msgstr ""
+"Bheir co-roinneadh fhaidhlichean 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>"
 
-#: panels/sharing/cc-sharing-panel.c:695
-#, c-format
+#. TRANSLATORS: %s is replaced with a link to a "ssh <hostname>" command to run
+#: panels/sharing/cc-sharing-panel.c:754
+#, fuzzy, 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>"
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
+"%s"
+msgstr ""
+"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>"
-msgstr "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:697
-#, 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>"
-
-#: panels/sharing/cc-sharing-panel.c:809
-msgid "Copy"
-msgstr "Dèan lethbhreac"
 
-#: panels/sharing/cc-sharing-panel.c:1236
+#: panels/sharing/cc-sharing-panel.ui:9
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "Co-roinneadh"
 
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
-msgid "Control what you want to share with others"
-msgstr "Stiùirich na cho-roinneas tu le daoine eile"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
-msgid "preferences-system-sharing"
-msgstr "preferences-system-sharing"
-
-#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
-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;"
-
-#: panels/sharing/networks.ui:19
-msgid "Networks"
-msgstr "Lìonraidhean"
-
-#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
-msgid "Enable or disable remote login"
-msgstr "Cuir an comas no à comas clàradh a-steach cèin"
-
-#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
-msgid "Authentication is required to enable or disable remote login"
-msgstr "Tha feum air dearbhadh mus gabh clàradh cèin a chur an comas no à comas"
-
-#: panels/sharing/sharing.ui:46
+#: panels/sharing/cc-sharing-panel.ui:31
 msgid "_Computer Name"
 msgstr "Ainm a’ _choimpiutair"
 
-#: panels/sharing/sharing.ui:104
+#: panels/sharing/cc-sharing-panel.ui:58
 msgid "_File Sharing"
 msgstr "Co-roinneadh _fhaidhlichean"
 
-#: panels/sharing/sharing.ui:147
-msgid "_Screen Sharing"
-msgstr "Co-roinneadh _sgrìnichean"
+#: panels/sharing/cc-sharing-panel.ui:65
+msgid "Remote _Desktop"
+msgstr ""
 
-#: panels/sharing/sharing.ui:190
+#: panels/sharing/cc-sharing-panel.ui:72
 msgid "_Media Sharing"
 msgstr "Co-roinneadh _mheadhanan"
 
-#: panels/sharing/sharing.ui:233
+#: panels/sharing/cc-sharing-panel.ui:79
 msgid "_Remote Login"
 msgstr "Clà_radh a-steach cèin"
 
-#: panels/sharing/sharing.ui:272
-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 air an lìonra."
-
-#: panels/sharing/sharing.ui:286 panels/sharing/sharing.ui:413
+#: panels/sharing/cc-sharing-panel.ui:92
 msgid "File Sharing"
 msgstr "Co-roinneadh fhaidhlichean"
 
-#: panels/sharing/sharing.ui:333
+#: panels/sharing/cc-sharing-panel.ui:138
 msgid "_Require Password"
 msgstr "Ia_rr facal-faire"
 
-#: panels/sharing/sharing.ui:424 panels/sharing/sharing.ui:496
+#: panels/sharing/cc-sharing-panel.ui:195
+#: panels/sharing/cc-sharing-panel.ui:231
 msgid "Remote Login"
 msgstr "Clàradh a-steach cèin"
 
-#: panels/sharing/sharing.ui:519 panels/sharing/sharing.ui:765
-msgid "Screen Sharing"
-msgstr "Co-roinneadh sgrìnichean"
+#: panels/sharing/cc-sharing-panel.ui:250
+#: panels/sharing/cc-sharing-panel.ui:267
+#, fuzzy
+#| msgid "Remote Login"
+msgid "Remote Desktop"
+msgstr "Clàradh a-steach cèin"
+
+#: panels/sharing/cc-sharing-panel.ui:263
+msgid ""
+"Remote desktop allows viewing and controlling your desktop from another "
+"computer."
+msgstr ""
+
+#: panels/sharing/cc-sharing-panel.ui:268
+#, fuzzy
+#| msgid "Enable or disable remote login"
+msgid "Enable or disable remote desktop connections to this computer."
+msgstr "Cuir an comas no à comas clàradh a-steach cèin"
+
+#: panels/sharing/cc-sharing-panel.ui:280
+#, fuzzy
+#| msgid "_Allow Remote Control"
+msgid "Remote Control"
+msgstr "Ce_adaich smachd cèin"
 
-#: panels/sharing/sharing.ui:577
-msgid "_Allow connections to control the screen"
+#: panels/sharing/cc-sharing-panel.ui:281
+#, fuzzy
+#| msgid "_Allow connections to control the screen"
+msgid "Allows remote connections to control the screen."
 msgstr "Leig le ce_anglaichean an sgrìn a stiùireadh"
 
-#: panels/sharing/sharing.ui:622
-msgid "_Password:"
-msgstr "_Facal-faire:"
+#: panels/sharing/cc-sharing-panel.ui:294
+#, fuzzy
+#| msgid "Not connected"
+msgid "How to Connect"
+msgstr "Chan eil ceangal ann"
 
-#: panels/sharing/sharing.ui:652
-msgid "_Show Password"
-msgstr "_Seall am facal-faire"
+#: panels/sharing/cc-sharing-panel.ui:295
+msgid ""
+"Connect to this computer using the device name or remote desktop address."
+msgstr ""
 
-#: panels/sharing/sharing.ui:683
-msgid "Access Options"
-msgstr "Roghainnean inntrigidh"
+#: panels/sharing/cc-sharing-panel.ui:323
+#, fuzzy
+#| msgid "Delete Address"
+msgid "Remote Desktop Address"
+msgstr "Sguab às an seòladh"
 
-#: panels/sharing/sharing.ui:697
-msgid "_New connections must ask for access"
-msgstr "Feumaidh ceanglaichean ùra cead-i_nntrigidh iarraidh"
+#: panels/sharing/cc-sharing-panel.ui:350
+#, fuzzy
+#| msgid "Au_thentication"
+msgid "Authentication"
+msgstr "D_earbhadh"
 
-#: panels/sharing/sharing.ui:715
-msgid "_Require a password"
-msgstr "Ia_rr facal-faire"
+#: panels/sharing/cc-sharing-panel.ui:351
+msgid "The user name and password are required to connect to this computer."
+msgstr ""
+
+#: panels/sharing/cc-sharing-panel.ui:355
+#, fuzzy
+#| msgid "Username"
+msgid "User Name"
+msgstr "Ainm-cleachdaiche"
+
+#: panels/sharing/cc-sharing-panel.ui:401
+msgid "Verify Encryption"
+msgstr ""
 
-#: panels/sharing/sharing.ui:776 panels/sharing/sharing.ui:870
+#: panels/sharing/cc-sharing-panel.ui:430
+#, fuzzy
+#| msgid "Enrolling fingerprints"
+msgid "Encryption Fingerprint"
+msgstr "A’ clàradh nam meur-lorgan"
+
+#: panels/sharing/cc-sharing-panel.ui:431
+msgid ""
+"The encryption fingerprint can be seen in connecting clients and should be "
+"identical"
+msgstr ""
+
+#: panels/sharing/cc-sharing-panel.ui:463
 msgid "Media Sharing"
 msgstr "Co-roinneadh mheadhanan"
 
-#: panels/sharing/sharing.ui:809
+#: panels/sharing/cc-sharing-panel.ui:485
 msgid "Share music, photos and videos over the network."
 msgstr "Co-roinn ceòl, dealbhan is videothan air an lìonra."
 
-#: panels/sharing/sharing.ui:824
+#: panels/sharing/cc-sharing-panel.ui:498
 msgid "Folders"
 msgstr "Pasgain"
 
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
-msgid "Sound"
-msgstr "Fuaim"
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
+msgid "Control what you want to share with others"
+msgstr "Stiùirich na cho-roinneas tu le daoine eile"
 
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
-msgid "Change sound levels, inputs, outputs, and alert sounds"
-msgstr "Atharraich ìre na fuaime, fuaimean ion-chuir, às-chuir is chaismeachdan"
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
+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;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
-msgid "multimedia-volume-control"
-msgstr "multimedia-volume-control"
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
+msgid "Enable or disable remote login"
+msgstr "Cuir an comas no à comas clàradh a-steach cèin"
 
-#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:20
-msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
-msgstr "Cairt;Micreofon;Àirde na fuaime;Crìonadh;Cothrom;Bluetooth;Headset;Fuaim;"
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
+msgid "Authentication is required to enable or disable remote login"
+msgstr ""
+"Tha feum air dearbhadh mus gabh clàradh cèin a chur an comas no à comas"
+
+#: panels/sound/cc-alert-chooser.c:150
+msgid "Custom"
+msgstr "Gnàthaichte"
 
-#. Translators: This is the name of an audio file that sounds like the bark of a dog.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:6
+#: panels/sound/cc-alert-chooser.ui:12
 msgid "Bark"
 msgstr "Comhartaich"
 
-#. Translators: This is the name of an audio file that sounds like a water drip.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:12
+#: panels/sound/cc-alert-chooser.ui:20
 msgid "Drip"
 msgstr "Friog-frag"
 
-#. Translators: This is the name of an audio file that sounds like tapping glass.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:18
+#: panels/sound/cc-alert-chooser.ui:28
 msgid "Glass"
 msgstr "Glainne"
 
-#. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:24
+#: panels/sound/cc-alert-chooser.ui:36
 msgid "Sonar"
 msgstr "Sònar"
 
-#: panels/sound/gvc-balance-bar.c:104
-msgctxt "balance"
-msgid "Left"
-msgstr "Clì"
-
-#: panels/sound/gvc-balance-bar.c:105
-msgctxt "balance"
-msgid "Right"
-msgstr "Deas"
-
-#: panels/sound/gvc-balance-bar.c:108
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:13
+#, fuzzy
+#| msgctxt "balance"
+#| msgid "Rear"
 msgid "Rear"
 msgstr "Deireadh"
 
-#: panels/sound/gvc-balance-bar.c:109
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:15
+#, fuzzy
+#| msgctxt "balance"
+#| msgid "Front"
 msgid "Front"
 msgstr "Beulaibh"
 
-#: panels/sound/gvc-balance-bar.c:112
-msgctxt "balance"
-msgid "Minimum"
-msgstr "As lugha"
-
-#: panels/sound/gvc-balance-bar.c:113
-msgctxt "balance"
-msgid "Maximum"
-msgstr "As motha"
-
-#: panels/sound/gvc-balance-bar.c:288
-msgid "_Balance:"
-msgstr "Cothro_m:"
-
-#: panels/sound/gvc-balance-bar.c:291
-msgid "_Fade:"
-msgstr "_Crìonadh:"
-
-#: panels/sound/gvc-balance-bar.c:294
-msgid "_Subwoofer:"
-msgstr "Sub_woofer:"
-
-#: panels/sound/gvc-channel-bar.c:610 panels/sound/gvc-channel-bar.c:619
-msgctxt "volume"
-msgid "100%"
-msgstr "100%"
+#: panels/sound/cc-output-test-dialog.c:134
+#, fuzzy, c-format
+#| msgid "Settings"
+msgid "Testing %s"
+msgstr "Roghainnean"
 
-#: panels/sound/gvc-channel-bar.c:614
-msgctxt "volume"
-msgid "Unamplified"
-msgstr "Gun amplachadh"
+#: panels/sound/cc-output-test-dialog.ui:131
+msgid "Click a speaker to test"
+msgstr ""
 
-#: panels/sound/gvc-combo-box.c:166 panels/sound/gvc-mixer-dialog.c:253
-#: panels/sound/gvc-mixer-dialog.c:520
-msgid "_Profile:"
-msgstr "_Pròifil:"
+#: panels/sound/cc-sound-panel.ui:8
+#, fuzzy
+#| msgid "System Sounds"
+msgid "System Volume"
+msgstr "Fuaimean an t-siostaim"
 
-#: panels/sound/gvc-mixer-dialog.c:255
-msgid "_Test Speakers"
-msgstr "Cuir na glaodhairean _fo dheuchainn"
+#: panels/sound/cc-sound-panel.ui:25
+#, fuzzy
+#| msgid "Volume mute"
+msgid "Volume Levels"
+msgstr "Mùch an fhuaim"
 
-#: panels/sound/gvc-mixer-dialog.c:424
-msgid "Peak detect"
-msgstr "Lorg am mullach"
+#: panels/sound/cc-sound-panel.ui:35
+msgid "Output"
+msgstr "Às-chur"
 
-#: panels/sound/gvc-mixer-dialog.c:1499
-msgid "Device"
-msgstr "Uidheam"
+#: panels/sound/cc-sound-panel.ui:56
+#, fuzzy
+#| msgid "_Output volume:"
+msgid "Output Device"
+msgstr "Àirde fuaim a_n às-chuir:"
 
-#: panels/sound/gvc-mixer-dialog.c:1562
-#, c-format
-msgid "Speaker Testing for %s"
-msgstr "Cuir na glaodhairean airson %s fo dheuchainn"
+#: panels/sound/cc-sound-panel.ui:75
+msgid "Test"
+msgstr "Cuir fo dheuchainn"
 
-#: panels/sound/gvc-mixer-dialog.c:1617
-msgid "_Output volume:"
-msgstr "Àirde fuaim a_n às-chuir:"
+#: panels/sound/cc-sound-panel.ui:104 panels/sound/cc-sound-panel.ui:263
+#, fuzzy
+#| msgid "_Configuration URL"
+msgid "Configuration"
+msgstr "An URL _rèiteachaidh"
 
-#: panels/sound/gvc-mixer-dialog.c:1631
-msgid "Output"
-msgstr "Às-chur"
+#: panels/sound/cc-sound-panel.ui:135
+#, fuzzy
+#| msgid "_Balance:"
+msgid "Balance"
+msgstr "Cothro_m:"
 
-#: panels/sound/gvc-mixer-dialog.c:1636
-msgid "C_hoose a device for sound output:"
-msgstr "T_agh uidheam airson às-chur na fuaime:"
+#: panels/sound/cc-sound-panel.ui:161
+#, fuzzy
+#| msgid "_Fade:"
+msgid "Fade"
+msgstr "_Crìonadh:"
 
-#: panels/sound/gvc-mixer-dialog.c:1658
-msgid "Settings for the selected device:"
-msgstr "Roghainnean an uidheim a thagh thu:"
+#: panels/sound/cc-sound-panel.ui:187
+msgid "Subwoofer"
+msgstr "Subwoofer"
 
-#: panels/sound/gvc-mixer-dialog.c:1669
+#: panels/sound/cc-sound-panel.ui:205
 msgid "Input"
 msgstr "Ion-chur"
 
-#: panels/sound/gvc-mixer-dialog.c:1676
-msgid "_Input volume:"
-msgstr "Àirde fuaim an i_on-chuir:"
-
-#: panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input level:"
+#: panels/sound/cc-sound-panel.ui:226
+#, fuzzy
+#| msgid "Input level:"
+msgid "Input Device"
 msgstr "Ìre an ion-chuir:"
 
-#: panels/sound/gvc-mixer-dialog.c:1723
-msgid "C_hoose a device for sound input:"
-msgstr "T_agh uidheam airson ion-chur fuaime:"
-
-#: panels/sound/gvc-mixer-dialog.c:1747
-msgid "Sound Effects"
-msgstr "Èifeachdan fuaime"
+#: panels/sound/cc-sound-panel.ui:294
+#, fuzzy
+#| msgid "Volume up"
+msgid "Volume"
+msgstr "Cuir an fhuaim an àirde"
 
-#: panels/sound/gvc-mixer-dialog.c:1754
-msgid "_Alert volume:"
+#: panels/sound/cc-sound-panel.ui:312
+#, fuzzy
+#| msgid "_Alert volume:"
+msgid "Alert Sound"
 msgstr "Àirde _fuaim nan rabhadh:"
 
-#: panels/sound/gvc-mixer-dialog.c:1775
-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."
+#: panels/sound/cc-volume-slider.c:117
+msgctxt "volume"
+msgid "100%"
+msgstr "100%"
 
-#: panels/sound/gvc-sound-theme-chooser.c:187
-msgid "Built-in"
-msgstr "’Na bhroinn o thùs"
+#: panels/sound/gnome-sound-panel.desktop.in.in:3
+msgid "Sound"
+msgstr "Fuaim"
 
-#: panels/sound/gvc-sound-theme-chooser.c:446
-#: panels/sound/gvc-sound-theme-chooser.c:458
-#: panels/sound/gvc-sound-theme-chooser.c:470
-msgid "Sound Preferences"
-msgstr "Roghainnean na fuaime"
+#: panels/sound/gnome-sound-panel.desktop.in.in:4
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr ""
+"Atharraich ìre na fuaime, fuaimean ion-chuir, às-chuir is chaismeachdan"
 
-#: panels/sound/gvc-sound-theme-chooser.c:449
-#: panels/sound/gvc-sound-theme-chooser.c:460
-#: panels/sound/gvc-sound-theme-chooser.c:472
-msgid "Testing event sound"
-msgstr "A’ cur na fuaime fo dheuchainn"
+#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/sound/gnome-sound-panel.desktop.in.in:20
+#, fuzzy
+#| msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+msgid ""
+"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;Output;Input;"
+msgstr ""
+"Cairt;Micreofon;Àirde na fuaime;Crìonadh;Cothrom;Bluetooth;Headset;Fuaim;"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:92
+#: panels/thunderbolt/cc-bolt-device-entry.c:123
+#, fuzzy
+#| msgid "Disconnecting"
+msgctxt "Thunderbolt Device Status"
+msgid "Disconnected"
+msgstr "A’ briseadh a’ cheangail"
 
-#: panels/sound/gvc-sound-theme-chooser.c:544
-#: panels/wacom/wacom-stylus-page.ui:25
-msgid "Default"
-msgstr "Bun-roghainn"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:95
+#: panels/thunderbolt/cc-bolt-device-entry.c:126
+#, fuzzy
+#| msgid "Connecting"
+msgctxt "Thunderbolt Device Status"
+msgid "Connecting"
+msgstr "A’ ceangal"
 
-#: panels/sound/gvc-sound-theme-chooser.c:545
-msgid "From theme"
-msgstr "On ùrlar"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:98
+#: panels/thunderbolt/cc-bolt-device-entry.c:130
+#: panels/thunderbolt/cc-bolt-device-entry.c:142
+#, fuzzy
+#| msgid "Connected"
+msgctxt "Thunderbolt Device Status"
+msgid "Connected"
+msgstr "Ceangailte"
 
-#: panels/sound/gvc-sound-theme-chooser.c:720
-msgid "C_hoose an alert sound:"
-msgstr "T_agh fuaim rabhaidh:"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:101
+#, fuzzy
+#| msgid "Authentication required"
+msgctxt "Thunderbolt Device Status"
+msgid "Authorization Error"
+msgstr "Tha feum air dearbhadh"
 
-#: panels/sound/gvc-speaker-test.c:229
-msgid "Stop"
-msgstr "Stad"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:104
+#: panels/thunderbolt/cc-bolt-device-entry.c:136
+msgctxt "Thunderbolt Device Status"
+msgid "Authorizing"
+msgstr ""
 
-#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
-msgid "Test"
-msgstr "Cuir fo dheuchainn"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:111
+msgctxt "Thunderbolt Device Status"
+msgid "Reduced Functionality"
+msgstr ""
 
-#: panels/sound/gvc-speaker-test.c:237
-msgid "Subwoofer"
-msgstr "Subwoofer"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:113
+#, fuzzy
+#| msgid "Connected Devices"
+msgctxt "Thunderbolt Device Status"
+msgid "Connected & Authorized"
+msgstr "Uidheaman a tha ceangailte ris"
 
-#: panels/sound/sound-theme-file-utils.c:288
-msgid "Custom"
-msgstr "Gnàthaichte"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:119
+#: panels/thunderbolt/cc-bolt-device-entry.c:150
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "Thunderbolt Device Status"
+msgid "Unknown"
+msgstr "Chan eil fhios"
 
-#. translators: the labels will read:
-#. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:353
-msgctxt "cursor size"
-msgid "Default"
-msgstr "Bun-roghainn"
+#. Translators: The time point the device was authorized.
+#: panels/thunderbolt/cc-bolt-device-dialog.c:175
+msgid "Authorized at:"
+msgstr ""
 
-#: panels/universal-access/cc-ua-panel.c:356
-msgctxt "cursor size"
-msgid "Medium"
-msgstr "Meadhanach"
+#. Translators: The time point the device was connected.
+#: panels/thunderbolt/cc-bolt-device-dialog.c:181
+#, fuzzy
+#| msgid "Connected"
+msgid "Connected at:"
+msgstr "Ceangailte"
 
-#: panels/universal-access/cc-ua-panel.c:359
-msgctxt "cursor size"
-msgid "Large"
-msgstr "Mòr"
+#. Translators: The time point the device was enrolled,
+#. * i.e. authorized and stored in the device database.
+#: panels/thunderbolt/cc-bolt-device-dialog.c:188
+#, fuzzy
+#| msgid "_Enroll"
+msgid "Enrolled at:"
+msgstr "_Clàraich"
 
-#: panels/universal-access/cc-ua-panel.c:362
-msgctxt "cursor size"
-msgid "Larger"
-msgstr "Nas motha"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:262
+#, fuzzy
+#| msgid "Failed to upload file: %s"
+msgid "Failed to authorize device: "
+msgstr "Cha b’ urrainn dhuinn am faidhle a leanas a luchdadh suas: %s"
 
-#: panels/universal-access/cc-ua-panel.c:365
-msgctxt "cursor size"
-msgid "Largest"
-msgstr "As motha"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:329
+#, fuzzy
+#| msgid "Failed to upload file: %s"
+msgid "Failed to forget device: "
+msgstr "Cha b’ urrainn dhuinn am faidhle a leanas a luchdadh suas: %s"
 
-#: panels/universal-access/cc-ua-panel.c:369
+#: panels/thunderbolt/cc-bolt-device-dialog.c:485
 #, 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"
+msgid "Depends on %u other device"
+msgid_plural "Depends on %u other devices"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:84
+#, fuzzy
+#| msgid "_Name:"
+msgid "Name:"
+msgstr "_Ainm:"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:112
+msgid "Status:"
+msgstr ""
 
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
-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 a bhriogadh"
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:141
+msgid "UUID:"
+msgstr ""
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
-msgid "preferences-desktop-accessibility"
-msgstr "preferences-desktop-accessibility"
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:247
+#, fuzzy
+#| msgid "Automatic _Connect"
+msgid "Authorize and Connect"
+msgstr "_Ceangail gu fèin-obrachail"
 
-#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
-msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"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;dùbailte;briog;briogadh;dàil;taic;priobadh;boillsgeadh;Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:263
+#, fuzzy
+#| msgid "Remove Device"
+msgid "Forget Device"
+msgstr "Thoirt an t-uidheam air falbh"
+
+#: panels/thunderbolt/cc-bolt-device-entry.c:133
+#, fuzzy
+#| msgid "Mirror"
+msgctxt "Thunderbolt Device Status"
+msgid "Error"
+msgstr "Sgàthanaich"
 
-#: panels/universal-access/uap.ui:89
-msgid "_Always Show Universal Access Menu"
-msgstr "Se_all clàr-taice an inntrigidh uile-choitchinn an-còmhnaidh"
+#: panels/thunderbolt/cc-bolt-device-entry.c:144
+#, fuzzy
+#| msgid "Authenticated"
+msgctxt "Thunderbolt Device Status"
+msgid "Authorized"
+msgstr "Air a dhearbhadh"
 
-#: panels/universal-access/uap.ui:131
-msgid "Seeing"
-msgstr "A’ faicinn"
+#: panels/thunderbolt/cc-bolt-panel.c:169
+msgid ""
+"The Thunderbolt subsystem (boltd) is not installed or not set up properly."
+msgstr ""
 
-#: panels/universal-access/uap.ui:177
-msgid "_High Contrast"
-msgstr "Iomsgarad_h àrd"
+#: panels/thunderbolt/cc-bolt-panel.c:425
+#: panels/thunderbolt/cc-bolt-panel.ui:157
+msgid "Allow direct access to devices such as docks and external GPUs."
+msgstr ""
 
-#: panels/universal-access/uap.ui:224
-msgid "_Large Text"
-msgstr "_Teacsa mòr"
+#: panels/thunderbolt/cc-bolt-panel.c:426
+msgid "Only USB and Display Port devices can attach."
+msgstr ""
 
-#: panels/universal-access/uap.ui:269
-msgid "C_ursor Size"
-msgstr "Me_ud a’ chùrsair"
+#: panels/thunderbolt/cc-bolt-panel.c:461
+msgid ""
+"Thunderbolt could not be detected.\n"
+"Either the system lacks Thunderbolt support, it has been disabled in the "
+"BIOS or is set to an unsupported security level in the BIOS."
+msgstr ""
 
-#: panels/universal-access/uap.ui:316
-#: panels/universal-access/zoom-options.ui:98
-msgid "_Zoom"
-msgstr "Sù_m"
+#: panels/thunderbolt/cc-bolt-panel.c:505
+msgid "Thunderbolt support has been disabled in the BIOS."
+msgstr ""
 
-#: panels/universal-access/uap.ui:362
-msgid "Screen _Reader"
-msgstr "Leughadai_r-sgrìn"
+#: panels/thunderbolt/cc-bolt-panel.c:509
+#, fuzzy
+#| msgid "The profile could not be generated."
+msgid "Thunderbolt security level could not be determined."
+msgstr "Cha b’ urrainn dhuinn a’ phròifil a ghintinn."
 
-#: panels/universal-access/uap.ui:408 panels/universal-access/uap.ui:1237
-msgid "_Sound Keys"
-msgstr "_Iuchraichean fuaime"
+#: panels/thunderbolt/cc-bolt-panel.c:614
+#, c-format
+msgid "Error switching direct mode: %s"
+msgstr ""
 
-#: panels/universal-access/uap.ui:470
-msgid "Hearing"
-msgstr "Claisneachd"
+#: panels/thunderbolt/cc-bolt-panel.ui:103
+msgid "No Thunderbolt Support"
+msgstr ""
 
-#: panels/universal-access/uap.ui:514 panels/universal-access/uap.ui:1340
-msgid "_Visual Alerts"
-msgstr "_Rabhaidhean lèirsinneach"
+#: panels/thunderbolt/cc-bolt-panel.ui:104
+#, fuzzy
+#| msgid "Couldn’t connect to the %s domain: %s"
+msgid "Could not connect to the thunderbolt subsystem."
+msgstr "Cha b’ urrainn ceangal ris an àrainn %s: %s"
 
-#: panels/universal-access/uap.ui:622
-msgid "Screen _Keyboard"
-msgstr "Meur-_chlàr air sgrìn"
+#: panels/thunderbolt/cc-bolt-panel.ui:153
+#, fuzzy
+#| msgid "Universal Access"
+msgid "Direct Access"
+msgstr "Inntrigeadh uile-choitcheann"
 
-#: panels/universal-access/uap.ui:667
-msgid "R_epeat Keys"
-msgstr "_Putain ath-dhèanaimh"
+#: panels/thunderbolt/cc-bolt-panel.ui:225
+#, fuzzy
+#| msgid "Add Device"
+msgid "Pending Devices"
+msgstr "Cuir uidheam ris"
 
-#: panels/universal-access/uap.ui:713
-msgid "Cursor _Blinking"
-msgstr "Prio_badh a’ chùrsair"
+#: panels/thunderbolt/cc-bolt-panel.ui:319
+msgid "No devices attached"
+msgstr ""
 
-#: panels/universal-access/uap.ui:759
-msgid "_Typing Assist (AccessX)"
-msgstr "_Cuidiche sgrìobhaidh (AccessX)"
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:3
+msgid "Thunderbolt"
+msgstr ""
 
-#: panels/universal-access/uap.ui:820
-msgid "Pointing & Clicking"
-msgstr "Tomhadh ⁊ briogadh"
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:4
+msgid "Manage Thunderbolt devices"
+msgstr ""
 
-#: panels/universal-access/uap.ui:866
-msgid "_Mouse Keys"
-msgstr "I_uchraichean luchaige"
+#. Translators: those are keywords for the thunderbolt control-center panel. Do NOT translate or localize 
the semicolons! The list MUST also end with a semicolon!
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:19
+msgid "Thunderbolt;privacy;"
+msgstr ""
 
-#: panels/universal-access/uap.ui:911
-msgid "_Click Assist"
-msgstr "Taic le _briogadh"
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:5
+msgid "Cursor Blinking"
+msgstr "Priobadh a’ chùrsair"
 
-#: panels/universal-access/uap.ui:957
-msgid "_Double-Click Delay"
-msgstr "_Dàil air a’ bhriogadh dùbailte"
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:29
+msgid "Cursor blinks in text fields."
+msgstr "Bidh an cùrsair a’ priobadh ann an raointean teacsa."
 
-#: panels/universal-access/uap.ui:977
-msgid "Double-Click Delay"
-msgstr "Dàil air a’ bhriogadh dùbailte"
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:62
+#: panels/universal-access/cc-repeat-keys-dialog.ui:117
+msgid "Speed"
+msgstr "Luaths"
 
-#: panels/universal-access/uap.ui:1042
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:84
+msgid "Cursor blinking speed"
+msgstr "Luaths priobadh a’ chùrsair"
+
+#: panels/universal-access/cc-cursor-size-dialog.ui:5
 msgid "Cursor Size"
 msgstr "Meud a’ chùrsair"
 
-#: panels/universal-access/uap.ui:1069
+#: panels/universal-access/cc-cursor-size-dialog.ui:22
 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."
+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:1105
-msgid "Screen Reader"
-msgstr "Leughadair-sgrìn"
+#: panels/universal-access/cc-pointing-dialog.ui:5
+msgid "Click Assist"
+msgstr "Taic le briogadh"
 
-#: panels/universal-access/uap.ui:1122
-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."
+#: panels/universal-access/cc-pointing-dialog.ui:38
+msgid "_Simulated Secondary Click"
+msgstr "Dàrnacha briogadh ma_s-fhìor"
+
+#: panels/universal-access/cc-pointing-dialog.ui:49
+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"
 
-#: panels/universal-access/uap.ui:1155
-msgid "_Screen Reader"
-msgstr "Leughadair-_sgrìn"
+#: panels/universal-access/cc-pointing-dialog.ui:66
+#: panels/universal-access/cc-typing-dialog.ui:123
+#: panels/universal-access/cc-typing-dialog.ui:230
+msgid "A_cceptance delay:"
+msgstr "Dàil g_abhail ris:"
 
-#: panels/universal-access/uap.ui:1194
-msgid "Sound Keys"
-msgstr "Iuchraichean fuaime"
+#: panels/universal-access/cc-pointing-dialog.ui:78
+msgctxt "secondary click"
+msgid "Short"
+msgstr "Goirid"
 
-#: panels/universal-access/uap.ui:1212
-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/cc-pointing-dialog.ui:90
+msgid "Secondary click delay"
+msgstr "An dàil air an dàrnacha briogadh"
 
-#: panels/universal-access/uap.ui:1282
-msgid "Visual Alerts"
-msgstr "Rabhaidhean lèirsinneach"
+#: panels/universal-access/cc-pointing-dialog.ui:97
+msgctxt "secondary click delay"
+msgid "Long"
+msgstr "Fada"
 
-#: panels/universal-access/uap.ui:1286
-msgid "_Test flash"
-msgstr "_Boillsgeadh deuchainne"
+#: panels/universal-access/cc-pointing-dialog.ui:126
+msgid "_Hover Click"
+msgstr "Briogadh _fantainn"
 
-#: panels/universal-access/uap.ui:1315
-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/cc-pointing-dialog.ui:137
+msgid "Trigger a click when the pointer hovers"
+msgstr "Dùisg briogadh nuair a dh’fhanas an tomhaire os cionn rud"
+
+#: panels/universal-access/cc-pointing-dialog.ui:154
+msgid "D_elay:"
+msgstr "_Dàil:"
 
-#: panels/universal-access/uap.ui:1366
-msgid "Flash the _window title"
-msgstr "Boillsg tiotal na _h-uinneige"
+#: panels/universal-access/cc-pointing-dialog.ui:166
+msgctxt "dwell click delay"
+msgid "Short"
+msgstr "Goirid"
 
-#: panels/universal-access/uap.ui:1384
-msgid "Flash the entire _screen"
-msgstr "Boillsg an _sgrìn gu lèir"
+#: panels/universal-access/cc-pointing-dialog.ui:184
+msgctxt "dwell click delay"
+msgid "Long"
+msgstr "Fada"
+
+#: panels/universal-access/cc-pointing-dialog.ui:201
+msgid "Motion _threshold:"
+msgstr "_Starsnaich gluasaid:"
+
+#: panels/universal-access/cc-pointing-dialog.ui:213
+msgctxt "dwell click threshold"
+msgid "Small"
+msgstr "Beag"
 
-#: panels/universal-access/uap.ui:1429
+#: panels/universal-access/cc-pointing-dialog.ui:231
+msgctxt "dwell click threshold"
+msgid "Large"
+msgstr "Mòr"
+
+#: panels/universal-access/cc-repeat-keys-dialog.ui:5
 msgid "Repeat Keys"
 msgstr "Putain ath-dhèanaimh"
 
-#: panels/universal-access/uap.ui:1459
+#: panels/universal-access/cc-repeat-keys-dialog.ui:29
 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:1538
+#: panels/universal-access/cc-repeat-keys-dialog.ui:85
 msgid "Repeat keys delay"
 msgstr "Dàil nam putan ath-dhèanaimh"
 
-#: panels/universal-access/uap.ui:1586 panels/universal-access/uap.ui:1719
-msgid "Speed"
-msgstr "Luaths"
-
-#: panels/universal-access/uap.ui:1623
+#: panels/universal-access/cc-repeat-keys-dialog.ui:141
 msgid "Repeat keys speed"
 msgstr "Astar nam putan ath-dhèanaimh"
 
-#: panels/universal-access/uap.ui:1647
-msgid "Cursor Blinking"
-msgstr "Priobadh a’ chùrsair"
-
-#: panels/universal-access/uap.ui:1677
-msgid "Cursor blinks in text fields."
-msgstr "Bidh an cùrsair a’ priobadh ann an raointean teacsa."
-
-#: panels/universal-access/uap.ui:1756
-msgid "Cursor blinking speed"
-msgstr "Luaths priobadh a’ chùrsair"
-
-#: panels/universal-access/uap.ui:1792
+#: panels/universal-access/cc-typing-dialog.ui:4
 msgid "Typing Assist"
 msgstr "An cuidiche sgrìobhaidh"
 
-#: panels/universal-access/uap.ui:1831
+#: panels/universal-access/cc-typing-dialog.ui:41
 msgid "_Sticky Keys"
 msgstr "Iuchraichean _steigeach"
 
-#: panels/universal-access/uap.ui:1848
+#: panels/universal-access/cc-typing-dialog.ui:51
 msgid "Treats a sequence of modifier keys as a key combination"
-msgstr "Làimhsichidh seo sreath de dh’iuchraichean atharrachaidh mar cho-iuchraichean"
+msgstr ""
+"Làimhsichidh seo sreath de dh’iuchraichean atharrachaidh mar cho-iuchraichean"
 
-#: panels/universal-access/uap.ui:1872
+#: panels/universal-access/cc-typing-dialog.ui:63
 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:1890
+#: panels/universal-access/cc-typing-dialog.ui:71
 msgid "Beep when a _modifier key is pressed"
 msgstr "_Bìd nuair a bhios iuchair atharrachaidh ’ga bhrùthadh"
 
-#: panels/universal-access/uap.ui:1938
+#: panels/universal-access/cc-typing-dialog.ui:96
 msgid "S_low Keys"
 msgstr "Putanan s_laodach"
 
-#: panels/universal-access/uap.ui:1955
+#: panels/universal-access/cc-typing-dialog.ui:106
 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:1988 panels/universal-access/uap.ui:2201
-#: panels/universal-access/uap.ui:2538
-msgid "A_cceptance delay:"
-msgstr "Dàil g_abhail ris:"
+msgstr ""
+"Cuiridh seo dàil eadar brùthadh iuchrach is cuin a ghabhas an siostam ris"
 
-#: panels/universal-access/uap.ui:2010
+#: panels/universal-access/cc-typing-dialog.ui:135
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Goirid"
 
-#: panels/universal-access/uap.ui:2029
+#: panels/universal-access/cc-typing-dialog.ui:147
 msgid "Slow keys typing delay"
 msgstr "Dàil clò-sgrìobhadh nam putan slaodach"
 
-#: panels/universal-access/uap.ui:2044
+#: panels/universal-access/cc-typing-dialog.ui:154
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Fada"
 
-#: panels/universal-access/uap.ui:2071
+#: panels/universal-access/cc-typing-dialog.ui:166
 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:2088
+#: panels/universal-access/cc-typing-dialog.ui:173
 msgid "Beep when a key is _accepted"
 msgstr "Dèan bìd _nuair a ghabhar ri iuchair"
 
-#: panels/universal-access/uap.ui:2105 panels/universal-access/uap.ui:2284
+#: panels/universal-access/cc-typing-dialog.ui:180
+#: panels/universal-access/cc-typing-dialog.ui:273
 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:2151
+#: panels/universal-access/cc-typing-dialog.ui:203
 msgid "_Bounce Keys"
 msgstr "_Putanan bocaidh"
 
-#: panels/universal-access/uap.ui:2168
+#: panels/universal-access/cc-typing-dialog.ui:213
 msgid "Ignores fast duplicate keypresses"
 msgstr "Leigidh seo seachad iuchraichean a thèid ath-bhrùthadh gu luath"
 
-#: panels/universal-access/uap.ui:2223
+#: panels/universal-access/cc-typing-dialog.ui:242
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Goirid"
 
-#: panels/universal-access/uap.ui:2242
+#: panels/universal-access/cc-typing-dialog.ui:254
 msgid "Bounce keys typing delay"
 msgstr "Dàil clò-sgrìobhadh air na putanan bocaidh"
 
-#: panels/universal-access/uap.ui:2257
+#: panels/universal-access/cc-typing-dialog.ui:261
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Fada"
 
-#: panels/universal-access/uap.ui:2370
+#: panels/universal-access/cc-typing-dialog.ui:326
 msgid "_Enable by Keyboard"
 msgstr "Cuir an comas l_eis a’ mheur-chlàr"
 
-#: panels/universal-access/uap.ui:2387
+#: panels/universal-access/cc-typing-dialog.ui:336
 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:2451
-msgid "Click Assist"
-msgstr "Taic le briogadh"
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: panels/universal-access/cc-ua-panel.c:356
+msgctxt "cursor size"
+msgid "Default"
+msgstr "Bun-roghainn"
 
-#: panels/universal-access/uap.ui:2487
-msgid "_Simulated Secondary Click"
-msgstr "Dàrnacha briogadh ma_s-fhìor"
+#: panels/universal-access/cc-ua-panel.c:359
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "Meadhanach"
 
-#: panels/universal-access/uap.ui:2505
-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"
+#: panels/universal-access/cc-ua-panel.c:362
+msgctxt "cursor size"
+msgid "Large"
+msgstr "Mòr"
 
-#: panels/universal-access/uap.ui:2559
-msgctxt "secondary click"
-msgid "Short"
-msgstr "Goirid"
+#: panels/universal-access/cc-ua-panel.c:365
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "Nas motha"
 
-#: panels/universal-access/uap.ui:2578
-msgid "Secondary click delay"
-msgstr "An dàil air an dàrnacha briogadh"
+#: panels/universal-access/cc-ua-panel.c:368
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "As motha"
 
-#: panels/universal-access/uap.ui:2593
-msgctxt "secondary click delay"
-msgid "Long"
-msgstr "Fada"
+#: panels/universal-access/cc-ua-panel.c:372
+#, 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"
 
-#: panels/universal-access/uap.ui:2650
-msgid "_Hover Click"
-msgstr "Briogadh _fantainn"
+#: panels/universal-access/cc-ua-panel.ui:17
+#, fuzzy
+#| msgid "_Always Show Universal Access Menu"
+msgid "_Always Show Accessibility Menu"
+msgstr "Se_all clàr-taice an inntrigidh uile-choitchinn an-còmhnaidh"
 
-#: panels/universal-access/uap.ui:2668
-msgid "Trigger a click when the pointer hovers"
-msgstr "Dùisg briogadh nuair a dh’fhanas an tomhaire os cionn rud"
+#: panels/universal-access/cc-ua-panel.ui:31
+msgid "Seeing"
+msgstr "A’ faicinn"
 
-#: panels/universal-access/uap.ui:2701
-msgid "D_elay:"
-msgstr "_Dàil:"
+#: panels/universal-access/cc-ua-panel.ui:34
+msgid "_High Contrast"
+msgstr "Iomsgarad_h àrd"
 
-#: panels/universal-access/uap.ui:2723
-msgctxt "dwell click delay"
-msgid "Short"
-msgstr "Goirid"
+#: panels/universal-access/cc-ua-panel.ui:46
+msgid "_Large Text"
+msgstr "_Teacsa mòr"
 
-#: panels/universal-access/uap.ui:2754
-msgctxt "dwell click delay"
-msgid "Long"
-msgstr "Fada"
+#: panels/universal-access/cc-ua-panel.ui:58
+msgid "Enable A_nimations"
+msgstr ""
 
-#: panels/universal-access/uap.ui:2790
-msgid "Motion _threshold:"
-msgstr "_Starsnaich gluasaid:"
+#: panels/universal-access/cc-ua-panel.ui:70
+msgid "Screen _Reader"
+msgstr "Leughadai_r-sgrìn"
 
-#: panels/universal-access/uap.ui:2812
-msgctxt "dwell click threshold"
-msgid "Small"
-msgstr "Beag"
+#: panels/universal-access/cc-ua-panel.ui:71
+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."
 
-#: panels/universal-access/uap.ui:2843
-msgctxt "dwell click threshold"
-msgid "Large"
-msgstr "Mòr"
+#: panels/universal-access/cc-ua-panel.ui:83
+msgid "_Sound Keys"
+msgstr "_Iuchraichean fuaime"
+
+#: panels/universal-access/cc-ua-panel.ui:84
+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/cc-ua-panel.ui:96
+msgid "C_ursor Size"
+msgstr "Me_ud a’ chùrsair"
+
+#: panels/universal-access/cc-ua-panel.ui:116
+#: panels/universal-access/cc-zoom-options-dialog.ui:82
+msgid "_Zoom"
+msgstr "Sù_m"
+
+#: panels/universal-access/cc-ua-panel.ui:138
+msgid "Hearing"
+msgstr "Claisneachd"
+
+#: panels/universal-access/cc-ua-panel.ui:141
+#: panels/universal-access/cc-visual-alerts-dialog.ui:54
+msgid "_Visual Alerts"
+msgstr "_Rabhaidhean lèirsinneach"
+
+#: panels/universal-access/cc-ua-panel.ui:166
+msgid "Screen _Keyboard"
+msgstr "Meur-_chlàr air sgrìn"
+
+#: panels/universal-access/cc-ua-panel.ui:178
+msgid "R_epeat Keys"
+msgstr "_Putain ath-dhèanaimh"
+
+#: panels/universal-access/cc-ua-panel.ui:198
+msgid "Cursor _Blinking"
+msgstr "Prio_badh a’ chùrsair"
+
+#: panels/universal-access/cc-ua-panel.ui:218
+msgid "_Typing Assist (AccessX)"
+msgstr "_Cuidiche sgrìobhaidh (AccessX)"
+
+#: panels/universal-access/cc-ua-panel.ui:240
+#, fuzzy
+#| msgid "Pointing & Clicking"
+msgid "Pointing &amp; Clicking"
+msgstr "Tomhadh ⁊ briogadh"
+
+#: panels/universal-access/cc-ua-panel.ui:243
+msgid "_Mouse Keys"
+msgstr "I_uchraichean an luch-chlàir"
+
+#: panels/universal-access/cc-ua-panel.ui:255
+#, fuzzy
+#| msgid "Remove Printer"
+msgid "_Locate Pointer"
+msgstr "Thoir air falbh an clò-bhualadair"
+
+#: panels/universal-access/cc-ua-panel.ui:267
+msgid "_Click Assist"
+msgstr "Taic le _briogadh"
+
+#: panels/universal-access/cc-ua-panel.ui:287
+msgid "_Double-Click Delay"
+msgstr "_Dàil air a’ bhriogadh dùbailte"
+
+#: panels/universal-access/cc-ua-panel.ui:297
+msgid "Double-Click Delay"
+msgstr "Dàil air a’ bhriogadh dùbailte"
+
+#: panels/universal-access/cc-visual-alerts-dialog.ui:5
+msgid "Visual Alerts"
+msgstr "Rabhaidhean lèirsinneach"
+
+#: panels/universal-access/cc-visual-alerts-dialog.ui:14
+msgid "_Test flash"
+msgstr "_Boillsgeadh deuchainne"
+
+#: panels/universal-access/cc-visual-alerts-dialog.ui:38
+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/cc-visual-alerts-dialog.ui:74
+msgid "Flash the entire _screen"
+msgstr "Boillsg an _sgrìn gu lèir"
 
-#: panels/universal-access/zoom-options.c:333
+#: panels/universal-access/cc-visual-alerts-dialog.ui:86
+#, fuzzy
+#| msgid "Flash the entire _screen"
+msgid "Flash the entire _window"
+msgstr "Boillsg an _sgrìn gu lèir"
+
+#: panels/universal-access/cc-zoom-options-dialog.c:306
 msgctxt "Distance"
 msgid "Short"
 msgstr "Goirid"
 
-#: panels/universal-access/zoom-options.c:334
+#: panels/universal-access/cc-zoom-options-dialog.c:307
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ dhen sgrìn"
 
-#: panels/universal-access/zoom-options.c:335
+#: panels/universal-access/cc-zoom-options-dialog.c:308
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ dhen sgrìn"
 
-#: panels/universal-access/zoom-options.c:336
+#: panels/universal-access/cc-zoom-options-dialog.c:309
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ dhen sgrìn"
 
-#: panels/universal-access/zoom-options.c:337
+#: panels/universal-access/cc-zoom-options-dialog.c:310
 msgctxt "Distance"
 msgid "Long"
 msgstr "Fada"
 
-#: panels/universal-access/zoom-options.ui:48
+#: panels/universal-access/cc-zoom-options-dialog.ui:40
 msgid "Full Screen"
 msgstr "Làn-sgrìn"
 
-#: panels/universal-access/zoom-options.ui:53
+#: panels/universal-access/cc-zoom-options-dialog.ui:45
 msgid "Top Half"
 msgstr "An leth gu h-àrd"
 
-#: panels/universal-access/zoom-options.ui:58
+#: panels/universal-access/cc-zoom-options-dialog.ui:50
 msgid "Bottom Half"
 msgstr "An leth gu h-ìosal"
 
-#: panels/universal-access/zoom-options.ui:63
+#: panels/universal-access/cc-zoom-options-dialog.ui:55
 msgid "Left Half"
 msgstr "An leth chlì"
 
-#: panels/universal-access/zoom-options.ui:68
+#: panels/universal-access/cc-zoom-options-dialog.ui:60
 msgid "Right Half"
 msgstr "An leth dheas"
 
-#: panels/universal-access/zoom-options.ui:77
+#: panels/universal-access/cc-zoom-options-dialog.ui:68
 msgid "Zoom Options"
 msgstr "Roghainnean an t-sùm"
 
-#: panels/universal-access/zoom-options.ui:186
+#: panels/universal-access/cc-zoom-options-dialog.ui:119
 msgid "_Magnification:"
 msgstr "_Meudachadh:"
 
-#: panels/universal-access/zoom-options.ui:250
+#: panels/universal-access/cc-zoom-options-dialog.ui:146
+msgid "Magnifier Position:"
+msgstr "Ionad a’ mheudaicheir:"
+
+#: panels/universal-access/cc-zoom-options-dialog.ui:163
 msgid "_Follow mouse cursor"
 msgstr "_Lean ri cùrsair na luchaige"
 
-#: panels/universal-access/zoom-options.ui:270
+#: panels/universal-access/cc-zoom-options-dialog.ui:174
 msgid "_Screen part:"
 msgstr "A’ phàirt dhen _sgrìn:"
 
-#: panels/universal-access/zoom-options.ui:332
+#: panels/universal-access/cc-zoom-options-dialog.ui:208
 msgid "Magnifier _extends outside of screen"
 msgstr "Thèid am m_eudaichear a-mach air an sgrìn"
 
-#: panels/universal-access/zoom-options.ui:351
+#: panels/universal-access/cc-zoom-options-dialog.ui:215
 msgid "_Keep magnifier cursor centered"
 msgstr "_Cum cùrsair a’ mheudaicheir sa mheadhan"
 
-#: panels/universal-access/zoom-options.ui:370
+#: panels/universal-access/cc-zoom-options-dialog.ui:223
 msgid "Magnifier cursor _pushes contents around"
 msgstr "_Gluaisidh cùrsair a’ mheudaicheir susbaint mun cuairt"
 
-#: panels/universal-access/zoom-options.ui:389
+#: panels/universal-access/cc-zoom-options-dialog.ui:231
 msgid "Magnifier cursor moves with _contents"
 msgstr "Gluaisidh cùrsair a’ mheudaicheir mun _cuairt leis an t-susbaint"
 
-#: panels/universal-access/zoom-options.ui:423
-msgid "Magnifier Position:"
-msgstr "Ionad a’ mheudaicheir:"
-
-#: panels/universal-access/zoom-options.ui:444
+#: panels/universal-access/cc-zoom-options-dialog.ui:247
 msgid "Magnifier"
 msgstr "Am meudaichear"
 
-#: panels/universal-access/zoom-options.ui:490
+#: panels/universal-access/cc-zoom-options-dialog.ui:267
+msgid "_Crosshairs:"
+msgstr "_Crois-ribeachan:"
+
+#: panels/universal-access/cc-zoom-options-dialog.ui:284
+msgid "_Overlaps mouse cursor"
+msgstr "A’ dol a-steach air cùrsair na _luchaige"
+
+#: panels/universal-access/cc-zoom-options-dialog.ui:306
 msgid "_Thickness:"
 msgstr "_Tiughad:"
 
-#: panels/universal-access/zoom-options.ui:516
+#: panels/universal-access/cc-zoom-options-dialog.ui:330
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Tana"
 
-#: panels/universal-access/zoom-options.ui:548
+#: panels/universal-access/cc-zoom-options-dialog.ui:348
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "Tiugh"
 
-#: panels/universal-access/zoom-options.ui:574
+#: panels/universal-access/cc-zoom-options-dialog.ui:361
 msgid "_Length:"
 msgstr "_Faid:"
 
 #. The color of the accessibility crosshair
-#: panels/universal-access/zoom-options.ui:626
+#: panels/universal-access/cc-zoom-options-dialog.ui:395
 msgid "Co_lor:"
 msgstr "_Dath:"
 
-#: panels/universal-access/zoom-options.ui:690
-msgid "_Crosshairs:"
-msgstr "_Crois-ribeachan:"
-
-#: panels/universal-access/zoom-options.ui:741
-msgid "_Overlaps mouse cursor"
-msgstr "A’ dol a-steach air cùrsair na _luchaige"
-
-#: panels/universal-access/zoom-options.ui:779
+#: panels/universal-access/cc-zoom-options-dialog.ui:427
 msgid "Crosshairs"
 msgstr "Crois-ribeachan"
 
-#: panels/universal-access/zoom-options.ui:827
+#: panels/universal-access/cc-zoom-options-dialog.ui:444
+msgid "Color Effects:"
+msgstr "Èifeachdan dhathan:"
+
+#: panels/universal-access/cc-zoom-options-dialog.ui:466
 msgid "_White on black:"
 msgstr "_Geal air dubh:"
 
-#: panels/universal-access/zoom-options.ui:850
+#: panels/universal-access/cc-zoom-options-dialog.ui:482
 msgid "_Brightness:"
 msgstr "_Soilleireachd:"
 
-#: panels/universal-access/zoom-options.ui:874
+#: panels/universal-access/cc-zoom-options-dialog.ui:499
 msgid "_Contrast:"
 msgstr "_Iomsgaradh:"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: panels/universal-access/zoom-options.ui:897
+#: panels/universal-access/cc-zoom-options-dialog.ui:515
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "_Dath"
 
-#: panels/universal-access/zoom-options.ui:925
+#: panels/universal-access/cc-zoom-options-dialog.ui:538
 msgctxt "universal access, color"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: panels/universal-access/zoom-options.ui:957
+#: panels/universal-access/cc-zoom-options-dialog.ui:556
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "Làn"
 
-#: panels/universal-access/zoom-options.ui:1023
+#: panels/universal-access/cc-zoom-options-dialog.ui:588
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Ìseal"
 
-#: panels/universal-access/zoom-options.ui:1056
+#: panels/universal-access/cc-zoom-options-dialog.ui:606
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "Àrd"
 
-#: panels/universal-access/zoom-options.ui:1087
+#: panels/universal-access/cc-zoom-options-dialog.ui:626
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Ìseal"
 
-#: panels/universal-access/zoom-options.ui:1120
+#: panels/universal-access/cc-zoom-options-dialog.ui:644
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "Àrd"
 
-#: panels/universal-access/zoom-options.ui:1156
-msgid "Color Effects:"
-msgstr "Èifeachdan dhathan:"
-
-#: panels/universal-access/zoom-options.ui:1181
+#: panels/universal-access/cc-zoom-options-dialog.ui:664
 msgid "Color Effects"
 msgstr "Èifeachdan dhathan"
 
-#: panels/user-accounts/data/account-dialog.ui:18
-#: panels/user-accounts/data/join-dialog.ui:11
-msgid "Add User"
-msgstr "Cuir ris Cleachdaiche"
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
+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 "
+"a bhriogadh"
 
-#: panels/user-accounts/data/account-dialog.ui:171
-msgid "_Full Name"
-msgstr "Ainm _slàn"
+#. Translators: Search terms to find the Accessibility panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
+#, fuzzy
+#| msgid ""
+#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
+#| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
+#| "Repeat;Blink;"
+msgid ""
+"Keyboard;Mouse;a11y;Accessibility;Universal Access;Contrast;Cursor;Sound;"
+"Zoom;Screen;Reader;big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;"
+"Bounce;Mouse;Double;click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;"
+"audio;typing;animations;"
+msgstr ""
+"meur-chlàr;a11y;so-ruigsinneachd;iomsgaradh;sùm;leughadair-sgrìn;teacsa;"
+"cruth-clò;AccessX;steigeach;slaodach;diùltaidh;luchag;dùbailte;briog;"
+"briogadh;dàil;taic;priobadh;boillsgeadh;Keyboard;Mouse;a11y;Accessibility;"
+"Contrast;Zoom;Screen;Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;"
+"Mouse;Double;click;Delay;Assist;Repeat;Blink;"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:55
+#, fuzzy
+#| msgid "1 hour"
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 uair a thìde"
 
-#: panels/user-accounts/data/account-dialog.ui:197
-#: panels/user-accounts/data/user-accounts-dialog.ui:146
-msgid "Standard"
-msgstr "Stannardach"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:58
+#, fuzzy
+#| msgid "1 day"
+msgctxt "purge_files"
+msgid "1 day"
+msgstr "1 latha"
 
-#: panels/user-accounts/data/account-dialog.ui:207
-#: panels/user-accounts/data/user-accounts-dialog.ui:155
-msgid "Administrator"
-msgstr "Rianaire"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:61
+#, fuzzy
+#| msgid "2 days"
+msgctxt "purge_files"
+msgid "2 days"
+msgstr "2 latha"
 
-#: panels/user-accounts/data/account-dialog.ui:223
-#: panels/user-accounts/data/user-accounts-dialog.ui:173
-msgid "Account _Type"
-msgstr "_Seòrsa a’ chunntais"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:64
+#, fuzzy
+#| msgid "3 days"
+msgctxt "purge_files"
+msgid "3 days"
+msgstr "3 làithean"
 
-#: panels/user-accounts/data/account-dialog.ui:260
-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 a-steach an ath-thuras"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:67
+#, fuzzy
+#| msgid "4 days"
+msgctxt "purge_files"
+msgid "4 days"
+msgstr "4 làithean"
 
-#: panels/user-accounts/data/account-dialog.ui:274
-msgid "Set a password _now"
-msgstr "Suidhich facal-faire a_n-dràsta"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:70
+#, fuzzy
+#| msgid "5 days"
+msgctxt "purge_files"
+msgid "5 days"
+msgstr "5 làithean"
 
-#: panels/user-accounts/data/account-dialog.ui:387
-msgid "_Confirm"
-msgstr "_Dearbhaich"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:73
+#, fuzzy
+#| msgid "6 days"
+msgctxt "purge_files"
+msgid "6 days"
+msgstr "6 làithean"
 
-#: panels/user-accounts/data/account-dialog.ui:463
-#: panels/user-accounts/data/account-dialog.ui:667
-msgid ""
-"Enterprise login allows an existing centrally managed user account to be "
-"used on this device. You can also use this account to access company "
-"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 seo a chleachdadh cuideachd gus goireasan na 
companaidh inntrigeadh air an eadar-lìn."
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:76
+#, fuzzy
+#| msgid "7 days"
+msgctxt "purge_files"
+msgid "7 days"
+msgstr "7 làithean"
 
-#: panels/user-accounts/data/account-dialog.ui:485
-#: panels/user-accounts/data/join-dialog.ui:116
-msgid "_Domain"
-msgstr "_Àrainn"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:79
+#, fuzzy
+#| msgid "14 days"
+msgctxt "purge_files"
+msgid "14 days"
+msgstr "Cola-deug"
 
-#: panels/user-accounts/data/account-dialog.ui:707
-msgid "You are Offline"
-msgstr "Tha thu far loidhne"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:82
+#, fuzzy
+#| msgid "30 days"
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 latha"
 
-#: panels/user-accounts/data/account-dialog.ui:726
-msgid "You must be online in order to add enterprise users."
-msgstr "Feumaidh tu bhith air loidhne gus cleachdaichean enterprise a chur ris."
+#: panels/usage/cc-usage-panel.c:180
+msgid "Empty all items from Trash?"
+msgstr "A bheil thu airson an sgudal fhalamhachadh gu tur?"
 
-#: panels/user-accounts/data/account-dialog.ui:760
-msgid "_Enterprise Login"
-msgstr "Clàradh a-steach _Enterprise"
+#: panels/usage/cc-usage-panel.c:181
+msgid "All items in the Trash will be permanently deleted."
+msgstr "Thèid gach rud san sgudal a sguabadh às gu buan."
 
-#: panels/user-accounts/data/account-fingerprint.ui:12
-msgid "Left thumb"
-msgstr "An òrdag chlì"
+#: panels/usage/cc-usage-panel.c:182
+msgid "_Empty Trash"
+msgstr "_Falamhaich an sgudal"
 
-#: panels/user-accounts/data/account-fingerprint.ui:15
-msgid "Left middle finger"
-msgstr "An gunna fada clì"
+#: panels/usage/cc-usage-panel.c:218
+msgid "Delete all the temporary files?"
+msgstr "A bheil thu airson na faidhlichean sealach a sguabadh às?"
 
-#: panels/user-accounts/data/account-fingerprint.ui:18
-msgid "Left ring finger"
-msgstr "Mac an aba clì"
+#: panels/usage/cc-usage-panel.c:219
+msgid "All the temporary files will be permanently deleted."
+msgstr "Thèid gach faidhle sealach a sguabadh às gu buan."
 
-#: panels/user-accounts/data/account-fingerprint.ui:21
-msgid "Left little finger"
-msgstr "An lùdag bheag chlì"
+#: panels/usage/cc-usage-panel.c:220
+msgid "_Purge Temporary Files"
+msgstr "_Purgaidich na faidhlichean sealach"
 
-#: panels/user-accounts/data/account-fingerprint.ui:24
-msgid "Right thumb"
-msgstr "An òrdag dheas"
+#. Translators: Option for "File History Duration" in "File History" group
+#: panels/usage/cc-usage-panel.c:247
+#, fuzzy
+#| msgid "1 day"
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 latha"
 
-#: panels/user-accounts/data/account-fingerprint.ui:27
-msgid "Right middle finger"
-msgstr "An gunna fada deas"
+#. Translators: Option for "File History Duration" in "File History" group
+#: panels/usage/cc-usage-panel.c:250
+#, fuzzy
+#| msgid "7 days"
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 làithean"
 
-#: panels/user-accounts/data/account-fingerprint.ui:30
-msgid "Right ring finger"
-msgstr "Mac an aba deas"
+#. Translators: Option for "File History Duration" in "File History" group
+#: panels/usage/cc-usage-panel.c:253
+#, fuzzy
+#| msgid "30 days"
+msgctxt "retain_history"
+msgid "30 days"
+msgstr "30 latha"
 
-#: panels/user-accounts/data/account-fingerprint.ui:33
-msgid "Right little finger"
-msgstr "An lùdag bheag dheas"
+#. Translators: Option for "File History Duration" in "File History" group
+#: panels/usage/cc-usage-panel.c:256
+#, fuzzy
+#| msgid "Forever"
+msgctxt "retain_history"
+msgid "Forever"
+msgstr "Gu buan"
 
-#: panels/user-accounts/data/account-fingerprint.ui:39
-#: panels/user-accounts/um-fingerprint-dialog.c:677
-msgid "Enable Fingerprint Login"
-msgstr "Cuir an comas clàradh a-steach le meur-lorg"
+#: panels/usage/cc-usage-panel.ui:9
+#, fuzzy
+#| msgid "History"
+msgid "File History"
+msgstr "An eachdraidh"
 
-#: panels/user-accounts/data/account-fingerprint.ui:89
-msgid "_Right index finger"
-msgstr "An sgealbag _dheas"
+#: panels/usage/cc-usage-panel.ui:10
+msgid ""
+"File history keeps a record of files that you have used. This information is "
+"shared between applications, and makes it easier to find files that you "
+"might want to use."
+msgstr ""
 
-#: panels/user-accounts/data/account-fingerprint.ui:105
-msgid "_Left index finger"
-msgstr "An sgealbag _chlì"
+#: panels/usage/cc-usage-panel.ui:13
+#, fuzzy
+#| msgid "History"
+msgid "File H_istory"
+msgstr "An eachdraidh"
 
-#: panels/user-accounts/data/account-fingerprint.ui:126
-msgid "_Other finger:"
-msgstr "Corrag _eile:"
+#: panels/usage/cc-usage-panel.ui:25
+msgid "File _History Duration"
+msgstr ""
 
-#: panels/user-accounts/data/account-fingerprint.ui:262
+#: panels/usage/cc-usage-panel.ui:48
+#, fuzzy
+#| msgid "Cl_ear Recent History"
+msgid "_Clear History…"
+msgstr "Falamhaich an _eachdraidh faisg ort"
+
+#: panels/usage/cc-usage-panel.ui:63
+#, fuzzy
+#| msgid "Purge Trash & Temporary Files"
+msgid "Trash &amp; Temporary Files"
+msgstr "Purgaidich an sgudal ⁊ na faidhlichean sealach"
+
+#: panels/usage/cc-usage-panel.ui:64
 msgid ""
-"Your fingerprint was successfully saved. You should now be able to log in "
-"using your fingerprint reader."
-msgstr "Chaidh lorg do mheòir a shàbhaladh. Bu chòir gun urrainn dhut clàradh a-steach le leughadair nam 
meur-lorg a-nis."
+"Trash and temporary files can sometimes include personal or sensitive "
+"information. Automatically deleting them can help to protect privacy."
+msgstr ""
 
-#: panels/user-accounts/data/avatar-chooser.ui:27
-#| msgid "Take a photo…"
-msgid "Take a Picture…"
-msgstr "Tog dealbh…"
+#: panels/usage/cc-usage-panel.ui:67
+#, fuzzy
+#| msgid "Automatically empty _Trash"
+msgid "Automatically Delete _Trash Content"
+msgstr "Fa_lamhaich an sgudal gu fèin-obrachail"
 
-#: panels/user-accounts/data/avatar-chooser.ui:34
-#| msgid "Select PPD File"
-msgid "Select a File…"
-msgstr "Tagh faidhle…"
+#: panels/usage/cc-usage-panel.ui:79
+#, fuzzy
+#| msgid "Automatically purge Temporary _Files"
+msgid "Automatically Delete Temporary _Files"
+msgstr "P_urgaidich faidhlichean sealach gu fèin-obrachail"
 
-#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
-msgid "Users"
-msgstr "Cleachdaichean"
+#: panels/usage/cc-usage-panel.ui:91
+#, fuzzy
+#| msgid "Automatically empty _Trash"
+msgid "Automatically Delete _Period"
+msgstr "Fa_lamhaich an sgudal gu fèin-obrachail"
 
-#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
-msgid "Add or remove users and change your password"
-msgstr "Cuir cleachdaichean ris no thoir air falbh feadhainn is atharraich am facal-faire agad"
+#: panels/usage/cc-usage-panel.ui:115
+msgid "_Empty Trash…"
+msgstr "_Falamhaich an sgudal…"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:7
-msgid "system-users"
-msgstr "system-users"
+#: panels/usage/cc-usage-panel.ui:126
+#, fuzzy
+#| msgid "_Purge Temporary Files…"
+msgid "_Delete Temporary Files…"
+msgstr "_Purgaidich na faidhlichean sealach…"
 
-#. Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:20
-msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
-msgstr "Clàraich a-steach;Ainm;Meur-lorg;Avatar;Suaicheantas;Aodann;Facal-faire;"
+#: panels/usage/gnome-usage-panel.desktop.in.in:3
+msgid "File History & Trash"
+msgstr ""
 
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: panels/user-accounts/data/join-dialog.ui:39
-msgid "_Enroll"
-msgstr "_Clàraich"
+#: panels/usage/gnome-usage-panel.desktop.in.in:4
+msgid "Don't leave traces"
+msgstr ""
 
-#: panels/user-accounts/data/join-dialog.ui:75
-msgid "Domain Administrator Login"
-msgstr "Clàradh a-steach rianaire na h-àrainne"
+#. FIXME
+#: panels/user-accounts/cc-add-user-dialog.c:35
+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."
 
-#: panels/user-accounts/data/join-dialog.ui:93
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr "Feumaidh an coimpiutair agad a bhith clàraichte aig an àrainn\nmus urrainn dhut clàradh a-steach 
Enterprise a dhèanamh. Iarr air\nrianaire an lìonraidh facal-faire na h-àrainne a chur a-steach an-seo."
+#: panels/user-accounts/cc-add-user-dialog.c:216
+msgid "Failed to add account"
+msgstr "Cha b’ urrainn dhuinn an cunntas a chur ris"
 
-#: panels/user-accounts/data/join-dialog.ui:150
-msgid "Administrator _Name"
-msgstr "_Ainm an rianaire"
+#: panels/user-accounts/cc-add-user-dialog.c:679
+#: panels/user-accounts/cc-password-dialog.c:258
+msgid "The passwords do not match."
+msgstr "Chan eil an dà fhacal-faire co-ionnann."
 
-#: panels/user-accounts/data/join-dialog.ui:185
-msgid "Administrator Password"
-msgstr "Facal-faire an rianaire"
+#: panels/user-accounts/cc-add-user-dialog.c:883
+#: panels/user-accounts/cc-add-user-dialog.c:922
+#: panels/user-accounts/cc-add-user-dialog.c:940
+msgid "Failed to register account"
+msgstr "Cha b’ urrainn dhuinn an cunntas a chlàradh"
 
-#: panels/user-accounts/data/password-dialog.ui:7
-msgid "Change Password"
-msgstr "Atharraich am facal-faire"
+#: panels/user-accounts/cc-add-user-dialog.c:1055
+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/data/password-dialog.ui:38
-msgid "Ch_ange"
-msgstr "_Atharraich"
+#: panels/user-accounts/cc-add-user-dialog.c:1119
+msgid "Failed to join domain"
+msgstr "Cha b’ urrainn dhuinn ceangal ris an àrainn"
 
-#: panels/user-accounts/data/password-dialog.ui:142
-msgid "_Verify New Password"
-msgstr "Dearbh a_m facal-faire ùr"
+#: panels/user-accounts/cc-add-user-dialog.c:1174
+msgid ""
+"That login name didn’t work.\n"
+"Please try again."
+msgstr ""
+"Cha do dh’obraich an t-ainm sin.\n"
+"Feuch ris a-rithist."
 
-#: panels/user-accounts/data/password-dialog.ui:159
-msgid "_New Password"
-msgstr "Facal-faire ù_r"
+#: panels/user-accounts/cc-add-user-dialog.c:1181
+msgid ""
+"That login password didn’t work.\n"
+"Please try again."
+msgstr ""
+"Cha do dh’obraich am facal-faire sin.\n"
+"Feuch ris a-rithist."
 
-#: panels/user-accounts/data/password-dialog.ui:208
-msgid "Current _Password"
-msgstr "Am _facal-faire làithreach"
+#: panels/user-accounts/cc-add-user-dialog.c:1189
+msgid "Failed to log into domain"
+msgstr "Cha b’ urrainn dhuinn clàradh a-steach aig an àrainn"
 
-#: panels/user-accounts/data/password-dialog.ui:243
-msgid "Allow user to change their password on next login"
-msgstr "Leig leis a’ chleachdaiche am facal-faire atharrachadh nuair a chlàraicheas iad a-steach an 
ath-thuras"
+#: panels/user-accounts/cc-add-user-dialog.c:1244
+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?"
 
-#: panels/user-accounts/data/password-dialog.ui:256
-msgid "Set a password now"
-msgstr "Suidhich facal-faire an-dràsta"
+#: panels/user-accounts/cc-add-user-dialog.ui:15
+#: panels/user-accounts/data/join-dialog.ui:9
+msgid "Add User"
+msgstr "Cuir ris Cleachdaiche"
 
-#: panels/user-accounts/data/user-accounts-dialog.ui:20
-msgid "_Add User…"
-msgstr "Cuir cle_achdaiche ris…"
+#: panels/user-accounts/cc-add-user-dialog.ui:131
+msgid "Administrator"
+msgstr "Rianaire"
 
-#: panels/user-accounts/data/user-accounts-dialog.ui:69
-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/cc-add-user-dialog.ui:132
+msgid ""
+"Administrators can add and remove other users, and can change settings for "
+"all users. Parental controls cannot be applied to administrators."
+msgstr ""
 
-#: panels/user-accounts/data/user-accounts-dialog.ui:77
-msgid "Restart Now"
-msgstr "Ath-thòisich an-dràsta"
+#: panels/user-accounts/cc-add-user-dialog.ui:149
+#, fuzzy
+#| msgid "Allow user to change their password on next login"
+msgid "User sets password on first login"
+msgstr ""
+"Leig leis a’ chleachdaiche am facal-faire atharrachadh nuair a chlàraicheas "
+"iad a-steach an ath-thuras"
 
-#: panels/user-accounts/data/user-accounts-dialog.ui:244
-msgid "A_utomatic Login"
-msgstr "Clàradh a-steach fèin-_obrachail"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:285
-msgid "_Fingerprint Login"
-msgstr "Clàradh a-steach le _meur-lorg"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:311
-#: panels/user-accounts/data/user-accounts-dialog.ui:324
-msgid "User Icon"
-msgstr "Ìomhaigheag a’ chleachdaiche"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:387
-msgid "Last Login"
-msgstr "An clàradh a-steach mu dheireadh"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:434
-msgid "Remove User…"
-msgstr "Thoir air falbh an cleachdaiche…"
-
-#. Translators: This is the empty state page label which states that there are no users to show in the panel.
-#: panels/user-accounts/data/user-accounts-dialog.ui:466
-#| msgid "No Printers Found"
-msgid "No Users Found"
-msgstr "Cha deach cleachdaiche a lorg"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:476
-#| msgid "Create a user account"
-msgid "Unlock to add a user account."
-msgstr "Thoir a’ ghlas dheth gus cunntas cleachdaiche a chur ris."
+#: panels/user-accounts/cc-add-user-dialog.ui:161
+#, fuzzy
+#| msgid "Set a password now"
+msgid "Set password now"
+msgstr "Suidhich facal-faire an-dràsta"
 
-#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
-msgid "Manage user accounts"
-msgstr "Stiùirich cunntasan nan cleachdaichean"
+#: panels/user-accounts/cc-add-user-dialog.ui:224
+#, fuzzy
+#| msgid "_Confirm"
+msgid "Confirm"
+msgstr "_Dearbhaich"
 
-#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
-msgid "Authentication is required to change user data"
-msgstr "Feumaidh tu dearbhadh a dhèanamh mus urrainn dhut dàta a’ chleachdaiche atharrachadh"
+#: panels/user-accounts/cc-add-user-dialog.ui:278
+#, fuzzy
+#| msgid "_Enterprise Login"
+msgid "Enterprise Login"
+msgstr "Clàradh a-steach _Enterprise"
 
-#: 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."
+#: panels/user-accounts/cc-add-user-dialog.ui:279
+msgid "User accounts which are managed by a company or organisation."
+msgstr ""
 
-#: panels/user-accounts/pw-utils.c:83
-msgctxt "Password hint"
-msgid "Try changing some letters and numbers."
-msgstr "Feuch is atharraich cuid dhe na litrichean is àireamhan."
+#: panels/user-accounts/cc-add-user-dialog.ui:385
+msgid "You are Offline"
+msgstr "Tha thu far loidhne"
 
-#: panels/user-accounts/pw-utils.c:85 panels/user-accounts/pw-utils.c:93
-msgctxt "Password hint"
-msgid "Try changing the password a bit more."
-msgstr "Feuch is atharraich am facal-faire beagan a bharrachd"
+#: panels/user-accounts/cc-add-user-dialog.ui:386
+msgid ""
+"Enterprise login allows an existing centrally managed user account to be "
+"used on this device. You can also use this account to access company "
+"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 "
+"seo a chleachdadh cuideachd gus goireasan na companaidh inntrigeadh air an "
+"eadar-lìn."
 
-#: panels/user-accounts/pw-utils.c:87
-msgctxt "Password hint"
-msgid "A password without your user name would be stronger."
-msgstr "Bhiodh facal-faire as aonais an ainm-chleachdaiche agad nas làidire."
+#: panels/user-accounts/cc-avatar-chooser.c:164
+msgid "Browse for more pictures"
+msgstr "Brabhsaich airson barrachd dhealbhan"
 
-#: 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."
+#: panels/user-accounts/cc-avatar-chooser.ui:32
+msgid "Select a File…"
+msgstr "Tagh faidhle…"
 
-#: panels/user-accounts/pw-utils.c:91
-msgctxt "Password hint"
-msgid "Try to avoid some of the words included in the password."
-msgstr "Feuch is seachain cuid dhe na faclan a tha san fhacal-fhaire."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:8
+#, fuzzy
+#| msgid "_Fingerprint Login"
+msgid "Fingerprint Manager"
+msgstr "Clàradh a-steach le _meur-lorg"
 
-#: panels/user-accounts/pw-utils.c:95
-msgctxt "Password hint"
-msgid "Try to avoid common words."
-msgstr "Feuch is seachain faclan cumanta."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:20
+#, fuzzy
+#| msgid "_Fingerprint Login"
+msgid "Fingerprint"
+msgstr "Clàradh a-steach le _meur-lorg"
 
-#: panels/user-accounts/pw-utils.c:97
-msgctxt "Password hint"
-msgid "Try to avoid reordering existing words."
-msgstr "Feuch is seachain fìor-fhaclan ath-òrdachadh."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:88
+#, fuzzy
+#| msgid "No"
+msgid "_No"
+msgstr "Chan eil"
 
-#: panels/user-accounts/pw-utils.c:99
-msgctxt "Password hint"
-msgid "Try to use more numbers."
-msgstr "Feuch is cleachd barrachd àireamhan."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:96
+msgid "_Yes"
+msgstr ""
 
-#: panels/user-accounts/pw-utils.c:101
-msgctxt "Password hint"
-msgid "Try to use more uppercase letters."
-msgstr "Feuch is cleachd barrachd litrichean mòra."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:116
+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 "
+"urrainnear clàradh a-steach leotha tuilleadh?"
 
-#: panels/user-accounts/pw-utils.c:103
-msgctxt "Password hint"
-msgid "Try to use more lowercase letters."
-msgstr "Feuch is cleachd barrachd litrichean beaga."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:172
+#, fuzzy
+#| msgid "Gaming input device"
+msgid "No fingerprint device"
+msgstr "Uidheam ion-chuir geama"
 
-#: panels/user-accounts/pw-utils.c:105
-msgctxt "Password hint"
-msgid "Try to use more special characters, like punctuation."
-msgstr "Feuch is cleachd barrachd charactaran sònraichte mar phuingeachadh."
+#. Translators: This is the empty state page label which states that there are no devices ready.
+#: panels/user-accounts/cc-fingerprint-dialog.ui:187
+#, fuzzy
+#| msgid "_Fingerprint Login"
+msgid "No Fingerprint device"
+msgstr "Clàradh a-steach le _meur-lorg"
 
-#: panels/user-accounts/pw-utils.c:107
-msgctxt "Password hint"
-msgid "Try to use a mixture of letters, numbers and punctuation."
-msgstr "Feuch is cleachd measgachadh de litrichean, àireamhan is puingeachadh."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:196
+msgid "Ensure the device is properly connected."
+msgstr ""
 
-#: 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."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:204
+#, fuzzy
+#| msgid "_Fingerprint Login"
+msgid "Fingerprint Device"
+msgstr "Clàradh a-steach le _meur-lorg"
 
-#: panels/user-accounts/pw-utils.c:111
-msgctxt "Password hint"
-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: feumaidh tu measgachadh de 
litrichean, àireamhan is puingeachadh."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:213
+msgid "Choose the fingerprint device you want to configure"
+msgstr ""
 
-#: panels/user-accounts/pw-utils.c:113
-msgctxt "Password hint"
-msgid "Try to avoid sequences like 1234 or abcd."
-msgstr "Feuch is seachain sreathan mar 1234 no abcd."
+#: panels/user-accounts/cc-fingerprint-dialog.ui:243
+#, fuzzy
+#| msgid "_Fingerprint Login"
+msgid "Fingerprint Login"
+msgstr "Clàradh a-steach le _meur-lorg"
 
-#: panels/user-accounts/pw-utils.c:115
-msgctxt "Password hint"
+#: panels/user-accounts/cc-fingerprint-dialog.ui:249
 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à."
+"Fingerprint login allows you to unlock and log into your computer with your "
+"finger"
+msgstr ""
 
-#: panels/user-accounts/pw-utils.c:119
-msgctxt "Password hint"
-msgid ""
-"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/cc-fingerprint-dialog.ui:276
+msgid "_Delete Fingerprints"
+msgstr "_Sguab às na meur-lorgan"
 
-#: panels/user-accounts/run-passwd.c:422
-msgid "Authentication failed"
-msgstr "Dh’fhàillig an dearbhadh"
+#: panels/user-accounts/cc-fingerprint-dialog.ui:290
+#, fuzzy
+#| msgid "_Fingerprint Login"
+msgid "Fingerprint Enroll"
+msgstr "Clàradh a-steach le _meur-lorg"
 
-#: panels/user-accounts/run-passwd.c:502
-#, c-format
-msgid "The new password is too short"
-msgstr "Tha am facal-faire ùr ro ghoirid"
+#: panels/user-accounts/cc-fingerprint-dialog.c:235
+msgid "the device needs to be claimed to perform this action"
+msgstr ""
 
-#: panels/user-accounts/run-passwd.c:508
-#, c-format
-msgid "The new password is too simple"
-msgstr "Tha am facal-faire ùr ro shimplidh"
+#: panels/user-accounts/cc-fingerprint-dialog.c:237
+#, fuzzy
+#| msgid "The device is already in use."
+msgid "the device is already claimed by another process"
+msgstr "Tha an t-uidheam seo ’ga chleachdadh mu thràth."
 
-#: panels/user-accounts/run-passwd.c:514
-#, c-format
-msgid "The old and new passwords are too similar"
-msgstr "Tha an seann fhacal-faire agus am fear ùr ro choltach ri chèile"
+#: panels/user-accounts/cc-fingerprint-dialog.c:239
+msgid "you do not have permission to perform the action"
+msgstr ""
 
-#: panels/user-accounts/run-passwd.c:517
-#, c-format
-msgid "The new password has already been used recently."
-msgstr "Chaidh am facal-faire ùr a chleachdadh o chionn ghoirid mu thràth."
+#: panels/user-accounts/cc-fingerprint-dialog.c:241
+msgid "no prints have been enrolled"
+msgstr ""
 
-#: panels/user-accounts/run-passwd.c:520
-#, c-format
-msgid "The new password must contain numeric or special characters"
-msgstr "Feumaidh àireamhan no caractaran sònraichte a bhith san fhacal-fhaire ùr"
+#: panels/user-accounts/cc-fingerprint-dialog.c:250
+#, fuzzy
+#| msgid "Failed to register with the requested network"
+msgid "Failed to communicate with the device during enrollment"
+msgstr "Cha b’ urrainn dhuinn clàradh aig an lìonra a dh’iarr thu"
 
-#: 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"
+#: panels/user-accounts/cc-fingerprint-dialog.c:254
+#, fuzzy
+#| msgid "Could not access any fingerprint readers"
+msgid "Failed to communicate with the fingerprint reader"
+msgstr ""
+"Cha b’ urrainn dhuinn cothrom fhaighinn air leughadair mheur-lorgan sam bith"
 
-#: panels/user-accounts/run-passwd.c:528
-#, c-format
-msgid "Your password has been changed since you initially authenticated!"
-msgstr "Chaidh am facal-faire agad atharrachadh on a rinn thu dearbhadh an toiseach!"
+#: panels/user-accounts/cc-fingerprint-dialog.c:256
+msgid "Failed to communicate with the fingerprint daemon"
+msgstr ""
 
-#: panels/user-accounts/run-passwd.c:532
-#, c-format
-msgid "The new password does not contain enough different characters"
-msgstr "Chan eil caractaran eadar-dhealaichte gu leòr san fhacal-fhaire ùr"
+#: panels/user-accounts/cc-fingerprint-dialog.c:539
+#, fuzzy, c-format
+#| msgid "Failed to upload file: %s"
+msgid "Failed to list fingerprints: %s"
+msgstr "Cha b’ urrainn dhuinn am faidhle a leanas a luchdadh suas: %s"
 
-#: panels/user-accounts/run-passwd.c:536
-#, c-format
-msgid "Unknown error"
-msgstr "Mearachd neo-aithnichte"
+#: panels/user-accounts/cc-fingerprint-dialog.c:606
+#, fuzzy, c-format
+#| msgid "Failed to delete user"
+msgid "Failed to delete saved fingerprints: %s"
+msgstr "Cha b’ urrainn dhuinn an cleachdaiche a sguabadh às"
 
-#: 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."
+#: panels/user-accounts/cc-fingerprint-dialog.c:637
+msgid "Left thumb"
+msgstr "An òrdag chlì"
 
-#: panels/user-accounts/um-account-dialog.c:229
-msgid "Failed to add account"
-msgstr "Cha b’ urrainn dhuinn an cunntas a chur ris"
+#: panels/user-accounts/cc-fingerprint-dialog.c:639
+msgid "Left middle finger"
+msgstr "An gunna fada clì"
 
-#: 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/cc-fingerprint-dialog.c:641
+msgid "_Left index finger"
+msgstr "An sgealbag _chlì"
 
-#: 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"
+#: panels/user-accounts/cc-fingerprint-dialog.c:643
+msgid "Left ring finger"
+msgstr "Mac an aba clì"
 
-#: 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/cc-fingerprint-dialog.c:645
+msgid "Left little finger"
+msgstr "An lùdag bheag chlì"
 
-#: panels/user-accounts/um-account-dialog.c:980
-msgid "Failed to join domain"
-msgstr "Cha b’ urrainn dhuinn ceangal ris an àrainn"
+#: panels/user-accounts/cc-fingerprint-dialog.c:647
+msgid "Right thumb"
+msgstr "An òrdag dheas"
 
-#: panels/user-accounts/um-account-dialog.c:1041
-msgid ""
-"That login name didn’t work.\n"
-"Please try again."
-msgstr "Cha do dh’obraich an t-ainm sin.\nFeuch ris a-rithist."
+#: panels/user-accounts/cc-fingerprint-dialog.c:649
+msgid "Right middle finger"
+msgstr "An gunna fada deas"
 
-#: panels/user-accounts/um-account-dialog.c:1048
-msgid ""
-"That login password didn’t work.\n"
-"Please try again."
-msgstr "Cha do dh’obraich am facal-faire sin.\nFeuch ris a-rithist."
+#: panels/user-accounts/cc-fingerprint-dialog.c:651
+msgid "_Right index finger"
+msgstr "An sgealbag _dheas"
 
-#: 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"
+#: panels/user-accounts/cc-fingerprint-dialog.c:653
+msgid "Right ring finger"
+msgstr "Mac an aba deas"
 
-#: panels/user-accounts/um-account-dialog.c:1114
-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?"
+#: panels/user-accounts/cc-fingerprint-dialog.c:655
+msgid "Right little finger"
+msgstr "An lùdag bheag dheas"
 
-#: panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "Stannardach"
+#: panels/user-accounts/cc-fingerprint-dialog.c:657
+#, fuzzy
+#| msgid "Unknown time"
+msgid "Unknown Finger"
+msgstr "Chan eil fhios dè cho fad"
 
-#: panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "Rianaire"
+#: panels/user-accounts/cc-fingerprint-dialog.c:791
+#, fuzzy
+#| msgid "Complete!"
+msgctxt "Fingerprint enroll state"
+msgid "Complete"
+msgstr "Deiseil!"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:139
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
-msgstr "Chan eil cead-inntrigidh agad dhan uidheam seo. Cuir fios gu rianaire an t-siostaim agad."
+#: panels/user-accounts/cc-fingerprint-dialog.c:802
+#, fuzzy
+#| msgid "PPP service disconnected"
+msgid "Fingerprint device disconnected"
+msgstr "Chaidh an ceangal ris an t-seirbheis PPP a bhriseadh"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:141
-msgid "The device is already in use."
-msgstr "Tha an t-uidheam seo ’ga chleachdadh mu thràth."
+#: panels/user-accounts/cc-fingerprint-dialog.c:808
+msgid "Fingerprint device storage is full"
+msgstr ""
 
-#: panels/user-accounts/um-fingerprint-dialog.c:143
-msgid "An internal error occurred."
-msgstr "Thachair mearachd inntearnail."
+#: panels/user-accounts/cc-fingerprint-dialog.c:812
+#, fuzzy
+#| msgid "Failed to add new printer."
+msgid "Failed to enroll new fingerprint"
+msgstr "Cha b’ urrainn dhuinn an clò-bhualadair ùr a chur ris."
 
-#: panels/user-accounts/um-fingerprint-dialog.c:214
-msgid "Enabled"
-msgstr "An comas"
+#: panels/user-accounts/cc-fingerprint-dialog.c:843
+#, fuzzy, c-format
+#| msgid "Failed to upload file: %s"
+msgid "Failed to start enrollment: %s"
+msgstr "Cha b’ urrainn dhuinn am faidhle a leanas a luchdadh suas: %s"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:260
-msgid "Delete registered fingerprints?"
-msgstr "A bheil thu airson na meur-lorgan clàraichte a sguabadh às?"
+#: panels/user-accounts/cc-fingerprint-dialog.c:851
+#, fuzzy
+#| msgid "Failed to add new printer."
+msgctxt "Fingerprint enroll state"
+msgid "Failed to enroll new fingerprint"
+msgstr "Cha b’ urrainn dhuinn an clò-bhualadair ùr a chur ris."
 
-#: panels/user-accounts/um-fingerprint-dialog.c:264
-msgid "_Delete Fingerprints"
-msgstr "_Sguab às na meur-lorgan"
+#: panels/user-accounts/cc-fingerprint-dialog.c:882
+#, fuzzy, c-format
+#| msgid "Failed to upload file: %s"
+msgid "Failed to stop enrollment: %s"
+msgstr "Cha b’ urrainn dhuinn am faidhle a leanas a luchdadh suas: %s"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:270
+#: panels/user-accounts/cc-fingerprint-dialog.c:928
 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 urrainnear clàradh 
a-steach leotha tuilleadh?"
+"Repeatedly lift and place your finger on the reader to enroll your "
+"fingerprint"
+msgstr ""
 
-#: panels/user-accounts/um-fingerprint-dialog.c:440
-msgid "Done!"
-msgstr "Deiseil!"
+#: panels/user-accounts/cc-fingerprint-dialog.c:1047
+msgid "_Re-enroll this finger…"
+msgstr ""
 
-#. 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:501
-#: panels/user-accounts/um-fingerprint-dialog.c:543
-#, c-format
-msgid "Could not access “%s” device"
-msgstr "Cha b’ urrainn dhuinn cothrom fhaighinn air an uidheam “%s”"
+#. TRANSLATORS: This is the label for the button to enroll a new finger
+#: panels/user-accounts/cc-fingerprint-dialog.c:1062
+#, fuzzy
+#| msgid "Enrolling fingerprints"
+msgid "Scan new fingerprint"
+msgstr "A’ clàradh nam meur-lorgan"
 
-#. 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:584
+#: panels/user-accounts/cc-fingerprint-dialog.c:1100
 #, c-format
-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”"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:628
-msgid "Could not access any fingerprint readers"
-msgstr "Cha b’ urrainn dhuinn cothrom fhaighinn air leughadair mheur-lorgan sam bith"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:629
-msgid "Please contact your system administrator for help."
-msgstr "Cuir fios gu rianaire an t-siostaim agad airson cuideachadh."
+msgid "Failed to release fingerprint device %s: %s"
+msgstr ""
 
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
-#. * 'Digital Persona U.are.U 4000/4000B' device."
-#.
-#: panels/user-accounts/um-fingerprint-dialog.c:711
-#, c-format
-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."
+#: panels/user-accounts/cc-fingerprint-dialog.c:1172
+#, fuzzy
+#| msgid "Problem Reporting"
+msgctxt "Fingerprint enroll state"
+msgid "Problem Reading Device"
+msgstr "Ag aithris air duilgheadasan"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:718
-msgid "Selecting finger"
-msgstr "A’ taghadh meur"
+#: panels/user-accounts/cc-fingerprint-dialog.c:1207
+#, fuzzy, c-format
+#| msgid "Failed to upload file: %s"
+msgid "Failed to claim fingerprint device %s: %s"
+msgstr "Cha b’ urrainn dhuinn am faidhle a leanas a luchdadh suas: %s"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:719
-msgid "Enrolling fingerprints"
-msgstr "A’ clàradh nam meur-lorgan"
+#: panels/user-accounts/cc-fingerprint-dialog.c:1358
+#, fuzzy, c-format
+#| msgid "Failed to add new printer."
+msgid "Failed to get fingerprint devices: %s"
+msgstr "Cha b’ urrainn dhuinn an clò-bhualadair ùr a chur ris."
 
-#: panels/user-accounts/um-history-dialog.c:70
+#: panels/user-accounts/cc-login-history-dialog.c:71
 msgid "This Week"
 msgstr "An t-seachdain-sa"
 
-#: panels/user-accounts/um-history-dialog.c:73
+#: panels/user-accounts/cc-login-history-dialog.c:74
 msgid "Last Week"
 msgstr "An t-seachdain seo chaidh"
 
@@ -6750,22 +7956,22 @@ msgstr "An t-seachdain seo chaidh"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/um-history-dialog.c:79
-#: panels/user-accounts/um-history-dialog.c:83
+#: panels/user-accounts/cc-login-history-dialog.c:84
+#: panels/user-accounts/cc-login-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%e %b"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/um-history-dialog.c:88
+#: panels/user-accounts/cc-login-history-dialog.c:93
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%e %b %Y"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: panels/user-accounts/um-history-dialog.c:93
+#: panels/user-accounts/cc-login-history-dialog.c:98
 #, c-format
 msgctxt "login history week label"
 msgid "%s — %s"
@@ -6773,583 +7979,2326 @@ 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.
-#: panels/user-accounts/um-history-dialog.c:177
-#: panels/user-accounts/um-user-panel.c:766
+#: panels/user-accounts/cc-login-history-dialog.c:179
+#: panels/user-accounts/cc-user-panel.c:712
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k.%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: panels/user-accounts/um-history-dialog.c:180
-#: panels/user-accounts/um-user-panel.c:770
+#: panels/user-accounts/cc-login-history-dialog.c:182
+#: panels/user-accounts/cc-user-panel.c:716
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: panels/user-accounts/um-history-dialog.c:250
+#: panels/user-accounts/cc-login-history-dialog.c:238
 msgid "Session Ended"
 msgstr "Thàinig an seisean gu crìoch"
 
-#: panels/user-accounts/um-history-dialog.c:256
+#: panels/user-accounts/cc-login-history-dialog.c:244
 msgid "Session Started"
 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
+#: panels/user-accounts/cc-login-history-dialog.c:339
 #, c-format
 msgid "%s — Account Activity"
 msgstr "%s – Gnìomhachd a’ chunntais"
 
-#: panels/user-accounts/um-password-dialog.c:144
+#: panels/user-accounts/cc-password-dialog.c:133
 msgid "Please choose another password."
 msgstr "Tagh facal-faire eile."
 
-#: panels/user-accounts/um-password-dialog.c:153
+#: panels/user-accounts/cc-password-dialog.c:142
 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:159
+#: panels/user-accounts/cc-password-dialog.c:148
 msgid "Password could not be changed"
 msgstr "Cha b’ urrainn dhuinn am facal-faire atharrachadh"
 
-#: 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/cc-password-dialog.ui:4
+msgid "Change Password"
+msgstr "Atharraich am facal-faire"
 
-#: panels/user-accounts/um-photo-dialog.c:227
-msgid "Browse for more pictures"
-msgstr "Brabhsaich airson barrachd dhealbhan"
+#: panels/user-accounts/cc-password-dialog.ui:32
+msgid "Ch_ange"
+msgstr "_Atharraich"
+
+#: panels/user-accounts/cc-password-dialog.ui:51
+#, fuzzy
+#| msgid "Current _Password"
+msgid "Current Password"
+msgstr "Am _facal-faire làithreach"
+
+#: panels/user-accounts/cc-password-dialog.ui:76
+#, fuzzy
+#| msgid "_New Password"
+msgid "New Password"
+msgstr "Facal-faire ù_r"
+
+#: panels/user-accounts/cc-password-dialog.ui:121
+#, fuzzy
+#| msgid "Change Password"
+msgid "Confirm Password"
+msgstr "Atharraich am facal-faire"
+
+#: panels/user-accounts/cc-password-dialog.ui:175
+msgid "Allow user to change their password on next login"
+msgstr ""
+"Leig leis a’ chleachdaiche am facal-faire atharrachadh nuair a chlàraicheas "
+"iad a-steach an ath-thuras"
+
+#: panels/user-accounts/cc-password-dialog.ui:186
+msgid "Set a password now"
+msgstr "Suidhich facal-faire an-dràsta"
+
+#: panels/user-accounts/cc-realm-manager.c:303
+msgid "Cannot automatically join this type of domain"
+msgstr ""
+"Chan urrainnear pàirt a ghabhail sa leithid seo de dh’àrainn gu fèin-"
+"obrachail"
+
+#: panels/user-accounts/cc-realm-manager.c:306
+msgid "No such domain or realm found"
+msgstr "Cha deach àrainn no rìoghachd mar sin a lorg"
+
+#: panels/user-accounts/cc-realm-manager.c:712
+#: panels/user-accounts/cc-realm-manager.c:726
+#, c-format
+msgid "Cannot log in as %s at the %s domain"
+msgstr "Chan urrainn dhut clàradh a-steach mar %s air an àrainn %s"
+
+#: panels/user-accounts/cc-realm-manager.c:718
+msgid "Invalid password, please try again"
+msgstr "Tha am facal-faire cearr, nach fheuch thu ris a-rithist?"
+
+#: panels/user-accounts/cc-realm-manager.c:731
+#, c-format
+msgid "Couldn’t connect to the %s domain: %s"
+msgstr "Cha b’ urrainn ceangal ris an àrainn %s: %s"
+
+#: panels/user-accounts/cc-user-panel.c:341
+msgid "Failed to delete user"
+msgstr "Cha b’ urrainn dhuinn an cleachdaiche a sguabadh às"
+
+#: panels/user-accounts/cc-user-panel.c:398
+#: panels/user-accounts/cc-user-panel.c:453
+#: panels/user-accounts/cc-user-panel.c:499
+msgid "Failed to revoke remotely managed user"
+msgstr "Cha deach leinn an cleachdaiche fo stiùireadh cèin a chùl-ghairm"
+
+#: panels/user-accounts/cc-user-panel.c:548
+msgid "You cannot delete your own account."
+msgstr "Chan urrainn dhut an cunntas agad fhèin a sguabadh às."
+
+#: panels/user-accounts/cc-user-panel.c:557
+#, c-format
+msgid "%s is still logged in"
+msgstr "Tha %s clàraichte a-staigh fhathast"
+
+#: panels/user-accounts/cc-user-panel.c:561
+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."
+
+#: panels/user-accounts/cc-user-panel.c:570
+#, c-format
+msgid "Do you want to keep %s’s files?"
+msgstr "A bheil thu airson na faidhlichean aig %s a chumail?"
+
+#: panels/user-accounts/cc-user-panel.c:574
+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 "
+"ghlèidheadh nuair a sguabar às cunntas cleachdaiche."
+
+#: panels/user-accounts/cc-user-panel.c:577
+msgid "_Delete Files"
+msgstr "_Sguab às na faidhlichean"
+
+#: panels/user-accounts/cc-user-panel.c:578
+msgid "_Keep Files"
+msgstr "_Cum na faidhlichean"
+
+#: panels/user-accounts/cc-user-panel.c:592
+#, c-format
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
+msgstr ""
+"A bheil thu cinnteach gu bheil thu airson an cunntas aig %s fo stiùireadh "
+"cèin a chùl-ghairm?"
+
+#: panels/user-accounts/cc-user-panel.c:596
+msgid "_Delete"
+msgstr "_Sguab às"
+
+#: panels/user-accounts/cc-user-panel.c:646
+msgctxt "Password mode"
+msgid "Account disabled"
+msgstr "Chaidh an cunntas a chur à comas"
+
+#: panels/user-accounts/cc-user-panel.c:654
+msgctxt "Password mode"
+msgid "To be set at next login"
+msgstr "Ri shuidheachadh an ath-thuras a nithear clàradh a-steach"
+
+#: panels/user-accounts/cc-user-panel.c:657
+msgctxt "Password mode"
+msgid "None"
+msgstr "Chan eil gin"
+
+#: panels/user-accounts/cc-user-panel.c:700
+msgid "Logged in"
+msgstr "Air clàradh a-steach"
+
+#. TRANSLATORS: Status of Parental Controls setup
+#: panels/user-accounts/cc-user-panel.c:787
+#: panels/user-accounts/cc-user-panel.c:876
+#: panels/wwan/cc-wwan-device-page.c:476
+msgid "Enabled"
+msgstr "An comas"
+
+#: panels/user-accounts/cc-user-panel.c:1173
+msgid "Failed to contact the accounts service"
+msgstr "Cha b’ urrainn dhuinn fios a chur gu seirbheis nan cunntasan"
+
+#: panels/user-accounts/cc-user-panel.c:1175
+msgid "Please make sure that the AccountService is installed and enabled."
+msgstr "Dèan cinnteach gun deach AccountService a stàladh agus an comas."
+
+#: panels/user-accounts/cc-user-panel.c:1197
+msgid "This panel must be unlocked to change this setting"
+msgstr ""
+
+#: panels/user-accounts/cc-user-panel.c:1264
+msgid "Delete the selected user account"
+msgstr "Sguab às cunntas a’ chleachdaiche a thagh thu"
+
+#: panels/user-accounts/cc-user-panel.c:1268
+#: panels/user-accounts/cc-user-panel.c:1377
+msgid ""
+"To delete the selected user account,\n"
+"click the * icon first"
+msgstr ""
+"Gus cunntas a’ chleachdaiche a thagh thu a sguabadh às,\n"
+"briog air an ìomhaigheag * an toiseach"
+
+#: panels/user-accounts/cc-user-panel.c:1423
+msgid "Unlock to Add Users and Change Settings"
+msgstr ""
+
+#: panels/user-accounts/cc-user-panel.ui:23
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
+msgid "Users"
+msgstr "Cleachdaichean"
+
+#: panels/user-accounts/cc-user-panel.ui:60
+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/cc-user-panel.ui:67
+msgid "Restart Now"
+msgstr "Ath-thòisich an-dràsta"
+
+#. FIXME
+#: panels/user-accounts/cc-user-panel.ui:195
+msgid "_Fingerprint Login"
+msgstr "Clàradh a-steach le _meur-lorg"
+
+#: panels/user-accounts/cc-user-panel.ui:218
+msgid "A_utomatic Login"
+msgstr "Clàradh a-steach fèin-_obrachail"
+
+#: panels/user-accounts/cc-user-panel.ui:231
+#, fuzzy
+#| msgid "%s — Account Activity"
+msgid "Account Activity"
+msgstr "%s – Gnìomhachd a’ chunntais"
+
+#: panels/user-accounts/cc-user-panel.ui:259
+#, fuzzy
+#| msgid "Administrator"
+msgid "_Administrator"
+msgstr "Rianaire"
+
+#: panels/user-accounts/cc-user-panel.ui:260
+msgid ""
+"Administrators can add and remove other users, and can change settings for "
+"all users."
+msgstr ""
+
+#: panels/user-accounts/cc-user-panel.ui:276
+msgid "_Parental Controls"
+msgstr ""
+
+#: panels/user-accounts/cc-user-panel.ui:277
+msgid "Open the Parental Controls application."
+msgstr ""
+
+#: panels/user-accounts/cc-user-panel.ui:328
+msgid "Remove User…"
+msgstr "Thoir air falbh an cleachdaiche…"
+
+#: panels/user-accounts/cc-user-panel.ui:340
+#, fuzzy
+#| msgid "_Other finger:"
+msgid "Other Users"
+msgstr "Corrag _eile:"
+
+#: panels/user-accounts/cc-user-panel.ui:353
+#, fuzzy
+#| msgid "_Add User…"
+msgid "Add User…"
+msgstr "Cuir cle_achdaiche ris…"
+
+#. Translators: This is the empty state page label which states that there are no users to show in the panel.
+#: panels/user-accounts/cc-user-panel.ui:381
+msgid "No Users Found"
+msgstr "Cha deach cleachdaiche a lorg"
+
+#: panels/user-accounts/cc-user-panel.ui:390
+msgid "Unlock to add a user account."
+msgstr "Thoir a’ ghlas dheth gus cunntas cleachdaiche a chur ris."
+
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
+msgid "Add or remove users and change your password"
+msgstr ""
+"Cuir cleachdaichean ris no thoir air falbh feadhainn is atharraich am facal-"
+"faire agad"
+
+#. Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:20
+msgid ""
+"Login;Name;Fingerprint;Avatar;Logo;Face;Password;Parental Controls;Screen "
+"Time;App Restrictions;Web Restrictions;Usage;Usage Limit;Kid;Child;"
+msgstr ""
+
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: panels/user-accounts/data/join-dialog.ui:30
+msgid "_Enroll"
+msgstr "_Clàraich"
+
+#: panels/user-accounts/data/join-dialog.ui:59
+msgid "Domain Administrator Login"
+msgstr "Clàradh a-steach rianaire na h-àrainne"
+
+#: panels/user-accounts/data/join-dialog.ui:72
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"Feumaidh an coimpiutair agad a bhith clàraichte aig an àrainn\n"
+"mus urrainn dhut clàradh a-steach Enterprise a dhèanamh. Iarr air\n"
+"rianaire an lìonraidh facal-faire na h-àrainne a chur a-steach an-seo."
+
+#: panels/user-accounts/data/join-dialog.ui:112
+msgid "Administrator _Name"
+msgstr "_Ainm an rianaire"
+
+#: panels/user-accounts/data/join-dialog.ui:135
+msgid "Administrator Password"
+msgstr "Facal-faire an rianaire"
+
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
+msgid "Manage user accounts"
+msgstr "Stiùirich cunntasan nan cleachdaichean"
+
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
+msgid "Authentication is required to change user data"
+msgstr ""
+"Feumaidh tu dearbhadh a dhèanamh mus urrainn dhut dàta a’ chleachdaiche "
+"atharrachadh"
+
+#: panels/user-accounts/pw-utils.c:94
+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."
+
+#: panels/user-accounts/pw-utils.c:96
+msgctxt "Password hint"
+msgid "Try changing some letters and numbers."
+msgstr "Feuch is atharraich cuid dhe na litrichean is àireamhan."
+
+#: panels/user-accounts/pw-utils.c:98 panels/user-accounts/pw-utils.c:106
+msgctxt "Password hint"
+msgid "Try changing the password a bit more."
+msgstr "Feuch is atharraich am facal-faire beagan a bharrachd"
+
+#: panels/user-accounts/pw-utils.c:100
+msgctxt "Password hint"
+msgid "A password without your user name would be stronger."
+msgstr "Bhiodh facal-faire as aonais an ainm-chleachdaiche agad nas làidire."
+
+#: panels/user-accounts/pw-utils.c:102
+msgctxt "Password hint"
+msgid "Try to avoid using your name in the password."
+msgstr "Feuch is na cleachd d’ ainm san fhacal-fhaire."
+
+#: panels/user-accounts/pw-utils.c:104
+msgctxt "Password hint"
+msgid "Try to avoid some of the words included in the password."
+msgstr "Feuch is seachain cuid dhe na faclan a tha san fhacal-fhaire."
+
+#: panels/user-accounts/pw-utils.c:108
+msgctxt "Password hint"
+msgid "Try to avoid common words."
+msgstr "Feuch is seachain faclan cumanta."
+
+#: panels/user-accounts/pw-utils.c:110
+msgctxt "Password hint"
+msgid "Try to avoid reordering existing words."
+msgstr "Feuch is seachain fìor-fhaclan ath-òrdachadh."
+
+#: panels/user-accounts/pw-utils.c:112
+msgctxt "Password hint"
+msgid "Try to use more numbers."
+msgstr "Feuch is cleachd barrachd àireamhan."
+
+#: panels/user-accounts/pw-utils.c:114
+msgctxt "Password hint"
+msgid "Try to use more uppercase letters."
+msgstr "Feuch is cleachd barrachd litrichean mòra."
+
+#: panels/user-accounts/pw-utils.c:116
+msgctxt "Password hint"
+msgid "Try to use more lowercase letters."
+msgstr "Feuch is cleachd barrachd litrichean beaga."
+
+#: panels/user-accounts/pw-utils.c:118
+msgctxt "Password hint"
+msgid "Try to use more special characters, like punctuation."
+msgstr "Feuch is cleachd barrachd charactaran sònraichte mar phuingeachadh."
+
+#: panels/user-accounts/pw-utils.c:120
+msgctxt "Password hint"
+msgid "Try to use a mixture of letters, numbers and punctuation."
+msgstr "Feuch is cleachd measgachadh de litrichean, àireamhan is puingeachadh."
+
+#: panels/user-accounts/pw-utils.c:122
+msgctxt "Password hint"
+msgid "Try to avoid repeating the same character."
+msgstr "Feuch is seachain an aon charactar a-rithist ’s a-rithist."
+
+#: panels/user-accounts/pw-utils.c:124
+msgctxt "Password hint"
+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: "
+"feumaidh tu measgachadh de litrichean, àireamhan is puingeachadh."
+
+#: panels/user-accounts/pw-utils.c:126
+msgctxt "Password hint"
+msgid "Try to avoid sequences like 1234 or abcd."
+msgstr "Feuch is seachain sreathan mar 1234 no abcd."
+
+#: panels/user-accounts/pw-utils.c:128
+msgctxt "Password hint"
+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:130
+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à."
+
+#: panels/user-accounts/pw-utils.c:132
+msgctxt "Password hint"
+msgid ""
+"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:413
+msgid "Authentication failed"
+msgstr "Dh’fhàillig an dearbhadh"
+
+#: panels/user-accounts/run-passwd.c:492
+#, c-format
+msgid "The new password is too short"
+msgstr "Tha am facal-faire ùr ro ghoirid"
+
+#: panels/user-accounts/run-passwd.c:498
+#, c-format
+msgid "The new password is too simple"
+msgstr "Tha am facal-faire ùr ro shimplidh"
+
+#: panels/user-accounts/run-passwd.c:504
+#, c-format
+msgid "The old and new passwords are too similar"
+msgstr "Tha an seann fhacal-faire agus am fear ùr ro choltach ri chèile"
+
+#: panels/user-accounts/run-passwd.c:507
+#, c-format
+msgid "The new password has already been used recently."
+msgstr "Chaidh am facal-faire ùr a chleachdadh o chionn ghoirid mu thràth."
+
+#: panels/user-accounts/run-passwd.c:510
+#, c-format
+msgid "The new password must contain numeric or special characters"
+msgstr ""
+"Feumaidh àireamhan no caractaran sònraichte a bhith san fhacal-fhaire ùr"
+
+#: panels/user-accounts/run-passwd.c:514
+#, c-format
+msgid "The old and new passwords are the same"
+msgstr "Tha an seann fhacal-faire ’s am fear ùra co-ionnann"
+
+#: panels/user-accounts/run-passwd.c:518
+#, c-format
+msgid "Your password has been changed since you initially authenticated!"
+msgstr ""
+"Chaidh am facal-faire agad atharrachadh on a rinn thu dearbhadh an toiseach!"
+
+#: panels/user-accounts/run-passwd.c:522
+#, c-format
+msgid "The new password does not contain enough different characters"
+msgstr "Chan eil caractaran eadar-dhealaichte gu leòr san fhacal-fhaire ùr"
+
+#: panels/user-accounts/run-passwd.c:526
+#: panels/wwan/cc-wwan-errors-private.h:72
+#, c-format
+msgid "Unknown error"
+msgstr "Mearachd neo-aithnichte"
+
+#: panels/user-accounts/user-utils.c:144
+#, fuzzy
+#| msgid ""
+#| "The username should only consist of upper and lower case letters from a-"
+#| "z, digits and the following characters: . - _"
+msgid ""
+"The username should usually only consist of 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 "
+"beaga o a-z, àireamhan agus gin dhe na caractaran seo: . - _"
+
+#: panels/user-accounts/user-utils.c:148
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr ""
+"Tha sinn duilich ach chan eil an t-ainm-cleachdaiche seo ri fhaighinn. Feuch "
+"fear eile."
+
+#: panels/user-accounts/user-utils.c:190
+msgid "The username is too long."
+msgstr "Tha an t-ainm-cleachdaiche ro fhada."
+
+#: panels/wacom/button-mapping.ui:7 panels/wacom/cc-wacom-page.ui:38
+msgid "Map Buttons"
+msgstr "Mapaich putanan"
+
+#: panels/wacom/button-mapping.ui:26
+msgid "Map buttons to functions"
+msgstr "Mapaich putanan ri gnìomhan"
+
+#: panels/wacom/button-mapping.ui:51
+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 buille-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/button-mapping.ui:66
+msgid "_Close"
+msgstr "_Dùin"
+
+#: panels/wacom/calibrator/calibrator.ui:51
+msgid ""
+"Please tap the target markers as they appear on screen to calibrate the "
+"tablet."
+msgstr ""
+"Thoir gnogag air na comharran targaide mar a nochdas iad air an sgrìn gus an "
+"tablaid a chailbhreachadh."
+
+#: panels/wacom/calibrator/calibrator.ui:63
+msgid "Mis-click detected, restarting…"
+msgstr "Mhothaich sinn do bhriogadh claon, ag ath-thòiseachadh…"
+
+#: panels/wacom/cc-wacom-button-row.c:244
+#, c-format
+msgid "Button %d"
+msgstr "Putan %d"
+
+#: panels/wacom/cc-wacom-button-row.h:34
+msgctxt "Wacom action-type"
+msgid "Application defined"
+msgstr "A-rèir na h-aplacaid"
+
+#: panels/wacom/cc-wacom-button-row.h:35
+msgctxt "Wacom action-type"
+msgid "Send Keystroke"
+msgstr "Cuir buille-iuchrach"
+
+#: panels/wacom/cc-wacom-button-row.h:36
+msgctxt "Wacom action-type"
+msgid "Switch Monitor"
+msgstr "Gearr leum gu monatair eile"
+
+#: panels/wacom/cc-wacom-button-row.h:37
+msgctxt "Wacom action-type"
+msgid "Show On-Screen Help"
+msgstr "Seall a’ chobhair air an sgrìn"
+
+#: panels/wacom/cc-wacom-device.c:431
+msgid "Tablet mounted on laptop panel"
+msgstr ""
+
+#: panels/wacom/cc-wacom-device.c:433
+msgid "Tablet mounted on external display"
+msgstr ""
+
+#: panels/wacom/cc-wacom-device.c:435
+#, fuzzy
+#| msgid "No tablet detected"
+msgid "External tablet device"
+msgstr "Cha deach tablaid a lorg"
+
+#. All displays item
+#: panels/wacom/cc-wacom-page.c:608
+#, fuzzy
+#| msgid "Displays"
+msgid "All Displays"
+msgstr "Uidheaman-taisbeanaidh"
+
+#: panels/wacom/cc-wacom-page.ui:16
+#, fuzzy
+#| msgid "Tablet"
+msgid "Tablet Mode"
+msgstr "Tablaid"
+
+#: panels/wacom/cc-wacom-page.ui:17
+msgid "Use absolute positioning for the pen"
+msgstr ""
+
+#: panels/wacom/cc-wacom-page.ui:27
+#, fuzzy
+#| msgid "Left-Handed Orientation"
+msgid "Left Hand Orientation"
+msgstr "An comhair na làimhe chlì"
+
+#: panels/wacom/cc-wacom-page.ui:28
+msgid "Tablet and Express Keys™ are rotated for left hand use"
+msgstr ""
+
+#: panels/wacom/cc-wacom-page.ui:56
+#, fuzzy
+#| msgid "Map to Monitor…"
+msgctxt "display setting"
+msgid "Map to Monitor"
+msgstr "Mapaich ri monatair…"
+
+#: panels/wacom/cc-wacom-page.ui:62
+#, fuzzy
+#| msgid "Aspect Ratio"
+msgid "Keep Aspect Ratio"
+msgstr "Co-mheas an deilbh"
+
+#: panels/wacom/cc-wacom-page.ui:63
+msgid "Only use a portion of the tablet surface to keep monitor aspect ratio"
+msgstr ""
+
+#: panels/wacom/cc-wacom-page.ui:73
+#, fuzzy
+#| msgid "Calibrate…"
+msgid "Calibrate"
+msgstr "Cailbhrich…"
+
+#: panels/wacom/cc-wacom-panel.ui:56
+msgid "No tablet detected"
+msgstr "Cha deach tablaid a lorg"
+
+#: panels/wacom/cc-wacom-panel.ui:57
+#, fuzzy
+#| msgid "Please plug in or turn on your Wacom tablet"
+msgid "Please plug in or turn on your Wacom tablet."
+msgstr "Plug a-steach an tablaid Wacom agad no cuir air e"
+
+#: panels/wacom/cc-wacom-stylus-page.ui:16
+msgid "Tip Pressure Feel"
+msgstr "Faireachdainn brùthadh a’ chinn"
+
+#: panels/wacom/cc-wacom-stylus-page.ui:54
+#, fuzzy
+#| msgid "Button"
+msgctxt "display setting"
+msgid "Button 1"
+msgstr "Putan"
+
+#: panels/wacom/cc-wacom-stylus-page.ui:62
+#, fuzzy
+#| msgid "Button"
+msgctxt "display setting"
+msgid "Button 2"
+msgstr "Putan"
+
+#: panels/wacom/cc-wacom-stylus-page.ui:70
+#, fuzzy
+#| msgid "Button"
+msgctxt "display setting"
+msgid "Button 3"
+msgstr "Putan"
+
+#: panels/wacom/cc-wacom-stylus-page.ui:77
+msgid "Eraser Pressure Feel"
+msgstr "Faireachdainn brùthadh an t-suathain"
+
+#: panels/wacom/cc-wacom-tool.c:321
+msgid "Airbrush stylus with pressure, tilt, and integrated slider"
+msgstr ""
+
+#: panels/wacom/cc-wacom-tool.c:323
+msgid "Airbrush stylus with pressure, tilt, and rotation"
+msgstr ""
+
+#: panels/wacom/cc-wacom-tool.c:325
+msgid "Standard stylus with pressure and tilt"
+msgstr ""
+
+#: panels/wacom/cc-wacom-tool.c:327
+msgid "Standard stylus with pressure"
+msgstr ""
+
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
+msgid "Wacom Tablet"
+msgstr "Tablaid Wacom"
+
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr ""
+"Suidhich mapadh nam putanan is cuir air gleus mothalachd an staidhleis "
+"airson tablaidean grafaigeachd"
+
+#. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:19
+msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
+msgstr "Tablaid;Wacom;Staidhleas;Suathan:Luchag;"
+
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:190
+msgid "New shortcut…"
+msgstr "Ath-ghoirid ùr…"
+
+#: panels/wwan/cc-wwan-apn-dialog.ui:8
+#, fuzzy
+#| msgid "Access Options"
+msgid "Access Points"
+msgstr "Roghainnean inntrigidh"
+
+#: panels/wwan/cc-wwan-apn-dialog.ui:122
+#, fuzzy
+#| msgid "VPN"
+msgid "APN"
+msgstr "VPN"
+
+#: panels/wwan/cc-wwan-data.c:542
+msgid "Operation Cancelled"
+msgstr ""
+
+#: panels/wwan/cc-wwan-data.c:545
+msgid "<b>Error:</b> Access denied changing settings"
+msgstr ""
+
+#: panels/wwan/cc-wwan-data.c:548
+msgid "<b>Error:</b> Mobile Equipment Error"
+msgstr ""
+
+#: panels/wwan/cc-wwan-details-dialog.c:80
+msgid "Not Registered"
+msgstr ""
+
+#: panels/wwan/cc-wwan-details-dialog.c:84
+#, fuzzy
+#| msgid "Yesterday"
+msgid "Registered"
+msgstr "An-dè"
+
+#: panels/wwan/cc-wwan-details-dialog.c:88
+msgid "Roaming"
+msgstr ""
+
+#: panels/wwan/cc-wwan-details-dialog.c:92
+#, fuzzy
+#| msgid "Search"
+msgid "Searching"
+msgstr "Lorg"
+
+#: panels/wwan/cc-wwan-details-dialog.c:96
+msgid "Denied"
+msgstr ""
+
+#: panels/wwan/cc-wwan-details-dialog.ui:5
+#, fuzzy
+#| msgid "Details"
+msgid "Modem Details"
+msgstr "Mion-fhiosrachadh"
+
+#: panels/wwan/cc-wwan-details-dialog.ui:16
+msgid "Modem Status"
+msgstr ""
+
+#: panels/wwan/cc-wwan-details-dialog.ui:25
+msgid "Carrier"
+msgstr ""
+
+#: panels/wwan/cc-wwan-details-dialog.ui:49
+#, fuzzy
+#| msgid "Network Name"
+msgid "Network Type"
+msgstr "Ainm an lìonraidh"
+
+#: panels/wwan/cc-wwan-details-dialog.ui:97
+#, fuzzy
+#| msgid "Networks"
+msgid "Network Status"
+msgstr "Lìonraidhean"
+
+#: panels/wwan/cc-wwan-details-dialog.ui:122
+#, fuzzy
+#| msgid "Numbers"
+msgid "Own Number"
+msgstr "Àireamhan"
+
+#: panels/wwan/cc-wwan-details-dialog.ui:151
+#, fuzzy
+#| msgid "Printer Details"
+msgid "Device Details"
+msgstr "Fiosrachadh a’ chlò-bhualadair"
+
+#: panels/wwan/cc-wwan-details-dialog.ui:210
+#, fuzzy
+#| msgid "Firmware missing"
+msgid "Firmware Version"
+msgstr "Tha bathar-an-sàs a dhìth"
+
+#: panels/wwan/cc-wwan-device.c:988
+msgid "2G Only"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:991
+msgid "3G Only"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:994
+msgid "4G Only"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1003
+msgid "2G, 3G, 4G (Preferred)"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1005
+msgid "2G, 3G (Preferred), 4G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1007
+msgid "2G (Preferred), 3G, 4G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1009
+msgid "2G, 3G, 4G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1015
+msgid "3G, 4G (Preferred)"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1017
+msgid "3G (Preferred), 4G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1019
+msgid "3G, 4G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1025
+msgid "2G, 4G (Preferred)"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1027
+msgid "2G (Preferred), 4G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1029
+msgid "2G, 4G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1035
+msgid "2G, 3G (Preferred)"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1037
+msgid "2G (Preferred), 3G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1039
+msgid "2G, 3G"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device.c:1043
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "Network mode"
+msgid "Unknown"
+msgstr "Chan eil fhios"
+
+#: panels/wwan/cc-wwan-device-page.c:187
+msgid "Unlock SIM card"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:188 panels/wwan/cc-wwan-device-page.c:236
+#, fuzzy
+#| msgid "_Unlock"
+msgid "Unlock"
+msgstr "_Thoir a’ ghlas dheth"
+
+#: panels/wwan/cc-wwan-device-page.c:193
+#, c-format
+msgid "Please provide PIN code for SIM %d"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:194
+msgid "Enter PIN to unlock your SIM card"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:198
+#, c-format
+msgid "Please provide PUK code for SIM %d"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:199
+msgid "Enter PUK to unlock your SIM card"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:217
+#, c-format
+msgid "Wrong password entered. You have %1$u try left"
+msgid_plural "Wrong password entered. You have %1$u tries left"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: panels/wwan/cc-wwan-device-page.c:220
+#, c-format
+msgid "You have %u try left"
+msgid_plural "You have %u tries left"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: panels/wwan/cc-wwan-device-page.c:225
+msgid "Wrong password entered."
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:270
+msgid "PUK code should be an 8 digit number"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:294
+msgid "Enter New PIN"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:298
+msgid "PIN code should be a 4-8 digit number"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.c:316
+#, fuzzy
+#| msgid "_Unlock"
+msgid "Unlocking…"
+msgstr "_Thoir a’ ghlas dheth"
+
+#: panels/wwan/cc-wwan-device-page.ui:18
+msgid "No SIM"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.ui:19
+msgid "Insert a SIM card to use this modem"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.ui:33
+msgid "SIM Locked"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.ui:77
+#, fuzzy
+#| msgid "_Mobile broadband"
+msgid "_Mobile Data"
+msgstr "Bann-leathann _mobile"
+
+#: panels/wwan/cc-wwan-device-page.ui:78
+msgid "Access data using mobile network"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.ui:88
+msgid "_Data Roaming"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.ui:89
+msgid "Use mobile data when roaming"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.ui:115
+#, fuzzy
+#| msgid "Network Name"
+msgid "_Network Mode"
+msgstr "Ainm an lìonraidh"
+
+#: panels/wwan/cc-wwan-device-page.ui:122
+#, fuzzy
+#| msgid "Network"
+msgid "N_etwork"
+msgstr "Lìonra"
+
+#: panels/wwan/cc-wwan-device-page.ui:132
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Advanced"
+msgid "Advanced"
+msgstr "Adhartach"
+
+#: panels/wwan/cc-wwan-device-page.ui:146
+#, fuzzy
+#| msgid "Access Options"
+msgid "_Access Point Names"
+msgstr "Roghainnean inntrigidh"
+
+#: panels/wwan/cc-wwan-device-page.ui:155
+#, fuzzy
+#| msgid "Screen Lock"
+msgid "_SIM Lock"
+msgstr "Glas na sgrìn"
+
+#: panels/wwan/cc-wwan-device-page.ui:156
+msgid "Lock SIM with PIN"
+msgstr ""
+
+#: panels/wwan/cc-wwan-device-page.ui:165
+#, fuzzy
+#| msgid "%s Details"
+msgid "M_odem Details"
+msgstr "Fiosrachadh air %s"
+
+#: panels/wwan/cc-wwan-errors-private.h:40
+#, fuzzy
+#| msgid "PIN check failed"
+msgid "Phone failure"
+msgstr "Dh’fhàillig sgrùdadh a’ PIN"
+
+#: panels/wwan/cc-wwan-errors-private.h:41
+#, fuzzy
+#| msgid "Not connected"
+msgid "No connection to phone"
+msgstr "Chan eil ceangal ann"
+
+#: panels/wwan/cc-wwan-errors-private.h:43
+msgid "Operation not allowed"
+msgstr ""
+
+#: panels/wwan/cc-wwan-errors-private.h:44
+msgid "Operation not supported"
+msgstr ""
+
+#: panels/wwan/cc-wwan-errors-private.h:48
+#, fuzzy
+#| msgid "SIM Card not inserted"
+msgid "SIM not inserted"
+msgstr "Cha deach cairt SIM a chur a-steach"
+
+#: panels/wwan/cc-wwan-errors-private.h:49
+#, fuzzy
+#| msgid "SIM Pin required"
+msgid "SIM PIN required"
+msgstr "Tha feum air PIN an SIM"
+
+#: panels/wwan/cc-wwan-errors-private.h:50
+#, fuzzy
+#| msgid "SIM Pin required"
+msgid "SIM PUK required"
+msgstr "Tha feum air PIN an SIM"
+
+#: panels/wwan/cc-wwan-errors-private.h:51
+msgid "SIM failure"
+msgstr ""
+
+#: panels/wwan/cc-wwan-errors-private.h:52
+msgid "SIM busy"
+msgstr ""
+
+#: panels/wwan/cc-wwan-errors-private.h:54
+#, fuzzy
+#| msgid "Current _Password"
+msgid "Incorrect password"
+msgstr "Am _facal-faire làithreach"
+
+#: panels/wwan/cc-wwan-errors-private.h:55
+#, fuzzy
+#| msgid "SIM Pin required"
+msgid "SIM PIN2 required"
+msgstr "Tha feum air PIN an SIM"
+
+#: panels/wwan/cc-wwan-errors-private.h:56
+#, fuzzy
+#| msgid "SIM Pin required"
+msgid "SIM PUK2 required"
+msgstr "Tha feum air PIN an SIM"
+
+#: panels/wwan/cc-wwan-errors-private.h:59
+#, fuzzy
+#| msgid "No stylus found"
+msgid "Not found"
+msgstr "Cha deach peann a lorg"
+
+#: panels/wwan/cc-wwan-errors-private.h:61
+#, fuzzy
+#| msgid "Networks"
+msgid "No network service"
+msgstr "Lìonraidhean"
+
+#: panels/wwan/cc-wwan-errors-private.h:62
+#, fuzzy
+#| msgid "Network Name"
+msgid "Network timeout"
+msgstr "Ainm an lìonraidh"
+
+#: panels/wwan/cc-wwan-errors-private.h:75
+#, fuzzy
+#| msgid "AutoIP service failed"
+msgid "GPRS services not allowed"
+msgstr "Dh’fhàillig an t-seirbheis AutoIP"
+
+#: panels/wwan/cc-wwan-errors-private.h:78
+msgid "Roaming not allowed in this location area"
+msgstr ""
+
+#: panels/wwan/cc-wwan-errors-private.h:82
+msgid "Unspecified GPRS error"
+msgstr ""
+
+#: panels/wwan/cc-wwan-errors-private.h:91
+#, fuzzy
+#| msgctxt "print job"
+#| msgid "Canceled"
+msgid "Action Cancelled"
+msgstr "Sguireadh dheth"
+
+#: panels/wwan/cc-wwan-errors-private.h:94
+msgid "Access denied"
+msgstr ""
+
+#: panels/wwan/cc-wwan-errors-private.h:103
+#, fuzzy
+#| msgid "Unknown error"
+msgid "Unknown Error"
+msgstr "Mearachd neo-aithnichte"
+
+#: panels/wwan/cc-wwan-mode-dialog.ui:5
+#, fuzzy
+#| msgid "Network Name"
+msgid "Network Mode"
+msgstr "Ainm an lìonraidh"
+
+#: panels/wwan/cc-wwan-mode-dialog.ui:39
+#: panels/wwan/cc-wwan-network-dialog.ui:146
+#: panels/wwan/cc-wwan-sim-lock-dialog.c:229
+msgid "_Set"
+msgstr ""
+
+#: panels/wwan/cc-wwan-network-dialog.ui:41 panels/wwan/cc-wwan-panel.ui:41
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:90
+msgid "Close"
+msgstr "Dùin"
+
+#: panels/wwan/cc-wwan-network-dialog.ui:69
+#, fuzzy
+#| msgid "Automatic"
+msgid "_Automatic"
+msgstr "Fèin-obrachail"
+
+#: panels/wwan/cc-wwan-network-dialog.ui:84
+#, fuzzy
+#| msgid "My Home Network"
+msgid "Choose Network"
+msgstr "An lìonra-dhachaidh agam"
+
+#: panels/wwan/cc-wwan-network-dialog.ui:99
+msgid "Refresh Network Providers"
+msgstr ""
+
+#: panels/wwan/cc-wwan-panel.c:417 panels/wwan/cc-wwan-panel.c:448
+#, c-format
+msgid "SIM %d"
+msgstr ""
+
+#: panels/wwan/cc-wwan-panel.ui:10
+#, fuzzy
+#| msgid "My Home Network"
+msgid "Enable Mobile Network"
+msgstr "An lìonra-dhachaidh agam"
+
+#: panels/wwan/cc-wwan-panel.ui:94
+#, fuzzy
+#| msgid "No Wi-Fi Adapter Found"
+msgid "No WWAN Adapter Found"
+msgstr "Cha deach adaptar WiFi a lorg"
+
+#: panels/wwan/cc-wwan-panel.ui:104
+#, fuzzy
+#| msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgid "Make sure you have a Wireless Wan/Cellular device"
+msgstr ""
+"Dèan cinnteach gu bheil adaptar WiFi agad ceangailte agus air a chur air"
+
+#: panels/wwan/cc-wwan-panel.ui:145
+#, fuzzy
+#| msgid "Bluetooth is disabled when airplane mode is on."
+msgid "Wireless Wan is disabled when airplane mode is on"
+msgstr "Tha Bluetooth à comas fhad ’s a tha am modh itealain air."
+
+#: panels/wwan/cc-wwan-panel.ui:153
+#, fuzzy
+#| msgid "Turn Off Airplane Mode"
+msgid "_Turn off Airplane Mode"
+msgstr "Cuir am modh itealain dheth"
+
+#: panels/wwan/cc-wwan-panel.ui:184
+#, fuzzy
+#| msgid "Forget Connection"
+msgid "Data Connection"
+msgstr "Dìochuimhnich an ceangal"
+
+#: panels/wwan/cc-wwan-panel.ui:185
+#, fuzzy
+#| msgid "SIM Card not inserted"
+msgid "SIM card used for internet"
+msgstr "Cha deach cairt SIM a chur a-steach"
+
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:9
+#, fuzzy
+#| msgid "Screen Lock"
+msgid "SIM Lock"
+msgstr "Glas na sgrìn"
+
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:24
+msgid "_Next"
+msgstr ""
+
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:122
+msgid "_Lock SIM with PIN"
+msgstr ""
+
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:138
+#, fuzzy
+#| msgid "Ch_ange"
+msgid "Change PIN"
+msgstr "_Atharraich"
+
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:231
+msgid "Enter current PIN to change SIM lock settings"
+msgstr ""
+
+#: panels/wwan/gnome-wwan-panel.desktop.in.in:3
+#, fuzzy
+#| msgid "My Home Network"
+msgid "Mobile Network"
+msgstr "An lìonra-dhachaidh agam"
+
+#: panels/wwan/gnome-wwan-panel.desktop.in.in:4
+#, fuzzy
+#| msgid "Configure Removable Media settings"
+msgid "Configure Telephony and mobile data connections"
+msgstr "Rèitich roghainnean nam meadhanan so-ghiùlain"
+
+#. FIXME
+#. Translators: Search terms to find the WWAN panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/wwan/gnome-wwan-panel.desktop.in.in:16
+msgid "cellular;wwan;telephony;sim;mobile;"
+msgstr ""
+
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:8
+#, fuzzy
+#| msgid "Utilities to configure the GNOME desktop"
+msgid "Utility to configure the GNOME desktop"
+msgstr "Goireasan gus an deasg GNOME a rèiteachadh"
+
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:10
+msgid "Settings is the primary interface for configuring your system."
+msgstr ""
+
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:34
+msgid "The GNOME Project"
+msgstr ""
+
+#: shell/cc-application.c:59
+msgid "Display version number"
+msgstr "Seall àireamh an tionndaidh"
+
+#: shell/cc-application.c:60
+msgid "Enable verbose mode"
+msgstr "Cuir an comas am modh brathrach"
+
+#: shell/cc-application.c:61
+msgid "Search for the string"
+msgstr "Lorg an t-sreang"
+
+#: shell/cc-application.c:62
+msgid "List possible panel names and exit"
+msgstr "Seall ainmean a ghabhas a chleachdadh is dèan fàgail"
+
+#: shell/cc-application.c:63
+msgid "Panel to display"
+msgstr "A’ phanail a thèid a shealltainn"
+
+#: shell/cc-application.c:63
+msgid "[PANEL] [ARGUMENT…]"
+msgstr "[PANEL] [ARGUMENT…]"
+
+#: shell/cc-panel-list.ui:39 shell/cc-window.c:242
+msgid "Privacy"
+msgstr "Prìobhaideachd"
+
+#: shell/cc-panel-loader.c:301
+msgid "Available panels:"
+msgstr "Panailean a tha ri fhaighinn:"
+
+#: shell/cc-window.ui:30
+msgid "All Settings"
+msgstr "Na h-uile roghainn"
+
+#: shell/cc-window.ui:54
+#, fuzzy
+#| msgid "Primary"
+msgid "Primary Menu"
+msgstr "Prìomh-phanail"
+
+#: shell/cc-window.ui:152
+msgid "Warning: Development Version"
+msgstr ""
+
+#: shell/cc-window.ui:153
+msgid ""
+"This version of Settings should only be used for development purposes. You "
+"may experience incorrect system behavior, data loss, and other unexpected "
+"issues. "
+msgstr ""
+
+#: shell/cc-window.ui:164
+msgid "Help"
+msgstr "Cobhair"
+
+#: shell/help-overlay.ui:15
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Coitcheann"
+
+#: shell/help-overlay.ui:20
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "Fàg an-seo"
+
+#: shell/help-overlay.ui:27 shell/help-overlay.ui:57
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Lorg"
+
+#: shell/help-overlay.ui:35
+msgctxt "shortcut window"
+msgid "Panels"
+msgstr "Panailean"
+
+#: shell/help-overlay.ui:41 shell/help-overlay.ui:49
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Go back to the overview"
+msgctxt "shortcut window"
+msgid "Go back to previous panel"
+msgstr "Till dhan fhoir-shealladh"
+
+#: shell/help-overlay.ui:62
+msgctxt "shortcut window"
+msgid "Cancel search"
+msgstr "Sguir dhen lorg"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: shell/org.gnome.Settings.desktop.in.in:17
+msgid "Preferences;Settings;"
+msgstr "Roghainnean;"
+
+#: shell/org.gnome.Settings.gschema.xml:5
+msgid "The identifier for the last Settings panel to be opened"
+msgstr "Aithnichear a’ phanail roghainnean mu dheireadh a thèid fhosgladh"
+
+#: shell/org.gnome.Settings.gschema.xml:6
+msgid ""
+"The identifier for the last Settings panel to be opened. Unrecognised values "
+"will be ignored and the first panel in the list selected."
+msgstr ""
+"Aithnichear a’ phanail roghainnean mu dheireadh a thèid fhosgladh. Thèid "
+"luachan nach aithne dhuinn a leigeil seachad agus a’ chiad phanail air an "
+"liosta a thaghadh ’na àite."
+
+#: shell/org.gnome.Settings.gschema.xml:13
+msgid "Show warning when running a development build of Settings"
+msgstr ""
+
+#: shell/org.gnome.Settings.gschema.xml:14
+msgid ""
+"Whether Settings should show a warning when running a development build."
+msgstr ""
+
+#: shell/org.gnome.Settings.gschema.xml:20
+msgid "Initial state of the window"
+msgstr ""
+
+#: shell/org.gnome.Settings.gschema.xml:21
+msgid ""
+"A tuple containing the initial width, height and maximized state of the "
+"application window."
+msgstr ""
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1915
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u às-chur"
+msgstr[1] "%u às-chur"
+msgstr[2] "%u às-chuir"
+msgstr[3] "%u às-chur"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1925
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u ion-chur"
+msgstr[1] "%u ion-chur"
+msgstr[2] "%u ion-chuir"
+msgstr[3] "%u ion-chur"
+
+#: subprojects/gvc/gvc-mixer-control.c:2876
+msgid "System Sounds"
+msgstr "Fuaimean an t-siostaim"
+
+#~ msgid "_Background"
+#~ msgstr "Cùlai_bh"
+
+#~ msgid "Changes throughout the day"
+#~ msgstr "Atharraichean tron latha"
+
+#~ msgid "_Lock Screen"
+#~ msgstr "G_lais an sgrìn"
+
+#~ msgctxt "background, style"
+#~ msgid "Tile"
+#~ msgstr "Leacag"
+
+#~ msgctxt "background, style"
+#~ msgid "Zoom"
+#~ msgstr "Sùm"
+
+#~ msgctxt "background, style"
+#~ msgid "Center"
+#~ msgstr "Meadhanaich"
+
+#~ msgctxt "background, style"
+#~ msgid "Scale"
+#~ msgstr "Sgèile"
+
+#~ msgctxt "background, style"
+#~ msgid "Fill"
+#~ msgstr "Lìon"
+
+#~ msgctxt "background, style"
+#~ msgid "Span"
+#~ msgstr "Ruigheachd"
+
+#~ msgid "Colors"
+#~ msgstr "Dathan"
+
+#~ msgid "Select Background"
+#~ msgstr "Tagh an cùlaibh"
+
+#~ msgid "Pictures"
+#~ msgstr "Dealbhan"
+
+#~ msgid "No Pictures Found"
+#~ msgstr "Cha deach dealbh a lorg"
+
+#~ 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 "
+#~ "an-seo"
+
+#~| msgid "Bluetooth"
+#~ msgid "bluetooth"
+#~ msgstr "bluetooth"
+
+#~ msgid "The profile has been uploaded to:"
+#~ msgstr "Chaidh a’ phròifil a luchdadh suas gu:"
+
+#~ msgid "Write down this URL."
+#~ msgstr "Sgrìobh sìos an URL seo."
+
+#~ msgid "Restart this computer and boot your normal operating system."
+#~ msgstr ""
+#~ "Ath-thòisich an coimpiutair seo is tòisich an siostam-obrachaidh "
+#~ "àbhaisteach agad."
+
+#~ 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 "
+#~ "a-nuas is a stàladh."
+
+#~ msgid "Upload profile"
+#~ msgstr "Luchdaich suas pròifil"
+
+#~ msgid "Requires Internet connection"
+#~ msgstr "Feumaidh seo ceangal ris an eadar-lìon"
+
+#~| msgid "Preferences"
+#~ msgid "preferences-color"
+#~ msgstr "preferences-color"
+
+#~ msgid "∶"
+#~ msgstr ":"
+
+#~ msgid "preferences-system-time"
+#~ msgstr "preferences-system-time"
+
+#~ msgid ""
+#~ "Drag displays to match your setup. The top bar is placed on the primary "
+#~ "display."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "Display Mode"
+#~ msgstr "Modh an taisbeanaidh"
+
+#~ msgid "Join Displays"
+#~ msgstr "Cuir na h-uidheaman-taisbeanaidh còmhla"
+
+#~ msgid "_Night Light"
+#~ msgstr "Solas _oidhche"
+
+#~ msgid "Could not get screen information"
+#~ msgstr "Cha b’ urrainn dhuinn fiosrachadh na sgrìn fhaighinn"
+
+#~ msgid "preferences-desktop-display"
+#~ msgstr "preferences-desktop-display"
+
+#~ msgid "Version %s"
+#~ msgstr "Tionndadh %s"
+
+#~ msgid "starred"
+#~ msgstr "starred"
+
+#~ msgid "help-about"
+#~ msgstr "help-about"
+
+#~ msgid "media-removable"
+#~ msgstr "media-removable"
+
+#~ msgid "OS name"
+#~ msgstr "Ainm an t-siostam-obrachaidh"
+
+#~ msgid "OS type"
+#~ msgstr "Seòrsa an t-siostam-obrachaidh"
+
+#~ msgid "Disk"
+#~ msgstr "Diosga"
+
+#~ msgid "Check for updates"
+#~ msgstr "Thoir sùil airson ùrachaidhean"
+
+#~ msgid "Screenshots"
+#~ msgstr "Glacaidhean-sgrìn"
+
+#~ msgid "Save a screenshot to $PICTURES"
+#~ msgstr "Cuir lethbhreac de ghlacadh-sgrìn dha $PICTURES"
+
+#~ msgid "Save a screenshot of a window to $PICTURES"
+#~ msgstr "Cuir lethbhreac de ghlacadh-sgrìn uinneige dha $PICTURES"
+
+#~ msgid "Save a screenshot of an area to $PICTURES"
+#~ msgstr "Cuir lethbhreac de ghlacadh-sgrìn raoin dha $PICTURES"
+
+#~ msgid "Copy a screenshot to clipboard"
+#~ msgstr "Cuir lethbhreac de ghlacadh-sgrìn air an stòr-bhòrd"
+
+#~ msgid "Copy a screenshot of a window to clipboard"
+#~ msgstr "Cuir lethbhreac de ghlacadh-sgrìn uinneige air an stòr-bhòrd"
+
+#~ msgid "Copy a screenshot of an area to clipboard"
+#~ msgstr "Cuir lethbhreac de raon air an stòr-bhòrd"
+
+#~ msgid "Record a short screencast"
+#~ msgstr "Clàraich craoladh-sgrìn goirid"
+
+#~ msgid "Modifiers-only switch to next source"
+#~ msgstr "Gluaisidh na h-iuchraichean atharrachaidh dhan ath-thùs thu"
+
+#~ msgid "input-keyboard"
+#~ msgstr "input-keyboard"
+
+#~ msgid "input-mouse"
+#~ msgstr "input-mouse"
+
+#~ msgid "Double-click timeout"
+#~ msgstr "Crìoch-ùine a’ bhriogaidh dhùbailte"
+
+#~ msgid "Network proxy"
+#~ msgstr "Progsaidh lìonraidh"
+
+#~ msgid "%s VPN"
+#~ msgstr "%s VPN"
+
+#~ msgid "page 1"
+#~ msgstr "duilleag 1"
+
+#~ msgid "Inner _authentication"
+#~ msgstr "De_arbhadh a-staigh"
+
+#~ msgid "page 2"
+#~ msgstr "duilleag 2"
+
+#~ msgid "Restrict background data usage"
+#~ msgstr "Cuingich cleachdadh dàta sa chùlaibh"
+
+#~ msgid "Appropriate for connections that have data charges or limits."
+#~ msgstr ""
+#~ "Tha seo iomchaidh airson ceanglaichean le cosgais no cuingeachadh dàta "
+#~ "orra."
+
+#~ msgid "Twisted Pair (TP)"
+#~ msgstr "Twisted Pair (TP)"
+
+#~ msgid "Attachment Unit Interface (AUI)"
+#~ msgstr "Attachment Unit Interface (AUI)"
+
+#~ msgid "BNC"
+#~ msgstr "BNC"
+
+#~ msgid "Media Independent Interface (MII)"
+#~ msgstr "Media Independent Interface (MII)"
+
+#~ msgid "10 Mb/s"
+#~ msgstr "10 Mb/s"
+
+#~ msgid "100 Mb/s"
+#~ msgstr "100 Mb/s"
+
+#~ msgid "1 Gb/s"
+#~ msgstr "1 Gb/s"
+
+#~ msgid "10 Gb/s"
+#~ msgstr "10 Gb/s"
+
+#~ msgid "network-workgroup"
+#~ msgstr "network-workgroup"
+
+#~ msgid "network-wireless"
+#~ msgstr "network-wireless"
+
+#~ 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."
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "details"
+#~ msgstr "mion-fhiosrachadh"
+
+#~ msgid "Show P_assword"
+#~ msgstr "Seall _am facal-faire"
+
+#~ msgid "Make available to other users"
+#~ msgstr "Cuir ri làimh chleachdaichean eile"
+
+#~ msgid "identity"
+#~ msgstr "dearbh-aithne"
+
+#~ msgid "IPv_4"
+#~ msgstr "IPv_4"
+
+#~ msgid "_Addresses"
+#~ msgstr "Seòl_aidhean"
+
+#~ msgid "Automatic (DHCP) addresses only"
+#~ msgstr "Seòlaidhean fèin-obrachail (DHCP) a-mhàin"
+
+#~ msgid "Link-local only"
+#~ msgstr "Link-Local a-mhàin"
+
+#~ msgid "_Ignore automatically obtained routes"
+#~ msgstr "Le_ig seachad slighean a fhuaras gu fèin-obrachail"
+
+#~ msgid "ipv4"
+#~ msgstr "ipv4"
+
+#~ msgid "IPv_6"
+#~ msgstr "IPv_6"
+
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
+
+#~ msgid "_Cloned MAC Address"
+#~ msgstr "Seòladh MAC _clònaichte"
+
+#~ msgid "hardware"
+#~ msgstr "bathar-cruaidh"
+
+#~ msgid "_Reset"
+#~ msgstr "_Ath-shuidhich"
+
+#~ 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 "
+#~ "fhearr leat."
+
+#~ 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 gu fèin-obrachail a-rithist"
+
+#~ msgid "Hardware"
+#~ msgstr "Bathar Cruaidh"
+
+#~ msgctxt "tab"
+#~ msgid "Reset"
+#~ msgstr "Ath-shuidhich"
+
+#~ msgid "Switch off to connect to a Wi-Fi network"
+#~ msgstr "Cuir dheth e gus ceangal a dhèanamh ri lìonra WiFi"
+
+#~| msgid "Password"
+#~ msgctxt "Wi-Fi passkey"
+#~ msgid "Password"
+#~ msgstr "Facal-faire"
+
+#~ msgid "Ad-hoc"
+#~ msgstr "Ad-hoc"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Bun-structar"
+
+#~| msgid "Preferences;Settings;"
+#~ msgid "preferences-system-notifications"
+#~ msgstr "preferences-system-notifications"
+
+#~ msgid "Notification _Popups"
+#~ msgstr "_Priob-bhrathan"
+
+#~ msgid "goa-panel"
+#~ msgstr "goa-panel"
+
+#~ msgctxt "Battery power"
+#~ msgid "Charging"
+#~ msgstr "A’ teairrdseadh"
+
+#~ msgctxt "Battery power"
+#~ msgid "Caution"
+#~ msgstr "Aire"
+
+#~ msgctxt "Battery power"
+#~ msgid "Low"
+#~ msgstr "Ìseal"
+
+#~ msgctxt "Battery power"
+#~ msgid "Good"
+#~ msgstr "Math"
+
+#~ msgctxt "Battery power"
+#~ msgid "Fully charged"
+#~ msgstr "Air a làn-teairrdseadh"
+
+#~ msgctxt "Battery power"
+#~ msgid "Empty"
+#~ msgstr "Falamh"
+
+#~ msgid "_Screen brightness"
+#~ msgstr "_Soilleireachd na sgrìn"
+
+#~ msgid "_Keyboard brightness"
+#~ msgstr "Soilleireachd a’ _mheur-chlàir"
+
+#~ msgid "_Dim screen when inactive"
+#~ msgstr "_Doilleirich an sgrìn mur eil gnìomhachd sam bith"
+
+#~ msgid "_Wi-Fi"
+#~ msgstr "_WiFi"
+
+#~ msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
+#~ msgstr ""
+#~ "Cuir am bann-leathann mobile (3G, 4G, LTE, is msaa.) dheth gus cumhachd a "
+#~ "chaomhnadh."
+
+#~ msgid "_Bluetooth"
+#~ msgstr "_Bluetooth"
+
+#~| msgid "Turn off Wi-Fi to save power."
+#~ msgid "Turn off Bluetooth to save power."
+#~ msgstr "Cuir Bluetooth dheth gus cumhachd a chaomhnadh."
+
+#~ msgid "Suspend & Power Button"
+#~ msgstr "Putan cur ’na dhàil ⁊ na cumhachd"
+
+#~ msgid "_Automatic suspend"
+#~ msgstr "Cuir ’n_a dhàil gu fèin-obrachail"
+
+#~ msgid "_When the Power Button is pressed"
+#~ msgstr "_Nuair a bhios putan na cumhachd ’ga bhrùthadh"
+
+#~ msgid "gnome-power-manager"
+#~ msgstr "gnome-power-manager"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Authenticate"
+#~ msgstr "Dearbhaich"
+
+#~| msgid "No printers"
+#~ msgid "printer"
+#~ msgstr "printer"
+
+#~ msgid "Add…"
+#~ msgstr "Cuir ris…"
+
+#~ msgid "In use"
+#~ msgstr "’Ga chleachdadh"
+
+#~ msgctxt "Location services status"
+#~ msgid "On"
+#~ msgstr "Air"
+
+#~ msgctxt "Location services status"
+#~ msgid "Off"
+#~ msgstr "Dheth"
+
+#~ msgid "Usage & History"
+#~ msgstr "Cleachdadh ⁊ an eachraidh"
+
+#~ msgid "Privacy Policy"
+#~ msgstr "Am poileasaidh prìobhaideachd"
+
+#~ msgid "Protect your personal information and control what others might see"
+#~ msgstr "Dìon am fiosrachadh pearsanta agad is stiùirich na chì càch"
+
+#~ msgid "preferences-system-privacy"
+#~ msgstr "preferences-system-privacy"
+
+#~ msgid ""
+#~ "Remembering your history makes things easier to find again. These items "
+#~ "are never shared over the network."
+#~ msgstr ""
+#~ "Ma chumas tu an eachdraidh an cuimhne, bidh e nas fhasa greim fhaighinn "
+#~ "air rudan. Cha dèid na rudan seo a nochdadh ris an lìonra idir."
+
+#~ msgid "_Recently Used"
+#~ msgstr "Ai_r an cleachdadh o chionn goirid"
+
+#~ msgid "Retain _History"
+#~ msgstr "Glèidh an eachdraid_h"
+
+#~ msgid "The Screen Lock protects your privacy when you are away."
+#~ msgstr ""
+#~ "Dìonaidh glas na sgrìn do phrìobhaideachd nuair a bhios tu air falbh."
+
+#~ msgid "Lock screen _after blank for"
+#~ msgstr "Glais _an sgrìn an dèidh dha a bhith bàn fad"
+
+#~ msgid ""
+#~ "Automatically purge the Trash and temporary files to help keep your "
+#~ "computer free of unnecessary sensitive information."
+#~ msgstr ""
+#~ "Purgaidich an sgudal is na faidhlichean sealach gu fèin-obrachail gus an "
+#~ "coimpiutair agad a chumail saor o fhiosrachadh prìobhaideach air nach eil "
+#~ "feum."
+
+#~ msgid "Purge _After"
+#~ msgstr "Purgaidich an _dèidh"
+
+#~ msgid ""
+#~ "Sending us information about which software you use helps us provide you "
+#~ "with more accurate recommendations. It also helps us to improve our "
+#~ "software.\n"
+#~ "\n"
+#~ "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 "
+#~ "urrainn dhuinn molaidhean nas pongaile a thoirt dhut. Agus bidh cothrom "
+#~ "againn am bathar-bog againn a leasachadh.\n"
+#~ "\n"
+#~ "Bidh fiosrachadh sam bith a chruinnicheas sinn gun urra agus cha doir "
+#~ "sinn an dàta agad do threas-phàrtaidhean idir."
+
+#~ msgid "_Send software usage statistics"
+#~ msgstr "Cuir _stats air cleachdadh a’ bhathair-bhog"
+
+#~ msgid ""
+#~ "Location services allow applications to know your location. Using Wi-Fi "
+#~ "and mobile broadband increases accuracy."
+#~ msgstr ""
+#~ "Leigidh seirbheisean ionaid leis na h-aplacaidean faighinn a-mach far a "
+#~ "bheil thu. Bidh seo nas pongaile le WiFi is bann-leathann mobile."
+
+#~ msgid ""
+#~ "Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+#~ "com/privacy'>Privacy Policy</a>"
+#~ msgstr ""
+#~ "Cleachdaidh e Mozilla Location Service: <a href='https://location.";
+#~ "services.mozilla.com/privacy'>Poileasaidh prìobhaideachd</a>"
+
+#~ msgid "_Location Services"
+#~ msgstr "Seirbheisean _ionaid"
+
+#~ msgid "No regions found"
+#~ msgstr "Cha deach roinn-dùthcha a lorg"
+
+#~ msgid "preferences-desktop-locale"
+#~ msgstr "preferences-desktop-locale"
+
+#~ msgid "Switch to previous source"
+#~ msgstr "Gearr leum gun tùs roimhe"
 
-#: 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-obrachail"
+#~ msgid "Super+Shift+Space"
+#~ msgstr "Super+Shift+Space"
 
-#: panels/user-accounts/um-realm-manager.c:413
-#, c-format
-msgid "No such domain or realm found"
-msgstr "Cha deach àrainn no rìoghachd mar sin a lorg"
+#~ msgid "Switch to next source"
+#~ msgstr "Gearr leum gun ath-thùs"
 
-#: panels/user-accounts/um-realm-manager.c:815
-#: panels/user-accounts/um-realm-manager.c:829
-#, c-format
-msgid "Cannot log in as %s at the %s domain"
-msgstr "Chan urrainn dhut clàradh a-steach mar %s air an àrainn %s"
+#~ msgid "Super+Space"
+#~ msgstr "Super+Space"
 
-#: panels/user-accounts/um-realm-manager.c:821
-msgid "Invalid password, please try again"
-msgstr "Tha am facal-faire cearr, nach fheuch thu ris a-rithist?"
+#~ msgid "Alternative switch to next source"
+#~ msgstr "Dòigh eile airson leumadh gun ath-thùs"
 
-#: panels/user-accounts/um-realm-manager.c:834
-#, c-format
-msgid "Couldn’t connect to the %s domain: %s"
-msgstr "Cha b’ urrainn ceangal ris an àrainn %s: %s"
+#~ msgid "English (United Kingdom)"
+#~ msgstr "Beurla (An Rìoghachd Aonaichte)"
 
-#: panels/user-accounts/um-user-panel.c:200
-msgid "Your account"
-msgstr "An cunntas agad"
+#~ 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/user-accounts/um-user-panel.c:380
-msgid "Failed to delete user"
-msgstr "Cha b’ urrainn dhuinn an cleachdaiche a sguabadh às"
+#~ msgid "Restart…"
+#~ msgstr "Ath-thòisich…"
 
-#: panels/user-accounts/um-user-panel.c:438
-#: panels/user-accounts/um-user-panel.c:497
-#: panels/user-accounts/um-user-panel.c:549
-msgid "Failed to revoke remotely managed user"
-msgstr "Cha deach leinn an cleachdaiche fo stiùireadh cèin a chùl-ghairm"
+#~ msgid "United Kingdom"
+#~ msgstr "An Rìoghachd Aonaichte"
 
-#: panels/user-accounts/um-user-panel.c:603
-msgid "You cannot delete your own account."
-msgstr "Chan urrainn dhut an cunntas agad fhèin a sguabadh às."
+#~ msgid "_Options"
+#~ msgstr "_Roghainnean"
 
-#: panels/user-accounts/um-user-panel.c:612
-#, c-format
-msgid "%s is still logged in"
-msgstr "Tha %s clàraichte a-staigh fhathast"
+#~ msgid "Add input source"
+#~ msgstr "Cuir tùs ion-chuir ris"
 
-#: panels/user-accounts/um-user-panel.c:616
-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."
+#~ msgid "Remove input source"
+#~ msgstr "Thoir an tùs ion-chuir air falbh"
 
-#: panels/user-accounts/um-user-panel.c:625
-#, c-format
-msgid "Do you want to keep %s’s files?"
-msgstr "A bheil thu airson na faidhlichean aig %s a chumail?"
+#~ msgid "Move input source up"
+#~ msgstr "Gluais an tùs ion-chuir suas"
 
-#: panels/user-accounts/um-user-panel.c:629
-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 ghlèidheadh nuair a 
sguabar às cunntas cleachdaiche."
+#~ msgid "Move input source down"
+#~ msgstr "Gluais an tùs ion-chuir sìos"
 
-#: panels/user-accounts/um-user-panel.c:632
-msgid "_Delete Files"
-msgstr "_Sguab às na faidhlichean"
+#~ msgid "Configure input source"
+#~ msgstr "Rèitich an tùs ion-chuir"
 
-#: panels/user-accounts/um-user-panel.c:633
-msgid "_Keep Files"
-msgstr "_Cum na faidhlichean"
+#~ msgid "Show input source keyboard layout"
+#~ msgstr "Seall co-dhealbhachd a’ mheur-chlàir air an tùs ion-chuir"
 
-#: panels/user-accounts/um-user-panel.c:647
-#, c-format
-msgid "Are you sure you want to revoke remotely managed %s’s account?"
-msgstr "A bheil thu cinnteach gu bheil thu airson an cunntas aig %s fo stiùireadh cèin a chùl-ghairm?"
+#~ 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 "
+#~ "cleachdaiche nuair a chlàraicheas iad a-steach air an t-siostam"
 
-#: panels/user-accounts/um-user-panel.c:651
-msgid "_Delete"
-msgstr "_Sguab às"
+#~ msgid "preferences-system-search"
+#~ msgstr "preferences-system-search"
 
-#: panels/user-accounts/um-user-panel.c:701
-msgctxt "Password mode"
-msgid "Account disabled"
-msgstr "Chaidh an cunntas a chur à comas"
+#~ 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>"
 
-#: panels/user-accounts/um-user-panel.c:709
-msgctxt "Password mode"
-msgid "To be set at next login"
-msgstr "Ri shuidheachadh an ath-thuras a nithear clàradh a-steach"
+#~ msgid "Copy"
+#~ msgstr "Dèan lethbhreac"
 
-#: panels/user-accounts/um-user-panel.c:712
-msgctxt "Password mode"
-msgid "None"
-msgstr "Chan eil gin"
+#~ msgid "preferences-system-sharing"
+#~ msgstr "preferences-system-sharing"
 
-#: panels/user-accounts/um-user-panel.c:759
-msgid "Logged in"
-msgstr "Air clàradh a-steach"
+#~ msgid "_Screen Sharing"
+#~ msgstr "Co-roinneadh _sgrìnichean"
 
-#: panels/user-accounts/um-user-panel.c:1106
-msgid "Failed to contact the accounts service"
-msgstr "Cha b’ urrainn dhuinn fios a chur gu seirbheis nan cunntasan"
+#~ 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 air an lìonra."
 
-#: panels/user-accounts/um-user-panel.c:1108
-msgid "Please make sure that the AccountService is installed and enabled."
-msgstr "Dèan cinnteach gun deach AccountService a stàladh agus an comas."
+#~ msgid "Screen Sharing"
+#~ msgstr "Co-roinneadh sgrìnichean"
 
-#. Translator comments:
-#. * We split the line in 2 here to "make it look good", as there's
-#. * no good way to do this in GTK+ for tooltips. See:
-#. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
-#: panels/user-accounts/um-user-panel.c:1140
-msgid ""
-"To make changes,\n"
-"click the * icon first"
-msgstr "Gus atharraichean a dhèanamh,\nbriog an ìomhaigheag * an toiseach"
+#~ msgid "_Password:"
+#~ msgstr "_Facal-faire:"
 
-#: panels/user-accounts/um-user-panel.c:1180
-msgid "Create a user account"
-msgstr "Cruthaich cunntas cleachdaiche"
+#~ msgid "_Show Password"
+#~ msgstr "_Seall am facal-faire"
 
-#: panels/user-accounts/um-user-panel.c:1191
-#: panels/user-accounts/um-user-panel.c:1370
-msgid ""
-"To create a user account,\n"
-"click the * icon first"
-msgstr "Gus cunntas cleachdaiche a chruthachadh,\nbriog air an ìomhaigheag * an toiseach"
+#~ msgid "_New connections must ask for access"
+#~ msgstr "Feumaidh ceanglaichean ùra cead-i_nntrigidh iarraidh"
 
-#: panels/user-accounts/um-user-panel.c:1201
-msgid "Delete the selected user account"
-msgstr "Sguab às cunntas a’ chleachdaiche a thagh thu"
+#~ msgid "_Require a password"
+#~ msgstr "Ia_rr facal-faire"
 
-#: panels/user-accounts/um-user-panel.c:1213
-#: panels/user-accounts/um-user-panel.c:1375
-msgid ""
-"To delete the selected user account,\n"
-"click the * icon first"
-msgstr "Gus cunntas a’ chleachdaiche a thagh thu a sguabadh às,\nbriog air an ìomhaigheag * an toiseach"
+#~ msgid "multimedia-volume-control"
+#~ msgstr "multimedia-volume-control"
 
-#: panels/user-accounts/um-utils.c:496
-msgid "Sorry, that user name isn’t available. Please try another."
-msgstr "Tha sinn duilich ach chan eil an t-ainm-cleachdaiche seo ri fhaighinn. Feuch fear eile."
+#~ msgctxt "balance"
+#~ msgid "Left"
+#~ msgstr "Clì"
 
-#: panels/user-accounts/um-utils.c:499
-#, c-format
-msgid "The username is too long."
-msgstr "Tha an t-ainm-cleachdaiche ro fhada."
+#~ msgctxt "balance"
+#~ msgid "Right"
+#~ msgstr "Deas"
 
-#: panels/user-accounts/um-utils.c:502
-msgid "The username cannot start with a “-”."
-msgstr "Chan fhaod an t-ainm-cleachdaiche tòiseachadh le “-”."
+#~ msgctxt "balance"
+#~ msgid "Minimum"
+#~ msgstr "As lugha"
 
-#: panels/user-accounts/um-utils.c:505
-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 beaga o a-z, àireamhan agus 
gin dhe na caractaran seo: . - _"
+#~ msgctxt "balance"
+#~ msgid "Maximum"
+#~ msgstr "As motha"
 
-#: panels/user-accounts/um-utils.c:509
-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 ghabh atharrachadh."
+#~ msgid "_Subwoofer:"
+#~ msgstr "Sub_woofer:"
 
-#: panels/wacom/button-mapping.ui:9
-msgid "Map Buttons"
-msgstr "Mapaich putanan"
+#~ msgctxt "volume"
+#~ msgid "Unamplified"
+#~ msgstr "Gun amplachadh"
 
-#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:547
-#: panels/wacom/gnome-wacom-properties.ui:60
-msgid "_Close"
-msgstr "_Dùin"
+#~ msgid "_Profile:"
+#~ msgstr "_Pròifil:"
 
-#: panels/wacom/button-mapping.ui:71
-msgid "Map buttons to functions"
-msgstr "Mapaich putanan ri gnìomhan"
+#~ msgid "_Test Speakers"
+#~ msgstr "Cuir na glaodhairean _fo dheuchainn"
 
-#: panels/wacom/button-mapping.ui:119
-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 buille-iuchrach”, brùth putan ath-ghoirid 
meur-chlàir is cum sìos na h-iuchraichean ùra no brùth Backspace gus fhalamhachadh."
+#~ msgid "Peak detect"
+#~ msgstr "Lorg am mullach"
 
-#: panels/wacom/calibrator/calibrator-gui.c:83
-msgid ""
-"Please tap the target markers as they appear on screen to calibrate the "
-"tablet."
-msgstr "Thoir gnogag air na comharran targaide mar a nochdas iad air an sgrìn gus an tablaid a 
chailbhreachadh."
+#~ msgid "Device"
+#~ msgstr "Uidheam"
 
-#: panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting…"
-msgstr "Mhothaich sinn do bhriogadh claon, ag ath-thòiseachadh…"
+#~ msgid "Speaker Testing for %s"
+#~ msgstr "Cuir na glaodhairean airson %s fo dheuchainn"
 
-#: panels/wacom/cc-wacom-button-row.c:266
-#, c-format
-msgid "Button %d"
-msgstr "Putan %d"
+#~ msgid "C_hoose a device for sound output:"
+#~ msgstr "T_agh uidheam airson às-chur na fuaime:"
 
-#: panels/wacom/cc-wacom-button-row.h:53
-msgctxt "Wacom action-type"
-msgid "Application defined"
-msgstr "A-rèir na h-aplacaid"
+#~ msgid "Settings for the selected device:"
+#~ msgstr "Roghainnean an uidheim a thagh thu:"
 
-#: panels/wacom/cc-wacom-button-row.h:54
-msgctxt "Wacom action-type"
-msgid "Send Keystroke"
-msgstr "Cuir buille-iuchrach"
+#~ msgid "_Input volume:"
+#~ msgstr "Àirde fuaim an i_on-chuir:"
 
-#: panels/wacom/cc-wacom-button-row.h:55
-msgctxt "Wacom action-type"
-msgid "Switch Monitor"
-msgstr "Gearr leum gu monatair eile"
+#~ msgid "C_hoose a device for sound input:"
+#~ msgstr "T_agh uidheam airson ion-chur fuaime:"
 
-#: 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"
+#~ msgid "Sound Effects"
+#~ msgstr "Èifeachdan fuaime"
 
-#: panels/wacom/cc-wacom-mapping-panel.c:260
-msgid "Output:"
-msgstr "Às-chur:"
+#~ msgid "Built-in"
+#~ msgstr "’Na bhroinn o thùs"
 
-#. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:272
-msgid "Keep aspect ratio (letterbox):"
-msgstr "Glèidh co-mheas an deilbh (bogsa-litrichean):"
+#~ msgid "Sound Preferences"
+#~ msgstr "Roghainnean na fuaime"
 
-#. Whole-desktop checkbox
-#: panels/wacom/cc-wacom-mapping-panel.c:283
-msgid "Map to single monitor"
-msgstr "Mapaich ri monatair singilte"
+#~ msgid "Testing event sound"
+#~ msgstr "A’ cur na fuaime fo dheuchainn"
 
-#: panels/wacom/cc-wacom-nav-button.c:86
-#, c-format
-msgid "%d of %d"
-msgstr "%d de %d"
+#~ msgid "Default"
+#~ msgstr "Bun-roghainn"
 
-#: panels/wacom/cc-wacom-page.c:544
-msgid "Display Mapping"
-msgstr "Seall am mapadh"
+#~ msgid "From theme"
+#~ msgstr "On ùrlar"
 
-#: panels/wacom/cc-wacom-panel.c:790 panels/wacom/wacom-stylus-page.ui:127
-msgid "Stylus"
-msgstr "Staidhleas"
+#~ msgid "C_hoose an alert sound:"
+#~ msgstr "T_agh fuaim rabhaidh:"
 
-#: panels/wacom/cc-wacom-stylus-page.c:362
-msgid "Button"
-msgstr "Putan"
+#~ msgid "Stop"
+#~ msgstr "Stad"
 
-#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
-#: panels/wacom/gnome-wacom-properties.ui:198
-msgid "Wacom Tablet"
-msgstr "Tablaid Wacom"
+#~ msgid "preferences-desktop-accessibility"
+#~ msgstr "preferences-desktop-accessibility"
 
-#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
-msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
-msgstr "Suidhich mapadh nam putanan is cuir air gleus mothalachd an staidhleis airson tablaidean 
grafaigeachd"
+#~ msgid "Screen Reader"
+#~ msgstr "Leughadair-sgrìn"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/wacom/gnome-wacom-panel.desktop.in.in:7
-msgid "input-tablet"
-msgstr "input-tablet"
+#~ msgid "_Screen Reader"
+#~ msgstr "Leughadair-_sgrìn"
 
-#. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
-#: panels/wacom/gnome-wacom-panel.desktop.in.in:19
-msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
-msgstr "Tablaid;Wacom;Staidhleas;Suathan:Luchag;"
+#~ msgid "Sound Keys"
+#~ msgstr "Iuchraichean fuaime"
 
-#: panels/wacom/gnome-wacom-properties.ui:15
-msgid "Tablet (absolute)"
-msgstr "Tablaid (absaloideach)"
+#~ msgid "Flash the _window title"
+#~ msgstr "Boillsg tiotal na _h-uinneige"
 
-#: panels/wacom/gnome-wacom-properties.ui:19
-msgid "Touchpad (relative)"
-msgstr "Pada-suathaidh (dàimheach)"
+#~ msgid "Standard"
+#~ msgstr "Stannardach"
 
-#: panels/wacom/gnome-wacom-properties.ui:27
-msgid "Tablet Preferences"
-msgstr "Roghainnean na tablaid"
+#~ msgid "Account _Type"
+#~ msgstr "_Seòrsa a’ chunntais"
 
-#: panels/wacom/gnome-wacom-properties.ui:44
-msgid "_Help"
-msgstr "Cob_hair"
+#~ 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 a-steach an ath-thuras"
 
-#: panels/wacom/gnome-wacom-properties.ui:123
-msgid "No tablet detected"
-msgstr "Cha deach tablaid a lorg"
+#~ msgid "Set a password _now"
+#~ msgstr "Suidhich facal-faire a_n-dràsta"
 
-#: panels/wacom/gnome-wacom-properties.ui:139
-msgid "Please plug in or turn on your Wacom tablet"
-msgstr "Plug a-steach an tablaid Wacom agad no cuir air e"
+#~ msgid "You must be online in order to add enterprise users."
+#~ msgstr ""
+#~ "Feumaidh tu bhith air loidhne gus cleachdaichean enterprise a chur ris."
 
-#: panels/wacom/gnome-wacom-properties.ui:159
-msgid "Bluetooth Settings"
-msgstr "Roghainnean Bluetooth"
+#~ msgid "Enable Fingerprint Login"
+#~ msgstr "Cuir an comas clàradh a-steach le meur-lorg"
 
-#: panels/wacom/gnome-wacom-properties.ui:231
-msgid "Map to Monitor…"
-msgstr "Mapaich ri monatair…"
+#~ msgid ""
+#~ "Your fingerprint was successfully saved. You should now be able to log in "
+#~ "using your fingerprint reader."
+#~ msgstr ""
+#~ "Chaidh lorg do mheòir a shàbhaladh. Bu chòir gun urrainn dhut clàradh a-"
+#~ "steach le leughadair nam meur-lorg a-nis."
 
-#: panels/wacom/gnome-wacom-properties.ui:247
-msgid "Map Buttons…"
-msgstr "Mapaich putanan…"
+#~| msgid "Take a photo…"
+#~ msgid "Take a Picture…"
+#~ msgstr "Tog dealbh…"
 
-#: panels/wacom/gnome-wacom-properties.ui:263
-msgid "Calibrate…"
-msgstr "Cailbhrich…"
+#~ msgid "system-users"
+#~ msgstr "system-users"
 
-#: panels/wacom/gnome-wacom-properties.ui:284
-msgid "Adjust display resolution"
-msgstr "Cuir air dòigh dùmhlachd-bhreacaidh an taisbeanaidh"
+#~ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
+#~ msgstr ""
+#~ "Clàraich a-steach;Ainm;Meur-lorg;Avatar;Suaicheantas;Aodann;Facal-faire;"
 
-#: panels/wacom/gnome-wacom-properties.ui:300
-msgid "Adjust mouse settings"
-msgstr "Cuir gleus roghainnean na luchaige."
+#~ msgid "_Verify New Password"
+#~ msgstr "Dearbh a_m facal-faire ùr"
 
-#: panels/wacom/gnome-wacom-properties.ui:328
-msgid "Tracking Mode"
-msgstr "Am modh tracaidh"
+#~ msgid "User Icon"
+#~ msgstr "Ìomhaigheag a’ chleachdaiche"
 
-#: panels/wacom/gnome-wacom-properties.ui:356
-msgid "Left-Handed Orientation"
-msgstr "An comhair na làimhe chlì"
+#~ msgid "Last Login"
+#~ msgstr "An clàradh a-steach mu dheireadh"
 
-#: panels/wacom/gsd-wacom-key-shortcut-button.c:263
-msgid "New shortcut…"
-msgstr "Ath-ghoirid ùr…"
+#~ msgid "Passwords do not match."
+#~ msgstr "Chan eil an dà fhacal-faire co-ionnann."
 
-#: panels/wacom/wacom-stylus-page.ui:29
-msgid "Middle Mouse Button Click"
-msgstr "Briogadh de phutan meadhan na luchaige"
+#~ msgctxt "Account type"
+#~ msgid "Standard"
+#~ msgstr "Stannardach"
 
-#: panels/wacom/wacom-stylus-page.ui:33
-msgid "Right Mouse Button Click"
-msgstr "Briogadh de phutan deas na luchaige"
+#~ msgctxt "Account type"
+#~ msgid "Administrator"
+#~ msgstr "Rianaire"
 
-#: panels/wacom/wacom-stylus-page.ui:37
-msgid "Back"
-msgstr "Air ais"
+#~ msgid ""
+#~ "You are not allowed to access the device. Contact your system "
+#~ "administrator."
+#~ msgstr ""
+#~ "Chan eil cead-inntrigidh agad dhan uidheam seo. Cuir fios gu rianaire an "
+#~ "t-siostaim agad."
 
-#: panels/wacom/wacom-stylus-page.ui:41
-msgid "Forward"
-msgstr "Air adhart"
+#~ msgid "An internal error occurred."
+#~ msgstr "Thachair mearachd inntearnail."
 
-#: panels/wacom/wacom-stylus-page.ui:77
-msgid "No stylus found"
-msgstr "Cha deach peann a lorg"
+#~ msgid "Delete registered fingerprints?"
+#~ msgstr "A bheil thu airson na meur-lorgan clàraichte a sguabadh às?"
 
-#: panels/wacom/wacom-stylus-page.ui:91
-msgid "Please move your stylus to the proximity of the tablet to configure it"
-msgstr "Gluais am peann agad faisg air an tablaid gus a rèiteachadh"
+#~ msgid "Done!"
+#~ msgstr "Deiseil!"
 
-#: panels/wacom/wacom-stylus-page.ui:167
-msgid "Eraser Pressure Feel"
-msgstr "Faireachdainn brùthadh an t-suathain"
+#~ msgid "Could not access “%s” device"
+#~ msgstr "Cha b’ urrainn dhuinn cothrom fhaighinn air an uidheam “%s”"
 
-#: panels/wacom/wacom-stylus-page.ui:188 panels/wacom/wacom-stylus-page.ui:348
-msgid "Soft"
-msgstr "Bog"
+#~ 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”"
 
-#: panels/wacom/wacom-stylus-page.ui:218 panels/wacom/wacom-stylus-page.ui:378
-msgid "Firm"
-msgstr "Stalcanta"
+#~ msgid "Please contact your system administrator for help."
+#~ msgstr "Cuir fios gu rianaire an t-siostaim agad airson cuideachadh."
 
-#: panels/wacom/wacom-stylus-page.ui:241
-msgid "Top Button"
-msgstr "Am putan aig a’ bharr"
+#~ 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."
 
-#: panels/wacom/wacom-stylus-page.ui:270
-msgid "Lower Button"
-msgstr "Am putan aig a’ bhonn"
+#~ msgid "Selecting finger"
+#~ msgstr "A’ taghadh meur"
 
-#: panels/wacom/wacom-stylus-page.ui:299
-#| msgid "Lower Button"
-msgid "Lowest Button"
-msgstr "Am putan aig a’ bhonn"
+#~ msgid ""
+#~ "To make changes,\n"
+#~ "click the * icon first"
+#~ msgstr ""
+#~ "Gus atharraichean a dhèanamh,\n"
+#~ "briog an ìomhaigheag * an toiseach"
 
-#: panels/wacom/wacom-stylus-page.ui:328
-msgid "Tip Pressure Feel"
-msgstr "Faireachdainn brùthadh a’ chinn"
+#~ msgid "Create a user account"
+#~ msgstr "Cruthaich cunntas cleachdaiche"
 
-#: panels/wacom/wacom-stylus-page.ui:440
-msgid "page 3"
-msgstr "duilleag 3"
+#~ msgid ""
+#~ "To create a user account,\n"
+#~ "click the * icon first"
+#~ msgstr ""
+#~ "Gus cunntas cleachdaiche a chruthachadh,\n"
+#~ "briog air an ìomhaigheag * an toiseach"
 
-#: shell/appdata/gnome-control-center.appdata.xml.in:7
-msgid "GNOME Control Center"
-msgstr "Ionad-stiùiridh GNOME"
+#~ msgid "The username cannot start with a “-”."
+#~ msgstr "Chan fhaod an t-ainm-cleachdaiche tòiseachadh le “-”."
 
-#: shell/appdata/gnome-control-center.appdata.xml.in:8
-msgid "Utilities to configure the GNOME desktop"
-msgstr "Goireasan gus an deasg GNOME a rèiteachadh"
+#~ 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 ghabh atharrachadh."
 
-#: shell/appdata/gnome-control-center.appdata.xml.in:10
-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 gleus dhen deasg agad a 
rèiteachadh."
+#~ msgid "Output:"
+#~ msgstr "Às-chur:"
 
-#: shell/cc-application.c:47
-msgid "Display version number"
-msgstr "Seall àireamh an tionndaidh"
+#~ msgid "Keep aspect ratio (letterbox):"
+#~ msgstr "Glèidh co-mheas an deilbh (bogsa-litrichean):"
 
-#: shell/cc-application.c:48
-msgid "Enable verbose mode"
-msgstr "Cuir an comas am modh brathrach"
+#~ msgid "Map to single monitor"
+#~ msgstr "Mapaich ri monatair singilte"
 
-#: shell/cc-application.c:49
-msgid "Show the overview"
-msgstr "Seall am foir-shealladh"
+#~ msgid "%d of %d"
+#~ msgstr "%d de %d"
 
-#: shell/cc-application.c:50
-msgid "Search for the string"
-msgstr "Lorg an t-sreang"
+#~ msgid "Display Mapping"
+#~ msgstr "Seall am mapadh"
 
-#: shell/cc-application.c:51
-msgid "List possible panel names and exit"
-msgstr "Seall ainmean a ghabhas a chleachdadh is dèan fàgail"
+#~ msgid "input-tablet"
+#~ msgstr "input-tablet"
 
-#: shell/cc-application.c:52
-msgid "Panel to display"
-msgstr "A’ phanail a thèid a shealltainn"
+#~ msgid "Tablet (absolute)"
+#~ msgstr "Tablaid (absaloideach)"
 
-#: shell/cc-application.c:52
-msgid "[PANEL] [ARGUMENT…]"
-msgstr "[PANEL] [ARGUMENT…]"
+#~ msgid "Touchpad (relative)"
+#~ msgstr "Pada-suathaidh (dàimheach)"
 
-#: shell/cc-application.c:117
-msgid "Available panels:"
-msgstr "Panailean a tha ri fhaighinn:"
+#~ msgid "Tablet Preferences"
+#~ msgstr "Roghainnean na tablaid"
 
-#: shell/cc-application.c:256
-msgid "Help"
-msgstr "Cobhair"
+#~ msgid "_Help"
+#~ msgstr "Cob_hair"
 
-#: shell/cc-application.c:257
-msgid "Quit"
-msgstr "Fàg an-seo"
+#~ msgid "Map Buttons…"
+#~ msgstr "Mapaich putanan…"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: shell/gnome-control-center.desktop.in.in:5
-msgid "gnome-control-center"
-msgstr "gnome-control-center"
+#~ msgid "Adjust display resolution"
+#~ msgstr "Cuir air dòigh dùmhlachd-bhreacaidh an taisbeanaidh"
 
-#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: shell/gnome-control-center.desktop.in.in:17
-msgid "Preferences;Settings;"
-msgstr "Roghainnean;"
+#~ msgid "Adjust mouse settings"
+#~ msgstr "Cuir gleus roghainnean na luchaige."
 
-#: shell/help-overlay.ui:15
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Coitcheann"
+#~ msgid "Tracking Mode"
+#~ msgstr "Am modh tracaidh"
 
-#: shell/help-overlay.ui:20
-msgctxt "shortcut window"
-msgid "Quit"
-msgstr "Fàg an-seo"
+#~ msgid "Middle Mouse Button Click"
+#~ msgstr "Briogadh de phutan meadhan na luchaige"
 
-#: shell/help-overlay.ui:27 shell/help-overlay.ui:48
-msgctxt "shortcut window"
-msgid "Search"
-msgstr "Lorg"
+#~ msgid "Right Mouse Button Click"
+#~ msgstr "Briogadh de phutan deas na luchaige"
 
-#: shell/help-overlay.ui:35
-msgctxt "shortcut window"
-msgid "Panels"
-msgstr "Panailean"
+#~ msgid "Forward"
+#~ msgstr "Air adhart"
 
-#: shell/help-overlay.ui:40
-msgctxt "shortcut window"
-msgid "Go back to the overview"
-msgstr "Till dhan fhoir-shealladh"
+#~ msgid ""
+#~ "Please move your stylus to the proximity of the tablet to configure it"
+#~ msgstr "Gluais am peann agad faisg air an tablaid gus a rèiteachadh"
 
-#: shell/help-overlay.ui:53
-msgctxt "shortcut window"
-msgid "Cancel search"
-msgstr "Sguir dhen lorg"
+#~ msgid "Soft"
+#~ msgstr "Bog"
 
-#. translators: This is the default hotspot name, need to be less than 32-bytes
-#: shell/hostname-helper.c:189
-msgctxt "hotspot"
-msgid "Hotspot"
-msgstr "Hotspot"
+#~ msgid "Firm"
+#~ msgstr "Stalcanta"
 
-#: shell/org.gnome.Settings.gschema.xml:5
-msgid "The identifier for the last Settings panel to be opened"
-msgstr "Aithnichear a’ phanail roghainnean mu dheireadh a thèid fhosgladh"
+#~ msgid "Top Button"
+#~ msgstr "Am putan aig a’ bharr"
 
-#: shell/org.gnome.Settings.gschema.xml:6
-msgid ""
-"The identifier for the last Settings panel to be opened. Unrecognised values "
-"will be ignored and the first panel in the list selected."
-msgstr "Aithnichear a’ phanail roghainnean mu dheireadh a thèid fhosgladh. Thèid luachan nach aithne dhuinn 
a leigeil seachad agus a’ chiad phanail air an liosta a thaghadh ’na àite."
+#~| msgid "Lower Button"
+#~ msgid "Lowest Button"
+#~ msgstr "Am putan aig a’ bhonn"
 
-#: shell/panel-list.ui:195
-msgid "No results found"
-msgstr "Cha deach toradh a lorg"
+#~ msgid "page 3"
+#~ msgstr "duilleag 3"
 
-#: shell/window.ui:141
-msgid "All Settings"
-msgstr "Na h-uile roghainn"
+#~ msgid "GNOME Control Center"
+#~ msgstr "Ionad-stiùiridh GNOME"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1873
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u às-chur"
-msgstr[1] "%u às-chur"
-msgstr[2] "%u às-chuir"
-msgstr[3] "%u às-chur"
+#~ 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 gleus dhen deasg agad a rèiteachadh."
 
-#. translators:
-#. * The number of sound inputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1883
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u ion-chur"
-msgstr[1] "%u ion-chur"
-msgstr[2] "%u ion-chuir"
-msgstr[3] "%u ion-chur"
+#~ msgid "Show the overview"
+#~ msgstr "Seall am foir-shealladh"
 
-#: subprojects/gvc/gvc-mixer-control.c:2738
-msgid "System Sounds"
-msgstr "Fuaimean an t-siostaim"
+#~ msgid "Quit"
+#~ msgstr "Fàg an-seo"
+
+#~ msgid "gnome-control-center"
+#~ msgstr "gnome-control-center"
 
 #~ msgid "Back­ground"
 #~ msgstr "Cùlaibh"
@@ -7380,10 +10329,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "Remo­vable Media"
 #~ msgstr "Meadhan so-ghiùlain"
 
-#~ msgctxt "keybinding"
-#~ msgid "Search"
-#~ msgstr "Lorg"
-
 #~ msgid "Net­work"
 #~ msgstr "Lìonra"
 
@@ -7414,10 +10359,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "Wa­com Tab­let"
 #~ msgstr "Tablaid Wacom"
 
-#~ msgctxt "category"
-#~ msgid "Personal"
-#~ msgstr "Pearsanta"
-
 #~ msgctxt "category"
 #~ msgid "Hardware"
 #~ msgstr "Bathar-cruaidh"
@@ -7432,9 +10373,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "Mirrored"
 #~ msgstr "Sgàthanaichte"
 
-#~ msgid "Primary"
-#~ msgstr "Prìomh-phanail"
-
 #~ msgid "Secondary"
 #~ msgstr "Panail dhàrnach"
 
@@ -7463,9 +10401,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ 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-"
@@ -7516,9 +10451,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ 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"
 
@@ -7554,9 +10486,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ "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"
 
@@ -7575,30 +10504,15 @@ msgstr "Fuaimean an t-siostaim"
 #~ 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"
 
@@ -7818,21 +10732,9 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "Scroll Down"
 #~ msgstr "Sgrolaich sìos"
 
-#~ msgid "Scroll Left"
-#~ msgstr "Sgrolaich dhan taobh chlì"
-
 #~ msgid "Scroll Right"
 #~ msgstr "Sgrolaich dhan taobh deas"
 
-#~ msgid "Wayland"
-#~ msgstr "Wayland"
-
-#~ msgid "_Name:"
-#~ msgstr "_Ainm:"
-
-#~ msgid "Add Shortcut"
-#~ msgstr "Cuir ath-ghoirid ris"
-
 #~ msgid "Remove Shortcut"
 #~ msgstr "Thoir an ath-ghoirid air falbh"
 
@@ -7907,9 +10809,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "Personal File Sharing"
 #~ msgstr "Co-roinneadh fhaidhlichean pearsanta"
 
-#~ msgid "_Allow Remote Control"
-#~ msgstr "Ce_adaich smachd cèin"
-
 #~ msgid "Login History"
 #~ msgstr "Eachdraidh nan daoine a chlàraich a-steach"
 
@@ -7980,9 +10879,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "Don't _warn me again"
 #~ msgstr "Na thoir _rabhadh dhomh a-rithist"
 
-#~ msgid "No"
-#~ msgstr "Chan eil"
-
 #~ msgid "Yes"
 #~ msgstr "Tha"
 
@@ -8075,9 +10971,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "No printers available"
 #~ msgstr "Chan eil clò-bhualadair ri làimh"
 
-#~ msgid "Close"
-#~ msgstr "Dùin"
-
 #~ msgid "Resume Printing"
 #~ msgstr "Lean air a' chlò-bhualadh"
 
@@ -8094,9 +10987,6 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "Job State"
 #~ msgstr "Staid na h-obrach"
 
-#~ msgid "Time"
-#~ msgstr "Àm"
-
 #~ msgid "Add New Printer"
 #~ msgstr "Cuir clò-bhualadair ùr ris"
 
@@ -8119,18 +11009,12 @@ msgstr "Fuaimean an t-siostaim"
 #~ msgid "Color"
 #~ msgstr "Dath"
 
-#~ msgid "Bluetooth is disabled"
-#~ msgstr "Tha Bluetooth à comas"
-
 #~ msgid "Bluetooth is disabled by hardware switch"
 #~ msgstr "Chaidh Bluetooth a chur à comas le suidse bathair-chruaidh"
 
 #~ msgid "No Bluetooth adapters found"
 #~ msgstr "Cha deach freagarraichearan Bluetooth a lorg"
 
-#~ msgid "Security key"
-#~ msgstr "An iuchair tèarainteachd"
-
 #~ msgid ""
 #~ "%s\n"
 #~ "Run '%s --help' to see a full list of available command line options.\n"


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