[network-manager-applet/th/tmp: 3/15] Update Scottish Gaelic translation



commit 7f72ef5ddf4632df0bd1c4087282dba8f80379f3
Author: GNOME Translation Robot <gnome-sysadmin gnome org>
Date:   Thu Mar 9 15:28:42 2017 +0000

    Update Scottish Gaelic translation
    
    (cherry picked from commit befa936d1abff72e1257515fdb6d06f1dfbb956f)

 po/gd.po | 2388 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 1652 insertions(+), 736 deletions(-)
---
diff --git a/po/gd.po b/po/gd.po
index 68425f3..fdf3752 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -2,14 +2,14 @@
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the eog package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-# GunChleoc <fios foramnagaidhlig net>, 2014, 2016.
+# GunChleoc <fios foramnagaidhlig net>, 2014, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ";
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-06-06 22:16+0000\n"
-"PO-Revision-Date: 2016-06-11 09:41+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Netwo";
+"rkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2017-03-07 08:51+0000\n"
+"PO-Revision-Date: 2017-03-09 15:27+0100\n"
 "Last-Translator: GunChleoc <fios foramnagaidhlig net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-09-15 06:24+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3098
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3132
 msgid "Network"
 msgstr "Lìonra"
 
@@ -139,9 +139,8 @@ msgid "NetworkManager"
 msgstr "Manaidsear lìonraidh"
 
 #: ../nm-connection-editor.appdata.xml.in.h:2
-#| msgid "No network connection"
 msgid "NetworkManager connection editor"
-msgstr "Deasaiche nan ceangal aig a' mhanaidsear lìonraidh"
+msgstr "Deasaiche ceanglaichean Manaidsear lìonraidh"
 
 #: ../nm-connection-editor.appdata.xml.in.h:3
 msgid ""
@@ -161,29 +160,62 @@ msgstr ""
 "lìonraidh."
 
 #: ../nm-connection-editor.appdata.xml.in.h:5
-#| msgid "NetworkManager Applet"
 msgid "The NetworkManager Developers"
-msgstr "Sgioba-leasachaidh NetworkManager"
+msgstr "Luchd-leasachaidh na h-aplaid Manaidsear lìonraidh"
 
+#: ../shared/nm-utils/nm-shared-utils.c:185
+#, c-format
+msgid "object class '%s' has no property named '%s'"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:192
+#, c-format
+msgid "property '%s' of object class '%s' is not writable"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:199
+#, c-format
+msgid ""
+"construct property \"%s\" for object '%s' can't be set after construction"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:207
+#, c-format
+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:216
+#, c-format
+msgid "unable to set property '%s' of type '%s' from value of type '%s'"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:227
+#, c-format
+msgid ""
+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
+"type '%s'"
+msgstr ""
+
+#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Dearbhadh 802.1X"
 
 #: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-new-connection.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-new-connection.ui.h:1
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
 #: ../src/connection-editor/nm-connection-editor.ui.h:6
 #: ../src/gsm-unlock.ui.h:1
 msgid "_Cancel"
-msgstr "_Sguir dheth"
+msgstr "S_guir dheth"
 
 #: ../src/8021x.ui.h:3
 msgid "C_onnect"
 msgstr "C_eangail"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "_Network name:"
 msgstr "Ainm an _lìonraidh:"
 
@@ -200,12 +232,12 @@ msgid "Failed to add/activate connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a chur ris/a chur an gnìomh"
 
 #: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
-#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#: ../src/applet-device-wifi.c:1445 ../src/applet-device-wifi.c:1468
 msgid "Unknown error"
 msgstr "Mearachd neo-aithnichte"
 
-#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
-#: ../src/applet-device-wifi.c:1470
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1448
+#: ../src/applet-device-wifi.c:1471
 msgid "Connection failure"
 msgstr "Dh'fhàillig an ceangal"
 
@@ -221,15 +253,20 @@ msgstr "Cha b' urrainn dhuinn an ceangal a bhriseadh"
 msgid "Connection activation failed"
 msgstr "Dh'fhàillig gnìomhachadh a' cheangail"
 
-#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
-msgid "Don't show this message again"
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1185
+#| msgid "Don't show this message again"
+msgid "Don’t show this message again"
 msgstr "Na seall an teachdaireachd seo a-rithist"
 
 #: ../src/applet.c:844
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because the network connection was "
+#| "interrupted."
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the network connection was "
+"The VPN connection “%s” failed because the network connection was "
 "interrupted."
 msgstr ""
 "\n"
@@ -238,9 +275,13 @@ msgstr ""
 
 #: ../src/applet.c:847
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because the VPN service stopped "
+#| "unexpectedly."
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr ""
 "\n"
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do stad an t-seirbheis VPN "
@@ -248,99 +289,132 @@ msgstr ""
 
 #: ../src/applet.c:850
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because the VPN service returned invalid "
+#| "configuration."
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
+"The VPN connection “%s” failed because the VPN service returned invalid "
 "configuration."
 msgstr ""
 "\n"
-"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do thill an t-seirbheis "
-"VPN rèiteachadh mì-dhligheach."
+"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do thill an t-seirbheis VPN "
+"rèiteachadh mì-dhligheach."
 
 #: ../src/applet.c:853
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because the connection attempt timed out."
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"The VPN connection “%s” failed because the connection attempt timed out."
 msgstr ""
 "\n"
-"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do dh'fhalbh an ùine air "
-"an oidhirp cheangail."
+"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do dh'fhalbh an ùine air an "
+"oidhirp cheangail."
 
 #: ../src/applet.c:856
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because the VPN service did not start in "
+#| "time."
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"The VPN connection “%s” failed because the VPN service did not start in time."
 msgstr ""
 "\n"
-"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-"
-"seirbheis VPN ri tìde."
+"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-seirbheis "
+"VPN ri tìde."
 
 #: ../src/applet.c:859
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because the VPN service failed to start."
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"The VPN connection “%s” failed because the VPN service failed to start."
 msgstr ""
 "\n"
-"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-"
-"seirbheis VPN."
+"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-seirbheis "
+"VPN."
 
 #: ../src/applet.c:862
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because there were no valid VPN secrets."
 msgid ""
 "\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr ""
 "\n"
-"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach robh rùintean VPN "
-"dligheach ann."
+"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach robh rùintean VPN dligheach "
+"ann."
 
 #: ../src/applet.c:865
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because of invalid VPN secrets."
 msgid ""
 "\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 "\n"
-"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun robh na rùintean VPN mì-"
-"dhligheach."
+"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun robh na rùintean VPN "
+"mì-dhligheach."
 
 #: ../src/applet.c:872
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed."
 msgid ""
 "\n"
-"The VPN connection '%s' failed."
+"The VPN connection “%s” failed."
 msgstr ""
 "\n"
 "Dh'fhàillig an ceangal VPN \"%s\"."
 
 #: ../src/applet.c:888
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' disconnected because the network connection was "
+#| "interrupted."
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the network connection was "
+"The VPN connection “%s” disconnected because the network connection was "
 "interrupted."
 msgstr ""
 "\n"
-"Bhris an ceangal VPN \"%s\" a chionn 's gun do bhris rudeigin a-steach air "
-"a' cheangal ris an lìonra."
+"Bhris an ceangal VPN \"%s\" a chionn 's gun do bhris rudeigin a-steach air a' "
+"cheangal ris an lìonra."
 
 #: ../src/applet.c:891
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' disconnected because the VPN service stopped."
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+"The VPN connection “%s” disconnected because the VPN service stopped."
 msgstr ""
 "\n"
 "Bhris an ceangal VPN \"%s\" a chionn 's gun do stad an t-seirbheis VPN."
 
 #: ../src/applet.c:897
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' disconnected."
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected."
+"The VPN connection “%s” disconnected."
 msgstr ""
 "\n"
 "Bhris an ceangal VPN \"%s\"."
@@ -370,23 +444,33 @@ msgstr "Dh'fhàillig an ceangal VPN"
 
 #: ../src/applet.c:990
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed because the VPN service failed to start.\n"
+#| "\n"
+#| "%s"
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"The VPN connection “%s” failed because the VPN service failed to start.\n"
 "\n"
 "%s"
 msgstr ""
 "\n"
-"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-"
-"seirbheis VPN.\n"
+"Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-seirbheis "
+"VPN.\n"
 "\n"
 "%s"
 
 #: ../src/applet.c:993
 #, c-format
+#| msgid ""
+#| "\n"
+#| "The VPN connection '%s' failed to start.\n"
+#| "\n"
+#| "%s"
 msgid ""
 "\n"
-"The VPN connection '%s' failed to start.\n"
+"The VPN connection “%s” failed to start.\n"
 "\n"
 "%s"
 msgstr ""
@@ -395,206 +479,218 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1285
+#: ../src/applet.c:1281
 msgid "device not ready (firmware missing)"
 msgstr "chan eil an t-uidheam deiseil (bathar-an-sàs a dhìth)"
 
-#: ../src/applet.c:1287
+#: ../src/applet.c:1283
 msgid "device not ready"
 msgstr "chan eil an t-uidheam deiseil"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1297 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1293 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "chan eil ceangal ann tuilleadh"
 
-#: ../src/applet.c:1313
+#: ../src/applet.c:1309
 msgid "Disconnect"
 msgstr "Cuir crìoch air a' cheangal"
 
-#: ../src/applet.c:1327
+#: ../src/applet.c:1323
 msgid "device not managed"
 msgstr "chan eil an t-uidheam fo stiùireadh"
 
-#: ../src/applet.c:1400
+#: ../src/applet.c:1396
 msgid "No network devices available"
 msgstr "Chan eil uidheaman lìonraidh ri làimh"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1450
 msgid "_VPN Connections"
 msgstr "_Ceanglaicheann VPN"
 
-#: ../src/applet.c:1498
-msgid "_Configure VPN..."
+#: ../src/applet.c:1494
+#| msgid "_Configure VPN..."
+msgid "_Configure VPN…"
 msgstr "_Rèitich VPN..."
 
-#: ../src/applet.c:1501
-#| msgid "Export VPN connection..."
-msgid "_Add a VPN connection..."
-msgstr "Cuir ce_angal VPN ris..."
+#: ../src/applet.c:1497
+#| msgid "_Add a VPN connection..."
+msgid "_Add a VPN connection…"
+msgstr "Cuir ris ce_angal VPN..."
 
-#: ../src/applet.c:1607
-msgid "NetworkManager is not running..."
-msgstr "Chan eil an NetworkManager 'na ruith..."
+#: ../src/applet.c:1603
+#| msgid "NetworkManager is not running..."
+msgid "NetworkManager is not running…"
+msgstr "Chan eil Manaidsear lìonraidh 'na ruith..."
 
-#: ../src/applet.c:1612 ../src/applet.c:2604
+#: ../src/applet.c:1608 ../src/applet.c:2632
 msgid "Networking disabled"
 msgstr "Chaidh lìonraidhean a chur à comas"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1822
+#: ../src/applet.c:1816
 msgid "Enable _Networking"
 msgstr "Cuir lìonraidhean a_n comas"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1831
+#: ../src/applet.c:1825
 msgid "Enable _Wi-Fi"
 msgstr "Cuir an comas _WiFi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1840
+#: ../src/applet.c:1834
 msgid "Enable _Mobile Broadband"
 msgstr "Cuir an comas bann-leathann _mobile"
 
 #. Toggle notifications item
-#: ../src/applet.c:1852
+#: ../src/applet.c:1846
 msgid "Enable N_otifications"
 msgstr "Cuir an comas na _brathan"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1864
+#: ../src/applet.c:1858
 msgid "Connection _Information"
 msgstr "_Fiosrachadh mun cheangal"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1872
-msgid "Edit Connections..."
+#: ../src/applet.c:1866
+#| msgid "Edit Connections..."
+msgid "Edit Connections…"
 msgstr "Deasaich na ceanglaichean..."
 
-#: ../src/applet.c:1886
+#: ../src/applet.c:1880
 msgid "_About"
 msgstr "_Mu dhèidhinn"
 
-#: ../src/applet.c:2171
+#: ../src/applet.c:2165
 #, c-format
-msgid "You are now connected to '%s'."
+#| msgid "You are now connected to '%s'."
+msgid "You are now connected to “%s”."
 msgstr "Tha thu air ceangal a dhèanamh ri \"%s\"."
 
-#: ../src/applet.c:2214
+#: ../src/applet.c:2208
 msgid "Disconnected"
 msgstr "Chan eil ceangal ann tuilleadh"
 
-#: ../src/applet.c:2215
+#: ../src/applet.c:2209
 msgid "The network connection has been disconnected."
 msgstr "Bhris an ceangal lìonraidh."
 
-#: ../src/applet.c:2466
+#: ../src/applet.c:2495
 #, c-format
-msgid "Preparing network connection '%s'..."
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing network connection “%s”…"
 msgstr "Ag ullachadh a' cheangail lìonraidh \"%s\"..."
 
-#: ../src/applet.c:2469
+#: ../src/applet.c:2498
 #, c-format
-msgid "User authentication required for network connection '%s'..."
+#| msgid "User authentication required for network connection '%s'..."
+msgid "User authentication required for network connection “%s”…"
 msgstr ""
-"Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ri \"%s"
-"\"..."
+"Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ri \"%"
+"s\"..."
 
-#: ../src/applet.c:2472 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2501 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
-msgid "Requesting a network address for '%s'..."
+#| msgid "Requesting a network address for '%s'..."
+msgid "Requesting a network address for “%s”…"
 msgstr "Ag iarraidh seòladh lìonraidh airson \"%s\"..."
 
-#: ../src/applet.c:2475
+#: ../src/applet.c:2504
 #, c-format
-msgid "Network connection '%s' active"
+#| msgid "Network connection '%s' active"
+msgid "Network connection “%s” active"
 msgstr "Tha an ceangal lìonraidh \"%s\" beò"
 
-#: ../src/applet.c:2549
+#: ../src/applet.c:2577
 #, c-format
-msgid "Starting VPN connection '%s'..."
+#| msgid "Starting VPN connection '%s'..."
+msgid "Starting VPN connection “%s”…"
 msgstr "A' tòiseachadh a' cheangail VPN \"%s\"..."
 
-#: ../src/applet.c:2552
+#: ../src/applet.c:2580
 #, c-format
-msgid "User authentication required for VPN connection '%s'..."
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 "Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ris a' "
 "VPN \"%s\"..."
 
-#: ../src/applet.c:2555
+#: ../src/applet.c:2583
 #, c-format
-msgid "Requesting a VPN address for '%s'..."
+#| msgid "Requesting a VPN address for '%s'..."
+msgid "Requesting a VPN address for “%s”…"
 msgstr "Ag iarraidh seòladh VPN airson \"%s\"..."
 
-#: ../src/applet.c:2558
+#: ../src/applet.c:2586
 #, c-format
-#| msgid "VPN connection '%s' active"
 msgid "VPN connection active"
 msgstr "Tha an ceangal VPN gnìomhach"
 
-#: ../src/applet.c:2608
+#: ../src/applet.c:2636
 msgid "No network connection"
 msgstr "Chan eil ceangal ris an lìonra"
 
-#: ../src/applet.c:3197
+#: ../src/applet.c:3231
 msgid "NetworkManager Applet"
-msgstr "Aplaid NetworkManager"
+msgstr "Aplaid Manaidsear lìonraidh"
 
-#: ../src/applet-device-broadband.c:159
+#: ../src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Tha am PUK cearr; cuir fios gun t-solaraiche agad."
 
-#: ../src/applet-device-broadband.c:201
+#: ../src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Tha am PIN cearr; cuir fios gun t-solaraiche agad."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:252
-msgid "Sending unlock code..."
+#: ../src/applet-device-broadband.c:254
+#| msgid "Sending unlock code..."
+msgid "Sending unlock code…"
 msgstr "A' cur a' chòd a bheir a' ghlais dheth..."
 
-#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Bann-leathann mobile (%s)"
 
-#: ../src/applet-device-broadband.c:736
-#: ../src/connection-editor/connection-helpers.c:100
+#: ../src/applet-device-broadband.c:738
+#: ../src/connection-editor/connection-helpers.c:107
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Bann-leathann mobile"
 
-#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:970
 msgid "Available"
 msgstr "Ri làimh"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:801
-msgid "New Mobile Broadband connection..."
+#: ../src/applet-device-broadband.c:803
+#| msgid "New Mobile Broadband Connection"
+msgid "New Mobile Broadband connection…"
 msgstr "Ceangal bann-leathainn mobile ùr..."
 
-#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1366
 msgid "Connection Established"
 msgstr "Chaidh ceangal a dhèanamh"
 
-#: ../src/applet-device-broadband.c:816
+#: ../src/applet-device-broadband.c:818
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Tha thu air ceangal a dhèanamh ris an lìonra bann-leathainn mobile."
 
-#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
 msgid "Mobile Broadband network."
 msgstr "Lìonra bann-leathainn mobile."
 
-#: ../src/applet-device-broadband.c:957
+#: ../src/applet-device-broadband.c:959
 msgid "You are now registered on the home network."
 msgstr "Tha thu a-nis clàraichte air an lìonra dachaigh."
 
-#: ../src/applet-device-broadband.c:963
+#: ../src/applet-device-broadband.c:965
 msgid "You are now registered on a roaming network."
 msgstr "Tha thu a-nis clàraichte air lìonra air fàrsan."
 
@@ -604,22 +700,26 @@ msgstr "Tha thu air ceangal a dhèanamh ris an lìonra bann-leathainn mobile."
 
 #: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
+#| msgid "Preparing mobile broadband connection '%s'..."
+msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Ag ullachadh a' cheangail bhann-leathainn mobile \"%s\"..."
 
 #: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
+#| msgid "Configuring mobile broadband connection '%s'..."
+msgid "Configuring mobile broadband connection “%s”…"
 msgstr "A' rèiteachadh a' cheangail bhann-leathainn mobile \"%s\"..."
 
 #: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+#| msgid "User authentication required for mobile broadband connection '%s'..."
+msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Feumaidh an ceangal bann-leathann mobile \"%s\" dearbhadh..."
 
 #: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
 #, c-format
-msgid "Mobile broadband connection '%s' active"
+#| msgid "Mobile broadband connection '%s' active"
+msgid "Mobile broadband connection “%s” active"
 msgstr "Tha an ceangal bann-leathann mobile \"%s\" gnìomhach"
 
 #: ../src/applet-device-ethernet.c:30
@@ -650,58 +750,65 @@ msgstr "Tha thu air ceangal a dhèanamh ris an lìonra ethernet."
 
 #: ../src/applet-device-ethernet.c:161
 #, c-format
-msgid "Preparing ethernet network connection '%s'..."
+#| msgid "Preparing ethernet network connection '%s'..."
+msgid "Preparing ethernet network connection “%s”…"
 msgstr "Ag ullachadh ceangail lìonra Ethernet \"%s\"..."
 
 #: ../src/applet-device-ethernet.c:164
 #, c-format
-msgid "Configuring ethernet network connection '%s'..."
+#| msgid "Configuring ethernet network connection '%s'..."
+msgid "Configuring ethernet network connection “%s”…"
 msgstr "A' rèiteachadh ceangail lìonra Ethernet \"%s\"..."
 
 #: ../src/applet-device-ethernet.c:167
 #, c-format
-msgid "User authentication required for ethernet network connection '%s'..."
+#| msgid "User authentication required for ethernet network connection '%s'..."
+msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ris an "
 "lìonra Ethernet \"%s\"..."
 
 #: ../src/applet-device-ethernet.c:170
 #, c-format
-msgid "Requesting an ethernet network address for '%s'..."
+#| msgid "Requesting an ethernet network address for '%s'..."
+msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Ag iarraidh seòladh lìonra Ethernet airson \"%s\"..."
 
 #: ../src/applet-device-ethernet.c:174
 #, c-format
-msgid "Ethernet network connection '%s' active"
+#| msgid "Ethernet network connection '%s' active"
+msgid "Ethernet network connection “%s” active"
 msgstr "Tha an ceangal lìonra Ethernet \"%s\" gnìomhach"
 
 #: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Dearbhadh  DSL"
 
-#: ../src/applet-device-wifi.c:230
-msgid "_Connect to Hidden Wi-Fi Network..."
+#: ../src/applet-device-wifi.c:231
+#| msgid "Connect to Hidden Wi-Fi Network"
+msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Ceangail ri lìonra WiFi falaichte..."
 
-#: ../src/applet-device-wifi.c:281
-msgid "Create _New Wi-Fi Network..."
+#: ../src/applet-device-wifi.c:282
+#| msgid "Create New Wi-Fi Network"
+msgid "Create _New Wi-Fi Network…"
 msgstr "Cruthaich lìonra WiFi ù_r..."
 
-#: ../src/applet-device-wifi.c:431
+#: ../src/applet-device-wifi.c:432
 msgid "(none)"
 msgstr "(chan eil gin)"
 
-#: ../src/applet-device-wifi.c:901
+#: ../src/applet-device-wifi.c:902
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Lìonraidhean WiFi (%s)"
 
-#: ../src/applet-device-wifi.c:903
+#: ../src/applet-device-wifi.c:904
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Lìonra WiFi (%s)"
 
-#: ../src/applet-device-wifi.c:905
+#: ../src/applet-device-wifi.c:906
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Lìonra WiFi"
@@ -709,69 +816,76 @@ msgstr[1] "Lìonraidhean WiFi"
 msgstr[2] "Lìonraidhean WiFi"
 msgstr[3] "Lìonraidhean WiFi"
 
-#: ../src/applet-device-wifi.c:934
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled"
 msgstr "Tha WiFi à comas"
 
-#: ../src/applet-device-wifi.c:935
+#: ../src/applet-device-wifi.c:936
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Chaidh am WiFi a chur à comas le suidse chruaidh"
 
-#: ../src/applet-device-wifi.c:996
+#: ../src/applet-device-wifi.c:997
 msgid "More networks"
 msgstr "Barrachd lìonraidhean"
 
-#: ../src/applet-device-wifi.c:1180
+#: ../src/applet-device-wifi.c:1181
 msgid "Wi-Fi Networks Available"
 msgstr "Lìonraidhean WiFi a tha ri làimh"
 
-#: ../src/applet-device-wifi.c:1181
+#: ../src/applet-device-wifi.c:1182
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 "Cleachd clàr-taice nan lìonraidhean gus ceangal a dhèanamh ri lìonra WiFi"
 
-#: ../src/applet-device-wifi.c:1364
+#: ../src/applet-device-wifi.c:1365
 #, c-format
-msgid "You are now connected to the Wi-Fi network '%s'."
-msgstr "Tha thu air ceangal a dhènamh ris an lìonra Wi-Fi \"%s\"."
+#| msgid "You are now connected to the Wi-Fi network '%s'."
+msgid "You are now connected to the Wi-Fi network “%s”."
+msgstr "Tha thu air ceangal a dhèanamh ris an lìonra Wi-Fi \"%s\"."
 
-#: ../src/applet-device-wifi.c:1399
+#: ../src/applet-device-wifi.c:1400
 #, c-format
-msgid "Preparing Wi-Fi network connection '%s'..."
+#| msgid "Preparing Wi-Fi network connection '%s'..."
+msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Ag ullachadh ceangal lìonraidh WiFi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1402
+#: ../src/applet-device-wifi.c:1403
 #, c-format
-msgid "Configuring Wi-Fi network connection '%s'..."
+#| msgid "Configuring Wi-Fi network connection '%s'..."
+msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "A' rèiteachadh ceangail lìonra WiFi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1405
+#: ../src/applet-device-wifi.c:1406
 #, c-format
-msgid "User authentication required for Wi-Fi network '%s'..."
+#| msgid "User authentication required for Wi-Fi network '%s'..."
+msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ris an "
 "lìonra WiFi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:1409
 #, c-format
-msgid "Requesting a Wi-Fi network address for '%s'..."
+#| msgid "Requesting a Wi-Fi network address for '%s'..."
+msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Ag iarraidh seòladh lìonra WiFi airson \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1419
+#: ../src/applet-device-wifi.c:1420
 #, c-format
-msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+#| msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Tha an ceangal lìonra WiFi \"%s\" gnìomhach: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1423
+#: ../src/applet-device-wifi.c:1424
 #, c-format
-msgid "Wi-Fi network connection '%s' active"
+#| msgid "Wi-Fi network connection '%s' active"
+msgid "Wi-Fi network connection “%s” active"
 msgstr "Tha an ceangal lìonra WiFi \"%s\" gnìomhach"
 
-#: ../src/applet-device-wifi.c:1442
+#: ../src/applet-device-wifi.c:1443
 msgid "Failed to activate connection"
 msgstr "Dh'fhàillig gnìomhachadh a' cheangail"
 
-#: ../src/applet-device-wifi.c:1465
+#: ../src/applet-device-wifi.c:1466
 msgid "Failed to add new connection"
 msgstr "Cha b' urrainn dhuinn ceangal ùr a chur ris"
 
@@ -779,8 +893,8 @@ msgstr "Cha b' urrainn dhuinn ceangal ùr a chur ris"
 msgid "Error displaying connection information:"
 msgstr "Mearachd a' taisbeanadh fiosrachadh a' cheangal:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
@@ -804,7 +918,7 @@ msgid "WEP"
 msgstr "WEP"
 
 #: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:283
+#: ../src/connection-editor/page-wifi-security.c:330
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Chan eil gin"
@@ -870,7 +984,9 @@ msgstr "CDMA (%s)"
 
 #. --- General ---
 #: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../src/connection-editor/page-general.c:347
+#: ../src/connection-editor/ce-page-team-port.ui.h:23
+#: ../src/connection-editor/ce-page-team.ui.h:48
+#: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Coitcheann"
 
@@ -897,6 +1013,7 @@ msgstr "Tèarainteachd:"
 
 #. --- IPv4 ---
 #: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -906,6 +1023,7 @@ msgstr "An t-slighe bhunaiteach:"
 
 #. --- IPv6 ---
 #: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -949,7 +1067,7 @@ msgid ""
 "and many other community contributors and translators"
 msgstr ""
 "Còir-lethbhreac © 2004-2014 Red Hat, Inc.\n"
-"Còir-lethbhreac © 2005-2008 Novell, Inc.\n"
+"Còir-lethbhreac  © 2005-2008 Novell, Inc.\n"
 "agus iomadh com-pàirtiche coimhearsnachd agus eadar-theangadairean"
 
 #: ../src/applet-dialogs.c:988
@@ -961,15 +1079,15 @@ msgstr ""
 
 #: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
-msgstr "Làrach-lìn NetworkManager"
+msgstr "Làrach-lìn Manaidsear lìonraidh"
 
 #: ../src/applet-dialogs.c:1001
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
-"Cha b' urrainn dhan aplaid NetworkManager cuid a ghoireasan a lorg air a "
-"bheil feum (cha deach am faidhle .ui a lorg)."
+"Cha b' urrainn dhan aplaid Manaidsear lìonraidh cuid a ghoireasan a lorg air "
+"a bheil feum (cha deach am faidhle .ui a lorg)."
 
 #: ../src/applet-dialogs.c:1006
 msgid "Missing resources"
@@ -981,7 +1099,8 @@ msgstr "Facail-faire lìonra bann-leathainn mobile"
 
 #: ../src/applet-dialogs.c:1040
 #, c-format
-msgid "A password is required to connect to '%s'."
+#| msgid "A password is required to connect to '%s'."
+msgid "A password is required to connect to “%s”."
 msgstr "Tha feum air facail-faire mus gabh ceangal a dhèanamh ri \"%s\"."
 
 #: ../src/applet-dialogs.c:1055
@@ -999,8 +1118,11 @@ msgstr "Feumaidh tu a' ghlais a thoirt far an SIM le PIN"
 #. FIXME: some warning about # of times you can enter incorrect PIN
 #: ../src/applet-dialogs.c:1340
 #, c-format
+#| msgid ""
+#| "The mobile broadband device '%s' requires a SIM PIN code before it can be "
+#| "used."
 msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"The mobile broadband device “%s” requires a SIM PIN code before it can be "
 "used."
 msgstr ""
 "Feumaidh tu a' ghlais a thoirt far an SIM le PIN an uidheim bhann-leathann "
@@ -1027,11 +1149,14 @@ msgstr "Feumaidh tu a' ghlais a thoirt far an SIM le PUK"
 #. FIXME: some warning about # of times you can enter incorrect PUK
 #: ../src/applet-dialogs.c:1351
 #, c-format
+#| msgid ""
+#| "The mobile broadband device '%s' requires a SIM PUK code before it can be "
+#| "used."
 msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"The mobile broadband device “%s” requires a SIM PUK code before it can be "
 "used."
 msgstr ""
-"Feumaidh tu a' ghlais a thoirt far an SIM le PIN an uidheim bhann-leathann "
+"Feumaidh tu a' ghlais a thoirt far an SIM le PUK an uidheim bhann-leathann "
 "mobile \"%s\" mus gabh a chleachdadh."
 
 #. Translators: PUK code entry label
@@ -1056,18 +1181,20 @@ msgstr "Seall còdaichean PIN/PUK"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:2
 #: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
 msgid "_OK"
-msgstr "_Ceart ma-tha"
+msgstr "_Ceart ma-thà"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page.h:114
+#| msgid ""
+#| "IP addresses identify your computer on the network.  Click the \"Add\" "
+#| "button to add an IP address."
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"IP addresses identify your computer on the network. Click the “Add” button "
+"to add an IP address."
 msgstr ""
 "Aithnichear an coimpiutair agad air an t-seòladh IP aige air an lìonra. "
 "Briog air a' phutan \"Cuir ris\" gus seòladh IP a chur ris."
@@ -1076,9 +1203,9 @@ msgstr ""
 #: ../src/connection-editor/ce-ip6-routes.ui.h:4
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "_Add"
 msgstr "_Cuir ris"
@@ -1088,10 +1215,10 @@ msgstr "_Cuir ris"
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-team.ui.h:15
+#: ../src/connection-editor/nm-connection-list.c:715
 msgid "_Delete"
 msgstr "_Sguab às"
 
@@ -1115,24 +1242,15 @@ msgstr ""
 "Ma tha seo an comas, cha dèid an ceangal seo a chleachdadh idir mar an "
 "ceangal lìonraidh bunaiteach."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1 ../src/libnma/wifi.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1 ../src/wireless-security/eap-method-fast.ui.h:1
-#: ../src/wireless-security/eap-method-peap.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:2
 msgid "Create…"
 msgstr "Cruthaich..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Choose a Connection Type"
 msgstr "Tagh seòrsa a' cheangail"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:5
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1146,10 +1264,12 @@ msgstr ""
 "stàlaichte agad."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:21
 msgid "Round-robin"
 msgstr "Round-robin"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:2
+#: ../src/connection-editor/ce-page-team.ui.h:22
 msgid "Active backup"
 msgstr "Lethbhreac-glèidhidh gnìomhach"
 
@@ -1158,6 +1278,7 @@ msgid "XOR"
 msgstr "XOR"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:20
 msgid "Broadcast"
 msgstr "Craoladh"
 
@@ -1186,15 +1307,15 @@ msgid "Bonded _connections:"
 msgstr "_Ceanglaichean bannaichte:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "M_ode:"
 msgstr "M_odh:"
 
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:5
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/ce-page-team.ui.h:14
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Edit"
 msgstr "D_easaich"
 
@@ -1208,7 +1329,7 @@ msgstr "ms"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:17
 #: ../src/connection-editor/ce-page-bridge.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: ../src/connection-editor/ce-page-team.ui.h:16
 msgid "_Interface name:"
 msgstr "Ainm na h-_eadar-aghaidh:"
 
@@ -1251,7 +1372,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
 #: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
 msgid "_MTU:"
@@ -1260,7 +1381,7 @@ msgstr "_MTU:"
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
 #: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "bytes"
@@ -1311,11 +1432,11 @@ msgstr "Aois as _motha:"
 msgid "_Aging time:"
 msgstr "Àm _aoiseachaidh:"
 
-#: ../src/connection-editor/ce-page.c:78
+#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "fèin-obrachail"
 
-#: ../src/connection-editor/ce-page.c:86
+#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
 #: ../src/connection-editor/page-wifi.c:168
 #: ../src/connection-editor/page-wifi.c:172
@@ -1324,44 +1445,76 @@ msgstr "fèin-obrachail"
 msgid "default"
 msgstr "bun-roghainn"
 
-#: ../src/connection-editor/ce-page.c:132
+#: ../src/connection-editor/ce-page.c:189
 msgid "unspecified error"
-msgstr "mearachd nach deach a mhìneachadh"
+msgstr "mearachd nach deach a shònrachadh"
+
+#: ../src/connection-editor/ce-page.c:294
+msgid "Preserve"
+msgstr "Glèidh"
+
+#: ../src/connection-editor/ce-page.c:295
+msgid "Permanent"
+msgstr "Buan"
+
+#: ../src/connection-editor/ce-page.c:296
+msgid "Random"
+msgstr "Air thuaiream"
+
+#: ../src/connection-editor/ce-page.c:297
+#| msgid "Enable"
+msgid "Stable"
+msgstr "Seasmhach"
+
+#: ../src/connection-editor/ce-page.c:301
+#| 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"
+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 ""
+"Thèid an seòladh MAC a chuireas tu a-steach an-seo a chleachdadh mar "
+"sheòladh a' bhathair-bhog airson an uidheim lìonraidh a tha an ceangal seo "
+"gnìomhach air. Canar clònachadh MAC no spoofing ris, mar eisimpleir "
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Seòladh MAC"
 
-#: ../src/connection-editor/ce-page.c:245
+#: ../src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Seòladh HW"
 
-#: ../src/connection-editor/ce-page.c:248
+#: ../src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s mì-dhligheach airson %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:252
-#: ../src/connection-editor/ce-page.c:484
+#: ../src/connection-editor/ce-page.c:348
+#: ../src/connection-editor/ce-page.c:604
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s mì-dhligheach (%s)"
 
-#: ../src/connection-editor/ce-page.c:268
+#: ../src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "interface-name mì-dhligheach airson %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:272
+#: ../src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "interface-name mì-dhligheach (%s)"
 
-#: ../src/connection-editor/ce-page.c:485
+#: ../src/connection-editor/ce-page.c:605
 msgid "device"
 msgstr "uidheam"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:713
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Dh'fhàillig ùrachadh rùintean a' cheangail air sgàth mearachd nach aithne "
@@ -1389,7 +1542,7 @@ msgstr "Smachd srutha"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:6
 msgid "Feature"
-msgstr "Gleus"
+msgstr "Feart"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:7
 msgid "Enable"
@@ -1408,7 +1561,8 @@ msgid "Priority"
 msgstr "Prìomhachas"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:11
-msgid "Options..."
+#| msgid "Options..."
+msgid "Options…"
 msgstr "Roghainnean..."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:12
@@ -1416,148 +1570,112 @@ msgid "Priority Groups"
 msgstr "Buidhnean prìomhachais"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:14
-msgid "0"
-msgstr "0"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
-msgid "1"
-msgstr "1"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
-msgid "5"
-msgstr "5"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "6"
-msgstr "6"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "7"
-msgstr "7"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
 msgid "Priority Flow Control"
 msgstr "Smachd srutha a' phrìomhachais"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Cuir an comas no à comas tar-chur stada a' phrìomhachais airson gach "
 "prìomhachas cleachdaiche."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
 msgid "Priority:"
 msgstr "Prìomhachas:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:25
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:26
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "Traffic Class:"
 msgstr "Clas trafaige:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "Strict Bandwidth:"
 msgstr "Leud-banna teann:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "Priority Bandwidth:"
 msgstr "Prìomhachas an leud-banna:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "Group Bandwidth:"
 msgstr "Leud-banna a' bhuidhinn:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "Group ID:"
 msgstr "ID a' bhuidhinn:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:42
-msgid "15"
-msgstr "15"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Cuir a-steach ID a' bhuidhinn prìomhachais airson gach prìomhachas "
 "cleachdaiche"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 #, no-c-format
+#| msgid ""
+#| "Enter the allowed link bandwidth percent each Priority Group may use.  "
+#| "The sum of all groups must total 100%."
 msgid ""
-"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 "Chuir a-steach a' cheudad de leud-banna a dh'fhaodas gach buidheann "
 "prìomhachais a chleachdadh. Feumaidh iomlan de 100% a bhith air a h-uile "
 "buidheann gu lèir."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Chuir a-steach a' cheudad de leud-banna a' bhuidhinn prìomhachais a "
 "dh'fhaodas gach prìomhachas cleachdaiche a chleachdadh."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:47
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Cuir an comas no à comas leud-banna teann airson gach prìomhachas "
 "cleachdaiche."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:48
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Enter the traffic class for each user priority."
 msgstr "Cuir a-steach an clas trafaige airson gach prìomhachas cleachdaiche."
 
@@ -1596,10 +1714,11 @@ msgstr "_Facal-faire:"
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:135
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:136
+#: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
@@ -1636,43 +1755,40 @@ msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "Half"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:11
-msgid "_Speed:"
-msgstr "_Astar:"
+msgid "Full"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-msgid "Full duple_x"
-msgstr "Làn duple_x"
+#: ../src/connection-editor/page-ip6.c:149
+msgid "Ignore"
+msgstr "Leig seachad"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "Co-rèitich gu fèi_n-obrachail"
+#: ../src/connection-editor/ce-page-ip4.ui.h:3
+#: ../src/connection-editor/ce-page-ip6.ui.h:3
+#: ../src/connection-editor/page-ip4.c:168
+#: ../src/connection-editor/page-ip6.c:185
+msgid "Manual"
+msgstr "A làimh"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:14
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
 #: ../src/connection-editor/ce-page-infiniband.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid "_Device:"
 msgstr "Ui_dheam:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
-msgid "C_loned MAC address:"
-msgstr "Seòladh MAC c_lònaichte:"
-
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
 #: ../src/connection-editor/ce-page-wifi.ui.h:10
-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 ""
-"Thèid an seòladh MAC a chuireas tu a-steach an-seo a chleachdadh mar "
-"sheòladh a' bhathair-bhog airson an uidheim lìonraidh a tha an ceangal seo "
-"gnìomhach air. Canar clònachadh MAC no spoofing ris, mar eisimpleir "
-"00:11:22:33:44:55"
+msgid "C_loned MAC address:"
+msgstr "Seòladh MAC c_lònaichte:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:19
 msgid "Wake on LAN:"
@@ -1696,7 +1812,7 @@ msgstr "_Aon-chraoladh"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
-msgstr "Ioma-chrao_ladh"
+msgstr "Io_ma-chraoladh"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
@@ -1718,9 +1834,43 @@ msgstr "Facal-faire aig _dùsgadh an lìonraidh:"
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"Facal-faire aig dùsgadh an lìonraidh (MAC Ethernet). Chan eil a dligheach "
+"Facal-faire aig dùsgadh an lìonraidh (MAC Ethernet). Chan eil e dligheach "
 "ach airson pacaidean draoidheach."
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+msgid "Lin_k negotiation:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+msgid ""
+"Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
+"will be forced without checking the device compatibility. If unsure, leave "
+"here “Ignore” or pick “Automatic”."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+msgid "_Speed:"
+msgstr "_Astar:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+msgid ""
+"Speed value for static link negotiation, required only when “Ignore” and "
+"“Automatic” options are not selected. Before specifying a speed value be "
+"sure your device supports it."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#| msgid "Full duple_x"
+msgid "Duple_x:"
+msgstr "Dà-_thaobhach:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+msgid ""
+"Duplex value for static link negotiation, required only when “Ignore” and "
+"“Automatic” options are not selected. Before specifying a duplex mode be "
+"sure your device supports it."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-general.ui.h:1
 msgid "Automatically connect to _VPN when using this connection"
 msgstr "Ceangail ri _VPN gu fèin-obrachail nuair a chleachdar an ceangal seo"
@@ -1734,9 +1884,54 @@ msgid "_Automatically connect to this network when it is available"
 msgstr "Ceangail ris an lìonra seo gu _fèin-obrachail nuair a bhios e ri làimh"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
+#| msgid "Connection _Information"
+msgid "Connection _priority for auto-activation:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:5
+msgid ""
+"Connection priority for automatic activation. Connections with higher "
+"numbers are preferred when selecting profiles for automatic activation. "
+"Default value is 0."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:6
 msgid "Firewall _zone:"
 msgstr "_Sòn cachaileith-theine:"
 
+#: ../src/connection-editor/ce-page.h:111
+#, fuzzy
+#| msgid ""
+#| "IP addresses identify your computer on the network.  Click the \"Add\" "
+#| "button to add an IP address."
+msgid ""
+"IP addresses identify your computer on the network. Click the “Add” button "
+"to add static IP address to be configured in addition to the automatic ones."
+msgstr ""
+"Aithnichear an coimpiutair agad air an t-seòladh IP aige air an lìonra. "
+"Briog air a' phutan \"Cuir ris\" gus seòladh IP a chur ris."
+
+#: ../src/connection-editor/ce-page.h:116
+msgid ""
+"The IP address identify your computer on the network and determines the "
+"address range distributed to other computers. Click the “Add” button to add "
+"an IP address. If no address is provided, range will be determined "
+"automatically."
+msgstr ""
+
+#: ../src/connection-editor/ce-page.h:121
+#| msgid "Automatic, addresses only"
+msgid "Additional static addresses"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.h:122
+msgid "Addresses"
+msgstr "Seòlaidhean"
+
+#: ../src/connection-editor/ce-page.h:123
+msgid "Address (optional)"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
 msgstr "Modh _còmhdhalach:"
@@ -1751,18 +1946,83 @@ msgstr "Dàtagram"
 msgid "Connected"
 msgstr "Ceangailte"
 
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+msgid "IPIP"
+msgstr "IPIP"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+msgid "GRE"
+msgstr "GRE"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+msgid "SIT"
+msgstr "SIT"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+msgid "ISATAP"
+msgstr "ISATAP"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+msgid "VTI"
+msgstr "VTI"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+msgid "IP6IP6"
+msgstr "IP6IP6"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+msgid "IPIP6"
+msgstr "IPIP6"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+msgid "IP6GRE"
+msgstr "IP6GRE"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+msgid "VTI6"
+msgstr "VTI6"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#| msgid "Device name + number"
+msgid "Device name"
+msgstr "Ainm an uidheim"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#| msgid "Ethernet device"
+msgid "Parent device"
+msgstr "Uidheam pàraint"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#| msgid "_Mode:"
+msgid "Mode"
+msgstr "Modh"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+msgid "Local IP"
+msgstr "IP ionadail"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+msgid "Remote IP"
+msgstr "IP cèin"
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+msgid "Input key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+msgid "Output key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#| msgid "_MTU:"
+msgid "MTU"
+msgstr "MTU"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
 msgstr "Gu fèin-obrachail le roghainnean DNS làimhe"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:166
-#: ../src/connection-editor/page-ip6.c:184
-msgid "Manual"
-msgstr "A làimh"
-
 #: ../src/connection-editor/ce-page-ip4.ui.h:4
 #: ../src/connection-editor/ce-page-ip6.ui.h:4
 msgid "Link-Local"
@@ -1770,8 +2030,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:186
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:188
+#: ../src/connection-editor/page-ip6.c:205
 msgid "Shared to other computers"
 msgstr "Co-roinnte ri coimpiutairean eile"
 
@@ -1780,23 +2040,22 @@ msgstr "Co-roinnte ri coimpiutairean eile"
 msgid "_Method:"
 msgstr "_Dòigh:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-msgid "Addresses"
-msgstr "Seòlaidhean"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#| msgid ""
+#| "The DHCP client identifier allows the network administrator to customize "
+#| "your computer's configuration.  If you wish to use a DHCP client "
+#| "identifier, enter it here."
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
-"your computer's configuration.  If you wish to use a DHCP client identifier, "
+"your computer’s configuration. If you wish to use a DHCP client identifier, "
 "enter it here."
 msgstr ""
 "Leigidh aithnichear cliant DHCP le rianaire an lìonraidh rèiteachadh a' "
 "choimpiutair agad a ghnàthachadh. Ma tha thu airson aithnichear cliant DHCP "
 "a chleachdadh, cuir a-steach an-seo e."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1804,25 +2063,25 @@ msgstr ""
 "Cleachdar àrainnean-lìn nuair a thathar a' fuasgladh ainmean òstairean. "
 "Cleachd cromagan gus diofar àrainnean-lìn a sgaradh o chèile."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid "D_HCP client ID:"
 msgstr "ID cliant D_HCP:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:308
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/page-ip4.c:372
+#: ../src/connection-editor/page-ip6.c:335
 msgid "S_earch domains:"
 msgstr "Lorg air na _h-àrainnean-lìn:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:299
-#: ../src/connection-editor/page-ip6.c:297
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/page-ip4.c:363
+#: ../src/connection-editor/page-ip6.c:326
 msgid "DNS ser_vers:"
 msgstr "Fri_thealaichean DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1831,11 +2090,11 @@ msgstr ""
 "thathar a' fuasgladh ainmean òstairean. Cleachd cromagan gus seòlaidhean "
 "fhrithealaichean aig diofar àrainnean-lìn a sgaradh o chèile."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Iarr seòladh IPv_4 mus gabh an ceangal seo a choileanadh"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1844,13 +2103,13 @@ msgstr ""
 "dhan cheangal coileanadh ma dh'fhàilligeas an rèiteachadh IPv4 ach ma thèid "
 "leis an rèiteachadh IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:19
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "_Routes…"
 msgstr "_ Rùtaichean..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:196
+#: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "À comas"
 
@@ -1862,7 +2121,7 @@ msgstr "An comas ('s fhearr leis seòladh poblach)"
 msgid "Enabled (prefer temporary address)"
 msgstr "An comas ('s fhearr leis seòladh sealach)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -1872,15 +2131,15 @@ msgstr ""
 "thathar a' fuasgladh ainmean òstairean. 'S e an eadar-aghaidh a cheanglas a "
 "bhios san sgòp aig seòlaidhean ionadail a' cheangail gu fèin-obrachail."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 msgid "IPv6 _privacy extensions:"
 msgstr "Leudachain _prìobhaideachd IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Iarr seòladh IPv_6 mus gabh an ceangal seo a choileanadh"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1890,6 +2149,7 @@ msgstr ""
 "leis an rèiteachadh IPv4."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
 msgstr "Bunasach"
 
@@ -1910,7 +2170,8 @@ msgid "N_etwork ID:"
 msgstr "ID an _lìonraidh:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "Change..."
+#| msgid "Change..."
+msgid "Change…"
 msgstr "Atharraich..."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
@@ -1973,22 +2234,516 @@ msgstr "Mac-talla"
 msgid "Send PPP _echo packets"
 msgstr "Cuir pacaidean _mac-talla PPP"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:1
+#| msgid "_Method:"
+msgid "Method:"
+msgstr "Modh:"
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
+#: ../src/connection-editor/ce-page-team.ui.h:25
+#| msgctxt "Wi-Fi/Ethernet security"
+#| msgid "None"
+msgid "None"
+msgstr "Chan eil gin"
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
+msgid "For browser only"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
+msgid "Use this proxy configuration for only browser clients/schemes."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC URL:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:7
+msgid "URL from where the PAC script is to be obtained."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:8
+msgid "PAC script:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#| msgid "_Import team configuration from a file..."
+msgid "Import script from a file…"
+msgstr "Ion-phortaich sgriobt o fhaidhle..."
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:2
-msgid "_JSON config:"
-msgstr "Rèiteachadh _JSON:"
+#: ../src/connection-editor/ce-page-team.ui.h:19
+#| msgid "Advanced"
+msgid "Ad_vanced…"
+msgstr "_Adhartach..."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-msgid "_Import team configuration from a file..."
-msgstr "_Ion-phortaich rèiteachadh sgioba o fhaidhle..."
+msgid "Set by master"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:3
+#: ../src/connection-editor/ce-page-team.ui.h:9
+#| msgid "Ethernet Networks"
+msgid "Ethernet port state"
+msgstr "Staid nam puirt Ethernet"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:10
+msgid "ARP (IPv4)"
+msgstr "ARP (IPv4)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:11
+msgid "NDP (IPv6)"
+msgstr "NDP (IPv6)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:6
+#: ../src/connection-editor/ce-page-team.ui.h:37
+msgid "Team Advanced Options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:7
+msgid "_Queue ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:8
+#: ../src/connection-editor/ce-page-team.ui.h:42
+msgid ""
+"Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
+"port is enabled or disabled."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:9
+msgid "ID of queue which this port should be mapped to."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#| msgid "_Priority:"
+msgid "_Port priority:"
+msgstr "_Prìomhachas a' phuirt:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
+msgid "Port _sticky"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:12
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: ../src/connection-editor/ce-page-team.ui.h:44
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of notify-peer packets."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port priority. The higher number means higher priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:15
+msgid "Active-Backup runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#| msgid "_Priority:"
+msgid "_LACP port priority:"
+msgstr "Prìomhachas a' phuirt _LACP:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#| msgid "Private _key:"
+msgid "LACP port _key:"
+msgstr "_Iuchair a' phuirt LACP:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team.ui.h:43
+msgid ""
+"Number of bursts of multicast group rejoin requests sent after port is "
+"enabled or disabled."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
+msgid ""
+"Port priority according to LACP standard. The lower number means higher "
+"priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team.ui.h:45
+msgid ""
+"Value is positive number in milliseconds. Specifies an interval between "
+"bursts of multicast group rejoin requests."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
+msgid ""
+"Port key according to LACP standard. It is only possible to aggregate ports "
+"with the same key."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
+msgid "LACP runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:24
+#: ../src/connection-editor/ce-page-team.ui.h:70
+msgid "_Link watcher:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:25
+#: ../src/connection-editor/ce-page-team.ui.h:71
+#| msgid "Link _up delay:"
+msgid "_Up delay:"
+msgstr "Dàil _suas:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:26
+#: ../src/connection-editor/ce-page-team.ui.h:72
+#| msgid "Link _down delay:"
+msgid "_Down delay:"
+msgstr "Dàil _a-nuas:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:27
+#: ../src/connection-editor/ce-page-team.ui.h:73
+#| msgid "_Parent interface:"
+msgid "Send _interval:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:28
+#: ../src/connection-editor/ce-page-team.ui.h:74
+msgid "Delay _before first send:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:29
+#: ../src/connection-editor/ce-page-team.ui.h:75
+msgid "_Maximum missed replies:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:30
+#: ../src/connection-editor/ce-page-team.ui.h:76
+msgid "_Source host:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:31
+#: ../src/connection-editor/ce-page-team.ui.h:77
+#| msgid "ARP _targets:"
+msgid "_Target host:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:32
+#: ../src/connection-editor/ce-page-team.ui.h:78
+msgid ""
+"Maximum number of missed replies. If this number is exceeded, link is "
+"reported as down."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:33
+#: ../src/connection-editor/ce-page-team.ui.h:79
+msgid ""
+"Hostname to be converted to IP address which will be filled into ARP request "
+"as source address."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:34
+#: ../src/connection-editor/ce-page-team.ui.h:80
+msgid ""
+"Hostname to be converted to IP address which will be filled into request as "
+"destination address."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:35
+#: ../src/connection-editor/ce-page-team.ui.h:81
+msgid "Ignore invalid packets from _active ports"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../src/connection-editor/ce-page-team.ui.h:83
+msgid "Ignore invalid packets from i_nactive ports"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team.ui.h:84
+msgid ""
+"Validate received ARP packets on inactive ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team.ui.h:85
+msgid "S_end on inactive ports"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team.ui.h:86
+msgid ""
+"By default, ARP requests are sent on active ports only. This option allows "
+"sending even on inactive ports."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team.ui.h:87
+msgid ""
+"The delay between the link coming up and the runner being notified about it."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team.ui.h:88
+msgid ""
+"The delay between the link going down and the runner being notified about it."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team.ui.h:89
+msgid "The interval between requests being sent."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team.ui.h:90
+msgid ""
+"The delay between link watch initialization and the first request being sent."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team.ui.h:91
+msgid "The link watcher to be used."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team.ui.h:92
+msgid "Link Watcher"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team.ui.h:93
+#| msgid "Im_port team configuration from a file..."
+msgid "Im_port team configuration from a file…"
+msgstr "Ion-_phortaich rèiteachadh sgioba o fhaidhle..."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team.ui.h:94
+#| msgid "_JSON config:"
+msgid "Edit _JSON configuration:"
+msgstr "Deasaich an rèiteachadh _JSON:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team.ui.h:95
+msgid "Raw Configuration"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "Highest priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "Highest priority (stable)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#| msgid "Group Bandwidth:"
+msgid "Bandwidth"
+msgstr "Leud-banna"
+
+#: ../src/connection-editor/ce-page-team.ui.h:4
+msgid "Highest number of ports"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#| msgid "Priority"
+msgid "Port priority"
+msgstr "Prìomhachas a' phuirt"
+
+#: ../src/connection-editor/ce-page-team.ui.h:6
+#| msgid "Ethernet device"
+msgid "From the team device"
+msgstr "O uidheam an sgioba"
+
+#: ../src/connection-editor/ce-page-team.ui.h:7
+msgid "From the active port"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:8
+msgid "From active to team device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:12
 msgid "_Teamed connections:"
 msgstr "_Ceanglaichean sgioba:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "Im_port team configuration from a file..."
-msgstr "Ion-_phortaich rèiteachadh sgioba o fhaidhle..."
+#: ../src/connection-editor/ce-page-team.ui.h:23
+msgid "Load balance"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:24
+msgid "LACP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:27
+#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/page-ethernet.c:351
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/ce-page-team.ui.h:28
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../src/connection-editor/ce-page-team.ui.h:31
+#| msgid "FIP"
+msgid "IP"
+msgstr "IP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:32
+msgid "Any L3 protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:33
+#| msgid "GTC"
+msgid "TCP"
+msgstr "TCP"
+
+#: ../src/connection-editor/ce-page-team.ui.h:34
+msgid "UDP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:35
+msgid "SCTP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:36
+msgid "Any L4 protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:38
+msgid "_Peer notification count:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:39
+msgid "Peer _notification interval:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:40
+msgid "_Multicast rejoin count:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:41
+msgid "Multicast _rejoin interval:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:46
+#| msgid "Hardware Address:"
+msgid "_Hardware Address:"
+msgstr "Seòladh bathair-c_hruaidh:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:47
+msgid ""
+"Desired hardware address of new team device. Usual MAC address format is "
+"accepted."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:49
+msgid "_Runner:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:50
+#| msgid "Hardware Address:"
+msgid "_Hardware address policy:"
+msgstr "Poileasaidh seòladh bathair-c_hruaidh:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:51
+msgid "Name of runner to be used."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:52
+msgid ""
+"This defines the policy of how hardware addresses of team device and port "
+"devices should be set during the team lifetime."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:53
+msgid "Send LACPDU frames _periodically"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:54
+msgid ""
+"If checked, LACPDU frames are sent along the configured links periodically. "
+"If not, it acts as “speak when spoken to”."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:55
+msgid "Send a LACPDU frame _every second"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:56
+msgid ""
+"Option specifies the rate at which our link partner is asked to transmit "
+"LACPDU packets. If checked, packets will be sent once per second. Otherwise "
+"they will be sent every 30 seconds."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:57
+#| msgid "_Priority:"
+msgid "_System priority:"
+msgstr "Prìomhachas an t-_siostaim:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:58
+msgid "_Minimum ports:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:59
+msgid "_Aggregator selection policy:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:60
+msgid "System priority, value can be 0 – 65535."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:61
+msgid ""
+"Specifies the minimum number of ports that must be active before asserting "
+"carrier in the master interface, value can be 1 – 255."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:62
+msgid "This selects the policy of how the aggregators will be selected."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:63
+msgid ""
+"List of fragment types (strings) which should be used for packet Tx hash "
+"computation."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:64
+msgid "_Fields for tramsmission hash"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:65
+msgid "In tenths of a second. Periodic interval between rebalancing."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:66
+msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:67
+#| msgid "Transmission po_wer:"
+msgid "Transmission _balancing interval:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:68
+#| msgid "Transmission po_wer:"
+msgid "_Transmission balancer:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:69
+msgid "Runner"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
@@ -2060,35 +2815,35 @@ msgstr "Hotspot"
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
 msgstr "Ne_art an tar-chuir:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "_Rate:"
 msgstr "_Reat:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "C_hannel:"
 msgstr "S_eanail:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "Ban_d:"
 msgstr "Ban_n:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
@@ -2141,86 +2896,126 @@ msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#| msgid ""
+#| "In most cases, the provider's PPP servers will support all authentication "
+#| "methods.  If connections fail, try disabling support for some methods."
 msgid ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
+"In most cases, the provider’s PPP servers will support all authentication "
+"methods. If connections fail, try disabling support for some methods."
 msgstr ""
 "Mar is trice, bheir frithealaichean PPP an t-solaraiche taic ri dòigh "
 "dearbhaidh sam bith. Ma dh'fhàilligeas na ceanglaichean, feuch is cuir à "
 "comas cuid dhe na dòighean."
 
-#: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:326
-#: ../src/libnm-gtk/nm-ui-utils.c:321
-msgid "Ethernet"
-msgstr "Ethernet"
-
-#: ../src/connection-editor/connection-helpers.c:98
-#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "WiFi"
 
-#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/connection-helpers.c:113
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bann"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-team.c:267 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:117
+#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Sgioba"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bridge.c:210
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-bridge.c:212
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Drochaid"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
-msgid "VLAN"
-msgstr "VLAN"
+#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/page-ip-tunnel.c:176
+msgid "IP tunnel"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/connection-helpers.c:252
-#: ../src/connection-editor/page-vpn.c:94
+#: ../src/connection-editor/connection-helpers.c:122
+#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:194
+#: ../src/connection-editor/connection-helpers.c:205
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+"Cha b' urrainn dhan phlugan VPN an ceangal VPN ion-phortadh mar bu chòir\n"
+"\n"
+"Mearachd: às aonais seòrsa seirbheis VPN."
+
+#: ../src/connection-editor/connection-helpers.c:217
+msgid "Cannot import VPN connection"
+msgstr "Chan urrainn dhuinn an ceangal VPN ion-phortadh"
+
+#: ../src/connection-editor/connection-helpers.c:219
+#, c-format
+#| msgid ""
+#| "The file '%s' could not be read or does not contain recognized VPN "
+#| "connection information\n"
+#| "\n"
+#| "Error: %s."
+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 fiosrachadh "
+"ceangail VPN ann a thuigeas sinn\n"
+"\n"
+"Mearachd: %s."
+
+#: ../src/connection-editor/connection-helpers.c:220
+msgid "unknown error"
+msgstr "mearachd nach aithne dhuinn"
+
+#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/page-proxy.c:120
+#: ../src/connection-editor/page-team.c:341
+#: ../src/connection-editor/page-team-port.c:203
+msgid "Select file to import"
+msgstr "Tagh am faidhle a tha ri ion-phortadh"
+
+#: ../src/connection-editor/connection-helpers.c:338
 msgid "Hardware"
 msgstr "Bathar-cruaidh"
 
-#: ../src/connection-editor/connection-helpers.c:221
+#: ../src/connection-editor/connection-helpers.c:365
 msgid "Virtual"
 msgstr "Biortail"
 
-#: ../src/connection-editor/connection-helpers.c:290
-#: ../src/connection-editor/connection-helpers.c:292
-msgid "Import a saved VPN configuration..."
+#: ../src/connection-editor/connection-helpers.c:514
+#: ../src/connection-editor/connection-helpers.c:516
+#| msgid "Import a saved VPN configuration..."
+msgid "Import a saved VPN configuration…"
 msgstr "Ion-phortaich rèiteachadh VPN a chaidh a shàbhaladh..."
 
-#: ../src/connection-editor/connection-helpers.c:321
+#: ../src/connection-editor/connection-helpers.c:546
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2228,77 +3023,78 @@ msgstr ""
 "Cha b' urrainn dhuinn còmhradh deasaiche nan ceanglaichean a thòiseachadh "
 "air sgàth mearachd neo-aithnichte."
 
-#: ../src/connection-editor/connection-helpers.c:330
+#: ../src/connection-editor/connection-helpers.c:555
 msgid "Could not create new connection"
 msgstr "Cha b' urrainn dhuinn an ceangal ùr a chruthachadh"
 
-#: ../src/connection-editor/connection-helpers.c:467
+#: ../src/connection-editor/connection-helpers.c:718
 msgid "Connection delete failed"
 msgstr "Dh'fhàillig sguabadh às a' cheangail"
 
-#: ../src/connection-editor/connection-helpers.c:515
+#: ../src/connection-editor/connection-helpers.c:766
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 "A bheil thu cinnteach gu bheil thu airson an ceangal \"%s\" a sguabadh às?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:804
-#: ../src/connection-editor/ip6-routes-dialog.c:746
-#: ../src/connection-editor/page-ip4.c:1068
-#: ../src/connection-editor/page-ip6.c:1066
+#: ../src/connection-editor/ip4-routes-dialog.c:697
+#: ../src/connection-editor/ip6-routes-dialog.c:718
+#: ../src/connection-editor/page-ip4.c:1136
+#: ../src/connection-editor/page-ip6.c:1095
 msgid "Address"
 msgstr "Seòladh"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:823
-#: ../src/connection-editor/page-ip4.c:1087
+#: ../src/connection-editor/ip4-routes-dialog.c:716
+#: ../src/connection-editor/page-ip4.c:1155
 msgid "Netmask"
 msgstr "Masg-lìn"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:842
-#: ../src/connection-editor/ip6-routes-dialog.c:784
-#: ../src/connection-editor/page-ip4.c:1106
-#: ../src/connection-editor/page-ip6.c:1104
+#: ../src/connection-editor/ip4-routes-dialog.c:735
+#: ../src/connection-editor/ip6-routes-dialog.c:756
+#: ../src/connection-editor/page-ip4.c:1174
+#: ../src/connection-editor/page-ip6.c:1133
 msgid "Gateway"
 msgstr "Bealach"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:861
-#: ../src/connection-editor/ip6-routes-dialog.c:803
+#: ../src/connection-editor/ip4-routes-dialog.c:754
+#: ../src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Meatraig"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:765
-#: ../src/connection-editor/page-ip6.c:1085
+#: ../src/connection-editor/ip6-routes-dialog.c:737
+#: ../src/connection-editor/page-ip6.c:1114
 msgid "Prefix"
 msgstr "Ro-leasachan"
 
-#: ../src/connection-editor/nm-connection-editor.c:100
+#: ../src/connection-editor/nm-connection-editor.c:102
 #, c-format
 msgid "Editing %s"
 msgstr "A' deasachadh %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:106
 msgid "Editing un-named connection"
 msgstr "A' deasachadh ceangal gun ainm"
 
-#: ../src/connection-editor/nm-connection-editor.c:124
+#: ../src/connection-editor/nm-connection-editor.c:126
 msgid "Missing connection name"
 msgstr "Tha ainm a' cheangail a dhìth"
 
-#: ../src/connection-editor/nm-connection-editor.c:187
-msgid "Editor initializing..."
+#: ../src/connection-editor/nm-connection-editor.c:189
+#| msgid "Editor initializing..."
+msgid "Editor initializing…"
 msgstr "A' tòiseachadh an deasaiche..."
 
-#: ../src/connection-editor/nm-connection-editor.c:194
-#: ../src/connection-editor/nm-connection-list.c:397
+#: ../src/connection-editor/nm-connection-editor.c:196
+#: ../src/connection-editor/nm-connection-list.c:412
 msgid "Connection cannot be modified"
 msgstr "Cha ghabh an ceangal atharrachadh"
 
-#: ../src/connection-editor/nm-connection-editor.c:207
+#: ../src/connection-editor/nm-connection-editor.c:209
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Roghainn mhì-dhligheach %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:283
+#: ../src/connection-editor/nm-connection-editor.c:285
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2306,39 +3102,45 @@ msgstr ""
 "Cha b' urrainn do dheasaiche nan ceanglaichean cuid a ghoireasan a lorg air "
 "a bheil feum (cha deach am faidhle .ui a lorg)."
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:405
 msgid "_Save"
 msgstr "_Sàbhail"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:406
 msgid "Save any changes made to this connection."
 msgstr "Sàbhail atharrachadh sam bith a chaidh a dhèanamh air a' cheangal seo."
 
-#: ../src/connection-editor/nm-connection-editor.c:421
+#: ../src/connection-editor/nm-connection-editor.c:407
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Dèan dearbhadh gus an ceangal seo a shàbhaladh airson gach cleachdaiche air "
 "an inneal seo."
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: ../src/connection-editor/nm-connection-editor.c:423
 msgid "Could not create connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a chruthachadh"
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: ../src/connection-editor/nm-connection-editor.c:423
 msgid "Could not edit connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a dheasachadh"
 
-#: ../src/connection-editor/nm-connection-editor.c:439
+#: ../src/connection-editor/nm-connection-editor.c:425
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "Thachair mearachd nach aithne dhuinn nuair a chruthaich sinn còmhradh "
 "deasaiche nan ceanglaichean."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
+#: ../src/connection-editor/nm-connection-editor.c:566
+msgid ""
+"Warning: the connection contains some properties not supported by the "
+"editor. They will be cleared upon save."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:586
 msgid "Error initializing editor"
 msgstr "Mearachd a' tòiseachadh an deasaiche"
 
-#: ../src/connection-editor/nm-connection-editor.c:921
+#: ../src/connection-editor/nm-connection-editor.c:974
 msgid "Connection add failed"
 msgstr "Cha b' urrainn dhuinn an ceangal a chur ris"
 
@@ -2351,8 +3153,9 @@ msgid "Connection _name:"
 msgstr "_Ainm a' cheangail:"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Export..."
-msgstr "Às-p_hortaich"
+#| msgid "_Export..."
+msgid "_Export…"
+msgstr "Às-p_hortaich..."
 
 #: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
@@ -2409,58 +3212,62 @@ msgstr[1] "%d bhliadhna air ais"
 msgstr[2] "%d bliadhna air ais"
 msgstr[3] "%d bliadhna air ais"
 
-#: ../src/connection-editor/nm-connection-list.c:623
+#: ../src/connection-editor/nm-connection-list.c:639
 msgid "Name"
 msgstr "Ainm"
 
-#: ../src/connection-editor/nm-connection-list.c:636
+#: ../src/connection-editor/nm-connection-list.c:652
 msgid "Last Used"
 msgstr "Cleachdadh mu dheireadh"
 
-#: ../src/connection-editor/nm-connection-list.c:684
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Edit the selected connection"
 msgstr "Deasaich an ceangal a thagh thu"
 
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to edit the selected connection"
 msgstr "Dèan dearbhadh gus an ceangal a thagh thu a dheasachadh"
 
-#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:716
 msgid "Delete the selected connection"
 msgstr "Sguab às an ceangal a thagh thu"
 
-#: ../src/connection-editor/nm-connection-list.c:701
+#: ../src/connection-editor/nm-connection-list.c:717
 msgid "Authenticate to delete the selected connection"
 msgstr "Dèan dearbhadh gus an ceangal a thagh thu a sguabadh às"
 
-#: ../src/connection-editor/nm-connection-list.c:911
-#: ../src/connection-editor/nm-connection-list.c:914
+#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:942
 msgid "Error creating connection"
 msgstr "Mearachd a' cruthachadh a' cheangail"
 
-#: ../src/connection-editor/nm-connection-list.c:912
+#: ../src/connection-editor/nm-connection-list.c:940
 msgid "No VPN plugins are installed."
 msgstr "Cha deach plugan VPN a stàladh."
 
-#: ../src/connection-editor/nm-connection-list.c:915
+#: ../src/connection-editor/nm-connection-list.c:943
 #, c-format
-msgid "Don't know how to create '%s' connections"
+#| msgid "Don't know how to create '%s' connections"
+msgid "Don’t know how to create “%s” connections"
 msgstr "Chan eil fhios mar a chruthaicheas sinn ceanglaichean \"%s\""
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:974
 msgid "Error editing connection"
 msgstr "Mearachd a' deasachadh a' cheangail"
 
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:975
 #, c-format
-msgid "Did not find a connection with UUID '%s'"
+#| msgid "Did not find a connection with UUID '%s'"
+msgid "Did not find a connection with UUID “%s”"
 msgstr "Cha do lorg sinn ceangal leis an UUID \"%s\""
 
 #: ../src/connection-editor/page-8021x-security.c:109
+#| msgid "802.1x Security"
 msgid "802.1X Security"
 msgstr "Tèarainteachd 802.1X"
 
 #: ../src/connection-editor/page-8021x-security.c:111
+#| msgid "Could not load 802.1x Security user interface."
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche tèarainteachd 802.1X a "
@@ -2490,44 +3297,44 @@ msgstr "uidheam Bluetooth mì-dhligheach (%s)"
 msgid "Bluetooth connection %d"
 msgstr "Ceangal Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:302
+#: ../src/connection-editor/page-bluetooth.c:308
 msgid "Bluetooth Type"
 msgstr "Seòrsa Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:320
+#: ../src/connection-editor/page-bluetooth.c:326
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Tagh an seòrsa dhe phròifil a' cheangail Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:325
+#: ../src/connection-editor/page-bluetooth.c:331
 msgid "_Personal Area Network"
 msgstr "_Personal Area Network"
 
-#: ../src/connection-editor/page-bluetooth.c:330
+#: ../src/connection-editor/page-bluetooth.c:336
 msgid "_Dial-Up Network"
 msgstr "Lìonra _dial-up"
 
-#: ../src/connection-editor/page-bond.c:447
+#: ../src/connection-editor/page-bond.c:449
 msgid "Could not load bond user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh airson bannadh chleachdaichean a "
 "luchdadh."
 
-#: ../src/connection-editor/page-bond.c:566
+#: ../src/connection-editor/page-bond.c:568
 msgid "primary"
-msgstr "prìomh-bhanntach"
+msgstr "prìomh-fhear"
 
-#: ../src/connection-editor/page-bond.c:616
+#: ../src/connection-editor/page-bond.c:623
 #, c-format
 msgid "Bond connection %d"
 msgstr "Ceangal banntach %d"
 
-#: ../src/connection-editor/page-bridge.c:213
+#: ../src/connection-editor/page-bridge.c:215
 msgid "Could not load bridge user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh airson drochaideachaidh "
 "chleachdaichean a luchdadh."
 
-#: ../src/connection-editor/page-bridge.c:310
+#: ../src/connection-editor/page-bridge.c:317
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Ceangal drochaide %d"
@@ -2557,54 +3364,63 @@ msgstr "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche DCB a luchdadh."
 msgid "Could not load DSL user interface."
 msgstr "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche DSL a luchdadh."
 
-#: ../src/connection-editor/page-dsl.c:214
+#: ../src/connection-editor/page-dsl.c:219
 #, c-format
 msgid "DSL connection %d"
 msgstr "Ceangal DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:74
+#: ../src/connection-editor/page-ethernet.c:81
+#| msgid ""
+#| "This option locks this connection to the network device specified either "
+#| "by its interface name or permanent MAC or both. Examples: \"em1\", "
+#| "\"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
 msgid ""
 "This option locks this connection to the network device specified either by "
-"its interface name or permanent MAC or both. Examples: \"em1\", "
-"\"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
+"its interface name or permanent MAC or both. Examples: “em1”, "
+"“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 msgstr ""
 "Glaisidh an roghainn seo an ceangal seo ris an uidheam lìonraidh a chaidh a "
 "shònrachadh a-rèir ainm eadar-aghaidh no MAC maireannach no an dà chuidh "
 "dhiubh. Mar eisimpleir: \"em1\", \"3C:97:0E:42:1A:19\", \"em1 "
 "(3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:328
+#: ../src/connection-editor/page-ethernet.c:262
+#| msgid "Ignored"
+msgid "ignored"
+msgstr "air a leigeil seachad"
+
+#: ../src/connection-editor/page-ethernet.c:353
 msgid "Could not load ethernet user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche Ethernet a luchdadh."
 
-#: ../src/connection-editor/page-ethernet.c:457
+#: ../src/connection-editor/page-ethernet.c:515
 msgid "Ethernet device"
 msgstr "Uidheam Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:461
-#: ../src/connection-editor/page-vlan.c:741
-#: ../src/connection-editor/page-wifi.c:581
+#: ../src/connection-editor/page-ethernet.c:519
+#: ../src/connection-editor/page-vlan.c:742
+#: ../src/connection-editor/page-wifi.c:574
 msgid "cloned MAC"
 msgstr "MAC clònaichte"
 
-#: ../src/connection-editor/page-ethernet.c:465
+#: ../src/connection-editor/page-ethernet.c:523
 msgid "Wake-on-LAN password"
 msgstr "Facal-faire aig dùsgadh an lìonraidh"
 
-#: ../src/connection-editor/page-ethernet.c:500
+#: ../src/connection-editor/page-ethernet.c:563
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ceangal Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:51
-#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/connection-editor/page-general.c:54
+#: ../src/libnma/nma-mobile-providers.c:817
 #: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Bun-roghainn"
 
-#: ../src/connection-editor/page-general.c:52
+#: ../src/connection-editor/page-general.c:55
 msgid ""
 "The zone defines the trust level of the connection. Default is not a regular "
 "zone, selecting it results in the use of the default zone set in the "
@@ -2615,21 +3431,22 @@ msgstr ""
 "a chleachdadh a chaidh a shuidheachadh sa chachaileith-theine. Cha ghabh a "
 "chleachdadh ach ma tha a' chachaileith-theine gnìomhach."
 
-#: ../src/connection-editor/page-general.c:53
-msgid "FirewallD is not running."
-msgstr "Chan eil FirewallD a' ruith."
-
-#: ../src/connection-editor/page-general.c:350
+#: ../src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche choitcheann a luchdadh."
 
 #: ../src/connection-editor/page-infiniband.c:57
+#| msgid ""
+#| "This option locks this connection to the network device specified either "
+#| "by its interface name or permanent MAC or both. Examples: \"ib0\", "
+#| "\"80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65\", \"ib0 "
+#| "(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
 msgid ""
 "This option locks this connection to the network device specified either by "
-"its interface name or permanent MAC or both. Examples: \"ib0\", "
-"\"80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65\", \"ib0 "
-"(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
+"its interface name or permanent MAC or both. Examples: “ib0”, “80:00:00:48:"
+"fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, “ib0 (80:00:00:48:"
+"fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 "Glaisidh an roghainn seo an ceangal seo dhan uidheam lìonraidh a chaidh a "
 "shònrachadh a-rèir eadar-aghaidh air neo MAC maireannach air neo an dà chuid "
@@ -2637,156 +3454,175 @@ msgstr ""
 "\"80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65\", \"ib0 "
 "(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
 
-#: ../src/connection-editor/page-infiniband.c:153
+#: ../src/connection-editor/page-infiniband.c:151
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche InfiniBand a luchdadh."
 
-#: ../src/connection-editor/page-infiniband.c:216
+#: ../src/connection-editor/page-infiniband.c:214
 msgid "infiniband device"
-msgstr "uidheam InfiniBand"
+msgstr "Uidheam InfiniBand"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: ../src/connection-editor/page-infiniband.c:254
 #, c-format
 msgid "InfiniBand connection %d"
-msgstr "Ceangal InfiniBand %d"
+msgstr "Ceangal nfiniBand %d"
+
+#: ../src/connection-editor/page-ip-tunnel.c:178
+#| msgid "Could not load IPv4 user interface."
+msgid "Could not load IP tunnel user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip-tunnel.c:292
+#, c-format
+#| msgid "Ethernet connection %d"
+msgid "IP tunnel connection %d"
+msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:125
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN)"
 msgstr "Fèin-obrachail (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:131
 msgid "Automatic (VPN) addresses only"
 msgstr "Seòlaidhean (VPN) fèin-obrachail a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic, addresses only"
 msgstr "Gu fèin-obrachail, seòlaidhean a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE)"
 msgstr "Fèin-obrachail (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Seòlaidhean (PPPoE) fèin-obrachail a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP)"
 msgstr "Fèin-obrachail (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP) addresses only"
 msgstr "Seòlaidhean (DHCP) fèin-obrachail a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:179
-#: ../src/connection-editor/page-ip6.c:197
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:198
 msgid "Link-Local Only"
 msgstr "Link-Local a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:295
+#: ../src/connection-editor/page-ip4.c:361
+#: ../src/connection-editor/page-ip6.c:324
 msgid "Additional DNS ser_vers:"
 msgstr "Fri_thealaichean DNS a bharrachd:"
 
-#: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:304
+#: ../src/connection-editor/page-ip4.c:370
+#: ../src/connection-editor/page-ip6.c:333
 msgid "Additional s_earch domains:"
 msgstr "Àrainnean-lìn l_uirg a bharrachd:"
 
-#: ../src/connection-editor/page-ip4.c:965
+#: ../src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "A' deasachadh rùtaichean IPv4 airson %s"
 
-#: ../src/connection-editor/page-ip4.c:1158
+#: ../src/connection-editor/page-ip4.c:1226
 msgid "IPv4 Settings"
 msgstr "Roghainnean IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1160
+#: ../src/connection-editor/page-ip4.c:1228
 msgid "Could not load IPv4 user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche IPv4 a luchdadh."
 
-#: ../src/connection-editor/page-ip4.c:1253
+#: ../src/connection-editor/page-ip4.c:1321
 #, c-format
-msgid "IPv4 address \"%s\" invalid"
+#| msgid "IPv4 address \"%s\" invalid"
+msgid "IPv4 address “%s” invalid"
 msgstr "Chan eil an seòladh IPv4 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip4.c:1261
+#: ../src/connection-editor/page-ip4.c:1329
 #, c-format
-msgid "IPv4 address netmask \"%s\" invalid"
+#| msgid "IPv4 address netmask \"%s\" invalid"
+msgid "IPv4 address netmask “%s” invalid"
 msgstr "Chan eil am masg-lìonraidh IPv4 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip4.c:1270
+#: ../src/connection-editor/page-ip4.c:1338
 #, c-format
-msgid "IPv4 gateway \"%s\" invalid"
+#| msgid "IPv4 gateway \"%s\" invalid"
+msgid "IPv4 gateway “%s” invalid"
 msgstr "Chan eil am bealach IPv4 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip4.c:1313
+#: ../src/connection-editor/page-ip4.c:1381
 #, c-format
-msgid "IPv4 DNS server \"%s\" invalid"
+#| msgid "IPv4 DNS server \"%s\" invalid"
+msgid "IPv4 DNS server “%s” invalid"
 msgstr "Chan eil am frithealaiche DNS IPv4 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip6.c:148
-msgid "Ignore"
-msgstr "Leig seachad"
-
-#: ../src/connection-editor/page-ip6.c:172
+#: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
 msgstr "Gu fèin-obrachail, DHCP a-mhàin"
 
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:993
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "A' deasachadh rùtaichean IPv6 airson %s"
 
-#: ../src/connection-editor/page-ip6.c:1155
+#: ../src/connection-editor/page-ip6.c:1184
 msgid "IPv6 Settings"
 msgstr "Roghainnean IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1157
+#: ../src/connection-editor/page-ip6.c:1186
 msgid "Could not load IPv6 user interface."
 msgstr "Cha b' urrainn duinn eadar-aghaidh cleachdaiche IPv6 a luchdadh."
 
-#: ../src/connection-editor/page-ip6.c:1248
+#: ../src/connection-editor/page-ip6.c:1277
 #, c-format
-msgid "IPv6 address \"%s\" invalid"
+#| msgid "IPv6 address \"%s\" invalid"
+msgid "IPv6 address “%s” invalid"
 msgstr "Chan eil an seòladh IPv6 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip6.c:1256
+#: ../src/connection-editor/page-ip6.c:1285
 #, c-format
-msgid "IPv6 prefix \"%s\" invalid"
+#| msgid "IPv6 prefix \"%s\" invalid"
+msgid "IPv6 prefix “%s” invalid"
 msgstr "Chan eil an ro-leasachan IPv6 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip6.c:1265
+#: ../src/connection-editor/page-ip6.c:1294
 #, c-format
-msgid "IPv6 gateway \"%s\" invalid"
+#| msgid "IPv6 gateway \"%s\" invalid"
+msgid "IPv6 gateway “%s” invalid"
 msgstr "Chan eil am bealach IPv6 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: ../src/connection-editor/page-ip6.c:1336
 #, c-format
-msgid "IPv6 DNS server \"%s\" invalid"
+#| msgid "IPv6 DNS server \"%s\" invalid"
+msgid "IPv6 DNS server “%s” invalid"
 msgstr "Chan eil am frithealaiche DNS IPv6 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-master.c:248
-#: ../src/connection-editor/page-master.c:259
+#: ../src/connection-editor/page-master.c:247
+#: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
 msgstr "Dùblaich tràillean"
 
-#: ../src/connection-editor/page-master.c:249
+#: ../src/connection-editor/page-master.c:248
 #, c-format
-msgid "Slaves '%s' and '%s' both apply to device '%s'"
+#| msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Tha an dà thràill \"%s\" agus \"%s\" an sàs airson an uidheim \"%s\""
 
-#: ../src/connection-editor/page-master.c:260
+#: ../src/connection-editor/page-master.c:259
 #, c-format
+#| msgid ""
+#| "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of "
+#| "the same physical device."
 msgid ""
-"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 "Tha an dà thràill \"%s\" agus \"%s\" an sàs airson puirt bhiortail eadar-"
@@ -2808,36 +3644,41 @@ msgid "Unsupported mobile broadband connection type."
 msgstr "Seòrsa de cheangal bann-leathainn mobile ris nach eil taic."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:529
+#: ../src/connection-editor/page-mobile.c:540
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Tagh seòrsa solaraiche a' bhann-leathainn mobile"
 
-#: ../src/connection-editor/page-mobile.c:556
+#: ../src/connection-editor/page-mobile.c:567
+#| msgid ""
+#| "Select the technology your mobile broadband provider uses.  If you are "
+#| "unsure, ask your provider."
 msgid ""
-"Select the technology your mobile broadband provider uses.  If you are "
+"Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 "Tagh an teicneolas a tha an solaraiche bann-leathainn mobile a' cleachdadh. "
 "Mur eil thu cinnteach, faighnich dhen t-solaraiche agad."
 
-#: ../src/connection-editor/page-mobile.c:561
+#: ../src/connection-editor/page-mobile.c:572
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Tha an solaraiche agam a' cleachdadh teicneolas stèidhichte air _GSM (m.e. "
 "GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:568
+#. Translators: CDMA has 'D' accelerator key; 'C' collides with 'Cancel' button.
+#. You may need to change it according to your language.
+#: ../src/connection-editor/page-mobile.c:579
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Tha an solaraiche agam a' cleachdadh teicneolas stèidhichte air C _DMA (m.e. "
 "1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
 #: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
@@ -2847,24 +3688,24 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:258
+#: ../src/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:303
+#: ../src/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:280
+#: ../src/wireless-security/eap-method-fast.c:283
 #: ../src/wireless-security/eap-method-peap.c:272
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: ../src/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:273
+#: ../src/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -2886,23 +3727,27 @@ msgstr "Roghainnean PPP"
 msgid "Could not load PPP user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche PPP a luchdadh."
 
-#: ../src/connection-editor/page-team.c:98
-#: ../src/connection-editor/page-team-port.c:71
-#: ../src/connection-editor/vpn-helpers.c:165
-msgid "Select file to import"
-msgstr "Tagh am faidhle a tha ri ion-phortadh"
+#: ../src/connection-editor/page-proxy.c:217
+msgid "Proxy"
+msgstr ""
+
+#: ../src/connection-editor/page-proxy.c:219
+#| msgid "Could not load bond user interface."
+msgid "Could not load proxy user interface."
+msgstr "Cha b' urrainn dhuinn an eadar-aghaidh airson progsaidhean a luchdadh."
 
-#: ../src/connection-editor/page-team.c:118
-#: ../src/connection-editor/page-team-port.c:91
-msgid "Error: file doesn't contain a valid JSON configuration"
+#: ../src/connection-editor/page-team.c:361
+#: ../src/connection-editor/page-team-port.c:223
+#| msgid "Error: file doesn't contain a valid JSON configuration"
+msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Mearachd: chan eil rèiteachadh JSON dligheach am broinn an fhaidhle"
 
-#: ../src/connection-editor/page-team.c:270
+#: ../src/connection-editor/page-team.c:1156
 msgid "Could not load team user interface."
 msgstr ""
 "Cha b' urrainn dhuinn eadar-aghaidh sgioba a' chleachdaiche a luchdadh."
 
-#: ../src/connection-editor/page-team.c:377
+#: ../src/connection-editor/page-team.c:1253
 #, c-format
 msgid "Team connection %d"
 msgstr "Ceangal sgioba %d"
@@ -2910,11 +3755,11 @@ msgstr "Ceangal sgioba %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:151
+#: ../src/connection-editor/page-team-port.c:732
 msgid "Team Port"
 msgstr "Port an sgioba"
 
-#: ../src/connection-editor/page-team-port.c:153
+#: ../src/connection-editor/page-team-port.c:734
 msgid "Could not load team port user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh airson port sgioba a' chleachdaiche a "
@@ -2923,73 +3768,67 @@ msgstr ""
 #. Translators: the first %s is a device name (eg, "em1"), the
 #. * second is a connection name (eg, "Auto Ethernet").
 #.
-#: ../src/connection-editor/page-vlan.c:414
+#: ../src/connection-editor/page-vlan.c:415
 #, c-format
-msgid "%s (via \"%s\")"
+#| msgid "%s (via \"%s\")"
+msgid "%s (via “%s”)"
 msgstr "%s (tro \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:426
+#: ../src/connection-editor/page-vlan.c:427
 #, c-format
-msgid "New connection..."
+#| msgid "New connection..."
+msgid "New connection…"
 msgstr "Ceangal ùr..."
 
 #: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche VLAN a luchdadh."
 
-#: ../src/connection-editor/page-vlan.c:734
+#: ../src/connection-editor/page-vlan.c:735
 msgid "vlan parent"
 msgstr "pàrant vlan"
 
-#: ../src/connection-editor/page-vlan.c:797
+#: ../src/connection-editor/page-vlan.c:803
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Ceangal VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:96
+#: ../src/connection-editor/page-vpn.c:98
 msgid "Could not load VPN user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche a luchdadh."
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-vpn.c:113
 #, c-format
-#| msgid "Could not find VPN plugin service for '%s'."
-msgid "Could not find VPN plugin for '%s'."
+#| msgid "Could not find VPN plugin for '%s'."
+msgid "Could not find VPN plugin for “%s”."
 msgstr "Cha b' urrainn dhuinn am plugan VPN airson \"%s\" a lorg."
 
-#: ../src/connection-editor/page-vpn.c:120
+#: ../src/connection-editor/page-vpn.c:122
 #, c-format
-#| msgid "Could not find VPN plugin service for '%s'."
-msgid "Could not load editor VPN plugin for '%s' (%s)."
+#| msgid "Could not load editor VPN plugin for '%s' (%s)."
+msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Cha b' urrainn dhuinn plugan deasaiche VPN airson \"%s\" a lorg (%s)."
 
-#: ../src/connection-editor/page-vpn.c:121
-#| msgid "Connection failure"
+#: ../src/connection-editor/page-vpn.c:123
 msgid "unknown failure"
 msgstr "mearachd nach aithne dhuinn"
 
-#: ../src/connection-editor/page-vpn.c:214
-#: ../src/connection-editor/page-vpn.c:309
+#: ../src/connection-editor/page-vpn.c:205
 #, c-format
 msgid "VPN connection %d"
 msgstr "Ceangal VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:238
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"Cha b' urrainn dhan phlugan VPN an ceangal VPN ion-phortadh mar bu chòir\n"
-"\n"
-"Mearachd: às aonais seòrsa seirbheis VPN."
-
-#: ../src/connection-editor/page-vpn.c:263
+#: ../src/connection-editor/page-vpn.c:211
 msgid "Choose a VPN Connection Type"
 msgstr "Tagh seòrsa a' cheangail VPN"
 
-#: ../src/connection-editor/page-vpn.c:264
+#: ../src/connection-editor/page-vpn.c:212
+#| msgid ""
+#| "Select the type of VPN you wish to use for the new connection.  If the "
+#| "type of VPN connection you wish to create does not appear in the list, "
+#| "you may not have the correct VPN plugin installed."
 msgid ""
-"Select the type of VPN you wish to use for the new connection.  If the type "
+"Select the type of VPN you wish to use for the new connection. If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
 msgstr ""
@@ -2998,19 +3837,26 @@ msgstr ""
 "mathaid nach eil am plugan VPN ceart stàlaichte agad."
 
 #: ../src/connection-editor/page-wifi.c:77
+#| msgid ""
+#| "This option locks this connection to the Wi-Fi access point (AP) "
+#| "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
-"by the BSSID entered here.  Example: 00:11:22:33:44:55"
+"by the BSSID entered here. Example: 00:11:22:33:44:55"
 msgstr ""
 "Tha an roghainn seo a’ glasadh a' cheangal seo ris a' phuing-inntrigidh WiFi "
 "(AP) a tha 'ga shònrachadh leis a' BSSID a chaidh a chur a-steach an-seo. "
 "Ball-eisimpleir: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/page-wifi.c:88
+#| msgid ""
+#| "This option locks this connection to the network device specified either "
+#| "by its interface name or permanent MAC or both. Examples: \"wlan0\", "
+#| "\"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
 msgid ""
 "This option locks this connection to the network device specified either by "
-"its interface name or permanent MAC or both. Examples: \"wlan0\", "
-"\"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
+"its interface name or permanent MAC or both. Examples: “wlan0”, "
+"“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”"
 msgstr ""
 "Glaisidh an roghainn seo an ceangal seo ris an uidheam lìonraidh a chaidh a "
 "shònrachadh a-rèir ainm eadar-aghaidh no MAC maireannach no an dà chuidh "
@@ -3022,119 +3868,103 @@ msgstr ""
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:450
+#: ../src/connection-editor/page-wifi.c:442
 msgid "Could not load Wi-Fi user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche WiFi a luchdadh."
 
-#: ../src/connection-editor/page-wifi.c:571
+#: ../src/connection-editor/page-wifi.c:564
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:577
+#: ../src/connection-editor/page-wifi.c:570
 msgid "Wi-Fi device"
 msgstr "Uidheam WiFi"
 
-#: ../src/connection-editor/page-wifi.c:619
+#: ../src/connection-editor/page-wifi.c:617
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Ceangal WiFi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Iuchair WEP 40/128-bit (Hex no ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:319
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Abairt-fhaire WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/connection-editor/page-wifi-security.c:392
+#| msgid "Dynamic WEP (802.1x)"
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamic WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
 
-#: ../src/connection-editor/page-wifi-security.c:371
-#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:413
+#: ../src/connection-editor/page-wifi-security.c:461
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Cha b' urrainn an eadar-aghaidh cleachdaiche airson tèarainteachd WiFi a "
 "luchdadh; tha roghainn WiFi a dhith."
 
-#: ../src/connection-editor/page-wifi-security.c:424
+#: ../src/connection-editor/page-wifi-security.c:472
 msgid "Wi-Fi Security"
 msgstr "Tèarainteachd WiFi"
 
-#: ../src/connection-editor/page-wifi-security.c:426
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche airson tèarainteachd "
 "WiFi a luchdadh."
 
-#: ../src/connection-editor/page-wifi-security.c:506
+#: ../src/connection-editor/page-wifi-security.c:558
 #, c-format
 msgid "missing SSID"
 msgstr "tha SSID a dhìth"
 
-#: ../src/connection-editor/page-wifi-security.c:512
+#: ../src/connection-editor/page-wifi-security.c:564
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Chan eil an tèarainteachd co-chòrdail le modh Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:138
-msgid "Cannot import VPN connection"
-msgstr "Chan urrainn dhuinn an ceangal VPN ion-phortadh"
-
-#: ../src/connection-editor/vpn-helpers.c:140
+#: ../src/connection-editor/vpn-helpers.c:132
 #, 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 fiosrachadh "
-"ceangail VPN ann a thuigeas sinn\n"
-"\n"
-"Mearachd: %s."
-
-#: ../src/connection-editor/vpn-helpers.c:141
-msgid "unknown error"
-msgstr "mearachd nach aithne dhuinn"
-
-#: ../src/connection-editor/vpn-helpers.c:215
-#, c-format
-msgid "A file named \"%s\" already exists."
+#| msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
 msgstr "Tha faidhle air a bheil \"%s\" ann mar-thà."
 
-#: ../src/connection-editor/vpn-helpers.c:217
+#: ../src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Cuir 'na àite"
 
-#: ../src/connection-editor/vpn-helpers.c:219
+#: ../src/connection-editor/vpn-helpers.c:136
 #, 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"
 "\"?"
 
-#: ../src/connection-editor/vpn-helpers.c:255
+#: ../src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Chan urrainn dhuinn an ceangal VPN às-phortadh"
 
-#: ../src/connection-editor/vpn-helpers.c:257
+#: ../src/connection-editor/vpn-helpers.c:174
 #, c-format
+#| msgid ""
+#| "The VPN connection '%s' could not be exported to %s.\n"
+#| "\n"
+#| "Error: %s."
 msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
 msgstr ""
@@ -3142,8 +3972,9 @@ msgstr ""
 "\n"
 "Mearachd: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:292
-msgid "Export VPN connection..."
+#: ../src/connection-editor/vpn-helpers.c:209
+#| msgid "Export VPN connection..."
+msgid "Export VPN connection…"
 msgstr "Às-phortaich ceangal VPN..."
 
 #: ../src/gsm-unlock.ui.h:2
@@ -3189,18 +4020,24 @@ msgstr "Am plana agad:"
 
 #: ../src/libnma/nma-mobile-wizard.c:248
 #: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#| msgid ""
+#| "A connection will now be made to your mobile broadband provider using the "
+#| "settings you selected.  If the connection fails or you cannot access "
+#| "network resources, double-check your settings.  To modify your mobile "
+#| "broadband connection settings, choose \"Network Connections\" from the "
+#| "System >> Preferences menu."
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
-"settings you selected.  If the connection fails or you cannot access network "
-"resources, double-check your settings.  To modify your mobile broadband "
-"connection settings, choose \"Network Connections\" from the System >> "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
 "Preferences menu."
 msgstr ""
 "Thèid ceangal ris an t-solaraiche bhann-leathainn mobile agad a-nis, a' "
 "cleachdadh nan roghainnean a thagh thu. Ma dh'fhàilligeas an ceangal no mur "
 "fhaigh thu greim air goireasan an lìonraidh, thoir sùil air na roghainnean. "
 "Gus roghainnean a' cheangail bhann-leathainn mobile agad atharrachadh, tagh "
-"\"Ceanglaichean lìonraidh\" on chlàr-taice \"Siostam\" » \"Roghainnean\"."
+"\"Ceanglaichean lìonraidh\" on chlàr-taice \"Siostam\" → \"Roghainnean\"."
 
 #: ../src/libnma/nma-mobile-wizard.c:261
 #: ../src/libnm-gtk/nm-mobile-wizard.c:262
@@ -3224,11 +4061,17 @@ msgstr "_APN (Access Point Name) a' phlana a thagh thu:"
 
 #: ../src/libnma/nma-mobile-wizard.c:500
 #: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#| msgid ""
+#| "Warning: Selecting an incorrect plan may result in billing issues for "
+#| "your broadband account or may prevent connectivity.\n"
+#| "\n"
+#| "If you are unsure of your plan please ask your provider for your plan's "
+#| "APN."
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
 "\n"
-"If you are unsure of your plan please ask your provider for your plan's APN."
+"If you are unsure of your plan please ask your provider for your plan’s APN."
 msgstr ""
 "Rabhadh: Ma thaghas tu am plana cearr, dh'fhaoidte gun èirich duilgheadasan "
 "bileachaidh airson a' cheangail bhann-leathainn agad no nach urrainn dhut "
@@ -3244,7 +4087,8 @@ msgstr "Tagh am plana bileachaidh agad."
 
 #: ../src/libnma/nma-mobile-wizard.c:557
 #: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed..."
+#| msgid "My plan is not listed..."
+msgid "My plan is not listed…"
 msgstr "Chan eil am plana agam air an liosta..."
 
 #: ../src/libnma/nma-mobile-wizard.c:710
@@ -3259,7 +4103,8 @@ msgstr "Solaraiche"
 
 #: ../src/libnma/nma-mobile-wizard.c:748
 #: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can't find my provider and I wish to enter it _manually:"
+#| msgid "I can't find my provider and I wish to enter it _manually:"
+msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr ""
 "Chan fhaic mi an solaraiche agam 's tha mi ag iarraidh a chur a-steach de "
 "lài_mh:"
@@ -3302,7 +4147,8 @@ msgstr "Chan eil mo dhùthaich air an liosta"
 
 #: ../src/libnma/nma-mobile-wizard.c:1126
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider's Country or Region"
+#| msgid "Choose your Provider's Country or Region"
+msgid "Choose your Provider’s Country or Region"
 msgstr "Tagh dùthaich no roinn-dùthcha an t-solaraiche agad"
 
 #: ../src/libnma/nma-mobile-wizard.c:1183
@@ -3331,7 +4177,8 @@ msgstr "Feumaidh tu am fiosrachadh a leanas:"
 
 #: ../src/libnma/nma-mobile-wizard.c:1371
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider's name"
+#| msgid "Your broadband provider's name"
+msgid "Your broadband provider’s name"
 msgstr "Ainm an t-solaraiche bhann-leathainn agad."
 
 #: ../src/libnma/nma-mobile-wizard.c:1377
@@ -3360,7 +4207,7 @@ msgstr "Uidheam sam bith"
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Suidhich ceangal bann-leathainn mobile"
 
-#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnma/nma-mobile-wizard.c:1620
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ceangal bann-leathainn mobile ùr"
@@ -3388,6 +4235,7 @@ msgstr "_Facal-faire dàrnach:"
 
 #: ../src/libnma/nma-vpn-password-dialog.c:102
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#| msgid "_Ternary Password:"
 msgid "_Tertiary Password:"
 msgstr "_Treas facal-faire:"
 
@@ -3408,56 +4256,63 @@ msgstr ""
 "Tha facal-faire a dhìth no chan eil an ceangal dligheach. Mur eil an ceangal "
 "dligheach, feumaidh tu a dheasachadh le nm-connection-editor an toiseach"
 
-#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
-msgid "New..."
+#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New…"
 msgstr "Ùr..."
 
-#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../src/libnma/nma-wifi-dialog.c:1071 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamic WEP (802.1x)"
+
+#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_ruthaich"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
+#| msgid ""
+#| "Passwords or encryption keys are required to access the Wi-Fi network "
+#| "'%s'."
 msgid ""
-"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Tha feum air faclan-faire no iuchraichean crioptachaidh mus fhaighear "
 "cothrom air an lìonra WiFi \"%s\"."
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Tha feum air dearbhadh lìonra WiFi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Tha an lìonra WiFi ag iarraidh dearbhadh"
 
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Cruthaich lìonra WiFi ùr"
 
-#: ../src/libnma/nma-wifi-dialog.c:1168 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Lìonra WiFi ùr"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Cuir a-steach ainm airson an lìonra WiFi a tha thu airson cruthachadh."
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Ceangail ri lìonra WiFi falaichte"
 
-#: ../src/libnma/nma-wifi-dialog.c:1173 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Lìonra WiFi falaichte"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3465,15 +4320,15 @@ msgstr ""
 "Cuir a-steach ainm agus fiosrachadh tèarainteachd an lìonraidh WiFi "
 "fhalaichte a tha thu airson ceangal ris."
 
-#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
 msgid "Wi-Fi _security:"
 msgstr "_Tèarainteachd WiFi:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "C_onnection:"
 msgstr "C_eangal:"
 
-#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptar WiFi:"
 
@@ -3518,8 +4373,8 @@ msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/";
 "Projects/NetworkManager/)."
 msgstr ""
-"Tha am prògram seo 'na phàirt de NetworkManager (https://wiki.gnome.org/";
-"Projects/NetworkManager/)."
+"Tha am prògram seo 'na phàirt de Manaidsear lìonraidh (https://wiki.gnome.";
+"org/Projects/NetworkManager/)."
 
 #: ../src/main.c:45
 msgid ""
@@ -3613,7 +4468,8 @@ msgstr "Lìonra  air fàrsan"
 
 #: ../src/mobile-helpers.c:331
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
+#| msgid "PIN code for SIM card '%s' on '%s'"
+msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Còd PIN airson na cairt SIM \"%s\" air \"%s\""
 
 #: ../src/mobile-helpers.c:464
@@ -3626,7 +4482,8 @@ msgstr "Feumaidh an t-uidheam bann-leathann mobile còd PIN"
 
 #: ../src/mobile-helpers.c:622
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+#| msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Tha an ceangal bann-leathann mobile \"%s\" gnìomhach: (%d%%%s%s)"
 
 #: ../src/mobile-helpers.c:625
@@ -3634,12 +4491,13 @@ msgid "roaming"
 msgstr "air fàrsan"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:179
+#: ../src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "ceangal %s"
 
-#: ../src/wireless-security/eap-method.c:56
+#: ../src/wireless-security/eap-method.c:57
+#| msgid "undefined error in 802.1x security (wpa-eap)"
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "mearachd gun sònrachadh san tèarainteachd 802.1X (wpa-eap)"
 
@@ -3647,79 +4505,79 @@ msgstr "mearachd gun sònrachadh san tèarainteachd 802.1X (wpa-eap)"
 msgid "no file selected"
 msgstr "cha deach faidhle a thaghadh"
 
-#: ../src/wireless-security/eap-method.c:260
+#: ../src/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "mearachd gun sònrachadh le dearbhadh an fhaidhle eap-method"
 
-#: ../src/wireless-security/eap-method.c:459
+#: ../src/wireless-security/eap-method.c:439
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 "Iuchraichean prìobhaideach DER, PEM no PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:462
+#: ../src/wireless-security/eap-method.c:442
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Teisteanasan DER no PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:70
+#: ../src/wireless-security/eap-method-fast.c:72
 msgid "missing EAP-FAST PAC file"
 msgstr "tha faidhle EAP-FAST PAC a dhìth"
 
-#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-fast.c:268
 #: ../src/wireless-security/eap-method-peap.c:302
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: ../src/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:403
+#: ../src/wireless-security/eap-method-fast.c:406
 #| msgid "Choose a PAC file..."
 msgid "Choose a PAC file"
 msgstr "Tagh faidhle PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "Faidhlichean PAC  (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "A h-uile faidhle"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: ../src/wireless-security/eap-method-fast.ui.h:1
 msgid "Anonymous"
 msgstr "Gun urra"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Authenticated"
 msgstr "Dearbhaichte"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:4
+#: ../src/wireless-security/eap-method-fast.ui.h:3
 msgid "Both"
 msgstr "An dà chuid"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "Anony_mous identity:"
 msgstr "Dearbh-aithne gun _urra"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:5
 msgid "PAC _file:"
 msgstr "_Faidhle PAC:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
 msgid "_Inner authentication:"
 msgstr "_Inner Authentication:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:8
+#: ../src/wireless-security/eap-method-fast.ui.h:7
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Ceadaich PAC _Provisioning fèin-obrachail"
 
-#: ../src/wireless-security/eap-method-leap.c:63
+#: ../src/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
 msgstr "tha ainm-cleachdaiche EAP-LEAP a dhìth"
 
-#: ../src/wireless-security/eap-method-leap.c:69
+#: ../src/wireless-security/eap-method-leap.c:74
 msgid "missing EAP-LEAP password"
 msgstr "tha facal-faire EAP-LEAP a dhìth"
 
@@ -3734,86 +4592,93 @@ msgstr ""
 "teisteanas EAP-PEAP CA mì-dhligheach: cha deach teisteanas a shònrachadh"
 
 #: ../src/wireless-security/eap-method-peap.c:287
-#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/eap-method-ttls.c:336
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
 #: ../src/wireless-security/eap-method-peap.c:381
-#: ../src/wireless-security/eap-method-tls.c:481
-#: ../src/wireless-security/eap-method-ttls.c:412
+#: ../src/wireless-security/eap-method-tls.c:501
+#: ../src/wireless-security/eap-method-ttls.c:430
 #| msgid "Choose a Certificate Authority certificate..."
 msgid "Choose a Certificate Authority certificate"
 msgstr "Tagh teisteanas ùghdarras theisteanasan"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Tionndadh 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 1"
 msgstr "Tionndadh 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-peap.ui.h:5
 #: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "C_A certificate:"
 msgstr "Teisteanas C_A:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "No CA certificate is _required"
 msgstr "Chan eil teisteanas CA _riatanach"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version:"
 msgstr "_Tionndadh PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:72
+#: ../src/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "tha ainm-cleachdaiche EAP a dhìth"
 
-#: ../src/wireless-security/eap-method-simple.c:82
+#: ../src/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "tha facal-faire EAP a dhìth"
 
-#: ../src/wireless-security/eap-method-tls.c:66
+#: ../src/wireless-security/eap-method-tls.c:68
 msgid "missing EAP-TLS identity"
 msgstr "tha dearbh-aithne EAP-TLS a dhìth"
 
-#: ../src/wireless-security/eap-method-tls.c:71
+#: ../src/wireless-security/eap-method-tls.c:77
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "teisteanas EAP-TLS CA mì-dhligheach: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:76
+#: ../src/wireless-security/eap-method-tls.c:84
 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"
 
-#: ../src/wireless-security/eap-method-tls.c:84
+#: ../src/wireless-security/eap-method-tls.c:95
 msgid "invalid EAP-TLS password: missing"
 msgstr "facal-faire EAP-TLS mì-dhligheach: chan eil gin ann"
 
-#: ../src/wireless-security/eap-method-tls.c:94
+#: ../src/wireless-security/eap-method-tls.c:109
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "iuchair phrìobhaideach EAP-TLS mhì-dhligheach: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:101
+#: ../src/wireless-security/eap-method-tls.c:119
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "teisteanas cleachdaiche EAP-TLS mì-dhligheach: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:296
+#: ../src/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "Chan eil iuchraichean prìobhaideach gun chrioptachadh tèarainte"
 
-#: ../src/wireless-security/eap-method-tls.c:299
+#: ../src/wireless-security/eap-method-tls.c:319
+#| msgid ""
+#| "The selected private key does not appear to be protected by a password.  "
+#| "This could allow your security credentials to be compromised.  Please "
+#| "select a password-protected private key.\n"
+#| "\n"
+#| "(You can password-protect your private key with openssl)"
 msgid ""
-"The selected private key does not appear to be protected by a password.  "
-"This could allow your security credentials to be compromised.  Please select "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
@@ -3825,12 +4690,12 @@ msgstr ""
 "(Faodaidh tu an iuchair phrìobhaideach agad a dhìon le facal-faire le "
 "openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:475
+#: ../src/wireless-security/eap-method-tls.c:495
 #| msgid "Choose your personal certificate..."
 msgid "Choose your personal certificate"
 msgstr "Tagh an teisteanas pearsanta agad"
 
-#: ../src/wireless-security/eap-method-tls.c:487
+#: ../src/wireless-security/eap-method-tls.c:507
 #| msgid "Choose your private key..."
 msgid "Choose your private key"
 msgstr "Tagh an iuchair phrìobhaideach agad"
@@ -3861,7 +4726,13 @@ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr ""
 "teisteanas EAP-TTLS CA mì-dhligheach: cha deach teisteanas a shònrachadh"
 
+#: ../src/wireless-security/eap-method-ttls.c:305
+#| msgid "MSCHAPv2"
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2 (gun EAP)"
+
 #: ../src/wireless-security/wireless-security.c:72
+#| msgid "Unknown error validating 802.1x security"
 msgid "Unknown error validating 802.1X security"
 msgstr "Mearachd nach aithne dhuinn le dearbhadh na tèarainteachd 802.1X"
 
@@ -3885,32 +4756,32 @@ msgstr "Tunneled TLS"
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../src/wireless-security/ws-wep-key.ui.h:9
-#: ../src/wireless-security/ws-wpa-eap.ui.h:2
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
 msgid "Au_thentication:"
 msgstr "De_arbhadh:"
 
-#: ../src/wireless-security/ws-leap.c:61
+#: ../src/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "tha ainm-cleachdaiche leap a dhìth"
 
-#: ../src/wireless-security/ws-leap.c:69
+#: ../src/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "tha facal-faire leap a dhìth"
 
-#: ../src/wireless-security/ws-wep-key.c:105
+#: ../src/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "tha iuchair wep a dhìth"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: ../src/wireless-security/ws-wep-key.c:116
 #, 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"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: ../src/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -3918,7 +4789,7 @@ msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod ach caractaran ASCII a bhith am "
 "broinn iuchair a tha %zu a dh'fhaid"
 
-#: ../src/wireless-security/ws-wep-key.c:125
+#: ../src/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3927,12 +4798,12 @@ 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"
 
-#: ../src/wireless-security/ws-wep-key.c:131
+#: ../src/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith falamh"
 
-#: ../src/wireless-security/ws-wep-key.c:133
+#: ../src/wireless-security/ws-wep-key.c:139
 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 "
@@ -3942,27 +4813,27 @@ msgstr ""
 msgid "1 (Default)"
 msgstr "1 (Bun-roghainn)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "Siostam fosgailte"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "Shared Key"
 msgstr "Iuchair cho-roinnte"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "_Iuchair:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:5
 msgid "Sho_w key"
 msgstr "Se_all an iuchair"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
+#: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "WEP inde_x:"
 msgstr "Clàr-a_mais WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:69
+#: ../src/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3971,7 +4842,7 @@ msgstr ""
 "wpa-psk mì-dhligheach: tha faide na h-iuchrach %zu mì-dhligheach. Feumaidh i "
 "bhith [8,63] baidht no 64 figear sia-dheicheach"
 
-#: ../src/wireless-security/ws-wpa-psk.c:77
+#: ../src/wireless-security/ws-wpa-psk.c:79
 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-"
@@ -3981,6 +4852,54 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Seòrsa:"
 
+#~ msgid "New Mobile Broadband connection..."
+#~ msgstr "Ceangal bann-leathainn mobile ùr..."
+
+#~ msgid "_Connect to Hidden Wi-Fi Network..."
+#~ msgstr "_Ceangail ri lìonra WiFi falaichte..."
+
+#~ msgid "Create _New Wi-Fi Network..."
+#~ msgstr "Cruthaich lìonra WiFi ù_r..."
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "15"
+#~ msgstr "15"
+
+#~ msgid "Aut_onegotiate"
+#~ msgstr "Co-rèitich gu fèi_n-obrachail"
+
+#~ msgid "FirewallD is not running."
+#~ msgstr "Chan eil FirewallD a' ruith."
+
+#~ msgid "New..."
+#~ msgstr "Ùr..."
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Aplaid NetworkManager"
@@ -4150,9 +5069,6 @@ msgstr "_Seòrsa:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "_Mode:"
-#~ msgstr "_Modh:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "Seòladh MAC an _uidheim:"
 


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